summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-09-30 03:35:32 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-09-30 03:35:32 -0300
commite19febc1b06e3578b3285e9eb7dcd25ebe50bfdc (patch)
tree34baeaf4fee986ecc701b8ae7797f67926510f9e /libre
parentedee29afbe8b759475bef14a355b56c0f84b80fb (diff)
parent28e2d654f0e7faad39dd9365e782901eb608246c (diff)
downloadabslibre-e19febc1b06e3578b3285e9eb7dcd25ebe50bfdc.tar.gz
abslibre-e19febc1b06e3578b3285e9eb7dcd25ebe50bfdc.tar.bz2
abslibre-e19febc1b06e3578b3285e9eb7dcd25ebe50bfdc.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rwxr-xr-xlibre/linux-libre/PKGBUILD19
1 files changed, 10 insertions, 9 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 45888f407..0e350070c 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"
+# remove the symlink (conflicts with glibc)
+ rm ${pkgdir}/lib
}
_package-headers() {