diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
| commit | 44fb7936931db66f6ba7c46f73ebb29d2725fe58 (patch) | |
| tree | 0be1bc01e36b6aea80bbae6a00f7cee123a162c3 /kernels/linux-libre-lts-xen | |
| parent | de83d1a9287e1d73029b1202069e3cefae26bb31 (diff) | |
| parent | 108181f9a57602fd8d527dafb3b46fc0b59711df (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'kernels/linux-libre-lts-xen')
| -rw-r--r-- | kernels/linux-libre-lts-xen/PKGBUILD | 25 | ||||
| -rw-r--r-- | kernels/linux-libre-lts-xen/linux-libre-lts-xen.install | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index 63bb952f9..160353e50 100644 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Si Feng <sci.feng at gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-lts-xen pkgname=('linux-libre-lts-xen' 'linux-libre-lts-xen-headers') # Build stock -LIBRE kernel with Xen guest support @@ -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 @@ -136,10 +139,16 @@ package_linux-libre-lts-xen() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # 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" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}/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 |