[openwrt/openwrt] include: make APK .list files even more reproducible

LEDE Commits lede-commits at lists.infradead.org
Tue Aug 26 18:28:54 PDT 2025


aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/44f76177d564c9c5d24f5bdf3329d19eba26740d

commit 44f76177d564c9c5d24f5bdf3329d19eba26740d
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Tue Aug 26 13:36:54 2025 +0200

    include: make APK .list files even more reproducible
    
    This commit fixes "aff2f096235 include: make APK .list files reproducible"
    since it would create the .list file while `find` still runs. This causes the
    .list file to be part of itself. As an alternative, write the file to a
    temporary folder first and then move it.
    
    Fix: aff2f096235 include: make APK .list files reproducible
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 include/package-pack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/package-pack.mk b/include/package-pack.mk
index 318d8ee5f6..38655a4492 100644
--- a/include/package-pack.mk
+++ b/include/package-pack.mk
@@ -353,7 +353,7 @@ else
 
 	if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1).rusers; fi;
 	if [ -n "$(ALTERNATIVES)" ]; then echo $(ALTERNATIVES) > $$(IDIR_$(1))/lib/apk/packages/$(1).alternatives; fi;
-	(cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" | sort > $$(IDIR_$(1))/lib/apk/packages/$(1).list)
+	(cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" | sort > $(TMP_DIR)/$(1).list && mv $(TMP_DIR)/$(1).list $$(IDIR_$(1))/lib/apk/packages/$(1).list)
 	# Move conffiles to IDIR and build conffiles_static with csums
 	if [ -f $$(ADIR_$(1))/conffiles ]; then \
 		mv -f $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \




More information about the lede-commits mailing list