diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-17 14:15:21 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-17 14:17:08 +0200 |
commit | 6e6d9eab528faa6b8ff0cb9485ef9e3bde9ce870 (patch) | |
tree | cc3dcd812a34140ea31040edcc2bc2a3e102ada1 | |
parent | 6af6a4ed008b52017981ecc8f82432aad2550164 (diff) | |
download | ptxdist-6e6d9eab528faa6b8ff0cb9485ef9e3bde9ce870.tar.gz ptxdist-6e6d9eab528faa6b8ff0cb9485ef9e3bde9ce870.tar.xz |
rules: introduce and use ptx/sh
Like ptx/force-sh but for 'shell' instead of 'ptx/force-shell'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/host-qemu.make | 2 | ||||
-rw-r--r-- | rules/image-rauc.make | 2 | ||||
-rw-r--r-- | rules/other/Toplevel.make | 5 | ||||
-rw-r--r-- | rules/poco.make | 2 | ||||
-rw-r--r-- | rules/qt5.make | 2 | ||||
-rw-r--r-- | rules/util-linux-ng.make | 2 |
6 files changed, 10 insertions, 5 deletions
diff --git a/rules/host-qemu.make b/rules/host-qemu.make index 6f3b6b4e0..c61318126 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -36,7 +36,7 @@ HOST_QEMU_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND MIT AND BSD-1-Clause # HOST_QEMU_BROKEN_ICECC := \ - $(shell gcc -dumpversion | awk -F . '{ if ($$1*100 + $$2 < 409) print "y" }') + $(call ptx/sh, gcc -dumpversion | awk -F . '{ if ($$1*100 + $$2 < 409) print "y" }') ifeq ($(HOST_QEMU_BROKEN_ICECC),y) HOST_QEMU_MAKE_ENV := PTXDIST_ICECC= diff --git a/rules/image-rauc.make b/rules/image-rauc.make index 0f5a6d868..fd2986ed5 100644 --- a/rules/image-rauc.make +++ b/rules/image-rauc.make @@ -34,7 +34,7 @@ IMAGE_RAUC_CERT := $(call ptx/in-platformconfigdir, config/rauc/rauc.cert.pem) IMAGE_RAUC_ENV := \ RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \ RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \ - RAUC_BUNDLE_BUILD=$(shell date +%FT%T%z) \ + RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \ RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \ RAUC_KEY=$(IMAGE_RAUC_KEY) \ RAUC_CERT=$(IMAGE_RAUC_CERT) diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 019b123a3..0b72c3f9e 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -13,6 +13,8 @@ endef define ptx/force-sh $(eval SHELL=/bin/sh)$(shell $(1))$(eval SHELL=true) endef +define ptx/sh +endef else # make sure bash is used to execute commands from makefiles SHELL=$(realpath $(PTXDIST_TOPDIR)/bin/bash) @@ -22,6 +24,9 @@ endef define ptx/force-sh $(eval SHELL=/bin/sh)$(shell $(1))$(eval SHELL=$(realpath $(PTXDIST_TOPDIR)/bin/bash)) endef +define ptx/sh +$(call ptx/force-sh,$(1)) +endef endif export SHELL diff --git a/rules/poco.make b/rules/poco.make index c60802b2e..a551f4156 100644 --- a/rules/poco.make +++ b/rules/poco.make @@ -22,7 +22,7 @@ POCO := poco-$(POCO_VERSION) POCO_SUFFIX := tar.gz POCO_URL := http://pocoproject.org/releases/$(POCO)/$(POCO)-all.$(POCO_SUFFIX) POCO_SOURCE := $(SRCDIR)/$(POCO).$(POCO_SUFFIX) -POCO_DIR := $(shell readlink -f "$(BUILDDIR)/$(POCO)") +POCO_DIR := $(call ptx/sh, readlink -f "$(BUILDDIR)/$(POCO)") POCO_LICENSE := BSL-1.0 # ---------------------------------------------------------------------------- diff --git a/rules/qt5.make b/rules/qt5.make index 629ef3e98..f8e6cd949 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -22,7 +22,7 @@ QT5 := qt-everywhere-src-$(QT5_VERSION) QT5_SUFFIX := tar.xz QT5_URL := \ http://download.qt-project.org/official_releases/qt/$(basename $(QT5_VERSION))/$(QT5_VERSION)/single/$(QT5).$(QT5_SUFFIX) \ - http://download.qt-project.org/development_releases/qt/$(basename $(QT5_VERSION))/$(shell echo $(QT5_VERSION) | tr 'A-Z' 'a-z')/single/$(QT5).$(QT5_SUFFIX) + http://download.qt-project.org/development_releases/qt/$(basename $(QT5_VERSION))/$(call ptx/sh, echo $(QT5_VERSION) | tr 'A-Z' 'a-z')/single/$(QT5).$(QT5_SUFFIX) QT5_SOURCE := $(SRCDIR)/$(QT5).$(QT5_SUFFIX) QT5_DIR := $(BUILDDIR)/$(QT5) QT5_BUILD_OOT := YES diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 43f8daa7c..efef9c956 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -21,7 +21,7 @@ UTIL_LINUX_NG_VERSION := 2.32.1 UTIL_LINUX_NG_MD5 := 9e5b1b8c1dc99455bdb6b462cf9436d9 UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION) UTIL_LINUX_NG_SUFFIX := tar.xz -UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[^0-9].*\?/\1/g') +UTIL_LINUX_NG_BASENAME := v$(call ptx/sh, echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[^0-9].*\?/\1/g') UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)) UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX) UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG) |