From 259edca94bad63412a83543c208e81fee69f2979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 5 Jul 2012 01:31:35 -0300
Subject: linux-libre-xen-3.3.6-1.1: updating revision

---
 kernels/linux-libre-xen/PKGBUILD | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'kernels/linux-libre-xen/PKGBUILD')

diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index a51108a82..cd82979a1 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre-xen
 pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kernel with Xen guest support
@@ -12,7 +12,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne
 _kernelname=-LIBRE-XEN
 _basekernel=3.3
 pkgver=${_basekernel}.6
-pkgrel=1
+pkgrel=1.1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -74,6 +74,9 @@ build() {
   # set extraversion to pkgrel
   sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+
   # get kernel version
   make prepare
 
@@ -143,6 +146,12 @@ package_linux-libre-xen() {
   # add real version for building modules and running depmod from post_install/upgrade
   mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
+
+  # move module tree /lib -> /usr/lib
+  mv "$pkgdir/lib" "$pkgdir/usr"
+
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
 }
 
 package_linux-libre-xen-headers() {
@@ -151,10 +160,10 @@ package_linux-libre-xen-headers() {
   conflicts=('kernel26-xen-headers' 'kernel26-libre-xen-headers' 'linux-xen-headers')
   replaces=('kernel26-xen-headers' 'kernel26-libre-xen-headers' 'linux-xen-headers')
 
-  mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  cd "${pkgdir}/lib/modules/${_kernver}"
-  ln -sf ../../../usr/src/linux-${_kernver} build
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build
 
   cd "${srcdir}/linux-${_basekernel}"
   install -D -m644 Makefile \
-- 
cgit v1.2.3-2-g168b