From b8e27ea5b62bde4bab4e8d6c548c69c4a8a97d07 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 9 Aug 2008 13:08:02 +0200 Subject: [PATCH] change updater to core17 add net and crypto modules to instroot (wlan driver need it) put all supported filesystem modules to initcpio --- doc/packages-list.txt | 2 +- lfs/initrd | 3 +-- lfs/mkinitcpio | 1 + lfs/updater | 6 +++--- src/install+setup/install/main.c | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 6ac362cc20..a8275ec031 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -80,7 +80,7 @@ * ebtables-v2.0.8-2 * ed-0.2 * elinks-0.11.4rc0 -* esniper-2-18-1 +* esniper-2-19-0 * espgs-8.15.1 * etherwake-1.09 * ethtool-3 diff --git a/lfs/initrd b/lfs/initrd index 8746943801..0f3d7c2621 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -64,10 +64,9 @@ $(TARGET) : cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/ - rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,net/*,kernel/{crypto,sound,net,drivers/{media,video}}} \ + rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,kernel/{sound,drivers/{media,video}}} \ /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* - cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/ cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio index b5246d9482..9966d61e72 100644 --- a/lfs/mkinitcpio +++ b/lfs/mkinitcpio @@ -73,5 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./install.sh "" sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf + sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/updater b/lfs/updater index 176ee8a4e0..ca528137e1 100644 --- a/lfs/updater +++ b/lfs/updater @@ -70,7 +70,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Other files cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/ chmod 755 /install/updater/update.sh - cd /install/updater && tar cf /install/packages/core-upgrade-2.1-16.ipfire \ + cd /install/updater && tar cf /install/packages/core-upgrade-2.1-17.ipfire \ update.sh files ROOTFILES rm -rf /install/updater @@ -78,5 +78,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e "s/VER/2.1/g" \ -e "s/RELEASE/16/g" \ -e "s/DEPS/$(DEPS)/g" \ - -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-16.ipfire | awk '{ print $$5 }'`/g" \ - < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-16 + -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-17.ipfire | awk '{ print $$5 }'`/g" \ + < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-17 diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index fb394ce0c9..f992eb9794 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -475,7 +475,6 @@ int main(int argc, char *argv[]) if (fstype == REISER4) { replace("/harddisk/etc/fstab", "FSTYPE", "reiser4"); - replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"reiser4 "); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw"); } else if (fstype == REISERFS) { replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs"); @@ -497,7 +496,6 @@ int main(int argc, char *argv[]) } replace("/harddisk/etc/fstab", "FSTYPE", "ext3"); NOJOURNAL: - replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 "); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } -- 2.39.2