From 6f2784d96695126fe24feaf7ff55595bb836355b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 19 May 2019 23:33:13 +0200 Subject: [PATCH] - fix get-git-source.sh handling; deps-file handling was broken --- make/crosstool.mk | 16 ++++++---------- make/gstreamer.mk | 24 ++++++------------------ make/neutrino-plugins.mk | 8 ++------ make/system-libs.mk | 8 ++------ make/system-tools-extra.mk | 8 ++------ make/system-tools.mk | 38 +++++++++----------------------------- 6 files changed, 27 insertions(+), 75 deletions(-) diff --git a/make/crosstool.mk b/make/crosstool.mk index 781d4c24..c5095f2b 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -41,16 +41,10 @@ crosstools-renew: # ----------------------------------------------------------------------------- -$(ARCHIVE)/crosstool-ng.git: - get-git-source.sh https://github.com/crosstool-ng/crosstool-ng.git $@ - -PHONY += $(ARCHIVE)/crosstool-ng.git - -# ----------------------------------------------------------------------------- - -crosstool-arm-hd1: CROSS_DIR-check $(ARCHIVE)/crosstool-ng.git $(SOURCE_DIR)/$(NI_LINUX-KERNEL) +crosstool-arm-hd1: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL) make $(BUILD_TMP) $(REMOVE)/crosstool-ng.git + get-git-source.sh https://github.com/crosstool-ng/crosstool-ng.git $(ARCHIVE)/crosstool-ng.git $(CPDIR)/crosstool-ng.git $(CHDIR)/crosstool-ng.git; \ git checkout 1dbb06f2 && \ @@ -78,9 +72,10 @@ crosstool-arm-hd1: CROSS_DIR-check $(ARCHIVE)/crosstool-ng.git $(SOURCE_DIR)/$(N $(REMOVE)/crosstool-ng.git UCLIBC_VER=1.0.24 -crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/crosstool-ng.git $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOURCE_DIR)/$(NI_LINUX-KERNEL) +crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOURCE_DIR)/$(NI_LINUX-KERNEL) make $(BUILD_TMP) $(REMOVE)/crosstool-ng.git + get-git-source.sh https://github.com/crosstool-ng/crosstool-ng.git $(ARCHIVE)/crosstool-ng.git $(CPDIR)/crosstool-ng.git $(CHDIR)/crosstool-ng.git; \ git checkout 1dbb06f2 && \ @@ -109,9 +104,10 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/crosstool-ng.git $(ARCHIVE)/gcc-li rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.22-gdb.py $(REMOVE)/crosstool-ng.git -crosstool-arm-hd51: CROSS_DIR-check $(ARCHIVE)/crosstool-ng.git $(SOURCE_DIR)/$(NI_LINUX-KERNEL) +crosstool-arm-hd51: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL) make $(BUILD_TMP) $(REMOVE)/crosstool-ng.git + get-git-source.sh https://github.com/crosstool-ng/crosstool-ng.git $(ARCHIVE)/crosstool-ng.git $(CPDIR)/crosstool-ng.git $(CHDIR)/crosstool-ng.git; \ git checkout 1dbb06f2 && \ diff --git a/make/gstreamer.mk b/make/gstreamer.mk index 134b64fd..b071c065 100644 --- a/make/gstreamer.mk +++ b/make/gstreamer.mk @@ -265,13 +265,9 @@ $(D)/gst-plugins-ugly: $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE) $(D)/gst-plugins-ba GST_PLUGIN_SUBSINK_VER = 1.0 -$(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git: - get-git-source.sh git://github.com/christophecvr/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $@ - -PHONY += $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git - -$(D)/gst-plugin-subsink: $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(D)/gst-plugins-base | $(TARGET_DIR) +$(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 $(CPDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(CHDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git; \ aclocal --force -I m4; \ @@ -295,13 +291,9 @@ $(D)/gst-plugin-subsink: $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-su GST_PLUGINS_DVBMEDIASINK_VER = 1.0 -$(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git: - get-git-source.sh https://github.com/OpenPLi/gst-plugin-dvbmediasink.git $@ - -PHONY += $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git - -$(D)/gst-plugin-dvbmediasink: $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git $(D)/gst-plugins-base $(D)/libdca | $(TARGET_DIR) +$(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 $(CPDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git $(CHDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git; \ git checkout gst-1.0; \ @@ -396,13 +388,9 @@ $(D)/gst_libav: $(ARCHIVE)/$(GST_LIBAV_SOURCE) $(D)/gstreamer $(D)/gst-plugins-b # ----------------------------------------------------------------------------- -$(ARCHIVE)/gmrender-resurrect.git: - get-git-source.sh https://github.com/hzeller/gmrender-resurrect.git $@ - -PHONY += $(ARCHIVE)/gmrender-resurrect.git - -$(D)/gmrender-resurrect: $(ARCHIVE)/gmrender-resurrect.git $(D)/gst-plugins-base $(D)/libupnp | $(TARGET_DIR) +$(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 $(CPDIR)/gmrender-resurrect.git $(CHDIR)/gmrender-resurrect.git; \ $(CONFIGURE) \ diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index 82ac0225..b03ad957 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -124,13 +124,9 @@ $(D)/doscam-webif-skin: # ----------------------------------------------------------------------------- -$(ARCHIVE)/mediathek.git: - get-git-source.sh https://github.com/neutrino-mediathek/mediathek.git $@ - -PHONY += $(ARCHIVE)/mediathek.git - -$(D)/neutrino-mediathek: $(ARCHIVE)/mediathek.git $(LIBPLUGINS) | $(TARGET_DIR) +$(D)/neutrino-mediathek: $(LIBPLUGINS) | $(TARGET_DIR) $(REMOVE)/mediathek.git + get-git-source.sh https://github.com/neutrino-mediathek/mediathek.git $(ARCHIVE)/mediathek.git $(CPDIR)/mediathek.git $(CHDIR)/mediathek.git; \ cp -a plugins/* $(LIBPLUGINS)/; \ diff --git a/make/system-libs.mk b/make/system-libs.mk index 87e8d6b1..e2094974 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -72,16 +72,12 @@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(ARCHIVE)/libdvbsi-.git: - get-git-source.sh git://github.com/OpenDMM/libdvbsi-.git $@ - -PHONY += $(ARCHIVE)/libdvbsi-.git - LIBDVBSI_PATCH = libdvbsi++-content_identifier_descriptor.patch LIBDVBSI_PATCH += libdvbsi++-fix-descriptorLenghth.patch -$(D)/libdvbsi: $(ARCHIVE)/libdvbsi-.git | $(TARGET_DIR) +$(D)/libdvbsi: | $(TARGET_DIR) $(REMOVE)/libdvbsi-.git + get-git-source.sh git://github.com/OpenDMM/libdvbsi-.git $(ARCHIVE)/libdvbsi-.git $(CPDIR)/libdvbsi-.git $(CHDIR)/libdvbsi-.git; \ $(call apply_patches, $(LIBDVBSI_PATCH)); \ diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk index 2d235165..76a3298e 100644 --- a/make/system-tools-extra.mk +++ b/make/system-tools-extra.mk @@ -192,15 +192,11 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(ARCHIVE)/astra-sm.git: - get-git-source.sh https://gitlab.com/crazycat69/astra-sm.git $@ - -PHONY += $(ARCHIVE)/astra-sm.git - # workaround unrecognized command line options $(D)/astra-sm: TARGET_MARCH_CFLAGS="" -$(D)/astra-sm: $(ARCHIVE)/astra-sm.git $(D)/openssl | $(TARGET_DIR) +$(D)/astra-sm: $(D)/openssl | $(TARGET_DIR) $(REMOVE)/astra-sm.git + get-git-source.sh https://gitlab.com/crazycat69/astra-sm.git $(ARCHIVE)/astra-sm.git $(CPDIR)/astra-sm.git $(CHDIR)/astra-sm.git; \ autoreconf -fi; \ diff --git a/make/system-tools.mk b/make/system-tools.mk index 0a933d1f..a72ae1aa 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -865,13 +865,9 @@ $(D)/fbshot: $(D)/libpng $(ARCHIVE)/fbshot-$(FBSHOT_VER).tar.gz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(ARCHIVE)/lcd4linux.git: - get-git-source.sh https://github.com/TangoCash/lcd4linux.git $@ - -PHONY += $(ARCHIVE)/lcd4linux.git - -$(D)/lcd4linux: $(ARCHIVE)/lcd4linux.git $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR) +$(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR) $(REMOVE)/lcd4linux.git + get-git-source.sh https://github.com/TangoCash/lcd4linux.git $(ARCHIVE)/lcd4linux.git $(CPDIR)/lcd4linux.git $(CHDIR)/lcd4linux.git; \ ./bootstrap; \ @@ -897,13 +893,9 @@ $(D)/lcd4linux: $(ARCHIVE)/lcd4linux.git $(D)/libncurses $(D)/libgd2 $(D)/libdpf # ----------------------------------------------------------------------------- -$(ARCHIVE)/samsunglcd4linux.git: - get-git-source.sh https://github.com/horsti58/samsunglcd4linux.git $@ - -PHONY += $(ARCHIVE)/samsunglcd4linux.git - -$(D)/samsunglcd4linux: $(ARCHIVE)/samsunglcd4linux.git | $(TARGET_DIR) +$(D)/samsunglcd4linux: | $(TARGET_DIR) $(REMOVE)/samsunglcd4linux.git + get-git-source.sh https://github.com/horsti58/samsunglcd4linux.git $(ARCHIVE)/samsunglcd4linux.git $(CPDIR)/samsunglcd4linux.git $(CHDIR)/samsunglcd4linux.git/ni; \ install -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \ @@ -930,11 +922,6 @@ $(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-$(WPA_SUPP_VER).tar. # ----------------------------------------------------------------------------- -$(ARCHIVE)/xupnpd.git: - get-git-source.sh https://github.com/clark15b/xupnpd.git $@ - -PHONY += $(ARCHIVE)/xupnpd.git - XUPNPD_PATCH = xupnpd-coolstream-dynamic-lua.patch XUPNPD_PATCH += xupnpd-fix-memleak-on-coolstream-boxes-thanks-ng777.patch XUPNPD_PATCH += xupnpd-fix-webif-backlinks.diff @@ -943,6 +930,7 @@ XUPNPD_PATCH += xupnpd-add-configuration-files.diff $(D)/xupnpd: $(ARCHIVE)/xupnpd.git $(D)/lua $(D)/openssl | $(TARGET_DIR) $(REMOVE)/xupnpd.git + get-git-source.sh https://github.com/clark15b/xupnpd.git $(ARCHIVE)/xupnpd.git $(CPDIR)/xupnpd.git $(CHDIR)/xupnpd.git; \ $(call apply_patches, $(XUPNPD_PATCH)) @@ -1287,13 +1275,9 @@ $(D)/ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(ARCHIVE)/aio-grab.git: - get-git-source.sh git://github.com/oe-alliance/aio-grab.git $@ - -PHONY += $(ARCHIVE)/aio-grab.git - -$(D)/aio-grab: $(ARCHIVE)/aio-grab.git $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR) +$(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR) $(REMOVE)/aio-grab.git + get-git-source.sh git://github.com/oe-alliance/aio-grab.git $(ARCHIVE)/aio-grab.git $(CPDIR)/aio-grab.git $(CHDIR)/aio-grab.git; \ aclocal --force -I m4; \ @@ -1312,13 +1296,9 @@ $(D)/aio-grab: $(ARCHIVE)/aio-grab.git $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TA # ----------------------------------------------------------------------------- -$(ARCHIVE)/dvbsnoop.git: - get-git-source.sh https://github.com/Duckbox-Developers/dvbsnoop.git $@ - -PHONY += $(ARCHIVE)/dvbsnoop.git - -$(D)/dvbsnoop: $(ARCHIVE)/dvbsnoop.git | $(TARGET_DIR) +$(D)/dvbsnoop: | $(TARGET_DIR) $(REMOVE)/dvbsnoop.git + get-git-source.sh https://github.com/Duckbox-Developers/dvbsnoop.git $(ARCHIVE)/dvbsnoop.git $(CPDIR)/dvbsnoop.git $(CHDIR)/dvbsnoop.git; \ $(CONFIGURE) \