webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multiarch rootfiles.

Browse Source
This commit is contained in:
Michael Tremer
2011-09-16 21:14:51 +02:00
parent 149e83be33
commit 1b453c76b4
3 changed files with 75 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lfs/Config
View File

@@ -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='#*' \

44
lfs/cdrom
View File

@@ -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