diff --git a/templates/kernel26-x86_64-dotconfig b/templates/kernel26-x86_64-dotconfig index ec268309860..67b50faa815 100644 --- a/templates/kernel26-x86_64-dotconfig +++ b/templates/kernel26-x86_64-dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.3 -# Sun Dec 14 01:43:30 2008 +# Linux kernel version: 2.6.27.9 +# Tue Dec 16 18:06:00 2008 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -292,6 +292,7 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y +CONFIG_X86_RESERVE_LOW_64K=y CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 @@ -2916,7 +2917,6 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m -CONFIG_USB_ISP1760_PCI=y CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set @@ -3361,13 +3361,20 @@ CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_CONFIGFS_FS=m +# +# Layered filesystems +# +CONFIG_ECRYPT_FS=m +CONFIG_UNION_FS=m +# CONFIG_UNION_FS_XATTR is not set +# CONFIG_UNION_FS_DEBUG is not set + # # Miscellaneous filesystems # CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -3396,6 +3403,9 @@ CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_DEBUG is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 CONFIG_VXFS_FS=m CONFIG_MINIX_FS=m CONFIG_OMFS_FS=m diff --git a/templates/kernel26.tmpl b/templates/kernel26.tmpl index 0c19e5e41fb..b926cda6cea 100644 --- a/templates/kernel26.tmpl +++ b/templates/kernel26.tmpl @@ -1,6 +1,12 @@ # Template file for 'kernel26' pkgname=kernel26 -version=2.6.27.3 +version=2.6.27.9 +# Vanilla kernel + UnionFS + SquashFS patches. +patch_files=" +unionfs-2.5_for_2.6.27-rc6.diff.bz2 +unionfs-2.5_fix_for_2.6.27.diff +squashfs3.4-2.6.27-rc4.diff.bz2" +patch_args="-p1" wrksrc="linux-$version" distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version.tar.bz2" build_style=gnu_makefile @@ -9,7 +15,7 @@ make_install_target="modules_install INSTALL_MOD_PATH=$XBPS_DESTDIR/$pkgname-$version" short_desc="The Linux kernel (2.6 branch)" maintainer="Juan RP " -checksum=52d9526ea8df33c9fab3df4564b0147b1866c76b0fd31474b92592567384a02c +checksum=fd710a841be6119cdd2c42f92ca405265fb156e279006bb89bb874e4198b3e5e long_desc=" This package provides the linux kernel image and kernel modules from the 2.6 branch." @@ -29,7 +35,7 @@ pre_build() fi if [ -f $XBPS_TEMPLATESDIR/kernel26-$arch-dotconfig ]; then - echo "=> Detected a .config file for your arch, using it." + msg_normal "Detected a .config file for your arch, using it." cp -f $XBPS_TEMPLATESDIR/kernel26-$arch-dotconfig \ $wrksrc/.config make oldconfig @@ -41,6 +47,7 @@ pre_build() post_install() { local destdir=$XBPS_DESTDIR/$pkgname-$version + local incdirs="acpi asm-generic asm-x86 config linux math-emu media \ net pcmcia scsi sound video" local _archs="alpha arm arm26 avr32 blackfin cris frv h8300 ia64 m32r \ @@ -75,7 +82,6 @@ post_install() cp arch/x86/kernel/asm-offsets.s \ $destdir/usr/src/linux-$version/arch/x86/kernel - install -m 644 vmlinux $destdir/usr/src/linux-$version/vmlinux for i in $(find . -name "Kconfig*"); do mkdir -p $destdir/usr/src/linux-$version/$(echo $i | sed 's|/Kconfig.*||') cp $i $destdir/usr/src/linux-$version/$i diff --git a/templates/squashfs3.4-2.6.27-rc4.diff.bz2 b/templates/squashfs3.4-2.6.27-rc4.diff.bz2 new file mode 100644 index 00000000000..093009902f0 Binary files /dev/null and b/templates/squashfs3.4-2.6.27-rc4.diff.bz2 differ diff --git a/templates/unionfs-2.5_fix_for_2.6.27.diff b/templates/unionfs-2.5_fix_for_2.6.27.diff new file mode 100644 index 00000000000..7bb7ab03822 --- /dev/null +++ b/templates/unionfs-2.5_fix_for_2.6.27.diff @@ -0,0 +1,21 @@ +Taken from: http://lkml.org/lkml/2007/10/21/193 + +--- a/security/security.c ++++ b/security/security.c +@@ -409,6 +409,7 @@ int security_inode_permission(struct inode *inode, int mask, struct nameidata *n + return 0; + return security_ops->inode_permission(inode, mask, nd); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_setattr(struct dentry *dentry, struct iattr *attr) + { +@@ -518,6 +519,7 @@ int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + { + return security_ops->file_ioctl(file, cmd, arg); + } ++EXPORT_SYMBOL(security_file_ioctl); + + int security_file_mmap(struct file *file, unsigned long reqprot, + unsigned long prot, unsigned long flags, + diff --git a/templates/unionfs-2.5_for_2.6.27-rc6.diff.bz2 b/templates/unionfs-2.5_for_2.6.27-rc6.diff.bz2 new file mode 100644 index 00000000000..aadfde08832 Binary files /dev/null and b/templates/unionfs-2.5_for_2.6.27-rc6.diff.bz2 differ