Add support for multiarch rootfiles.

diff --git a/lfs/Config b/lfs/Config
index fac10eba27c5b270790ff419c9bbdf6af45d68e4..e71294ccbf26269de1824add99f7e3898d922500 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -130,16 +130,13 @@ define POSTBUILD
                else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
                fi; \
                echo $(LFS_SCRIPT); \
-               ROOTFILE=`find $(DIR_SRC)/config/rootfiles/common $(DIR_SRC)/config/rootfiles/packages -maxdepth 1 -type f -name $$LFS_SCRIPT`; \
-               if [ "$$ROOTFILE" = "" ]; then \
-                       ROOTFILE=`find $(DIR_SRC)/config/rootfiles/ver_$(IPFVER) -type f -name $$LFS_SCRIPT`; \
-               fi; \
+               ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(TARGET),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
                if [ "$$ROOTFILE" = "" ]; then \
                        touch $(TARGET)_missing_rootfile; \
                        ROOTFILE=$(TARGET)_missing_rootfile ; \
                        echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
                fi; \
-               sed "s/KVER/$(KVER)/g" $$ROOTFILE > $(TARGET)_rootfile; \
+               sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/MACHINE/$(MACHINE)/g" $$ROOTFILE > $(TARGET)_rootfile; \
                for line in `cat $(TARGET)_diff`; do \
                        if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
                        elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
@@ -195,7 +192,7 @@ define PAK
                /install/packages/package; \
        fi
        cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
-       sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
+       sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
        sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh
        cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \

diff --git a/lfs/cdrom b/lfs/cdrom
index 064769de127c74f5ee03ad5137b8bca84040ea09..ab3b11b16218bbc98f79ff8739955f23cf56edaa 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -47,18 +47,20 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /install/cdrom /tmp/*
+       mkdir -p /install/cdrom/doc
 
-       #Clear mtab (prevents .journal problems)
+       # Clear mtab (prevents .journal problems)
+       rm -vf /etc/mtab
        echo > /etc/mtab
 
+       # Create filelist for packaging.
+       BUILDTARGET="$(BUILDTARGET)" MACHINE="$(MACHINE)" KVER="$(KVER)" \
+               $(DIR_SRC)/src/scripts/archive.files \
+               $(DIR_SRC)/config/rootfiles/common \
+               > /tmp/ROOTFILES
+
        # Compress root filesystem
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
-       mkdir -p /install/cdrom/doc
-       find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
-       find $(DIR_SRC)/config/rootfiles/ver_$(ED) -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
-       find $(DIR_SRC)/config/rootfiles/core/*/files -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
-       sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
-
        tar -c -C / --files-from=/tmp/ROOTFILES \
                -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
                --exclude='proc/*' --exclude='tmp/ROOTFILES'
@@ -78,17 +80,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp $(DIR_SRC)/config/syslinux/unattended.conf    /install/cdrom/boot/unattended.conf
 
        # Make the ISO
-       mkdir -p /install/cdrom/boot/isolinux; \
-       dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog; \
-       cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot; \
-       cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz; \
-       cp $(DIR_SRC)/config/syslinux/syslinux.cfg  /install/cdrom/boot/isolinux/isolinux.cfg; \
-       cp $(DIR_SRC)/config/syslinux/boot.msg      /install/cdrom/boot/isolinux/boot.msg; \
-       cp $(DIR_SRC)/config/syslinux/splash.lss    /install/cdrom/boot/isolinux/splash.lss; \
-       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest; \
-       cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin; \
+       mkdir -p /install/cdrom/boot/isolinux
+       dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
+       cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot
+       cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
+ifneq "$(MACHINE_TYPE)" "arm"
+       cp $(DIR_SRC)/config/syslinux/syslinux.cfg  /install/cdrom/boot/isolinux/isolinux.cfg
+       cp $(DIR_SRC)/config/syslinux/boot.msg      /install/cdrom/boot/isolinux/boot.msg
+       cp $(DIR_SRC)/config/syslinux/splash.lss    /install/cdrom/boot/isolinux/splash.lss
+       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
+       cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
+endif
        cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \
-                                               xargs md5sum > md5sum.txt; \
+                                               xargs md5sum > md5sum.txt
+
+ifeq "$(MACHINE_TYPE)" "arm"
+       cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
+               . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso
+else
        cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
            -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
            -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso
+endif

diff --git a/src/scripts/archive.files b/src/scripts/archive.files
new file mode 100755 (executable)
index 0000000..8e276ba
--- /dev/null
+++ b/src/scripts/archive.files
@@ -0,0 +1,45 @@
+#!/bin/bash
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+FILELIST=
+
+for dir in $@; do
+       for exclude in ${dir}/${MACHINE}/*; do
+               EXCLUDE="$EXCLUDE $exclude"
+       done
+
+       FILELIST="${FILELIST} ${EXCLUDE}"
+
+       for include in ${dir}/*; do
+               [ -d ${include} ] && continue
+               IN=true
+               for exclude in ${EXCLUDE}; do
+                       if [ "$(basename ${exclude})" = "$(basename ${include})" ]; then
+                               IN=false
+                               break
+                       fi
+               done
+               ${IN} && FILELIST="${FILELIST} ${include}"
+       done
+done
+
+cat ${FILELIST} | grep -v ^# | sort | uniq | \
+       sed -e "s/KVER/${KVER}/g" -e "s/MACHINE/${MACHINE}/g" -e "s/BUILDTARGET/${BUILDTARGET}/g"