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

Add Xen Patches for 2.6.32.8 and enabled build.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-02-18 08:23:17 +01:00
parent dd79c3999b
commit 0e717101e1
10 changed files with 3666 additions and 2415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1190
config/kernel/kernel.config.i586-ipfire-xen
View File

File diff suppressed because it is too large Load Diff

699
config/rootfiles/packages/linux-xen-disabled → config/rootfiles/packages/linux-xen
View File

File diff suppressed because it is too large Load Diff

7
doc/packages-list.txt
View File

@@ -66,7 +66,6 @@
* centerim-4.22.1
* clamav-0.95.3
* cmake-2.4.8
* collectd-4.5.3
* collectd-4.5.4
* coreutils-5.96
* cpio-2.6
@@ -77,6 +76,7 @@
* cyrus-sasl-2.1.21
* dahdi-2.2.1
* dahdi-2.2.1-kmod-2.6.32.8-ipfire
* dahdi-2.2.1-kmod-2.6.32.8-ipfire-xen
* db-4.4.20
* dbus-1.0.3
* dhcp-3.1.0
@@ -153,6 +153,7 @@
* kbd-1.12
* klibc-1.5.14
* kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire
* kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire-xen
* kudzu-1.2.64
* l7-protocols-2009-05-10
* lame-3.97
@@ -185,6 +186,7 @@
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.32.8-ipfire
* linux-2.6.32.8-ipfire-xen
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* lm_sensors-3.1.2
@@ -196,6 +198,7 @@
* m4-1.4.4
* mISDNuser_20090906
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire-xen
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -245,6 +248,7 @@
* openssl-0.9.8l
* openswan-2.6.24
* openswan-2.6.24-kmod-2.6.32.8-ipfire
* openswan-2.6.24-kmod-2.6.32.8-ipfire-xen
* openvpn-2.1_rc20
* p7zip_4.65
* pam_mysql-0.7RC1
@@ -321,6 +325,7 @@
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-690055993011-kmod-2.6.32.8-ipfire
* v4l-dvb-690055993011-kmod-2.6.32.8-ipfire-xen
* vdr-1.6.0
* vdradmin-am-3.6.5
* vim-7.0

18
lfs/linux
View File

@@ -57,21 +57,21 @@ objects =$(DL_FILE) \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.32.patch.bz2 \
squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
# linux-$(VER)-suse_xen_patches-1.tar.bz2
linux-$(VER)-suse_xen_patches-1.tar.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
#linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
$(DL_FILE)_MD5 = 82023ede52f067fcc55c5e70b02e48ae
netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
#linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = 0bf813cbfef22f37e5060daa7dad0496
install : $(TARGET)
@@ -117,9 +117,11 @@ ifeq "$(XEN)" "1"
done
rm -rf $(DIR_SRC)/linux-*-suse_xen_patches
# Fix strange patchset errors
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
# Linux Intermediate Queueing Device
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq-skbuff.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3-xen.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
else
# Linux Intermediate Queueing Device
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
@@ -131,10 +133,8 @@ endif
# 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
ifeq "$(XEN)" ""
# Reiser4
cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
endif
# Reiser4 (don't check if fail (some patches are already in xen patchset)
-cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch

3
lfs/xen-image
View File

@@ -130,9 +130,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org
sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf
#Remove reiser4 because it is not work with xen-kernel
sed -i -e "s|reiser4 | |g" $(MNThdd)/etc/mkinitcpio.conf
chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen
cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf

38
make.sh
View File

@@ -341,16 +341,16 @@ buildipfire() {
ipfiremake unzip
ipfiremake which
ipfiremake xz
# ipfiremake linux XEN=1
# ipfiremake kqemu XEN=1
# #ipfiremake kvm-kmod XEN=1
# ipfiremake v4l-dvb XEN=1
# ipfiremake madwifi XEN=1
# #ipfiremake alsa XEN=1 KMOD=1
# ipfiremake dahdi XEN=1 KMOD=1
# ipfiremake openswan XEN=1 KMOD=1
# ipfiremake mISDN XEN=1
# ipfiremake compat-wireless XEN=1
ipfiremake linux XEN=1
ipfiremake kqemu XEN=1
#ipfiremake kvm-kmod XEN=1
ipfiremake v4l-dvb XEN=1
ipfiremake madwifi XEN=1
#ipfiremake alsa XEN=1 KMOD=1
ipfiremake dahdi XEN=1 KMOD=1
ipfiremake openswan XEN=1 KMOD=1
#ipfiremake mISDN XEN=1
#ipfiremake compat-wireless XEN=1
ipfiremake linux
ipfiremake kqemu
#ipfiremake kvm-kmod
@@ -725,15 +725,15 @@ buildpackages() {
ipfirepackages
# # Check if there is a loop device for building in virtual environments
# if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
# cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
# cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
# ipfiremake xen-image ED=$IPFVER
# rm -rf $LFS/install/packages/linux-xen-*.ipfire
# rm -rf $LFS/install/packages/meta-linux-xen
# fi
# mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
# Check if there is a loop device for building in virtual environments
if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
ipfiremake xen-image ED=$IPFVER
rm -rf $LFS/install/packages/linux-xen-*.ipfire
rm -rf $LFS/install/packages/meta-linux-xen
fi
mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
# Cleanup
stdumount

4
src/paks/linux-xen/install.sh
View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
KVER=2.6.27.42
KVER=2.6.32.8
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
@@ -64,8 +64,6 @@ fi
#
cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
sed -i -e "s| autodetect | |g" /etc/mkinitcpio.conf
# Remove Reiser4 (not working with xen)
sed -i -e "s|reiser4 | |g" /etc/mkinitcpio.conf
mkinitcpio -k $KVER-ipfire-xen -g /boot/ipfirerd-$KVER-xen.img
#
# Create new module depency

1353
src/patches/linux-2.6.32.8-xen-imq-test2.patch Normal file
View File

File diff suppressed because it is too large Load Diff

13
src/patches/linux-2.6.32.8-xen-patch-fixes.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -Naur linux-2.6.32.8.org/init/main.c linux-2.6.32.8/init/main.c
--- linux-2.6.32.8.org/init/main.c 2010-02-17 20:30:17.000000000 +0100
+++ linux-2.6.32.8/init/main.c 2010-02-17 22:00:48.000000000 +0100
@@ -90,9 +90,6 @@
extern void prio_tree_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
-#ifndef CONFIG_DEBUG_RODATA
-static inline void mark_rodata_ro(void) { }
-#endif
#ifdef CONFIG_TC
extern void tc_init(void);

2756
src/patches/suse_xen_series.conf Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff