Wed Sep 7 15:26:04 UTC 2011

5 files changed, 37 insertions, 29 deletions

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 <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 
 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:
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
index cec208ee8..63435d84f 100644
--- a/libre/linux-libre/change-default-console-loglevel.patch
+++ b/libre/linux-libre/change-default-console-loglevel.patch
@@ -10,4 +10,3 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
  
  DECLARE_WAIT_QUEUE_HEAD(log_wait);
  
-
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 8bd0cbe40..69a35c73c 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -470,7 +470,7 @@ CONFIG_CAN_PM_TRACE=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
+# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 8d40df599..d7b662cb6 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -458,7 +458,7 @@ CONFIG_CAN_PM_TRACE=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
+# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 51e78dc60..6f7ae815a 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -11,10 +11,17 @@ post_install () {
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
   mkinitcpio -p linux-libre${KERNEL_NAME}
 
-  # add compat symlinks for the initramfs images
-  ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-  ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-    boot/kernel26${KERNEL_NAME}-fallback.img
+  # compat symlinks for the official kernels only
+  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
+    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
+    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
+    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
+      # add compat symlinks for the initramfs images
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
+    fi
+  fi
 }
 
 post_upgrade() {