From c3d603ec6687900fd67f8a2e6f3ef4a54593626e Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 16 Jul 2012 12:29:24 -0600 Subject: [PATCH] core/linux-cubox: /usr/lib changes --- core/linux-cubox/PKGBUILD | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/linux-cubox/PKGBUILD b/core/linux-cubox/PKGBUILD index ab0a0efbc..74e432988 100644 --- a/core/linux-cubox/PKGBUILD +++ b/core/linux-cubox/PKGBUILD @@ -35,6 +35,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 @@ -100,6 +103,12 @@ package_linux-cubox() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_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-headers-cubox() { @@ -108,10 +117,10 @@ package_linux-headers-cubox() { conflicts=('kernel26-headers') replaces=('kernel26-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" install -D -m644 Makefile \