summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rules/barebox.make2
-rw-r--r--rules/binutils.make2
-rw-r--r--rules/gcclibs.make2
-rw-r--r--rules/host-elf-h-compat.make2
-rw-r--r--rules/host-kernel-header.make4
-rw-r--r--rules/os-release.make2
-rw-r--r--rules/post/ptxd_make_collection.make2
-rw-r--r--rules/pre/Rules.make4
-rw-r--r--rules/pre/gdb.make6
-rw-r--r--rules/pre/get_alternative.make2
-rw-r--r--rules/pre/kernel.make4
-rw-r--r--rules/sw-ek-lm3s3748.make4
12 files changed, 18 insertions, 18 deletions
diff --git a/rules/barebox.make b/rules/barebox.make
index 4018dd697..83a7126cc 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -66,7 +66,7 @@ BAREBOX_EXTRA_ENV_PATH := $(foreach path, \
$(call ptx/in-platformconfigdir,$(path)))
BAREBOX_EXTRA_ENV_DEPS := \
$(BAREBOX_EXTRA_ENV_PATH) \
- $(shell find $(BAREBOX_EXTRA_ENV_PATH) -print 2>/dev/null)
+ $(call ptx/force-shell, find $(BAREBOX_EXTRA_ENV_PATH) -print 2>/dev/null)
$(STATEDIR)/barebox.prepare: $(BAREBOX_EXTRA_ENV_DEPS)
endif
diff --git a/rules/binutils.make b/rules/binutils.make
index fb448524f..b780ab262 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BINUTILS) += binutils
#
# Paths and names
#
-BINUTILS_VERSION := $(or $(shell $(CROSS_LD) -v | sed -e 's/.* \(.*\)$$/\1/g'),unknown)
+BINUTILS_VERSION := $(or $(call ptx/force-shell, $(CROSS_LD) -v | sed -e 's/.* \(.*\)$$/\1/g'),unknown)
BINUTILS_MD5 := none
BINUTILS := binutils-$(BINUTILS_VERSION)
BINUTILS_SUFFIX := tar.bz2
diff --git a/rules/gcclibs.make b/rules/gcclibs.make
index 63a898d02..6b1a31ebf 100644
--- a/rules/gcclibs.make
+++ b/rules/gcclibs.make
@@ -16,7 +16,7 @@
#
PACKAGES-$(PTXCONF_GCCLIBS) += gcclibs
-GCCLIBS_VERSION := $(or $(shell $(CROSS_CC) -dumpversion),unknown)
+GCCLIBS_VERSION := $(or $(call ptx/force-shell, $(CROSS_CC) -dumpversion),unknown)
# for license information
-include $(PTXDIST_PLATFORMDIR)/selected_toolchain/../share/compliance/gcclibs.make
diff --git a/rules/host-elf-h-compat.make b/rules/host-elf-h-compat.make
index 94c087874..03fe111b0 100644
--- a/rules/host-elf-h-compat.make
+++ b/rules/host-elf-h-compat.make
@@ -30,7 +30,7 @@ HOST_ELF_H_COMPAT_LICENSE := GPL-2.0-or-later
#
HOST_ELF_H_COMPAT_CONF_TOOL := autoconf
-ifneq ($(shell uname -s),Linux)
+ifneq ($(call ptx/force-shell, uname -s),Linux)
$(STATEDIR)/base.prepare: $(STATEDIR)/host-elf-h-compat.install.post
endif
diff --git a/rules/host-kernel-header.make b/rules/host-kernel-header.make
index bd1059dd8..4e84d1788 100644
--- a/rules/host-kernel-header.make
+++ b/rules/host-kernel-header.make
@@ -19,8 +19,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_KERNEL_HEADER) += host-kernel-header
ifndef PTXCONF_KERNEL_HEADER
TOOLCHAIN_CONFIG := $(PTXDIST_PLATFORMDIR)/selected_toolchain/ptxconfig
ifneq ($(wildcard $(TOOLCHAIN_CONFIG)),)
-HOST_KERNEL_HEADER_VERSION := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_KERNEL_HEADERS_VERSION))
-HOST_KERNEL_HEADER_MD5 := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_KERNEL_HEADERS_MD5))
+HOST_KERNEL_HEADER_VERSION := $(call remove_quotes,$(call ptx/force-shell, ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_KERNEL_HEADERS_VERSION))
+HOST_KERNEL_HEADER_MD5 := $(call remove_quotes,$(call ptx/force-shell, ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_KERNEL_HEADERS_MD5))
else
HOST_KERNEL_HEADER_VERSION := 4.19
HOST_KERNEL_HEADER_MD5 := 740a90cf810c2105df8ee12e5d0bb900
diff --git a/rules/os-release.make b/rules/os-release.make
index 7092f50d5..7d92a0471 100644
--- a/rules/os-release.make
+++ b/rules/os-release.make
@@ -27,7 +27,7 @@ OS_RELEASE_STAMP := $(call remove_quotes, \
$(PTXCONF_PLATFORM) \
$(PTXCONF_PLATFORM_VERSION))
-ifneq ($(strip $(OS_RELEASE_STAMP)),$(strip $(shell cat $(STATEDIR)/os-release.stamp 2>/dev/null)))
+ifneq ($(strip $(OS_RELEASE_STAMP)),$(strip $(call ptx/force-shell, cat $(STATEDIR)/os-release.stamp 2>/dev/null)))
PHONY += $(STATEDIR)/os-release.targetinstall
endif
diff --git a/rules/post/ptxd_make_collection.make b/rules/post/ptxd_make_collection.make
index 1d11cdd53..4b2a55997 100644
--- a/rules/post/ptxd_make_collection.make
+++ b/rules/post/ptxd_make_collection.make
@@ -8,6 +8,6 @@
# see the README file.
#
-ptx/collection = $(PACKAGES-y) $(filter $(foreach PKG,$(shell sed -n 's/^PTXCONF_\([^_][^=]*\)=y$$/\1/p' "$(strip $(1))"),$(PTX_MAP_TO_package_$(PKG))), $(PACKAGES-m))
+ptx/collection = $(PACKAGES-y) $(filter $(foreach PKG,$(call ptx/force-shell, sed -n 's/^PTXCONF_\([^_][^=]*\)=y$$/\1/p' "$(strip $(1))"),$(PTX_MAP_TO_package_$(PKG))), $(PACKAGES-m))
# vim: syntax=make
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 170c9dfe0..fbf5f1fad 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -9,8 +9,8 @@
# FIXME: cleanup
-GNU_BUILD := $(shell $(SCRIPTSDIR)/autoconf/config.guess)
-GNU_HOST := $(shell echo $(GNU_BUILD) | sed s/-[a-zA-Z0-9_]*-/-host-/)
+GNU_BUILD := $(call ptx/force-shell, $(SCRIPTSDIR)/autoconf/config.guess)
+GNU_HOST := $(call ptx/force-shell, echo $(GNU_BUILD) | sed s/-[a-zA-Z0-9_]*-/-host-/)
INSTALL := install
diff --git a/rules/pre/gdb.make b/rules/pre/gdb.make
index 31b1975d6..7c3afa179 100644
--- a/rules/pre/gdb.make
+++ b/rules/pre/gdb.make
@@ -13,12 +13,12 @@ SHARED_GDB_MD5 := $(call remove_quotes,$(PTXCONF_GDB_MD5))
ifdef PTXCONF_GDB_TOOLCHAIN_VERSION
TOOLCHAIN_CONFIG := $(PTXDIST_PLATFORMDIR)/selected_toolchain/ptxconfig
ifneq ($(wildcard $(TOOLCHAIN_CONFIG)),)
-SHARED_GDB_VERSION := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_VERSION))
+SHARED_GDB_VERSION := $(call remove_quotes,$(call ptx/force-shell, ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_VERSION))
ifeq ($(SHARED_GDB_MD5),)
-SHARED_GDB_MD5 := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5))
+SHARED_GDB_MD5 := $(call remove_quotes,$(call ptx/force-shell, ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5))
endif
else
-SHARED_GDB_VERSION := $(shell $(PTXCONF_COMPILER_PREFIX)gdb -v | sed -e 's/.* //;q')
+SHARED_GDB_VERSION := $(call ptx/force-shell, $(PTXCONF_COMPILER_PREFIX)gdb -v | sed -e 's/.* //;q')
endif
else
SHARED_GDB_VERSION := $(call remove_quotes,$(PTXCONF_GDB_VERSION))
diff --git a/rules/pre/get_alternative.make b/rules/pre/get_alternative.make
index 0477ed59e..afccdd9f6 100644
--- a/rules/pre/get_alternative.make
+++ b/rules/pre/get_alternative.make
@@ -23,7 +23,7 @@ endef
define ptx/in-path2
$(call ptx/in-path3,
$(filter-out /%,$(3)),
-$(shell p='$($(strip $(1)))' ptxd_in_path p $(2) && echo $$ptxd_reply),
+$(call ptx/force-shell, p='$($(strip $(1)))' ptxd_in_path p $(2) && echo $$ptxd_reply),
$(firstword $(wildcard $(addsuffix /$(strip $(2)),$(3)))))
endef
# create a path ist from the variable with ':' separated paths
diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make
index 7d5056974..dc42a212c 100644
--- a/rules/pre/kernel.make
+++ b/rules/pre/kernel.make
@@ -38,10 +38,10 @@ endif
# by cgit.
#
ifneq ($(findstring -rc,$(KERNEL_VERSION)),)
-KERNEL_NEEDS_GIT_URL := $(shell test $(KERNEL_VERSION_MAJOR) -ge 4 -a $(KERNEL_VERSION_MINOR) -ge 12 && echo y)
+KERNEL_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_VERSION_MAJOR) -ge 4 -a $(KERNEL_VERSION_MINOR) -ge 12 && echo y)
endif
ifneq ($(findstring -rc,$(KERNEL_HEADER_VERSION)),)
-KERNEL_HEADER_NEEDS_GIT_URL := $(shell test $(KERNEL_HEADER_VERSION_MAJOR) -ge 4 -a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 && echo y)
+KERNEL_HEADER_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_HEADER_VERSION_MAJOR) -ge 4 -a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 && echo y)
endif
KERNEL_HEADERS_DIR := $(PTXDIST_SYSROOT_TARGET)/kernel-headers
diff --git a/rules/sw-ek-lm3s3748.make b/rules/sw-ek-lm3s3748.make
index 9ca5fc762..422f86eeb 100644
--- a/rules/sw-ek-lm3s3748.make
+++ b/rules/sw-ek-lm3s3748.make
@@ -9,11 +9,11 @@
#
ifdef PTXCONF_SW_EK_LM3S3748
-ifneq ($(shell test -h $(PTXDIST_WORKSPACE)/selected_toolchain_stellaris && echo ok),ok)
+ifneq ($(call ptx/force-shell, test -h $(PTXDIST_WORKSPACE)/selected_toolchain_stellaris && echo ok),ok)
$(warning *** selected_toolchain_stellaris must point to a valid stellaris toolchain)
$(error )
endif
-ifneq ($(shell test -x $(PTXDIST_WORKSPACE)/selected_toolchain_stellaris/$(PTXCONF_STELLARIS_CC) && echo ok),ok)
+ifneq ($(call ptx/force-shell, test -x $(PTXDIST_WORKSPACE)/selected_toolchain_stellaris/$(PTXCONF_STELLARIS_CC) && echo ok),ok)
$(warning *** $(PTXDIST_WORKSPACE)/selected_toolchain_stellaris/$(PTXCONF_STELLARIS_CC) not found)
$(error )
endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 10:15:30 +0000