diff options
-rw-r--r-- | libre/kernel26-libre-lts/PKGBUILD (renamed from libre-testing/kernel26-libre-lts/PKGBUILD) | 27 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/config.i686 (renamed from libre-testing/kernel26-libre-lts/config.i686) | 2 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/config.x86_64 (renamed from libre-testing/kernel26-libre-lts/config.x86_64) | 2 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/kernel26-libre-lts.install (renamed from libre-testing/kernel26-libre-lts/kernel26-libre-lts.install) | 0 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/kernel26-lts.preset (renamed from libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset) | 0 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/libata-alignment.patch (renamed from libre-testing/kernel26-libre-lts/libata-alignment.patch) | 0 |
6 files changed, 19 insertions, 12 deletions
diff --git a/libre-testing/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 964e94eb2..bde639c4c 100644 --- a/libre-testing/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -6,8 +6,9 @@ pkgbase=kernel26-libre-lts pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts kernel _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 -pkgver=${_basekernel}.29 -pkgrel=2 +_preset=kernel26-lts.preset +pkgver=${_basekernel}.32 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') url="http://linux-libre.fsfla.org" @@ -16,7 +17,7 @@ source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkg # the main kernel config files config.i686 config.x86_64 # standard config files for mkinitcpio ramdisk - ${pkgname}.preset + ${_preset} ${pkgname}.install) build() { @@ -59,9 +60,12 @@ build() { package_kernel26-libre-lts() { pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers" - backup=(etc/mkinitcpio.d/${pkgname}.preset) + backup=(etc/mkinitcpio.d/${_preset}) depends=('coreutils' 'module-init-tools' 'mkinitcpio>=0.6.4') install=${pkgname}.install + provides=("kernel26-lts=$pkgver") + replaces=('kernel26-lts') + conflicts=('kernel26-lts') KARCH=x86 cd ${srcdir}/linux-$pkgver @@ -75,7 +79,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}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset + install -m644 -D ${srcdir}/${_preset} ${pkgdir}/etc/mkinitcpio.d/${_preset} # set correct depmod command for install sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ @@ -85,9 +89,9 @@ package_kernel26-libre-lts() { -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \ -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 + -i ${pkgdir}/etc/mkinitcpio.d/${_preset} - echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/${pkgname}.kver + echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/kernel26${_kernelname}.kver # remove build and source links rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build} # remove the firmware @@ -97,6 +101,9 @@ package_kernel26-libre-lts() { } package_kernel26-libre-lts-headers() { + provides=("kernel26-lts-headers=$pkgver") + replaces=('kernel26-lts-headers') + conflicts=('kernel26-lts-headers') pkgdesc="Header files and scripts for building modules for kernel26-libre-lts" mkdir -p ${pkgdir}/lib/modules/${_kernver} cd ${pkgdir}/lib/modules/${_kernver} @@ -211,9 +218,9 @@ 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=('56f1879c2e12421882826aad8b6d9210' +md5sums=('8ae29e4463ad994c446862f9551e7461' '30851deee235a7486bd408cbe8eb2d71' - '5b4fcd892ee4baf9db8fc9b8aa66a741' - '4741e988cce00d77a02424ae4286bcb0' + '1b255afae0e3c92987979131731df128' + 'edd88c94fc91008685abcd45d94f8d16' '2cbfeb3e2a18d45f82f613e97fc23355' 'fbfc7a1af3208c7b729055d91e1c149a') diff --git a/libre-testing/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 index 0a14c46f3..367d76e18 100644 --- a/libre-testing/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 -# Sat Feb 19 16:39:33 2011 +# Tue Mar 8 07:29:39 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/libre-testing/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 92b878704..7af1bb324 100644 --- a/libre-testing/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Sat Feb 19 17:17:30 2011 +# Tue Mar 8 07:14:12 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/libre-testing/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install index c3249445a..c3249445a 100644 --- a/libre-testing/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install diff --git a/libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset b/libre/kernel26-libre-lts/kernel26-lts.preset index b65e064b4..b65e064b4 100644 --- a/libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset +++ b/libre/kernel26-libre-lts/kernel26-lts.preset diff --git a/libre-testing/kernel26-libre-lts/libata-alignment.patch b/libre/kernel26-libre-lts/libata-alignment.patch index edd96f3b1..edd96f3b1 100644 --- a/libre-testing/kernel26-libre-lts/libata-alignment.patch +++ b/libre/kernel26-libre-lts/libata-alignment.patch |