base-files: check for existing links

closes #8349
This commit is contained in:
Cameron Nemo 2019-02-08 11:34:08 -08:00 committed by maxice8
parent 396d50157c
commit 2e4c923e05
2 changed files with 12 additions and 12 deletions

View file

@ -47,19 +47,19 @@ make_system_dirs() {
[ ! -d var/${d} ] && install -d var/${d} [ ! -d var/${d} ] && install -d var/${d}
done done
if [ "${ARCH}" = "x86_64" ]; then if [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "ppc64le" ]; then
ln -sf usr/lib lib64 [ -L lib64 ] || ln -sf usr/lib lib64
cd usr && ln -sf lib lib64 && cd .. cd usr
install -d usr/lib32 [ -L lib64 ] || ln -sf lib lib64
ln -sf usr/lib32 lib32 cd ..
fi fi
if [ "${ARCH}" = "ppc64le" ]; then if [ "${ARCH}" = "x86_64" ]; then
ln -sf usr/lib lib64 install -d usr/lib32
cd usr && ln -sf lib lib64 && cd .. [ -L lib32 ] || ln -sf usr/lib32 lib32
fi fi
if [ "${ARCH}" = "i686" ]; then if [ "${ARCH}" = "i686" ]; then
ln -sf lib lib32 [ -L lib32 ] || ln -sf lib lib32
ln -sf lib usr/lib32 [ -L usr/lib32 ] || ln -sf lib usr/lib32
fi fi
# Create /var/run and /var/lock symlinks. # Create /var/run and /var/lock symlinks.

View file

@ -1,13 +1,13 @@
# Template file for 'base-files' # Template file for 'base-files'
pkgname=base-files pkgname=base-files
version=0.140 version=0.140
revision=1 revision=2
bootstrap=yes bootstrap=yes
depends="xbps-triggers" depends="xbps-triggers"
short_desc="Void Linux base system files" short_desc="Void Linux base system files"
maintainer="Juan RP <xtraeme@voidlinux.org>" maintainer="Juan RP <xtraeme@voidlinux.org>"
homepage="https://www.voidlinux.eu"
license="Public domain" license="Public domain"
homepage="https://www.voidlinux.org"
conf_files=" conf_files="
/etc/inputrc /etc/inputrc
/etc/profile /etc/profile