diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-07-05 04:10:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-05 04:10:14 +0100 |
| commit | fc3556aa4466d278bff2aef2f88113089def0bab (patch) | |
| tree | 1f76bbf16fd77b5c04183054f423b9fe5179fcff /sys-apps/baselayout/baselayout-9999.ebuild | |
| parent | cfd874bb4cf6ed8fa9b0d38cc3a81b33a793ebc8 (diff) | |
gentoo auto-resync : 05:07:2023 - 04:10:14
Diffstat (limited to 'sys-apps/baselayout/baselayout-9999.ebuild')
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 2294e5e84cc3..a588c68f51e9 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -21,10 +21,6 @@ IUSE="build +split-usr" RDEPEND="!sys-apps/baselayout-prefix" -pkg_setup() { - multilib_layout -} - riscv_compat_symlink() { # Here we apply some special sauce for riscv. # Two multilib layouts exist for now: @@ -191,29 +187,8 @@ multilib_layout() { fi } -pkg_preinst() { - # We need to install directories and maybe some dev nodes when building - # stages, but they cannot be in CONTENTS. - # Also, we cannot reference $S as binpkg will break so we do this. +pkg_setup() { multilib_layout - if use build ; then - if use split-usr ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout - else - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge - fi - fi - rm -f "${ED}"/usr/share/${PN}/Makefile || die - - # Create symlinks in pkg_preinst to avoid Portage collision check. - # Create the symlinks in ${ED} via dosym so that we own it. - # Only create the symlinks if it wont cause a conflict in ${EROOT}. - if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then - dosym ../run/lock /var/lock - fi - if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then - dosym ../run /var/run - fi } src_prepare() { @@ -291,6 +266,31 @@ src_install() { fi } +pkg_preinst() { + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile || die + + # Create symlinks in pkg_preinst to avoid Portage collision check. + # Create the symlinks in ${ED} via dosym so that we own it. + # Only create the symlinks if it wont cause a conflict in ${EROOT}. + if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then + dosym ../run/lock /var/lock + fi + if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then + dosym ../run /var/run + fi +} + pkg_postinst() { local x |