From 933d142a24a0a6e926ba788b1f952bd4b43a59ca Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Thu, 27 Sep 2012 16:43:49 -0300
Subject: Backported 6c84f5d from abslibre-mips64el

Link lib to usr/lib before installing modules
---
 libre/linux-libre/PKGBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'libre')

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 45888f407..b0dafc91b 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/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}" "${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() {
-- 
cgit v1.2.3


From 28e2d654f0e7faad39dd9365e782901eb608246c Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Thu, 27 Sep 2012 17:22:16 -0300
Subject: Backported d4157e6 from abslibre-mips64el.git

The lib symlink conflicts with glibc
---
 libre/linux-libre/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libre')

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b0dafc91b..0e350070c 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -228,8 +228,8 @@ _package() {
   # 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() {
-- 
cgit v1.2.3