From 08333f7096f368fb2661a7bf958b0a3d37914b0e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 11 Aug 2019 23:22:35 +0200 Subject: [PATCH] - remove HELPERS_DIR from PATH --- make/crosstool.mk | 2 +- make/environment-build.mk | 6 +++++- make/linux-drivers.mk | 2 +- make/neutrino-plugins.mk | 2 +- make/target-gstreamer-unused.mk | 6 +++--- make/target-libs-static.mk | 2 +- make/target-libs.mk | 4 ++-- make/target-lua.mk | 2 +- make/target-tools-unused.mk | 2 +- make/target-tools.mk | 10 +++++----- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/make/crosstool.mk b/make/crosstool.mk index 4e739ff1..6f86764e 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -89,7 +89,7 @@ $(CROSS_BASE)/arm/hd51: | $(BUILD_TMP) make $(BUILD_TMP)/linux-$(KERNEL_VERSION).tar # $(REMOVE)/$(CROSSTOOL-NG_TMP) - get-git-source.sh $(CROSSTOOL-NG_URL)/$(CROSSTOOL-NG_SOURCE) $(ARCHIVE)/$(CROSSTOOL-NG_SOURCE) + $(GET-GIT-SOURCE) $(CROSSTOOL-NG_URL)/$(CROSSTOOL-NG_SOURCE) $(ARCHIVE)/$(CROSSTOOL-NG_SOURCE) $(CPDIR)/$(CROSSTOOL-NG_SOURCE) $(CHDIR)/$(CROSSTOOL-NG_TMP); \ git checkout 1dbb06f2; \ diff --git a/make/environment-build.mk b/make/environment-build.mk index f43a031a..b998b09f 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -260,7 +260,7 @@ TERM_YELLOW = \033[40;0;33m TERM_YELLOW_BOLD= \033[40;1;33m TERM_NORMAL = \033[0m -PATH := $(HOST_DIR)/bin:$(CROSS_DIR)/bin:$(HELPERS_DIR):$(PATH) +PATH := $(HOST_DIR)/bin:$(CROSS_DIR)/bin:$(PATH) PKG_CONFIG = $(HOST_DIR)/bin/$(TARGET)-pkg-config PKG_CONFIG_LIBDIR = $(TARGET_LIB_DIR) @@ -314,6 +314,10 @@ INSTALL_EXEC = $(INSTALL) -m 0755 # empty variable EMPTY for smoother comparisons EMPTY = +GET-GIT-ARCHIVE = $(HELPERS_DIR)/get-git-archive.sh +GET-GIT-SOURCE = $(HELPERS_DIR)/get-git-source.sh +GET-SVN-SOURCE = $(HELPERS_DIR)/get-svn-source.sh + # ----------------------------------------------------------------------------- MAKE_OPTS = \ diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index 43de740c..13ac8379 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -9,7 +9,7 @@ RTL8192EU_URL = https://github.com/mange/$(RTL8192EU_SOURCE) $(D)/rtl8192eu: $(D)/kernel-$(BOXTYPE) | $(TARGET_DIR) $(REMOVE)/$(RTL8192EU_SOURCE) - get-git-source.sh $(RTL8192EU_URL) $(ARCHIVE)/$(RTL8192EU_SOURCE) + $(GET-GIT-SOURCE) $(RTL8192EU_URL) $(ARCHIVE)/$(RTL8192EU_SOURCE) $(CPDIR)/$(RTL8192EU_SOURCE) $(CHDIR)/$(RTL8192EU_SOURCE); \ $(MAKE) $(KERNEL_MAKEVARS); \ diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index 8c37d3cf..32ec8b62 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -140,7 +140,7 @@ NEUTRINO-MEDIATHEK_URL = https://github.com/neutrino-mediathek $(D)/neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR) $(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP) - get-git-source.sh $(NEUTRINO-MEDIATHEK_URL)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE) + $(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_URL)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \ cp -a plugins/* $(SHAREPLUGINS)/; \ diff --git a/make/target-gstreamer-unused.mk b/make/target-gstreamer-unused.mk index 4eaef7ab..ed2ae1e2 100644 --- a/make/target-gstreamer-unused.mk +++ b/make/target-gstreamer-unused.mk @@ -267,7 +267,7 @@ GST_PLUGIN_SUBSINK_VER = 1.0 $(D)/gst-plugin-subsink: $(D)/gst-plugins-base | $(TARGET_DIR) $(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git - get-git-source.sh git://github.com/christophecvr/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git + $(GET-GIT-SOURCE) git://github.com/christophecvr/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(CPDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(CHDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git; \ aclocal --force -I m4; \ @@ -293,7 +293,7 @@ GST_PLUGINS_DVBMEDIASINK_VER = 1.0 $(D)/gst-plugin-dvbmediasink: $(D)/gst-plugins-base $(D)/libdca | $(TARGET_DIR) $(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git - get-git-source.sh https://github.com/OpenPLi/gst-plugin-dvbmediasink.git $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git + $(GET-GIT-SOURCE) https://github.com/OpenPLi/gst-plugin-dvbmediasink.git $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git $(CPDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git $(CHDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git; \ git checkout gst-1.0; \ @@ -390,7 +390,7 @@ $(D)/gst_libav: $(ARCHIVE)/$(GST_LIBAV_SOURCE) $(D)/gstreamer $(D)/gst-plugins-b $(D)/gmrender-resurrect: $(D)/gst-plugins-base $(D)/libupnp | $(TARGET_DIR) $(REMOVE)/gmrender-resurrect.git - get-git-source.sh https://github.com/hzeller/gmrender-resurrect.git $(ARCHIVE)/gmrender-resurrect.git + $(GET-GIT-SOURCE) https://github.com/hzeller/gmrender-resurrect.git $(ARCHIVE)/gmrender-resurrect.git $(CPDIR)/gmrender-resurrect.git $(CHDIR)/gmrender-resurrect.git; \ $(CONFIGURE) \ diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index 901cd81e..4b9477cb 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -18,7 +18,7 @@ CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 CORTEX-STRINGS_URL = http://git.linaro.org/git-ro/toolchain/cortex-strings.git $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE): - get-git-archive.sh $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE) + $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE) CORTEX-STRINGS_CONF = ifneq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k)) diff --git a/make/target-libs.mk b/make/target-libs.mk index c0e1b883..3f67f75e 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -106,7 +106,7 @@ LIBDVBSI_PATCH = libdvbsi++-content_identifier_descriptor.patch $(D)/libdvbsi: | $(TARGET_DIR) $(REMOVE)/$(LIBDVBSI_TMP) - get-git-source.sh $(LIBDVBSI_URL)/$(LIBDVBSI_SOURCE) $(ARCHIVE)/$(LIBDVBSI_SOURCE) + $(GET-GIT-SOURCE) $(LIBDVBSI_URL)/$(LIBDVBSI_SOURCE) $(ARCHIVE)/$(LIBDVBSI_SOURCE) $(CPDIR)/$(LIBDVBSI_SOURCE) $(CHDIR)/$(LIBDVBSI_TMP); \ $(call apply_patches, $(LIBDVBSI_PATCH)); \ @@ -571,7 +571,7 @@ LIBDPF_PATCH = libdpf-crossbuild.patch $(D)/libdpf: $(D)/libusb-compat | $(TARGET_DIR) $(REMOVE)/$(LIBDPF_TMP) - get-git-source.sh $(LIBDPF_URL)/$(LIBDPF_SOURCE) $(ARCHIVE)/$(LIBDPF_SOURCE) + $(GET-GIT-SOURCE) $(LIBDPF_URL)/$(LIBDPF_SOURCE) $(ARCHIVE)/$(LIBDPF_SOURCE) $(CPDIR)/$(LIBDPF_SOURCE) $(CHDIR)/$(LIBDPF_TMP)/dpflib; \ $(call apply_patches, $(LIBDPF_PATCH)); \ diff --git a/make/target-lua.mk b/make/target-lua.mk index 279ecc33..3eda6379 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -106,7 +106,7 @@ LUACURL_URL = https://github.com/lua-curl/$(LUACURL_SOURCE) $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR) $(REMOVE)/$(LUACURL_TMP) - get-git-source.sh $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE) + $(GET-GIT-SOURCE) $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE) $(CPDIR)/$(LUACURL_SOURCE) $(CHDIR)/$(LUACURL_TMP); \ $(BUILD_ENV) \ diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index 8dcdaeb2..1d068abc 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -129,7 +129,7 @@ ASTRA-SM_URL = https://gitlab.com/crazycat69 $(D)/astra-sm: TARGET_ABI="" $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR) $(REMOVE)/$(ASTRA-SM_TMP) - get-git-source.sh $(ASTRA-SM_URL)/$(ASTRA-SM_SOURCE) $(ARCHIVE)/$(ASTRA-SM_SOURCE) + $(GET-GIT-SOURCE) $(ASTRA-SM_URL)/$(ASTRA-SM_SOURCE) $(ARCHIVE)/$(ASTRA-SM_SOURCE) $(CPDIR)/$(ASTRA-SM_SOURCE) $(CHDIR)/$(ASTRA-SM_TMP); \ autoreconf -fi; \ diff --git a/make/target-tools.mk b/make/target-tools.mk index 896f1f53..acbaa53b 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1159,7 +1159,7 @@ LCD4LINUX_URL = https://github.com/TangoCash $(D)/lcd4linux: $(D)/ncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR) $(REMOVE)/$(LCD4LINUX_TMP) - get-git-source.sh $(LCD4LINUX_URL)/$(LCD4LINUX_SOURCE) $(ARCHIVE)/$(LCD4LINUX_SOURCE) + $(GET-GIT-SOURCE) $(LCD4LINUX_URL)/$(LCD4LINUX_SOURCE) $(ARCHIVE)/$(LCD4LINUX_SOURCE) $(CPDIR)/$(LCD4LINUX_SOURCE) $(CHDIR)/$(LCD4LINUX_TMP); \ ./bootstrap; \ @@ -1192,7 +1192,7 @@ SAMSUNGLCD4LINUX_URL = https://github.com/horsti58 $(D)/samsunglcd4linux: | $(TARGET_DIR) $(REMOVE)/$(SAMSUNGLCD4LINUX_TMP) - get-git-source.sh $(SAMSUNGLCD4LINUX_URL)/$(SAMSUNGLCD4LINUX_SOURCE) $(ARCHIVE)/$(SAMSUNGLCD4LINUX_SOURCE) + $(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_URL)/$(SAMSUNGLCD4LINUX_SOURCE) $(ARCHIVE)/$(SAMSUNGLCD4LINUX_SOURCE) $(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE) $(CHDIR)/$(SAMSUNGLCD4LINUX_TMP)/ni; \ $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \ @@ -1238,7 +1238,7 @@ XUPNPD_PATCH += xupnpd-add-configuration-files.diff $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR) $(REMOVE)/$(XUPNPD_TMP) - get-git-source.sh $(XUPNPD_URL)/$(XUPNPD_SOURCE) $(ARCHIVE)/$(XUPNPD_SOURCE) + $(GET-GIT-SOURCE) $(XUPNPD_URL)/$(XUPNPD_SOURCE) $(ARCHIVE)/$(XUPNPD_SOURCE) $(CPDIR)/$(XUPNPD_SOURCE) $(CHDIR)/$(XUPNPD_TMP); \ $(call apply_patches, $(XUPNPD_PATCH)) @@ -1620,7 +1620,7 @@ AIO-GRAB_URL = https://github.com/oe-alliance $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR) $(REMOVE)/$(AIO-GRAB_TMP) - get-git-source.sh $(AIO-GRAB_URL)/$(AIO-GRAB_SOURCE) $(ARCHIVE)/$(AIO-GRAB_SOURCE) + $(GET-GIT-SOURCE) $(AIO-GRAB_URL)/$(AIO-GRAB_SOURCE) $(ARCHIVE)/$(AIO-GRAB_SOURCE) $(CPDIR)/$(AIO-GRAB_SOURCE) $(CHDIR)/$(AIO-GRAB_TMP); \ aclocal --force -I m4; \ @@ -1646,7 +1646,7 @@ DVBSNOOP_URL = https://github.com/Duckbox-Developers $(D)/dvbsnoop: | $(TARGET_DIR) $(REMOVE)/$(DVBSNOOP_TMP) - get-git-source.sh $(DVBSNOOP_URL)/$(DVBSNOOP_SOURCE) $(ARCHIVE)/$(DVBSNOOP_SOURCE) + $(GET-GIT-SOURCE) $(DVBSNOOP_URL)/$(DVBSNOOP_SOURCE) $(ARCHIVE)/$(DVBSNOOP_SOURCE) $(CPDIR)/$(DVBSNOOP_SOURCE) $(CHDIR)/$(DVBSNOOP_TMP); \ $(CONFIGURE) \