summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-06 17:00:39 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-06 17:00:39 -0300
commit467289604eeefb4df2f33a2d358b76dc029de743 (patch)
tree780daa6158f60792aa686393253c4dbc62a64774
parent38ac409be73b78ec373cdffaa1a689fac065922f (diff)
downloadabslibre-467289604eeefb4df2f33a2d358b76dc029de743.tar.gz
abslibre-467289604eeefb4df2f33a2d358b76dc029de743.tar.bz2
abslibre-467289604eeefb4df2f33a2d358b76dc029de743.zip
linux-libre-lts-3.0.44-1: Changing link lib to usr/lib before installing modules and fixing the lib symlink that conflicts with glibc
-rwxr-xr-xlibre/linux-libre-lts/PKGBUILD19
1 files changed, 10 insertions, 9 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3aee15c50..252903c90 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -90,7 +90,7 @@ build() {
# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
# and make USB storage support builtin (e.g. for booting from USB
# disks without slowly loading an initramfs)
- 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" \
@@ -178,7 +178,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
@@ -213,22 +214,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-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+ ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" "${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-LTS}"
- echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version"
+ mkdir -p "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}"
+ echo "${_kernver}" > "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version"
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
- # move module tree /lib -> /usr/lib
- mv "$pkgdir/lib" "$pkgdir/usr"
+ # remove the symlink (conflicts with glibc)
+ rm ${pkgdir}/lib
}
_package-headers() {