From f08494d7af86fa6f803a107585aa3d7d65e0c12c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jul 2008 09:15:29 +0200 Subject: [PATCH] Fix ipsec modul build Enabled big-kernel-lock on non-smp kernel (kqemu need this) --- config/kernel/kernel.config.i586 | 19 ++++++++++--------- config/kernel/kernel.config.i586.smp | 2 +- doc/packages-list.txt | 14 +++++++++----- make.sh | 4 +++- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index f69e964dca..3746057e01 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.23.17 -# Fri Jul 18 02:35:31 2008 +# Linux kernel version: 2.6.23.17-ipfire +# Sat Jul 19 07:10:03 2008 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -29,6 +29,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -157,9 +158,10 @@ CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y CONFIG_X86_UP_APIC=y CONFIG_X86_UP_IOAPIC=y CONFIG_X86_LOCAL_APIC=y @@ -696,12 +698,11 @@ CONFIG_KINGSUN_DONGLE=m # # Old SIR device drivers # -CONFIG_IRPORT_SIR=m +# CONFIG_IRPORT_SIR is not set # # Old Serial dongle support # -# CONFIG_DONGLE_OLD is not set # # FIR device drivers @@ -1312,7 +1313,7 @@ CONFIG_ULTRA=m CONFIG_ULTRA32=m CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI5010=m +# CONFIG_NI5010 is not set CONFIG_NI52=m CONFIG_NI65=m CONFIG_NET_TULIP=y @@ -1326,7 +1327,7 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m -CONFIG_PCMCIA_XIRTULIP=m +# CONFIG_PCMCIA_XIRTULIP is not set CONFIG_AT1700=m CONFIG_DEPCA=m CONFIG_HP100=m @@ -1849,7 +1850,7 @@ CONFIG_I2C_ALI15X3=m CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m -CONFIG_I2C_ELEKTOR=m +# CONFIG_I2C_ELEKTOR is not set CONFIG_I2C_I801=m CONFIG_I2C_I810=m CONFIG_I2C_PIIX4=m diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 054f64eb2e..4209afc668 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.23.17-ipfire -# Thu Jul 17 19:43:47 2008 +# Sat Jul 19 07:10:44 2008 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y diff --git a/doc/packages-list.txt b/doc/packages-list.txt index e9290fab5d..3cefd3639b 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -128,13 +128,13 @@ * ipaddr-1.2 * ipfireseeder-1.00 * iproute2-2.6.16-060323 -* iptables-1.4.0 +* iptables-1.3.8 * iptstate-2.1 * iputils-ss020927 * java-1.5.0_06-for-ipfire * jpegsrc.v6b * kbd-1.12 -* klibc-1.5.10 +* klibc-1.5 * kqemu-1.3.0pre11 * kudzu-1.2.64 * l7-protocols-2007-10-10 @@ -164,8 +164,9 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.24.7 +* linux-2.6.23.17 * linux-atm-2.4.1 +* linux-fusion-7.0.1 * linux-libc-headers-2.6.12.0 * linuxigd-0.95 * lm_sensors-3.0.2 @@ -215,7 +216,7 @@ * openmailadmin-1.0.0 * openssh-4.7p1 * openssl-0.9.8g -* openswan-2.6.16dr2 +* openswan-2.4.13 * openvpn-2.0.9 * pam_mysql-0.7RC1 * patch-2.5.4 @@ -233,6 +234,8 @@ * procps-3.2.6 * psmisc-22.2 * qemu-0.9.1 +* r8168-8.005.00 +* r8169-6.005.00 * readline-5.1 * reiser4progs-1.0.5 * reiserfsprogs-3.6.19 @@ -262,7 +265,7 @@ * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.4.1 -* syslinux-3.11 +* syslinux-3.62 * sysstat-6.0.2 * sysvinit-2.86 * tar-1.15.1 @@ -271,6 +274,7 @@ * tcptrack-1.3.0 * teamspeak-2.0.24.1 * texinfo-4.8 +* tftp-hpa-0.48 * tiff-3.8.2 * traceroute-1.4a12 * tripwire-2.4.1.2 diff --git a/make.sh b/make.sh index 2204089bad..a9bc9ed4a7 100755 --- a/make.sh +++ b/make.sh @@ -343,16 +343,18 @@ buildipfire() { ipfiremake v4l-dvb SMP=1 ipfiremake madwifi SMP=1 ipfiremake sane KMOD=1 SMP=1 + ipfiremake openswan KMOD=1 SMP=1 ipfiremake linux ipfiremake linux-fusion # ipfiremake ipp2p ipfiremake r8169 ipfiremake r8168 ipfiremake atl2 -# ipfiremake kqemu + ipfiremake kqemu ipfiremake v4l-dvb ipfiremake madwifi ipfiremake sane KMOD=1 + ipfiremake openswan KMOD=1 ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio -- 2.39.2