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

xen-kernel: updated to 2.6.32.60.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-10-09 20:34:18 +02:00
parent 1ae1ce18ae
commit 500f7b48cd
10 changed files with 1975 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3882
config/rootfiles/packages/linux-xen
View File

File diff suppressed because it is too large Load Diff

2
lfs/compat-wireless
View File

@@ -29,7 +29,7 @@ VERSUFIX=ipfire$(KCFG)
VER = 3.5.3-2-snpc
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.59
KVER = 2.6.32.60
endif
THISAPP = compat-wireless-$(VER)

2
lfs/cryptodev
View File

@@ -25,7 +25,7 @@
include Config
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.59
KVER = 2.6.32.60
endif
VERSUFIX=ipfire$(KCFG)

2
lfs/linux
View File

@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 20
PAK_VER = 21
DEPS = ""
VERSUFIX=ipfire$(KCFG)

8
lfs/linux2
View File

@@ -24,8 +24,8 @@
include Config
PATCHLEVEL = .59
VER = 2.6.32.59
PATCHLEVEL = .60
VER = 2.6.32.60
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 20
PAK_VER = 21
DEPS = ""
# Normal build or XEN build.
@@ -82,7 +82,7 @@ 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
xen-patches-2.6.32-2g.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2g.tar.bz2
$(DL_FILE)_MD5 = 69c68c4a8eb0f04b051a7dbcff16f6d0
$(DL_FILE)_MD5 = a8e037a78c5fabefd2baa83f7ae0b8b1
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

2
lfs/mISDN
View File

@@ -27,7 +27,7 @@ include Config
VERSUFIX=ipfire$(KCFG)
ifeq "$(KCFG)" "-xen"
KVER = "2.6.32.59"
KVER = "2.6.32.60"
endif
VER = 20121008

2
lfs/v4l-dvb
View File

@@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
ifeq "$(KCFG)" "-xen"
XVER = 2.6.32
KVER = 2.6.32.59
KVER = 2.6.32.60
else
XVER = 3.2.0
endif

38
lfs/xen-image
View File

@@ -29,7 +29,7 @@ VER = ipfire
THISAPP = xen-image
TARGET = $(DIR_INFO)/$(THISAPP)
KVER = `grep "^VER " $(DIR_SRC)/lfs/linux2 | sed "s| ||g" | cut -d"=" -f2`
KVER2 = `grep "^VER " $(DIR_SRC)/lfs/linux2 | sed "s| ||g" | cut -d"=" -f2`
###############################################################################
# Top-level Rules
@@ -91,8 +91,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma \
--exclude=lib/modules* --exclude=boot*
#Install Xen Kernel
tar -C $(MNThdd)/opt/pakfire/tmp -xvf /install/packages/linux-xen-$(KVER)-*.ipfire
#Install legacy Xen Kernel
tar -C $(MNThdd)/opt/pakfire/tmp -xvf /install/packages/linux-xen-$(KVER2)-*.ipfire
chroot $(MNThdd) /opt/pakfire/tmp/install.sh
rm -rf $(MNThdd)/opt/pakfire/tmp/*
#Install pae Kernel
tar -C $(MNThdd)/opt/pakfire/tmp -xvf /install/packages/linux-pae-$(KVER)-*.ipfire
chroot $(MNThdd) /opt/pakfire/tmp/install.sh
rm -rf $(MNThdd)/opt/pakfire/tmp/*
@@ -100,23 +105,30 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir $(MNThdd)/boot/grub
echo "timeout 10" > $(MNThdd)/boot/grub/grub.conf
echo "default 0" >> $(MNThdd)/boot/grub/grub.conf
echo "title IPFire (XEN-Kernel)" >> $(MNThdd)/boot/grub/grub.conf
echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
echo "title IPFire (legacy XEN-Kernel)" >> $(MNThdd)/boot/grub/grub.conf
echo " kernel /vmlinuz-$(KVER2)-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
>> $(MNThdd)/boot/grub/grub.conf
echo " initrd /ipfirerd-$(KVER2)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
echo "# savedefault 0" >> $(MNThdd)/boot/grub/grub.conf
echo "title IPFire (PAE-Kernel)" >> $(MNThdd)/boot/grub/grub.conf
echo " kernel /vmlinuz-$(KVER)-ipfire-pae root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
>> $(MNThdd)/boot/grub/grub.conf
echo " initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
echo "# savedefault 0" >> $(MNThdd)/boot/grub/grub.conf
echo "# savedefault 1" >> $(MNThdd)/boot/grub/grub.conf
ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
#Copy the meta-info of linux-xen package
cp -f /install/packages/meta-linux-xen $(MNThdd)/opt/pakfire/db/installed
cp -f /install/packages/meta-linux-xen $(MNThdd)/opt/pakfire/db/meta
cp -f /install/packages/meta-linux-pae $(MNThdd)/opt/pakfire/db/installed
cp -f /install/packages/meta-linux-pae $(MNThdd)/opt/pakfire/db/meta
#Set default configuration
echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
touch $(MNThdd)/lib/modules/$(KVER)-ipfire-xen/modules.dep
touch $(MNThdd)/lib/modules/$(KVER2)-ipfire-xen/modules.dep
mkdir $(MNThdd)/proc
mount --bind /proc $(MNThdd)/proc
mount --bind /dev $(MNThdd)/dev
@@ -129,7 +141,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sed -i -e "s|FSTYPE|ext3|g" $(MNThdd)/etc/fstab
chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen
chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER2)-xen.img $(KVER2)-ipfire-xen
chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-pae.img $(KVER)-ipfire-pae
#Remove root / fstab check
rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S19checkfstab
@@ -156,15 +169,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sed -i -e "s|^thermal|#thermal|g" $(MNThdd)/etc/sysconfig/modules
sed -i -e "s|^video|#video|g" $(MNThdd)/etc/sysconfig/modules
#Copy initramdisk, kernel and config
#cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \
# /install/images/$(SNAME)/boot
#cp -f $(MNThdd)/boot/vmlinuz-$(KVER)-ipfire-xen \
# /install/images/$(SNAME)/boot
cp $(DIR_SRC)/config/xen-image/* \
/install/images/$(SNAME)
sed -i -e "s|KVER|$(KVER)|g" /install/images/$(SNAME)/ipfire.cfg
# Unmount
umount $(MNThdd)/proc
umount $(MNThdd)/dev

2
make.sh
View File

@@ -834,6 +834,8 @@ buildpackages() {
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
ipfiremake xen-image
rm -rf $LFS/install/packages/linux-xen-*.ipfire
rm -rf $LFS/install/packages/meta-linux-xen

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

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
KVER=2.6.32.59
KVER=2.6.32.60
ROOT=`mount | grep " / " | cut -d" " -f1`
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
if [ ! -z $ROOTUUID ]; then
@@ -51,7 +51,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
# Add new Entry to grub.conf
#
echo "" >> /boot/grub/grub.conf
echo "title IPFire (XEN-Kernel $KVER)" >> /boot/grub/grub.conf
echo "title IPFire (legacy XEN-Kernel $KVER)" >> /boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf
echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
echo "# savedefault $ENTRY" >> /boot/grub/grub.conf