diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-07-05 01:36:18 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-07-05 01:36:18 -0300 |
| commit | 0a33fc0181311fe94f223a440050700eacf5fa46 (patch) | |
| tree | 5e4e2b7bbed340f5c8d1dd59ed0f8952df327233 | |
| parent | 259edca94bad63412a83543c208e81fee69f2979 (diff) | |
linux-libre-lts-xen-3.0.31-1.1: updating revision
| -rw-r--r-- | kernels/linux-libre-lts-xen/PKGBUILD | 17 | ||||
| -rw-r--r-- | kernels/linux-libre-lts-xen/linux-libre-lts-xen.install | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index 63bb952f9..f98ed5e5b 100644 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts-xen' 'linux-libre-lts-xen-headers') # Build stock -LIB _kernelname=-LIBRE-LTS-XEN _basekernel=3.0 pkgver=${_basekernel}.31 -pkgrel=1 +pkgrel=1.1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -71,6 +71,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 @@ -140,6 +143,12 @@ package_linux-libre-lts-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-lts-xen-headers() { @@ -148,10 +157,10 @@ package_linux-libre-lts-xen-headers() { conflicts=('kernel26-lts-xen-headers' 'kernel26-libre-lts-xen-headers' 'linux-lts-xen-headers') replaces=('kernel26-lts-xen-headers' 'kernel26-libre-lts-xen-headers' 'linux-lts-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 \ diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install index 95b8d4e26..a63eba08e 100644 --- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-xen -KERNEL_VERSION=3.0.31-1-LIBRE-LTS-XEN +KERNEL_VERSION=3.0.31-1.1-LIBRE-LTS-XEN post_install () { # updating module dependencies |