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

Updated kernel25 to 2.6.25.18

Browse Source 
Updated h12y patch
Add patch to remove kudzu deprecated syscall message
fix name of some rootfiles
This commit is contained in:
Arne Fitzenreiter
2008-10-11 00:50:29 +02:00
parent ed35052af0
commit 2219b263eb
12 changed files with 1372 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
config/rootfiles/common/atl2-2.0.4 → config/rootfiles/common/atl2
View File

0
config/rootfiles/common/r8168-8.005.00 → config/rootfiles/common/r8168
View File

0
config/rootfiles/common/v4l-dvb-e9a442d3b53a → config/rootfiles/common/v4l-dvb
View File

2598
config/rootfiles/packages/linux25
View File

File diff suppressed because it is too large Load Diff

0
config/rootfiles/packages/nagios-3.0 → config/rootfiles/packages/nagios
View File

14
doc/packages-list.txt
View File

@@ -35,7 +35,7 @@
* XML-Parser-2.34
* alsa-lib-1.0.17
* alsa-lib-1.0.17-kmod-2.6.23.17
* alsa-lib-1.0.17-kmod-2.6.25.17
* alsa-lib-1.0.17-kmod-2.6.25.18
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.30
@@ -43,7 +43,7 @@
* as86-0.16.17
* asterisk-1.4.18
* atl2-2.0.4-kmod-2.6.23.17
* atl2-2.0.4-kmod-2.6.25.17
* atl2-2.0.4-kmod-2.6.25.18
* autoconf-2.59
* automake-1.9.6
* backup-ipfire
@@ -146,7 +146,7 @@
* kbd-1.12
* klibc-1.5.14
* kqemu-1.3.0pre11-kmod-2.6.23.17
* kqemu-1.3.0pre11-kmod-2.6.25.17
* kqemu-1.3.0pre11-kmod-2.6.25.18
* kudzu-1.2.64
* l7-protocols-2008-04-23
* lame-3.97
@@ -176,7 +176,7 @@
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.23.17
* linux-2.6.25.17
* linux-2.6.25.18
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* linuxigd-0.95
@@ -188,7 +188,7 @@
* m4-1.4.4
* mISDNuser-1_1_8
* madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.23.17
* madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.17
* madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.18
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -275,7 +275,7 @@
* squashfs3.4
* squid-2.7.STABLE4
* squidGuard-1.3
* squidclamav-3.5
* squidclamav-3.6
* sudo-1.6.8p12
* sysfsutils-1.3.0
* sysklogd-1.4.1
@@ -300,7 +300,7 @@
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-e9a442d3b53a-kmod-2.6.23.17
* v4l-dvb-e9a442d3b53a-kmod-2.6.25.17
* v4l-dvb-e9a442d3b53a-kmod-2.6.25.18
* vdr-1.6.0
* vim-7.0
* vlan.1.9

11
lfs/linux25
View File

@@ -24,8 +24,8 @@
include Config
PATCHLEVEL = .17
VER = 2.6.25.17
PATCHLEVEL = .18
VER = 2.6.25.18
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -43,7 +43,7 @@ else
endif
PROG = linux25
PAK_VER = 1
PAK_VER = 2
DEPS = ""
###############################################################################
@@ -63,7 +63,7 @@ squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
mISDN-1_1_8.tar.gz = $(URL_IPFIRE)/mISDN-1_1_8.tar.gz
reiser4-for-2.6.25.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
$(DL_FILE)_MD5 = 30618bff93fd4fd048e20a9a6aab8e5d
$(DL_FILE)_MD5 = f0e4680a17ba0071d1579b890e201951
netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
@@ -102,6 +102,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
# Not report deprecated syscall 1.23 (for kudzu)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
# Fix crash on Twinhead H12Y notebooks
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch

12
make.sh
View File

