Date: Sunday, May 30, 2010 @ 04:21:19 Author: thomas Revision: 81433 Remove kernel26-firmware package, it is replaced by linux-firmware
Modified: kernel26/trunk/PKGBUILD ----------+ PKGBUILD | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-30 07:52:46 UTC (rev 81432) +++ PKGBUILD 2010-05-30 08:21:19 UTC (rev 81433) @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tp...@archlinux.org> # Maintainer: Thomas Baechler <tho...@archlinux.org> pkgbase="kernel26" -pkgname=('kernel26' 'kernel26-firmware' 'kernel26-headers' 'kernel26-manpages' 'kernel26-docs') # Build stock -ARCH kernel +pkgname=('kernel26' 'kernel26-headers' 'kernel26-manpages' 'kernel26-docs') # Build stock -ARCH kernel # pkgname=kernel26-custom # Build kernel with a different name _kernelname=${pkgname#kernel26} _basekernel=2.6.34 @@ -61,7 +61,7 @@ pkgdesc="The Linux Kernel and modules" groups=('base') backup=(etc/mkinitcpio.d/${pkgname}.preset) - depends=('coreutils' 'kernel26-firmware>=2.6.34' 'module-init-tools' 'mkinitcpio>=0.5.20') + depends=('coreutils' 'linux-firmware' 'module-init-tools' 'mkinitcpio>=0.5.20') # pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now # nforce package support was abandoned by nvidia, kernel modules should cover everything now. # kernel24 support is dropped since glibc24 @@ -200,15 +200,15 @@ 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} } -package_kernel26-firmware() { - pkgdesc="The included firmware files of the Linux Kernel" - groups=('base') +#package_kernel26-firmware() { +# pkgdesc="The included firmware files of the Linux Kernel" +# groups=('base') +# +# cd ${srcdir}/linux-$_basekernel +# make firmware || return 1 +# make INSTALL_MOD_PATH=${pkgdir} firmware_install || return 1 +#} - cd ${srcdir}/linux-$_basekernel - make firmware || return 1 - make INSTALL_MOD_PATH=${pkgdir} firmware_install || return 1 -} - package_kernel26-manpages() { pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux kernel."