From 74156957bbadafe53849e0423030c33ee5b3d89d Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Fri, 28 Nov 2008 13:57:39 -0600 Subject: [PATCH] Updated boot kernel to 2.6.27.7, removed ide-generic module from initramfs and init, removed date string from ISO label --- Makefile | 8 ++++---- initramfs/init | 2 +- initramfs/initramfs.lst | 1 - kernel/{linux-2.6.27.4.config => linux-2.6.27.7.config} | 5 +++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename kernel/{linux-2.6.27.4.config => linux-2.6.27.7.config} (99%) diff --git a/Makefile b/Makefile index 38ecb5a..e33d1ef 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CRUXVERSION = 2.5 COLLECTIONS = core opt xorg KERNEL_MIRROR = ftp://ftp.kernel.org -KERNEL_VERSION = 2.6.27.4 +KERNEL_VERSION = 2.6.27.7 KERNEL_PATCHES = squashfs3.4-patch STATIC_BB = http://jaeger.morpheus.net/linux/crux/files/busybox-1.7.2-i386-static.bz2 SYSLINUX_VERSION = 3.72 @@ -360,14 +360,14 @@ iso: check-root kernel syslinux initramfs squashfs setup.dependencies unsquashfs @echo "- Starting genisoimage" @if [ -f $(ISO_FILENAME) ]; then rm -f $(ISO_FILENAME); fi @if [ -f $(NETISO_FILENAME) ]; then rm -f $(NETISO_FILENAME); fi - @genisoimage -R -l -J -V CRUX-$(CRUXVERSION)-$(DATE_STR) -A CRUX -b boot/isolinux/isolinux.bin \ + @genisoimage -R -l -J -V CRUX-$(CRUXVERSION) -A CRUX -b boot/isolinux/isolinux.bin \ -c boot/isolinux/isolinux.boot -no-emul-boot -boot-load-size 4 \ -boot-info-table -sort /tmp/iso.sort -o $(ISO_FILENAME) $(ISO_ROOT_DIR) @md5sum `basename $(ISO_FILENAME)` > `basename $(ISO_FILENAME) .iso`.md5 @rm $(ISO_ROOT_DIR)/crux.squashfs @cp squashfs/crux.squashfs-net $(ISO_ROOT_DIR)/crux.squashfs - @genisoimage -R -l -J -V CRUX-NET-$(CRUXVERSION)-$(DATE_STR) -A CRUX -b \ - boot/isolinux/isolinux.bin -c boot/isolinux/isolinux.boot \ + @genisoimage -R -l -J -V CRUX-NET-$(CRUXVERSION) -A CRUX \ + -b boot/isolinux/isolinux.bin -c boot/isolinux/isolinux.boot \ -exclude-list iso/excludelist.net -no-emul-boot -boot-load-size 4 \ -boot-info-table -sort /tmp/iso.sort -o $(NETISO_FILENAME) $(ISO_ROOT_DIR) @md5sum `basename $(NETISO_FILENAME)` > \ diff --git a/initramfs/init b/initramfs/init index 79a8683..34baccf 100755 --- a/initramfs/init +++ b/initramfs/init @@ -161,7 +161,7 @@ then load_ide_modules() { echo -e -n "${BOLD}${BLUE}IDE${NORM}" for mod in ide-core ide-cd_mod ide-disk aec62xx alim15x3 amd74xx atiixp \ - cmd64x cs5520 cs5530 cs5535 ide-generic ide-pci-generic hpt366 it8213 \ + cmd64x cs5520 cs5530 cs5535 ide-pci-generic hpt366 it8213 \ it821x jmicron ns87415 opti621 pdc202xx_new piix rz1000 sc1200 \ serverworks siimage sis5513 slc90e66 tc86c001 triflex trm290 \ via82cxxx diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst index ff3ae8e..0c05ebe 100644 --- a/initramfs/initramfs.lst +++ b/initramfs/initramfs.lst @@ -145,7 +145,6 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-cd_mod.ko ../kernel/li file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-core.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-core.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-disk.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-disk.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-floppy.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-floppy.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-generic.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-generic.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-pnp.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-pnp.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-tape.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-tape.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/legacy/ide-cs.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/legacy/ide-cs.ko 644 0 0 diff --git a/kernel/linux-2.6.27.4.config b/kernel/linux-2.6.27.7.config similarity index 99% rename from kernel/linux-2.6.27.4.config rename to kernel/linux-2.6.27.7.config index c124bf4..b8ac0f2 100644 --- a/kernel/linux-2.6.27.4.config +++ b/kernel/linux-2.6.27.7.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.4 -# Thu Oct 30 15:13:25 2008 +# Linux kernel version: 2.6.27.7 +# Tue Nov 25 11:11:59 2008 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -259,6 +259,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y +CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y # CONFIG_MTRR_SANITIZER is not set