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

Xen-Support vorruebergehend wieder entfernt, da die Entwickler keine Reaktion zeigen.

Browse Source 
Vielleicht wirds ja was im naechsten Release.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@668 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-07-09 22:20:53 +00:00
parent 908a3eb776
commit 642b2e7f84
7 changed files with 1 additions and 115806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1975
config/kernel/kernel.config.i586.xen
View File

File diff suppressed because it is too large Load Diff

29
lfs/linux
View File

@@ -40,13 +40,9 @@ CXXFLAGS =
#
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/linux-$(VER)-smp
else
ifeq "$(XEN)" "1"
TARGET = $(DIR_INFO)/linux-$(VER)-xen
else
TARGET = $(DIR_INFO)/linux-$(VER)
endif
endif
###############################################################################
@@ -109,12 +105,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@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
ifeq "$(XEN)" "1"
# XEN
-cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xen-3.0.4-2.6.16.x.patch
cd $(DIR_APP)/net/ipv4/netfilter && patch -Np0 < $(DIR_SRC)/src/patches/xen-3.0.4-netfilter-fix.patch
endif
# An UTF8 patch from LFS
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
@@ -160,9 +150,6 @@ endif
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.9
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
ifeq "$(XEN)" "1"
cd $(DIR_APP)/net/ipv4/netfilter && patch -Np0 < $(DIR_SRC)/src/patches/xen-3.0.4-layer7-fix.patch
endif
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
@@ -184,12 +171,8 @@ endif
ifeq "$(SMP)" "1"
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
else
ifeq "$(XEN)" "1"
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).xen $(DIR_APP)/.config
else
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
endif
endif
cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
@@ -203,15 +186,6 @@ ifeq "$(SMP)" "1"
ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
else
ifeq "$(XEN)" "1"
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-xen/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
cd $(DIR_APP) && cp -v vmlinuz /boot/vmlinuz-$(VER)-ipfire-xen
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-xen
ln -sf vmlinuz-$(VER)-ipfire-xen /boot/vmlinuz-ipfire-xen
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
else
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
@@ -222,17 +196,14 @@ else
ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
endif
endif
# remove symlinked pcmcia directory
-rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia
ifeq "$(SMP)" ""
ifeq "$(XEN)" ""
# Only do this once on the non-SMP pass
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
endif
endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*

1
make.sh
View File

@@ -336,7 +336,6 @@ buildipfire() {
# ipfiremake promise-sata-300-tx SMP=1
ipfiremake zaptel SMP=1
ipfiremake fuse SMP=1
#ipfiremake linux XEN=1
ipfiremake linux
ipfiremake ipp2p
ipfiremake fcdsl

1
src/paks/ipfireseeder/install.sh
View File

@@ -2,3 +2,4 @@
. /opt/pakfire/lib/functions.sh
extract_files
/etc/init.d/ipfireseeder start

113769
src/patches/xen-3.0.4-2.6.16.x.patch
View File

File diff suppressed because it is too large Load Diff

19
src/patches/xen-3.0.4-layer7-fix.patch
View File

@@ -1,19 +0,0 @@
--- ipt_layer7.c~ 2007-05-25 13:57:38.000000000 +0200
+++ ipt_layer7.c 2007-05-25 13:58:43.000000000 +0200
@@ -368,13 +368,13 @@
return (pattern_result ^ info->invert);
}
- if(skb_is_nonlinear(skb)){
- if(skb_linearize(skb, GFP_ATOMIC) != 0){
+// if(skb_is_nonlinear(skb)){
+ if(skb_linearize(skb/*, GFP_ATOMIC */) != 0){
if (net_ratelimit())
printk(KERN_ERR "layer7: failed to linearize packet, bailing.\n");
return info->invert;
}
- }
+// }
/* now that the skb is linearized, it's safe to set these. */
app_data = skb->data + app_data_offset(skb);

13
src/patches/xen-3.0.4-netfilter-fix.patch
View File

@@ -1,13 +0,0 @@
--- ipt_REJECT.c~ 2007-05-25 13:59:33.000000000 +0200
+++ ipt_REJECT.c 2007-05-25 13:00:17.000000000 +0200
@@ -159,8 +159,8 @@
nskb->nf_bridge = NULL;
#endif
- skb_shinfo(nskb)->tso_size = 0;
- skb_shinfo(nskb)->tso_segs = 0;
+ skb_shinfo(nskb)->gso_size = 0;
+ skb_shinfo(nskb)->gso_segs = 0;
tcph = (struct tcphdr *)((u_int32_t*)nskb->nh.iph + nskb->nh.iph->ihl);