From 9a1a8d77ee00e49dfeef44d74b1e40a831332383 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2011 15:26:04 +0000 Subject: Wed Sep 7 15:26:04 UTC 2011 --- libre/linux-libre/PKGBUILD | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'libre/linux-libre/PKGBUILD') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b76294ad4..c83f3ef23 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -2,21 +2,22 @@ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds -# Contributor (Parabola): Sorin-Mihai Vârgolici +# Maintainer (Parabola): Sorin-Mihai Vârgolici pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.0 -pkgver=${_basekernel} -pkgrel=4 +pkgver=${_basekernel}.4 +pkgrel=2 arch=('i686' 'x86_64') -url="http://linux-libre.fsfla.org" +url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.xz" +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 @@ -25,16 +26,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/l 'fix-i915.patch' 'change-default-console-loglevel.patch') md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - '66dff8af6b00eb8d054b2af85aaa5ef7' - '1a98b8b8f2140ac8f95c3814cba8cc95' - '7af24ad1789055e991b1e1f090ff276d' + 'f17e9c5f801be0b17efe78aaff0f2a0e' + 'bb679e0e61c53a8f1a22b8d46f89f47e' + '68d2fc73ce1d9057678f91235f6e22c6' + 'a8a3843046926eb7ab81312cd438c5c5' '04b21c79df0a952c22d681dd4f4562df' '263725f20c0b9eb9c353040792d644e5' - '7396b811db06dec0250a1a098f527b83') + '9d3c56a4b999c8bfbd4018089a62f662') build() { cd "${srcdir}/linux-${_basekernel}" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" + # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" @@ -46,7 +50,7 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - cat "$srcdir/config.$CARCH" > ./.config # simpler + cat "${srcdir}/config.${CARCH}" > ./.config # simpler if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config @@ -91,8 +95,8 @@ package_linux-libre() { depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=$pkgver") - conflicts=('kernel26' 'linux') - replaces=('kernel26' 'linux') + conflicts=('kernel26' 'kernel26-libre' 'linux') + replaces=('kernel26' 'kernel26-libre' 'linux') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install @@ -119,14 +123,13 @@ package_linux-libre() { -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ -i "${startdir}/${pkgname}.install" sed \ + -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} - # add compat symlink for the kernel image - ln -sf vmlinuz-${pkgname} "${pkgdir}/boot/vmlinuz26${_kernelname}" # remove the firmware rm -rf "${pkgdir}/lib/firmware" # gzip -9 all modules to safe 100MB of space @@ -135,9 +138,9 @@ package_linux-libre() { package_linux-libre-headers() { pkgdesc="Header files and scripts for building modules for linux-libre kernel" - provides=('kernel26-headers' "linux-headers=$pkgver") - conflicts=('kernel26-headers' 'linux-headers') - replaces=('kernel26-headers' 'linux-headers') + provides=('kernel26-headers' "linux-headers=${pkgver}") + conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') + replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') mkdir -p "${pkgdir}/lib/modules/${_kernver}" @@ -267,13 +270,13 @@ package_linux-libre-headers() { package_linux-libre-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel." provides=('kernel26-docs' "linux-docs=$pkgver") - conflicts=('kernel26-docs' 'linux-docs') - replaces=('kernel26-docs' 'linux-docs') + conflicts=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs') + replaces=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs') cd "${srcdir}/linux-${_basekernel}" - mkdir -p "$pkgdir/usr/src/linux-$_kernver" - cp -r Documentation "$pkgdir/usr/src/linux-$_kernver" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" + cp -r Documentation "${pkgdir}/usr/src/linux-${_kernver}" find "${pkgdir}" -type f -exec chmod 444 {} \; find "${pkgdir}" -type d -exec chmod 755 {} \; @@ -281,4 +284,3 @@ package_linux-libre-docs() { rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf