webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

change updater to core17

Browse Source 
add net and crypto modules to instroot (wlan driver need it)
put all supported filesystem modules to initcpio
This commit is contained in:
Arne Fitzenreiter
2008-08-09 13:08:02 +02:00
parent 961cf723b0
commit b8e27ea5b6
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/packages-list.txt
View File

@@ -80,7 +80,7 @@
* ebtables-v2.0.8-2 * ebtables-v2.0.8-2
* ed-0.2 * ed-0.2
* elinks-0.11.4rc0 * elinks-0.11.4rc0
* esniper-2-18-1 * esniper-2-19-0
* espgs-8.15.1 * espgs-8.15.1
* etherwake-1.09 * etherwake-1.09
* ethtool-3 * ethtool-3

3
lfs/initrd
View File

@@ -64,10 +64,9 @@ $(TARGET) :
cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/ 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* /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan*
cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/ 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 cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so

1
lfs/mkinitcpio
View File

@@ -73,5 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./install.sh "" cd $(DIR_APP) && ./install.sh ""
sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio 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|^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) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

6
lfs/updater
View File

@@ -70,7 +70,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Other files # Other files
cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/ cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
chmod 755 /install/updater/update.sh 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 update.sh files ROOTFILES
rm -rf /install/updater rm -rf /install/updater
@@ -78,5 +78,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-e "s/VER/2.1/g" \ -e "s/VER/2.1/g" \
-e "s/RELEASE/16/g" \ -e "s/RELEASE/16/g" \
-e "s/DEPS/$(DEPS)/g" \ -e "s/DEPS/$(DEPS)/g" \
-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-16.ipfire | awk '{ print $$5 }'`/g" \ -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-16 < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-17

2
src/install+setup/install/main.c
View File

@@ -475,7 +475,6 @@ int main(int argc, char *argv[])
if (fstype == REISER4) { if (fstype == REISER4) {
replace("/harddisk/etc/fstab", "FSTYPE", "reiser4"); replace("/harddisk/etc/fstab", "FSTYPE", "reiser4");
replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"reiser4 ");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw");
} else if (fstype == REISERFS) { } else if (fstype == REISERFS) {
replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs"); replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
@@ -497,7 +496,6 @@ int main(int argc, char *argv[])
} }
replace("/harddisk/etc/fstab", "FSTYPE", "ext3"); replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
NOJOURNAL: NOJOURNAL:
replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
} }