diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-27 16:33:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-27 16:33:23 -0300 |
| commit | 2299798c7dcc12c3505252cc84b95d7666c84f5d (patch) | |
| tree | 84f0377f1b0464b41702683dabb3d0a5fba05e68 | |
| parent | 959510fa239cdcdaf0d8d3875cd2aaf652d74241 (diff) | |
Link lib to usr/lib before installing modules
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7450960e3..efee0ba3f 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -91,7 +91,7 @@ build() { # and make USB storage support builtin (e.g. for booting from USB # disks without slowly loading an initramfs) # since 3.4 rtl8187 supports adhoc mode, so batman-adv is enabled again - sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \ @@ -181,7 +181,8 @@ _package() { _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} - mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + mkdir -p "${pkgdir}"/{usr/{lib/modules,lib/firmware},boot} + ln -s usr/lib "${pkgdir}"/lib make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install if [ "$CARCH" == "mips64el" ]; then @@ -216,22 +217,22 @@ _package() { fi # remove build and source links - rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} + rm -f "${pkgdir}"/usr/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}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" + mkdir -p "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" + echo "${_kernver}" > "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" +# mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { |