webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add auto_fs & auto_fs4 kernel modules

Browse Source 
Disabled build of the second kernel
kernel "ipfire" is now the smp-enabled version
This commit is contained in:
Arne Fitzenreiter
2008-08-14 05:03:27 +02:00
parent 95257a66c3
commit fd383f41eb
11 changed files with 59 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
config/grub/grub.conf
View File

@@ -6,46 +6,26 @@ background = ffffff
splashimage (hd0,0)/grub/ipfire.xpm.gz
title IPFire
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-smp.img
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER.img
savedefault 0
title IPFire (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER-smp.img
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER.img
savedefault 1
title IPFire (acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER-smp.img
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 2
title IPFire (vesafb 1024x768, acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 3
title IPFire - Single CPU
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER.img
savedefault 4
title IPFire - Single CPU (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER.img
savedefault 5
title IPFire - Single CPU (acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 6
title IPFire - Single CPU (vesafb 1024x768, acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 7
title IPFire - Single CPU (emergency - all storage drivers)
savedefault 3
title IPFire (emergency - all storage drivers)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-emergency.img
savedefault 8
savedefault 4

39
config/kernel/kernel.config.i586
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23.17
# Tue Jul 29 20:12:30 2008
# Linux kernel version: 2.6.23.17-ipfire
# Wed Aug 13 17:07:37 2008
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -28,7 +28,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
@@ -44,6 +43,7 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=15
# CONFIG_CPUSETS is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
@@ -79,6 +79,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBD=y
# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -104,7 +105,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_TICK_ONESHOT is not set
# CONFIG_NO_HZ is not set
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_SMP is not set
CONFIG_SMP=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
@@ -158,12 +159,13 @@ CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_MINIMUM_CPU_FAMILY=4
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_BKL=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
@@ -211,6 +213,7 @@ CONFIG_VIRT_TO_BUS=y
CONFIG_MATH_EMULATION=y
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_IRQBALANCE=y
CONFIG_SECCOMP=y
CONFIG_HZ_100=y
# CONFIG_HZ_250 is not set
@@ -222,6 +225,7 @@ CONFIG_HZ=100
CONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_HOTPLUG_CPU=y
CONFIG_COMPAT_VDSO=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -231,10 +235,11 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_PM=y
CONFIG_PM_LEGACY=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_SLEEP=y
CONFIG_SUSPEND_UP_POSSIBLE=y
CONFIG_SUSPEND_SMP_POSSIBLE=y
CONFIG_SUSPEND=y
CONFIG_HIBERNATION_UP_POSSIBLE=y
CONFIG_HIBERNATION_SMP_POSSIBLE=y
# CONFIG_HIBERNATION is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
@@ -247,6 +252,7 @@ CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
# CONFIG_ACPI_DOCK is not set
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_TOSHIBA is not set
@@ -698,7 +704,6 @@ CONFIG_KINGSUN_DONGLE=m
#
# Old SIR device drivers
#
# CONFIG_IRPORT_SIR is not set
#
# Old Serial dongle support
@@ -1105,7 +1110,6 @@ CONFIG_SCSI_NCR_Q720=m
CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
CONFIG_SCSI_NCR53C8XX_SYNC=20
# CONFIG_SCSI_MCA_53C9X is not set
CONFIG_SCSI_PAS16=m
CONFIG_SCSI_PSI240I=m
CONFIG_SCSI_QLOGIC_FAS=m
@@ -1313,7 +1317,6 @@ CONFIG_ULTRA=m
CONFIG_ULTRA32=m
CONFIG_SMC9194=m
CONFIG_NET_VENDOR_RACAL=y
# CONFIG_NI5010 is not set
CONFIG_NI52=m
CONFIG_NI65=m
CONFIG_NET_TULIP=y
@@ -1327,7 +1330,6 @@ CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
# CONFIG_PCMCIA_XIRTULIP is not set
CONFIG_AT1700=m
CONFIG_DEPCA=m
CONFIG_HP100=m
@@ -1852,7 +1854,6 @@ CONFIG_I2C_ALI15X3=m
CONFIG_I2C_AMD756=m
CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_ELEKTOR is not set
CONFIG_I2C_I801=m
CONFIG_I2C_I810=m
CONFIG_I2C_PIIX4=m
@@ -2786,8 +2787,8 @@ CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
#
@@ -3051,5 +3052,9 @@ CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_X86_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y

3060
config/kernel/kernel.config.i586.smp
View File

File diff suppressed because it is too large Load Diff

4
config/rootfiles/common/kqemu
View File

@@ -1,2 +1,2 @@
#lib/modules/KVER-ipfire/misc/kqemu.ko # doesnt work in non-smp mode yet
lib/modules/KVER-ipfire-smp/misc/kqemu.ko
lib/modules/KVER-ipfire/misc/kqemu.ko
#lib/modules/KVER-ipfire-smp/misc/kqemu.ko

8
config/rootfiles/common/linux
View File

@@ -649,12 +649,12 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/source
#lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko
#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_IMQ.ko
boot/System.map-KVER-ipfire-smp
#boot/System.map-KVER-ipfire-smp
boot/config-KVER-ipfire
boot/vmlinuz-KVER-ipfire-smp
boot/vmlinuz-ipfire-smp
#boot/vmlinuz-KVER-ipfire-smp
#boot/vmlinuz-ipfire-smp
#lib/modules
lib/modules/KVER-ipfire-smp
#lib/modules/KVER-ipfire-smp
#lib/modules/KVER-ipfire-smp/build
#lib/modules/KVER-ipfire-smp/kernel
#lib/modules/KVER-ipfire-smp/kernel/arch

2
config/rootfiles/common/oldcore5
View File

@@ -1,5 +1,5 @@
lib/modules/KVER-ipfire/kernel/fs/nfsd/nfsd.ko
lib/modules/KVER-ipfire-smp/kernel/fs/nfsd/nfsd.ko
#lib/modules/KVER-ipfire-smp/kernel/fs/nfsd/nfsd.ko
usr/local/bin/qosctrl
etc/rc.d/init.d/squid
var/ipfire/langs

8
config/rootfiles/updater/filelists/linux
View File

@@ -649,12 +649,12 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/source
#lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko
#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_IMQ.ko
boot/System.map-KVER-ipfire-smp
#boot/System.map-KVER-ipfire-smp
boot/config-KVER-ipfire
boot/vmlinuz-KVER-ipfire-smp
boot/vmlinuz-ipfire-smp
#boot/vmlinuz-KVER-ipfire-smp
#boot/vmlinuz-ipfire-smp
#lib/modules
lib/modules/KVER-ipfire-smp
#lib/modules/KVER-ipfire-smp
#lib/modules/KVER-ipfire-smp/build
#lib/modules/KVER-ipfire-smp/kernel
#lib/modules/KVER-ipfire-smp/kernel/arch

2
config/rootfiles/updater/update.sh
View File

@@ -101,7 +101,7 @@ if [ "${ROOT:0:7}" == "/dev/hd" ]; then
fi
fi
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
#mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
#
# Change version of Pakfire.conf
#

2
lfs/initrd
View File

@@ -60,7 +60,7 @@ $(TARGET) :
# make new dependencies
depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
#depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/

22
make.sh
View File

@@ -333,18 +333,18 @@ buildipfire() {
ipfiremake ppp
ipfiremake rp-pppoe
ipfiremake unzip
ipfiremake linux SMP=1
ipfiremake linux-fusion SMP=1
# ipfiremake linux SMP=1
# ipfiremake linux-fusion SMP=1
# ipfiremake ipp2p SMP=1
ipfiremake r8169 SMP=1
ipfiremake r8168 SMP=1
ipfiremake atl2 SMP=1
ipfiremake kqemu SMP=1
ipfiremake v4l-dvb SMP=1
ipfiremake madwifi SMP=1
ipfiremake alsa KMOD=1 SMP=1
ipfiremake sane KMOD=1 SMP=1
ipfiremake openswan KMOD=1 SMP=1
# ipfiremake r8169 SMP=1
# ipfiremake r8168 SMP=1
# ipfiremake atl2 SMP=1
# ipfiremake kqemu SMP=1
# ipfiremake v4l-dvb SMP=1
# ipfiremake madwifi SMP=1
# ipfiremake alsa KMOD=1 SMP=1
# ipfiremake sane KMOD=1 SMP=1
# ipfiremake openswan KMOD=1 SMP=1
ipfiremake linux
ipfiremake linux-fusion
# ipfiremake ipp2p

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

@@ -448,11 +448,11 @@ int main(int argc, char *argv[])
"/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
snprintf(commandstring, STRING_SIZE,
/* snprintf(commandstring, STRING_SIZE,
"/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
*/
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
@@ -522,9 +522,9 @@ int main(int argc, char *argv[])
/* Going to make our initrd... */
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
/* snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
*/
sprintf(string, "root=%s3", hdparams.devnode_part_run);
replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");