From a8bdfefc15187360b82345ceb79c2128f2c07c67 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Fri, 14 Sep 2018 22:50:45 +0200
Subject: build & release : downgrade to Barrier Breaker

---
 target/imagebuilder/Config.in      |  1 -
 target/imagebuilder/files/Makefile |  1 +
 target/sdk/Makefile                |  4 ++--
 target/toolchain/Makefile          | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'target')

diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index d3bc729..6756c14 100644
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,6 +1,5 @@
 config IB
 	bool "Build the OpenWrt Image Builder"
-	depends on !TARGET_ROOTFS_INITRAMFS
 	depends on !PROFILE_KCONFIG
 	depends on !EXTERNAL_TOOLCHAIN
 	help
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 222dac4..72a91e0 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -149,6 +149,7 @@ package_postinst: FORCE
 			IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \
 		done || true; \
 	)
+	rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst
 	$(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
 
 build_image: FORCE
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 828cff5..1c696d5 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -31,8 +31,7 @@ EXCLUDE_DIRS:=*/ccache \
 	*.install.clean \
 	*.install.flags \
 	*.install \
-	*/doc \
-	$(STAGING_SUBDIR_TARGET)/usr/bin
+	*/doc
 
 SDK_DIRS = \
 		$(STAGING_SUBDIR_HOST) \
@@ -109,6 +108,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	cat $(TOPDIR)/feeds.conf.default \
 		>> $(SDK_BUILD_DIR)/feeds.conf.default
 	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
+	$(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk
 	find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
 	find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
 	find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index 20f753a..6e60a08 100644
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -19,6 +19,7 @@ PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
 TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
 TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
 EXCLUDE_DIRS:=*/ccache \
+	*/initial \
 	*/stamp \
 	*/stampfiles \
 	*/man \
@@ -46,6 +47,15 @@ $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
 			ln -sf $(REAL_GNU_TARGET_NAME)-wrapper.sh $(REAL_GNU_TARGET_NAME)-$${app} ; \
 		done; \
 	)
+
+	@-( \
+		find \
+			$(TOOLCHAIN_BUILD_DIR)/*/bin \
+			$(TOOLCHAIN_BUILD_DIR)/*/*/bin \
+			$(TOOLCHAIN_BUILD_DIR)/*/libexec \
+			-type f; \
+	) | xargs strip 2>/dev/null >/dev/null
+
 	echo REVISION:="$(REVISION)" > $(TOOLCHAIN_BUILD_DIR)/version.mk
 	find $(TOOLCHAIN_BUILD_DIR) -name .git | $(XARGS) rm -rf
 	find $(TOOLCHAIN_BUILD_DIR) -name .svn | $(XARGS) rm -rf
-- 
cgit v1.1