@@ -344,12 +344,12 @@ buildipfire() {
# ipfiremake sane KMOD=1 SMP=1
# ipfiremake openswan KMOD=1 SMP=1
ipfiremake linux25
ipfiremake atl2 KVER=2.6.25.17
ipfiremake kqemu KVER=2.6.25.17
ipfiremake v4l-dvb KVER=2.6.25.17
ipfiremake madwifi KVER=2.6.25.17
ipfiremake alsa KMOD=1 KVER=2.6.25.17
# ipfiremake openswan KMOD=1 KVER=2.6.25.17
ipfiremake atl2 KVER=2.6.25.18
ipfiremake kqemu KVER=2.6.25.18
ipfiremake v4l-dvb KVER=2.6.25.18
ipfiremake madwifi KVER=2.6.25.18
ipfiremake alsa KMOD=1 KVER=2.6.25.18
# ipfiremake openswan KMOD=1 KVER=2.6.25.18
ipfiremake linux
ipfiremake atl2
ipfiremake r8168

2
src/paks/linux25/install.sh
View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
KVER=2.6.25.17
KVER=2.6.25.18
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden

2
src/paks/linux25/uninstall.sh
View File

@@ -23,4 +23,4 @@
#
. /opt/pakfire/lib/functions.sh
remove_files
mv -f /boot/grub/grub-backup-2.6.25.17.conf /boot/grub/grub.conf
mv -f /boot/grub/grub-backup-2.6.25.*.conf /boot/grub/grub.conf

14
src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -Naur linux-2.6.25.18.org/kernel/sysctl.c linux-2.6.25.18/kernel/sysctl.c
--- linux-2.6.25.18.org/kernel/sysctl.c 2008-10-09 04:58:32.000000000 +0200
+++ linux-2.6.25.18/kernel/sysctl.c 2008-10-10 18:03:33.000000000 +0200
@@ -2807,6 +2807,10 @@
if ((args->nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION))
return 0;
+ /* Ignore kudzu syscall 1.23 */
+ if ((args->nlen == 2) && (name[0] == 1) && (name[1] == 23))
+ return 0;
+
if (msg_count < 5) {
msg_count++;
printk(KERN_INFO

42
src/patches/linux-h12y-mmio-quirks.patch Normal file → Executable file
View File

@@ -1,6 +1,6 @@
--- a/drivers/pci/quirks.c 2008-09-08 20:33:16.000000000 +0200
+++ b/drivers/pci/quirks.c 2008-09-11 08:52:32.000000000 +0200
@@ -1381,6 +1381,50 @@
--- linux/drivers/pci/quirks.c 2008-09-08 20:33:16.000000000 +0200
+++ linux/drivers/pci/quirks.c 2008-10-06 16:37:35.000000000 +0200
@@ -1381,6 +1381,82 @@
PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE,
quirk_tc86c001_ide);
@@ -9,8 +9,8 @@
+ * resources that seems to be used by an unknown device.
+ * This quirk reserve more than really used mmio space to
+ * force change the mmio area of the cardreader and the network chip.
+ * See http://bugzilla.kerbel.org/show_bug.cgi?id=10231
+ * and http://bugzilla.kerbel.org/show_bug.cgi?id=9905
+ * See http://bugzilla.kernel.org/show_bug.cgi?id=10231
+ * and http://bugzilla.kernel.org/show_bug.cgi?id=9905
+ * for more details
+ */
+static void __init quirk_h12y_1_mmio(struct pci_dev *dev)
@@ -47,6 +47,38 @@
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7120,quirk_h12y_2_mmio);
+
+static void __init quirk_h12y_3_mmio(struct pci_dev *dev)
+{
+/*
+ * Firewire Device: O2 00F7 of Twinhead H12Y
+ * PCI VENDOR: 0x1217 PCI ID:0x00F7
+ * SUB VENDOR: 0x14FF SUB ID:0xA003
+ */
+ struct resource *r = &dev->resource[1];
+ if ((dev->subsystem_vendor) == 0x14FF &&
+ (dev->subsystem_device) == 0xA003) {
+ r->start = 0;
+ r->end = 0x0fff;
+ }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x00F7,quirk_h12y_3_mmio);
+
+static void __init quirk_h12y_4_mmio(struct pci_dev *dev)
+{
+/*
+ * MS-Cardreader Device: O2 7130 of Twinhead H12Y
+ * PCI VENDOR: 0x1217 PCI ID:0x7130
+ * SUB VENDOR: 0x14FF SUB ID:0xA003
+ */
+ struct resource *r = &dev->resource[0];
+ if ((dev->subsystem_vendor) == 0x14FF &&
+ (dev->subsystem_device) == 0xA003) {
+ r->start = 0;
+ r->end = 0x1fff;
+ }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7130,quirk_h12y_4_mmio);
+
+
static void __devinit quirk_netmos(struct pci_dev *dev)
{