Add support for multiarch core updates.

diff --git a/lfs/core-updates b/lfs/core-updates
index 0dd2ecccbc5a20a2e1c939fdacc011154a22eb56..c4cedcd66bc57e133775367c1ff65085903fc22d 100644 (file)
--- 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 8e276bac7f25e1f39782ef8310ea059c43dc0177..ca0ee51b6823c664e9c0a31571ac84177ce0ca80 100755 (executable)
--- 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"