[arch-commits] CVS update of core/base/kernel26 (PKGBUILD)
Thomas Baechler
thomas at archlinux.org
Sun Mar 30 09:23:05 UTC 2008
Date: Sunday, March 30, 2008 @ 11:23:05
Author: thomas
Path: /home/cvs-core/core/base/kernel26
Modified: PKGBUILD (1.297 -> 1.298)
upgpkg: kernel26 2.6.24.4-1
----------+
PKGBUILD | 218 +++----------------------------------------------------------
1 file changed, 14 insertions(+), 204 deletions(-)
Index: core/base/kernel26/PKGBUILD
diff -u core/base/kernel26/PKGBUILD:1.297 core/base/kernel26/PKGBUILD:1.298
--- core/base/kernel26/PKGBUILD:1.297 Mon Mar 24 18:14:29 2008
+++ core/base/kernel26/PKGBUILD Sun Mar 30 11:23:05 2008
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.297 2008/03/24 17:14:29 tpowa Exp $
+# $Id: PKGBUILD,v 1.298 2008/03/30 09:23:05 thomas Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
# Maintainer: Thomas Baechler <thomas at archlinux.org>
pkgname=kernel26
_basekernel=2.6.24
-pkgver=2.6.24.3
-pkgrel=6
+pkgver=2.6.24.4
+pkgrel=1
pkgdesc="The Linux Kernel and modules"
arch=(i686 x86_64)
license=('GPL2')
groups=('base')
url="http://www.kernel.org"
-backup=('boot/kconfig26' etc/mkinitcpio.d/${pkgname}.preset etc/mkinitcpio.d/${pkgname}-fallback.conf)
+backup=(etc/mkinitcpio.d/${pkgname}.preset)
depends=('coreutils' 'module-init-tools' 'mkinitcpio>=0.5.18')
# pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now
# nforce package support was abandoned by nvidia, kernel modules should cover everything now.
@@ -21,215 +21,27 @@
'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs')
install=kernel26.install
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
- ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- # add latest fixes
- ftp://ftp.archlinux.org/other/kernel26/pre-2.6.24.4.patch.bz2
- ### next two lines only needed for rc kernel building
- #http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc6.bz2
- #http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.24-rc6-git2.bz2
+ ftp://ftp.archlinux.org/other/kernel26/patch-${pkgver}-${pkgrel}-ARCH.bz2
# the main kernel config files
config config.x86_64
- # the archlinux boot logos
- logo_linux_clut224.ppm
- logo_linux_mono.pbm
- logo_linux_vga16.ppm
# standard config files for mkinitcpio ramdisk
- kernel26.preset
- mkinitcpio-$pkgname.conf
- # add possibility to load your own dsdt acpi table
- acpi-dsdt-initrd-v0.8.4-2.6.21.patch
- # fix bluetooth on some toshiba notebooks
- toshiba-bluetooth.patch
- # add additional unusual usb entry
- usb-storage-unusual-devs.patch
- # improve intel macintosh support
- mactel-linux-2.6.24.patch
- # fix broken acpi c states on buggy bioses, which violate acpi specification
- acpi-buggy-bios.patch
- # add squashfs and unionfs
- http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tar.gz
- http://download.filesystems.org/unionfs/stable/unionfs-2.2.4_for_2.6.24.2.diff.gz
- # patch below for aufs compatibility
- lhash-2.6.24.patch
- put_filp-2.6.24.patch
- sec_perm-2.6.24.patch
- splice-2.6.24.patch
- #put_filp.patch
- # add possibility to undervolt certain cpus
- linux-phc-0.3.0-kernel-vanilla-2.6.23rc3.patch
- # adding genpatches from gentoo
- 2100_sd-sr-medium-detection.patch
- 2101_sr-follow-tray-status.patch
- 2102_sr-test-unit-ready.patch
- 2405_sis190-eeprom-mac.patch
- 2700_alsa-hda-lifebook-e8410.patch
- # fix Leadtek_WinFast_2000
- winfast-2000.patch
- # fix ata limit
- ata-2.6.24.patch
- # fix some sis agp ids
- sis671-intelgly-2.6.24.patch
- # fix drm spinlock
- drm-spinlock-fix.patch
- # fix capabilities
- fix-capabilities.patch
- # fix hanftek usb dvb-t receiver
- hanftek.patch
- # fix gcc43 compilation
- fix-gcc43.patch
- # add atheros l2 support
- http://people.redhat.com/csnook/atl2/atl2-2.0.4.patch.bz2
-)
+ kernel26.preset)
md5sums=('3f23ad4b69d0a552042d1ed0f4399857'
- '4c42be33a7d98f280588c9d28478cdfd'
- '24f94c38202b9eac01783f116be24b77'
+ '9d435f1a3b56d74265d9eb7c49060ff4'
'817294b52dc1f0acb1a8616fe792f29a'
'ae7370a442115f2c7ee45d0123f617e3'
- '5974286ba3e9716bfbad83d3f4ee985a'
- 'e8c333eaeac43f5c6a1d7b2f47af12e2'
- 'a6f0377c814da594cffcacbc0785ec1a'
- '25584700a0a679542929c4bed31433b6'
- '36858bd6a0bca63d2aa901b2e42d4a05'
- '493137566bc397ec762c86e64bd96849'
- '695d8578a0334fa9bb140917561f03d4'
- '3ed791c3af3099489faf0d22cbcc55a8'
- 'ad590a038da7af4fddd28b49257a18f6'
- 'bbc730a590d4e09b3d937b257e5a4bfe'
- '62d3ff7c067a5aa82f57711b3a4ab86a'
- '0c1fe21bcf42cd6c1bc524469f7431a6'
- '0f72452b84db921e417b719c1d5d8213'
- '1a7e063a4972143374049e0df006044e'
- 'b478f209867ab551f12ad23062c3109d'
- '6482e0d1a3dd60130f873e83e906ffc3'
- '0866faa4e11ed5b65f1b9bf91a7b6310'
- 'fd452453b1b2d5e6793673fccda74a54'
- 'f3d47edbfcdb5852717b76b9b0fe7245'
- 'f144cac5b7d036f73c23671f63b06a5e'
- '9a4d34ce0a170166a5b3709cb05fc284'
- 'fdff57384070308278eacd0fd3950369'
- '9dd6078ef9426ef0dafa9bcfd042af58'
- '8eafd3da53b57118cb22f6dc5e82bb8b'
- 'bb4108d87f61444757864084c8cb731e'
- '2be4c345ae87be719ea88b61aa64215f'
- '9a0db9c527fb1a3353415a912732b564'
- 'ea1e6a05e98150b5f4d4c96f3936b3f0'
- '3fdc9e3b343f173b86e7266b9a3d2118'
- '565cde4fd4f23a5021f73617b3cc62ea')
+ '25584700a0a679542929c4bed31433b6')
build() {
- [ "${CARCH}" = "i686" ] && KARCH=x86
- [ "${CARCH}" = "x86_64" ] && KARCH=x86
+ KARCH=x86
cd $startdir/src/linux-$_basekernel
- # add upstream patch from 2.6.24 series
- patch -Np1 -i ../patch-$pkgver || return 1
+ # Add -ARCH patches
+ # There is no script for the patch generation yet, so I am abusing makepkg to do it
+ # See http://dev.archlinux.org/~thomas/kernel26/
+ # This will be improved
+ patch -Np1 -i $startdir/src/patch-${pkgver}-${pkgrel}-ARCH || return 1
- # add queued patches for 2.6.24 series
- #http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- patch -Np1 -i ../pre-2.6.24.4.patch || return 1
- ### next 2 lines are only needed for rc kernels
- #patch -Np1 -i ../patch-$pkgver-rc6 || return 1
- #patch -Np1 -i ../patch-2.6.24-rc6-git2 || return 1
-
- # add custom acpi dsdt patch, in reference to:
- # http://gaugusch.at/kernel.shtml
- # http://acpi.sourceforge.net
- patch -Np1 -i ../acpi-dsdt-initrd-v0.8.4-2.6.21.patch || return 1
-
- # fix enabling of bluetooth on some toshiba notebooks in reference to:
- # http://bugs.archlinux.org/task/5608
- # http://www.cwrose.de/toshiba/s5200.html#bluetooth
- patch -Np1 -i ../toshiba-bluetooth.patch || return 1
-
- # fix I/O errors with Teac HD-35PU devices
- patch -Np1 -i ../usb-storage-unusual-devs.patch || return 1
-
- # improve intel macintosh support, in reference to:
- # http://www.mactel-linux.org/wiki/Main_Page
- # http://mactel-linux.svn.sourceforge.net/viewvc/mactel-linux/trunk/kernel/
- patch -Np1 -i ../mactel-linux-2.6.24.patch || return 1
-
- # add possibility to undervolt certain cpus, in reference to:
- # https://www.dedigentoo.org/trac/linux-phc/
- patch -Np1 -i ../linux-phc-0.3.0-kernel-vanilla-2.6.23rc3.patch || return 1
-
- # fix buggy bios acpi to get c states, which violate acpi specification, in reference to:
- # http://bugzilla.kernel.org/show_bug.cgi?id=7578
- # http://bugs.archlinux.org/task/6875
- patch -Np1 -i ../acpi-buggy-bios.patch || return 1
-
- # fix Leadtek_WinFast_2000
- # in reference to:
- # http://www.linuxtv.org/v4lwiki/index.php/Leadtek_WinFast_2000
- patch -Np0 -i ../winfast-2000.patch || return 1
-
- # fix sis ids
- # in reference to:
- # http://www.linuxconsulting.ro/xorg-drivers/
- # http://bugs.archlinux.org/task/9655
- patch -Np1 -i ../sis671-intelgly-2.6.24.patch || return 1
-
- # fix some ata limits
- # http://bugs.archlinux.org/task/9386
- # in reference to:
- # http://www.mail-archive.com/linux-ide%40vger.kernel.org/msg14722.html
- patch -Np2 -i ../ata-2.6.24.patch || return 1
-
- # fix drm spinlocks
- # in reference to:
- # http://bugs.archlinux.org/task/9386
- patch -Np1 -i ../drm-spinlock-fix.patch || return 1
-
- # fix capabilities which broke at daemon
- # in reference to:
- # http://bugs.archlinux.org/task/9800
- patch -Np1 -i ../fix-capabilities.patch || return 1
-
- # fix capabilities which broke at daemon
- # in reference to:
- # http://bugs.archlinux.org/task/9801
- patch -Np1 -i ../fix-gcc43.patch || return 1
-
- # add Atheros L2 support
- #(also known as Attansic L2, before Atheros acquired Attansic)
- patch -Np1 -i ../atl2-2.0.4.patch || return 1
-
- # prevent umt-010 from oopsing.
- # in reference to:
- # http://bugzilla.kernel.org/show_bug.cgi?id=9720
- patch -Np1 -i ../hanftek.patch || return 1
-
- # adding some genpatches from gentoo, in reference to:
- # http://sources.gentoo.org/viewcvs.py/linux-patches/genpatches-2.6/trunk/2.6.24/
- patch -Np1 -i ../2100_sd-sr-medium-detection.patch || return 1
- patch -Np1 -i ../2101_sr-follow-tray-status.patch || return 1
- patch -Np1 -i ../2102_sr-test-unit-ready.patch || return 1
- patch -Np1 -i ../2405_sis190-eeprom-mac.patch || return 1
- patch -Np1 -i ../2700_alsa-hda-lifebook-e8410.patch || return 1
-
- # add sqashfs support, in reference to:
- # http://squashfs.sourceforge.net/
- patch -Np1 -i ../squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch || return 1
-
- # add unionfs support. in reference to:
- # http://www.fsl.cs.sunysb.edu/project-unionfs.html
- patch -Np1 -i ../unionfs-2.2.4_for_2.6.24.2.diff || return 1
-
- # add sec_perm-2.6.24.patch for aufs, in reference to:
- # http://aufs.sourceforge.net/
- patch -Np1 -i ../sec_perm-2.6.24.patch || return 1
- patch -Np0 -i ../put_filp-2.6.24.patch || return 1
- patch -Np1 -i ../lhash-2.6.24.patch || return 1
- patch -Np0 -i ../splice-2.6.24.patch || return 1
-
- # remove the extraversion from Makefile
- ### next line is only needed for rc kernels
- #sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION =-rc6|g' Makefile
- sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION =|g' Makefile
- # Arch logo!
- cp ../logo_linux_clut224.ppm drivers/video/logo/
- cp ../logo_linux_mono.pbm drivers/video/logo/
- cp ../logo_linux_vga16.ppm drivers/video/logo/
if [ "$CARCH" = "x86_64" ]; then
cat ../config.x86_64 >./.config
else
@@ -259,7 +71,6 @@
$startdir/pkg/usr/src/linux-${_kernver}/kernel/Makefile
install -D -m644 .config \
$startdir/pkg/usr/src/linux-${_kernver}/.config
- install -D -m644 .config $startdir/pkg/boot/kconfig26
mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include
for i in acpi asm-{generic,x86} config linux math-emu media net pcmcia scsi sound video; do
@@ -328,7 +139,6 @@
(rm -f source build; ln -sf ../../../usr/src/linux-${_kernver} build)
# install fallback mkinitcpio.conf file and preset file for kernel
install -m644 -D $startdir/src/${pkgname}.preset $startdir/pkg/etc/mkinitcpio.d/${pkgname}.preset || return 1
- install -m644 -D $startdir/src/mkinitcpio-$pkgname.conf $startdir/pkg/etc/mkinitcpio.d/$pkgname-fallback.conf || return 1
# set correct depmod command for install
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install
echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/${pkgname}.kver
More information about the arch-commits
mailing list