Date: Tuesday, July 3, 2012 @ 20:29:12 Author: dreisner Revision: 162921
upgpkg: linux-lts 3.0.36-2 - rebuild for /usr move - only run depmod after compressing modules Modified: linux-lts/trunk/PKGBUILD linux-lts/trunk/linux-lts.install -------------------+ PKGBUILD | 17 +++++++++++++---- linux-lts.install | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-07-04 00:20:05 UTC (rev 162920) +++ PKGBUILD 2012-07-04 00:29:12 UTC (rev 162921) @@ -8,7 +8,7 @@ _kernelname=${pkgname#linux} _basekernel=3.0 pkgver=${_basekernel}.36 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL2') @@ -72,6 +72,9 @@ # 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 @@ -145,6 +148,12 @@ # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/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-lts-headers() { @@ -153,10 +162,10 @@ conflicts=('kernel26-lts-headers') replaces=('kernel26-lts-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 \ Modified: linux-lts.install =================================================================== --- linux-lts.install 2012-07-04 00:20:05 UTC (rev 162920) +++ linux-lts.install 2012-07-04 00:29:12 UTC (rev 162921) @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.36-1-lts +KERNEL_VERSION=3.0.36-2-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'