summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-04 00:53:37 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-04 00:53:37 -0300
commit1f80b8ed5e2c21c924db41116fcb86a36240bf5e (patch)
tree996a5aece056c312b6cec7b5d61e07b966f53fd7
parent4e96c6080ac2721ced6deaebab169189ce89491c (diff)
downloadabslibre-1f80b8ed5e2c21c924db41116fcb86a36240bf5e.tar.gz
abslibre-1f80b8ed5e2c21c924db41116fcb86a36240bf5e.tar.bz2
abslibre-1f80b8ed5e2c21c924db41116fcb86a36240bf5e.zip
linux-libre-lts-3.0.36-2: updating revision
-rw-r--r--libre/linux-libre-lts/PKGBUILD19
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
2 files changed, 15 insertions, 6 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 6c163e5f5..f4807a4d8 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgbase=linux-libre-lts
pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel
@@ -12,7 +12,7 @@ _basekernel=3.0
_sublevel=36
pkgver=${_basekernel}.${_sublevel}
_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -106,6 +106,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
@@ -203,6 +206,12 @@ package_linux-libre-lts() {
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/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-lts-headers() {
@@ -220,10 +229,10 @@ package_linux-libre-lts-headers() {
_kernver="$(make kernelrelease)"
fi
- 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 \
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 4b6841658..8a688091d 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.36-1-LIBRE-LTS
+KERNEL_VERSION=3.0.36-2-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'