diff options
Diffstat (limited to 'srcpkgs/base-files/template')
-rw-r--r-- | srcpkgs/base-files/template | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index a049c59681d..68ea75347a7 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,12 +1,12 @@ # Template file for 'base-files' pkgname=base-files version=0.140 -revision=8 +revision=9 bootstrap=yes depends="xbps-triggers" short_desc="Void Linux base system files" maintainer="Enno Boland <orphan@voidlinux.org>" -license="custom:Public domain" +license="Public Domain" homepage="https://www.voidlinux.org" conf_files=" /etc/inputrc @@ -32,11 +32,26 @@ replaces="base-directories>=0" system_groups="kvm:24" do_install() { - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - vmkdir usr/lib + # Create bin and lib dirs and symlinks. + for d in bin lib; do + vmkdir "usr/${d}" + ln -snrf "${DESTDIR}/usr/${d}" "${DESTDIR}/${d}" + done + # Symlink sbin paths to /usr/bin. + for d in sbin usr/sbin; do + ln -snrf "${DESTDIR}/usr/bin" "${DESTDIR}/${d}" + done + # Symlink word-specific lib paths to /usr/lib. + for d in lib usr/lib; do + ln -snrf "${DESTDIR}/usr/lib" \ + "${DESTDIR}/${d}${XBPS_TARGET_WORDSIZE}" + done + # Populate 32-bit lib files on 64-bit systems, for multilib. + if [ "${XBPS_TARGET_WORDSIZE}" = "64" ]; then vmkdir usr/lib32 - ln -s ../lib/locale ${DESTDIR}/usr/lib32/locale - vinstall ${FILESDIR}/ld.so.lib32.conf 644 etc/ld.so.conf.d lib32.conf + ln -snrf "${DESTDIR}/usr/lib32" "${DESTDIR}/lib32" + ln -sf ../lib/locale "${DESTDIR}/usr/lib32/locale" + vinstall "${FILESDIR}/ld.so.lib32.conf" 644 etc/ld.so.conf.d lib32.conf fi # Install misc config files. |