From 0eba206689e5d0d3b44476b8c41354c3fa342d55 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 11 Nov 2018 18:35:07 +0100 Subject: [PATCH] introduce archive-imagefiles; add patch function --- make/environment.mk | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/make/environment.mk b/make/environment.mk index 4db8358..68b8284 100755 --- a/make/environment.mk +++ b/make/environment.mk @@ -12,7 +12,7 @@ LIB_HAL_SOURCE ?= "libstb_hal_tuxbox" ARCHIVE = $(BASE_DIR)/download PATCHES = $(BASE_DIR)/archive-patches -#TARGET ?= powerpc-405-linux-gnu +IMAGEFILES = $(BASE_DIR)/archive-imagefiles BUILD_TMP = $(BASE_DIR)/build_tmp D = $(BASE_DIR)/deps # backwards compatibility @@ -178,7 +178,34 @@ REWRITE_PKGCONF = sed -i "s,^prefix=.*,prefix='$(TARGETPREFIX)'," # unpack tarballs, clean up UNTAR = tar -C $(BUILD_TMP) -xf $(ARCHIVE) REMOVE = rm -rf $(BUILD_TMP)/.remove $(TARGETPREFIX)/.remove $(BUILD_TMP) -PATCH = patch -p1 -i $(PATCHES) +# +PATCH = patch -p1 -i $(PATCHES) +APATCH = patch -p1 -i +define apply_patches + for i in $(1); do \ + if [ -d $$i ]; then \ + for p in $$i/*; do \ + if [ $${p:0:1} == "/" ]; then \ + echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$p"; $(APATCH) $$p; \ + else \ + echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$p"; $(PATCH)/$$p; \ + fi; \ + done; \ + else \ + if [ $${i:0:1} == "/" ]; then \ + echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; $(APATCH) $$i; \ + else \ + echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; $(PATCH)/$$i; \ + fi; \ + fi; \ + done; \ + if [ $(PKG_VER_HELPER) == "AA" ]; then \ + echo -e "Patching $(TERM_GREEN_BOLD)$(PKG_NAME)$(TERM_NORMAL) completed"; \ + else \ + echo -e "Patching $(TERM_GREEN_BOLD)$(PKG_NAME) $(PKG_VER)$(TERM_NORMAL) completed"; \ + fi; \ + echo +endef # split_deps_dir=$(subst ., ,$(1)) -- 2.39.5