diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-07 04:31:02 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-07 04:31:02 -0200 |
| commit | 76d356f0dff1178eabbe5bcbe8935775f50e7d55 (patch) | |
| tree | dcbf2b96e433b7196d771694bd279d172d733db7 /libre | |
| parent | 1343f94089edce027e4a7ead1a0da5540ac768c3 (diff) | |
linux-libre-lts-3.0.44-1.1: reverting changes due conflicts
Diffstat (limited to 'libre')
| -rwxr-xr-x | libre/linux-libre-lts/PKGBUILD | 19 | ||||
| -rwxr-xr-x | libre/linux-libre-lts/linux-libre-lts.install | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 252903c90..78b74d730 100755 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel _basekernel=3.0 _sublevel=44 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 +pkgrel=1.1 _lxopkgver=${_basekernel}.44 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -178,8 +178,7 @@ _package() { _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} - mkdir -p "${pkgdir}"/{usr/{lib/modules,lib/firmware},boot} - ln -s usr/lib "${pkgdir}"/lib + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install if [ "$CARCH" == "mips64el" ]; then @@ -214,22 +213,22 @@ _package() { fi # remove build and source links - rm -f "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build} + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware -# rm -rf "${pkgdir}/lib/firmware" + rm -rf "${pkgdir}/lib/firmware" # 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}${_localversionname:--LIBRE-LTS}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" - echo "${_kernver}" > "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version" # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" - # remove the symlink (conflicts with glibc) - rm ${pkgdir}/lib + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index c7f4bc9f6..2a208603c 100755 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.44-1-LIBRE-LTS +KERNEL_VERSION=3.0.44-1.1-LIBRE-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' |