diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-07-05 01:44:28 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-07-05 01:44:28 -0300 |
| commit | 949214468c5bc614a6c23431de96173175271b45 (patch) | |
| tree | 3507eb8c07b50d6a72997aaa04bd1f0e1cc31bb0 /kernels/linux-libre-aufs_friendly | |
| parent | 0a33fc0181311fe94f223a440050700eacf5fa46 (diff) | |
linux-libre-aufs_friendly-3.3.4-1.1: updating revision
Diffstat (limited to 'kernels/linux-libre-aufs_friendly')
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/PKGBUILD | 17 | ||||
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 8c82d07cd..ded457dc7 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -16,7 +16,7 @@ _basekernel=3.3 _sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -119,6 +119,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 @@ -216,6 +219,12 @@ package_linux-libre-aufs_friendly() { # 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-aufs_friendly-headers() { @@ -233,10 +242,10 @@ package_linux-libre-aufs_friendly-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/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index 2553613f7..ba8593dbf 100644 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-aufs_friendly -KERNEL_VERSION=3.3.4-1-LIBRE-AUFS_FRIENDLY +KERNEL_VERSION=3.3.4-1.1-LIBRE-AUFS_FRIENDLY post_install () { # updating module dependencies |