From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Sep 2011 20:09:01 +0000 (+0200)
Subject: Add support for multiarch core updates.
X-Git-Tag: v2.9-core54~13^2~65
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2e00d018a564deb1e6e47a8ff0d4362541679d54

Add support for multiarch core updates.
---

diff --git a/lfs/core-updates b/lfs/core-updates
index 0dd2ecccbc..c4cedcd66b 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -49,13 +49,18 @@ CORE = $(patsubst $(DIR_SRC)/config/rootfiles/%,%,$(wildcard $(DIR_SRC)/config/r
 
 $(TARGET) : $(CORE)
 
+.PHONY:
 core/%:
 	rm -rf /install/packages/package
 	mkdir -p /install/packages/package
 	eval $$(cat /usr/src/config/rootfiles/$@/meta)
 
-	#Generate ROOTFILES from filelists	
-	find $(DIR_SRC)/config/rootfiles/$@/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES.tmp
+	#Generate ROOTFILES from filelists
+	$(DIR_SRC)/src/scripts/archive.files \
+		$(DIR_SRC)/config/rootfiles/$@/filelists \
+		$(DIR_SRC)/config/rootfiles/$@/files \
+		$(DIR_SRC)/config/rootfiles/$@/files.$(MACHINE) \
+		> /tmp/ROOTFILES.tmp
 
 	#remove excluded files from ROOTFILES
 	grep -f $(DIR_SRC)/config/rootfiles/$@/exclude -v /tmp/ROOTFILES.tmp > /tmp/ROOTFILES
diff --git a/src/scripts/archive.files b/src/scripts/archive.files
index 8e276bac7f..ca0ee51b68 100755
--- a/src/scripts/archive.files
+++ b/src/scripts/archive.files
@@ -22,7 +22,17 @@
 FILELIST=
 
 for dir in $@; do
+	# Skip all objects that do not exist.
+	[ -e "${dir}" ] || continue
+
+	# Files go directly to the rootfile.
+	if [ -f "${dir}" ]; then
+		FILELIST="${FILELIST} ${dir}"
+		continue
+	fi
+
 	for exclude in ${dir}/${MACHINE}/*; do
+		[ -f "${exclude}" ] || continue
 		EXCLUDE="$EXCLUDE $exclude"
 	done
 
@@ -41,5 +51,5 @@ for dir in $@; do
 	done
 done
 
-cat ${FILELIST} | grep -v ^# | sort | uniq | \
+cat ${FILELIST} 2>/dev/null | grep -v ^# | sort | uniq | \
 	sed -e "s/KVER/${KVER}/g" -e "s/MACHINE/${MACHINE}/g" -e "s/BUILDTARGET/${BUILDTARGET}/g"