diff options
| author |   William Hubbs <williamh@gentoo.org> | 2020-08-20 09:50:47 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2020-08-20 09:50:47 -0500 |
| commit | 410804ae543ad927dc2b75f125cde04baa907a77 (patch) | |
| tree | 443e748f0cf27589f9be75883f3a5760f1445a3f | |
| parent | sys-apps/baselayout: fix quoting and add a missing die call (diff) | |
| download | gentoo-410804ae543ad927dc2b75f125cde04baa907a77.tar.gz gentoo-410804ae543ad927dc2b75f125cde04baa907a77.tar.bz2 gentoo-410804ae543ad927dc2b75f125cde04baa907a77.zip | |
sys-apps/baselayout: sync live
Signed-off-by: William Hubbs <williamh@gentoo.org>
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index a94078654b83..ee4f298e8409 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -33,7 +33,7 @@ multilib_layout() { if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) - for prefix in ${prefix_lst[@]}; do + for prefix in "${prefix_lst[@]}"; do for libdir in ${libdirs}; do dir="${prefix}${libdir}" if [[ -e "${dir}" ]]; then @@ -153,7 +153,8 @@ multilib_layout() { if ! use split-usr ; then for libdir in ${libdirs}; do if [[ ! -e "${EROOT}${libdir}" ]]; then - ln -s usr/"${libdir}" "${EROOT}${libdir}" + ln -s usr/"${libdir}" "${EROOT}${libdir}" || + die " Unable to make ${EROOT}${libdir} symlink" fi done fi @@ -222,6 +223,7 @@ src_install() { DESTDIR="${ED}" \ install dodoc ChangeLog + rm "${ED}"/etc/sysctl.d/README # need the makefile in pkg_preinst insinto /usr/share/${PN} |