[openwrt/openwrt] imagebuilder: fix partition signature

LEDE Commits lede-commits at lists.infradead.org
Tue Nov 24 19:47:58 EST 2020


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/aab36200e7eb539afb18df74476132f4750a9f0b

commit aab36200e7eb539afb18df74476132f4750a9f0b
Author: Matthew Gyurgyik <matthew at gyurgyik.io>
AuthorDate: Fri Nov 13 11:21:29 2020 -0800

    imagebuilder: fix partition signature
    
    When building images with the imagebuilder, the partition signature
    never changes. The signature is generated by hashing SOURCE_DATE_EPOCH
    and LINUX_VERMAGIC which are undefined. Prepopulate these variables, as
    done by the SDK.
    
    Signed-off-by: Matthew Gyurgyik <matthew at gyurgyik.io>
---
 target/imagebuilder/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index a96f8618e8..e7954e96a4 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -89,6 +89,8 @@ endif
 		$(CP) -L $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts/* $(IB_DTSDIR); \
 	fi
 	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk
+	$(SED) 's,^# SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g' $(PKG_BUILD_DIR)/include/version.mk
+	$(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(PKG_BUILD_DIR)/include/kernel.mk
 	find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
 	  | $(XARGS) rm -rf
 	$(INSTALL_DIR) $(IB_IDIR)



More information about the lede-commits mailing list