diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-07-20 15:13:03 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-20 11:03:54 +0200 |
| commit | 8aa1b97cc801fc88bf5afef2459387d44352f426 (patch) | |
| tree | 90202c2160fc06d0fad6d4129bfbbde2b8cdab8b | |
| parent | 78c8ed0a5fdac6340dddeeee4bcf7eee4b343118 (diff) | |
| download | ptxdist-8aa1b97cc801fc88bf5afef2459387d44352f426.tar.gz ptxdist-8aa1b97cc801fc88bf5afef2459387d44352f426.tar.xz | |
use ptx/get-alternative and ptx/in-path everywhere
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/ca-certificates.make | 4 | ||||
| -rw-r--r-- | rules/host-libsemanage.make | 2 | ||||
| -rw-r--r-- | rules/host-qemu.make | 2 | ||||
| -rw-r--r-- | rules/hostapd.make | 2 | ||||
| -rw-r--r-- | rules/qt5.make | 2 | ||||
| -rw-r--r-- | rules/wpa_supplicant.make | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make index 613aae716..d2c798d48 100644 --- a/rules/ca-certificates.make +++ b/rules/ca-certificates.make @@ -27,8 +27,8 @@ CA_CERTIFICATES_SOURCE := $(SRCDIR)/certdata-$(CA_CERTIFICATES_VERSION).$(CA_CE CA_CERTIFICATES_DIR := $(BUILDDIR)/$(CA_CERTIFICATES) CA_CERTIFICATES_LICENSE := MPL-2.0 # Use '=' to delay $(shell ...) calls until this is needed -CA_CERTIFICATES_CERTDATA2PEM = $(shell ptxd_in_path PTXDIST_PATH_SCRIPTS certdata2pem.py && echo "$${ptxd_reply}") -CA_CERTIFICATES_BLACKLIST = $(shell ptxd_get_alternative config/ca-certificates blacklist.txt && echo "$${ptxd_reply}") +CA_CERTIFICATES_CERTDATA2PEM = $(call ptx/in-path, PTXDIST_PATH_SCRIPTS, certdata2pem.py) +CA_CERTIFICATES_BLACKLIST = $(call ptx/get-alternative, config/ca-certificates, blacklist.txt) # ---------------------------------------------------------------------------- # Extract diff --git a/rules/host-libsemanage.make b/rules/host-libsemanage.make index affcda117..876fdce1d 100644 --- a/rules/host-libsemanage.make +++ b/rules/host-libsemanage.make @@ -32,7 +32,7 @@ HOST_LIBSEMANAGE_INSTALL_OPT = \ define semanage/conf_helper PTXDIST_SYSROOT_HOST=$(PTXDIST_SYSROOT_HOST) \ ptxd_replace_magic \ - $(call ptx/get_alternative, config/libsemanage, host-semanage.conf) > \ + $(call ptx/get-alternative, config/libsemanage, host-semanage.conf) > \ $(strip $(1))/etc/selinux/semanage.conf endef diff --git a/rules/host-qemu.make b/rules/host-qemu.make index e5f6fffb6..96f56f536 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -146,7 +146,7 @@ HOST_QEMU_CONF_OPT = \ --enable-vhost-scsi # Use '=' to delay $(shell ...) calls until this is needed -QEMU_CROSS_QEMU = $(shell ptxd_get_alternative config/qemu qemu-cross && echo $$ptxd_reply) +QEMU_CROSS_QEMU = $(call ptx/get-alternative, config/qemu, qemu-cross) QEMU_CROSS_DL = $(shell ptxd_cross_cc_v | sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p') QEMU_CROSS_TOOLEXECLIBDIR = $(shell dirname $$(realpath $$(ptxd_cross_cc -print-file-name=libatomic.so 2> /dev/null))) QEMU_CROSS_LD_LIBRARY_PATH = $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(QEMU_CROSS_TOOLEXECLIBDIR):$(SYSROOT)/$(CROSS_LIB_DIR):$(SYSROOT)/usr/$(CROSS_LIB_DIR) diff --git a/rules/hostapd.make b/rules/hostapd.make index 14d71c549..22c5766a0 100644 --- a/rules/hostapd.make +++ b/rules/hostapd.make @@ -27,7 +27,7 @@ HOSTAPD_SOURCE := $(SRCDIR)/$(HOSTAPD).$(HOSTAPD_SUFFIX) HOSTAPD_DIR := $(BUILDDIR)/$(HOSTAPD) HOSTAPD_SUBDIR := $(HOSTAPD_NAME) # Use '=' to delay $(shell ...) calls until this is needed -HOSTAPD_DEFCONF = $(shell ptxd_get_alternative config/hostapd defconfig && echo $$ptxd_reply) +HOSTAPD_DEFCONF = $(call ptx/get-alternative, config/hostapd, defconfig) HOSTAPD_CONFIG := $(BUILDDIR)/$(HOSTAPD)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_LICENSE := BSD-3-Clause HOSTAPD_LICENSE_FILES := \ diff --git a/rules/qt5.make b/rules/qt5.make index e4449292a..71740684f 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -33,7 +33,7 @@ QT5_LICENSE_FILES := \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e -QT5_MKSPECS := $(shell ptxd_get_alternative config/qt5 linux-ptx-g++ && echo $$ptxd_reply) +QT5_MKSPECS := $(call ptx/get-alternative, config/qt5, linux-ptx-g++) ifdef PTXCONF_QT5 ifeq ($(strip $(QT5_MKSPECS)),) diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make index 1c841d669..f5ad83e69 100644 --- a/rules/wpa_supplicant.make +++ b/rules/wpa_supplicant.make @@ -26,7 +26,7 @@ WPA_SUPPLICANT_SOURCE := $(SRCDIR)/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) WPA_SUPPLICANT_DIR := $(BUILDDIR)/$(WPA_SUPPLICANT) WPA_SUPPLICANT_SUBDIR := $(WPA_SUPPLICANT_NAME) # Use '=' to delay $(shell ...) calls until this is needed -WPA_SUPPLICANT_DEFCONF = $(shell ptxd_get_alternative config/wpasupplicant defconfig && echo $$ptxd_reply) +WPA_SUPPLICANT_DEFCONF = $(call ptx/get-alternative, config/wpasupplicant, defconfig) WPA_SUPPLICANT_CONFIG := $(BUILDDIR)/$(WPA_SUPPLICANT)/$(WPA_SUPPLICANT_SUBDIR)/.config WPA_SUPPLICANT_LICENSE := GPL-2.0-only |