From 817e58c278cb8ebee7743205877d0f67c431fcec Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Jan 2012 23:14:48 +0000 Subject: Thu Jan 5 23:14:48 UTC 2012 --- libre/kernel26-libre-lts/PKGBUILD | 59 +++++++++++----------- libre/kernel26-libre-lts/config.i686 | 49 ++++++++++-------- libre/kernel26-libre-lts/config.x86_64 | 12 ++--- .../kernel26-libre-lts/kernel26-libre-lts.install | 13 +++-- 4 files changed, 69 insertions(+), 64 deletions(-) (limited to 'libre/kernel26-libre-lts') diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index acbdde5ad..7c444e8ff 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 142426 2011-11-09 13:05:04Z tpowa $ # Maintainer: Andreas Radke # Maintainer (Parabola): fauno @@ -6,35 +6,34 @@ pkgbase=kernel26-libre-lts pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts kernel _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 -_preset=kernel26-lts.preset -pkgver=${_basekernel}.42 +pkgver=${_basekernel}.52 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') url="http://linux-libre.fsfla.org" -source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2 +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" # the main kernel config files config.i686 config.x86_64 # standard config files for mkinitcpio ramdisk - ${_preset} - ${pkgname}.install) + ${pkgname}.preset) options=(!strip) build() { - cd ${srcdir}/linux-$pkgver + cd ${srcdir}/linux-$_basekernel + if [ "$_basekernel" != "$pkgver" ]; then + # add latest kernel stable patch + patch -Np1 -i ${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre + fi cat ../config.$CARCH >./.config if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config fi + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 ${pkgver#$_basekernel}-${pkgrel}|" Makefile + - for this_doesnt_build in CONFIG_RT2860 CONFIG_RT2870 CONFIG_RT3090; do - sed -i "s|^${this_doesnt_build}=.*|# ${this_doesnt_build} is not set|g" ./.config - done - # remove the extraversion from Makefile - # this ensures our kernel version is always 2.6.XX-lts - # this way, minor kernel updates will not break external modules - sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile # get kernel version make prepare # load configuration @@ -56,15 +55,15 @@ build() { package_kernel26-libre-lts() { pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers" - backup=(etc/mkinitcpio.d/${_preset}) - depends=('coreutils' 'module-init-tools' 'mkinitcpio>=0.6.4') + backup=(etc/mkinitcpio.d/${pkgname}.preset) + depends=('coreutils' 'module-init-tools>=3.12-2' 'mkinitcpio>=0.6.8-2') install=${pkgname}.install provides=("kernel26-lts=$pkgver") replaces=('kernel26-lts') conflicts=('kernel26-lts') KARCH=x86 - cd ${srcdir}/linux-$pkgver + cd ${srcdir}/linux-$_basekernel # get kernel version _kernver="$(make kernelrelease)" mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot} @@ -75,7 +74,7 @@ package_kernel26-libre-lts() { install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux # install fallback mkinitcpio.conf file and preset file for kernel - install -m644 -D ${srcdir}/${_preset} ${pkgdir}/etc/mkinitcpio.d/${_preset} + install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset # set correct depmod command for install sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ @@ -83,17 +82,22 @@ package_kernel26-libre-lts() { -i $startdir/${pkgname}.install sed \ -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \ - -e "s|default_image=.*|default_image=\"/boot/kernel26${_kernelname}.img\"|g" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/kernel26${_kernelname}-fallback.img\"|g" \ - -i ${pkgdir}/etc/mkinitcpio.d/${_preset} + -e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \ + -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset - echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/kernel26${_kernelname}.kver + echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/${pkgname}.kver # remove build and source links rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf ${pkgdir}/lib/firmware - # gzip -9 all modules to safe 100MB of space + # gzip -9 all modules to save 100MB of space find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; + # make room for external modules + ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # add real version for building the kernel + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" } package_kernel26-libre-lts-headers() { @@ -104,7 +108,7 @@ package_kernel26-libre-lts-headers() { mkdir -p ${pkgdir}/lib/modules/${_kernver} cd ${pkgdir}/lib/modules/${_kernver} ln -sf ../../../usr/src/linux-${_kernver} build - cd ${srcdir}/linux-$pkgver + cd ${srcdir}/linux-$_basekernel install -D -m644 Makefile \ ${pkgdir}/usr/src/linux-${_kernver}/Makefile install -D -m644 kernel/Makefile \ @@ -193,7 +197,7 @@ package_kernel26-libre-lts-headers() { cd ${pkgdir}/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm # add header for aufs2-util - cp -a ${srcdir}/linux-$pkgver/include/asm-generic/bitsperlong.h ${pkgdir}/usr/src/linux-${_kernver}/include/asm/ + cp -a ${srcdir}/linux-$_basekernel/include/asm-generic/bitsperlong.h ${pkgdir}/usr/src/linux-${_kernver}/include/asm/ chown -R root.root ${pkgdir}/usr/src/linux-${_kernver} find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \; @@ -211,8 +215,3 @@ package_kernel26-libre-lts-headers() { # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } -md5sums=('4344dc9016b73a4910566e4a45087465' - '3298f542840c52a8b8abc1b3795e455b' - '9990806b3bf3cec6f8bd419249903613' - '2cbfeb3e2a18d45f82f613e97fc23355' - 'a03a56a3cd700f0c9004b17e7391f8ff') diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 index 2865c58fa..b9fc967af 100644 --- a/libre/kernel26-libre-lts/config.i686 +++ b/libre/kernel26-libre-lts/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Mon Apr 18 12:31:05 2011 +# Tue Jun 7 06:41:37 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -69,9 +69,9 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set -CONFIG_KERNEL_LZMA=y +# CONFIG_KERNEL_LZMA is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -195,7 +195,7 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y @@ -3914,7 +3914,7 @@ CONFIG_LEDS_CLASS=m # # LED drivers # -# CONFIG_LEDS_ALIX2 is not set +CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_GPIO=m CONFIG_LEDS_GPIO_PLATFORM=y @@ -4328,7 +4328,7 @@ CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_MINIX_FS=m CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -4366,11 +4366,11 @@ CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y -# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set @@ -4399,7 +4399,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_MINIX_SUBPARTITION=y CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set CONFIG_LDM_PARTITION=y @@ -4517,6 +4517,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4524,7 +4525,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4532,24 +4535,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4558,7 +4565,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y @@ -4567,7 +4573,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 5f7e05284..751f759e6 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -70,9 +70,9 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set -CONFIG_KERNEL_LZMA=y +# CONFIG_KERNEL_LZMA is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -196,7 +196,7 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y @@ -3725,7 +3725,7 @@ CONFIG_LEDS_CLASS=m # # LED drivers # -# CONFIG_LEDS_ALIX2 is not set +CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_GPIO=m CONFIG_LEDS_GPIO_PLATFORM=y @@ -4141,7 +4141,7 @@ CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_MINIX_FS=m CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -4212,7 +4212,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_MINIX_SUBPARTITION=y CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set CONFIG_LDM_PARTITION=y diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install index 8bc94634d..0e4b44fa3 100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=2.6.32-lts +KERNEL_VERSION=2.6.32.50-1-lts post_install () { # updating module dependencies @@ -17,7 +17,7 @@ post_install () { echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio" echo "" echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - /sbin/mkinitcpio -p kernel26${KERNEL_NAME} + mkinitcpio -p kernel26${KERNEL_NAME} } post_upgrade() { @@ -41,9 +41,8 @@ post_upgrade() { if grep "/boot" /etc/fstab 2>&1 >/dev/null; then if ! grep "/boot" /etc/mtab 2>&1 >/dev/null; then - echo "WARNING: /boot appears to be a seperate partition but is not mounted" - echo " This is most likely not what you want. Please mount your /boot" - echo " partition and reinstall the kernel unless you are sure this is OK" + echo "WARNING: /boot appears to be a seperate partition but is not mounted." + echo " You probably just broke your system. Congratulations." fi fi @@ -124,11 +123,11 @@ post_upgrade() { echo "" echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." if [ "`vercmp $2 2.6.19`" -lt 0 ]; then - /sbin/mkinitcpio -p kernel26${KERNEL_NAME} -m "ATTENTION:\nIf you get a kernel panic below + mkinitcpio -p kernel26${KERNEL_NAME} -m "ATTENTION:\nIf you get a kernel panic below and are using an Intel chipset, append 'earlymodules=piix' to the kernel commandline" else - /sbin/mkinitcpio -p kernel26${KERNEL_NAME} + mkinitcpio -p kernel26${KERNEL_NAME} fi if [ "`vercmp $2 2.6.21`" -lt 0 ]; then echo "" -- cgit v1.2.3-54-g00ecf