diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /sys-apps/baselayout | |
parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) |
gentoo resync : 11.02.2018
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r-- | sys-apps/baselayout/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-2.3.ebuild | 241 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 49 |
4 files changed, 19 insertions, 279 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 98d52b06bbf5..a83d219a0c5c 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,4 @@ -DIST baselayout-2.3.tar.bz2 32266 BLAKE2B 6535bb451e393accd7c041079188c8c76b318f449adf2e5d1579496a27951de12b8404fb4ded3c143b60fe59ad04017a1a53e4a4ce864559f192fc96f1269a05 SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 -EBUILD baselayout-2.3.ebuild 8334 BLAKE2B e5a11ef84c953d802cf7d9b4a0aaffb62ae24882176067ca64a359ea3092cf6eac3e6666ee68dc74db1a1024ce99127342e09b8ecb287a0c16c807fe3b2665fa SHA512 c070760aedc79dc1fa2642aadd4db41d40e6c10738d2815d479c81a39a0d930cad150bdf01162f880f9cf64e81498d910278a0e028d696f915a13ecefb7babdf -EBUILD baselayout-2.4.1-r2.ebuild 8574 BLAKE2B 13006a5d466e76cdc845198de3b9535c0ba5a08ae7584c7d2d1cb64cfb2005ed5becd0b3e05903d88f750c706457a235f65d88a811b27eeb57bd6d438c09deb2 SHA512 a64f391e2efb667d3b819fd14ea246eb09e2c4db305a00c7528c34eabf16a2206ab7b216cffdcb048c20038c1ff3238d32be9405e9c31f04b98692e425fd1292 -EBUILD baselayout-9999.ebuild 9179 BLAKE2B 0846b334af76aa2e121e476511f9623995b239aff79c25aab86d40302b85e641c95f0368758c68044b1ec256a68b2dbf0173b722725f0079f403e9e9258bacf9 SHA512 69bd9ce94c2a315f403d9cf539a0f5cd491ae752fe50f678d4e9e2ab61fbb9715c302d368aa1d21922101fb742b85596cb2ab38f9dc3e05d130bafae5dd0042e +EBUILD baselayout-2.4.1-r2.ebuild 8573 BLAKE2B 1ae0257d233a4ee8a6351cd501bd3516b0c3c3a6e306d3b01fd45db29b4a932214dfe4989d23f397733eefd02c72f58bb726bdcfce975a58a0541f7fe71b4671 SHA512 cdd4f344d072851848c6e512bc3c47f1225d49b2077dbd3af45caf1f4e8d6d9d112a315b034a2237f8cf7bcadd5585cd3fc55489a085bb744130c0d37d2d7662 +EBUILD baselayout-9999.ebuild 8278 BLAKE2B 881c1c977e016d92fb97a44818e1f0d0226c9c4f576b55b9f75ba0ff95633ff33e05764eb9fc60d9f52ff2939374934e6fe46881cc97d5b814a1b5e5977035b2 SHA512 ee1ab4d87039d4c732c5d8cd85f9aa91c4b979cd68e925da2b3a9e99e9b95202ed98aa4b787fde83916e8fb56d9c65f2753c8bec57ba61f20e32e5a504d8c0a4 MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1 diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild deleted file mode 100644 index 153e53b5ebe2..000000000000 --- a/sys-apps/baselayout/baselayout-2.3.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build kernel_linux" - -pkg_setup() { - multilib_layout -} - -# Create our multilib dirs - the Makefile has no knowledge of this -multilib_layout() { - local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" - - # figure out which paths should be symlinks and which should be directories - local dirs syms exp d - for libdir in ${libdirs} ; do - exp=( {,usr/,usr/local/}${libdir} ) - for d in "${exp[@]}" ; do - # most things should be dirs - if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then - [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" - else - [ -h "${d}" ] && syms+=" ${d}" - fi - done - done - if [ -n "${syms}${dirs}" ] ; then - ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" - ewarn "have these paths configured as follows:" - [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" - [ -n "${syms}" ] && ewarn "directories:${syms}" - ewarn "The ebuild will attempt to fix these, but only for trivial conversions." - ewarn "If things fail, you will need to manually create/move the directories." - echo - fi - - # setup symlinks and dirs where we expect them to be; do not migrate - # data ... just fall over in that case. - local prefix - for prefix in "${EROOT}"{,usr/,usr/local/} ; do - if [ "${SYMLINK_LIB}" = yes ] ; then - # we need to make sure "lib" points to the native libdir - if [ -h "${prefix}lib" ] ; then - # it's already a symlink! assume it's pointing to right place ... - continue - elif [ -d "${prefix}lib" ] ; then - # "lib" is a dir, so need to convert to a symlink - ewarn "Converting ${prefix}lib from a dir to a symlink" - rm -f "${prefix}lib"/.keep - if rmdir "${prefix}lib" 2>/dev/null ; then - ln -s ${def_libdir} "${prefix}lib" || die - else - die "non-empty dir found where we needed a symlink: ${prefix}lib" - fi - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a symlink" - mkdir -p "${prefix}" || die - rm -f "${prefix}lib" || die - ln -s ${def_libdir} "${prefix}lib" || die - mkdir -p "${prefix}${def_libdir}" #423571 - fi - else - # we need to make sure "lib" is a dir - if [ -h "${prefix}lib" ] ; then - # "lib" is a symlink, so need to convert to a dir - ewarn "Converting ${prefix}lib from a symlink to a dir" - rm -f "${prefix}lib" || die - if [ -d "${prefix}lib32" ] ; then - ewarn "Migrating ${prefix}lib32 to ${prefix}lib" - mv "${prefix}lib32" "${prefix}lib" || die - else - mkdir -p "${prefix}lib" || die - fi - elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then - # make sure the old "lib" ABI location does not exist; we - # only symlinked the lib dir on systems where we moved it - # to "lib32" ... - case ${CHOST} in - *-gentoo-freebsd*) ;; # We want it the other way on fbsd. - i?86*|x86_64*|powerpc*|sparc*|s390*) - if [ -d "${prefix}lib32" ] ; then - rm -f "${prefix}lib32"/.keep - if ! rmdir "${prefix}lib32" 2>/dev/null ; then - ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" - die "non-empty dir found where there should be none: ${prefix}lib32" - fi - fi - ;; - esac - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a dir" - mkdir -p "${prefix}lib" || die - fi - fi - done -} - -pkg_preinst() { - # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of - # the baselayout-1.x ebuild copies all the real configs from the user's - # /etc/conf.d into ${D}, it makes them all appear to be the default - # versions. In order to protect them from being unmerged after this - # upgrade, modify their timestamps. - touch "${EROOT}"/etc/conf.d/* 2>/dev/null - - # This is written in src_install (so it's in CONTENTS), but punt all - # pending updates to avoid user having to do etc-update (and make the - # pkg_postinst logic simpler). - rm -f "${EROOT}"/etc/._cfg????_gentoo-release - - # 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 - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die - fi - rm -f "${ED}"/usr/share/${PN}/Makefile -} - -src_prepare() { - if use prefix; then - sed -i -r\ - -e "/PATH=/!s:/(etc|usr/bin|bin):\"${EPREFIX}\"/\1:g" \ - -e "/PATH=/s|([:\"])/|\1${EPREFIX}/|g" \ - -e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \ - -e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \ - etc/profile || die - sed -i -r \ - -e "s:/(etc/env.d|opt|usr):${EPREFIX}/\1:g" \ - -e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \ - etc/env.d/00basic || die - sed -i "s:/bin:${EPREFIX}/bin:" etc/shells || die - sed -i -r \ - -e "s,:/(root|bin|sbin|var|),:${EPREFIX}/\1,g" \ - share.Linux/passwd || die - fi - - # handle multilib paths. do it here because we want this behavior - # regardless of the C library that you're using. we do explicitly - # list paths which the native ldconfig searches, but this isn't - # problematic as it doesn't change the resulting ld.so.cache or - # take longer to generate. similarly, listing both the native - # path and the symlinked path doesn't change the resulting cache. - local libdir ldpaths - for libdir in $(get_all_libdirs) ; do - ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" - ldpaths+=":${EPREFIX}/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> etc/env.d/00basic - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > etc/gentoo-release -} - -src_install() { - emake \ - OS=$(usex kernel_FreeBSD BSD Linux) \ - DESTDIR="${ED}" \ - install - dodoc ChangeLog - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile -} - -pkg_postinst() { - local x - - # We installed some files to /usr/share/baselayout instead of /etc to stop - # (1) overwriting the user's settings - # (2) screwing things up when attempting to merge files - # (3) accidentally packaging up personal files with quickpkg - # If they don't exist then we install them - for x in master.passwd passwd shadow group fstab ; do - [ -e "${EROOT}etc/${x}" ] && continue - [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue - cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc - done - - # Force shadow permissions to not be world-readable #260993 - for x in shadow ; do - [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" - done - - # Take care of the etc-update for the user - if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release - fi - - # whine about users that lack passwords #193541 - if [[ -e "${EROOT}"etc/shadow ]] ; then - local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) - if [[ -n ${bad_users} ]] ; then - echo - ewarn "The following users lack passwords!" - ewarn ${bad_users} - fi - fi - - # baselayout leaves behind a lot of .keep files, so let's clean them up - find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null - find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null - - # whine about users with invalid shells #215698 - if [[ -e "${EROOT}"etc/passwd ]] ; then - local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) - if [[ -n ${bad_shells} ]] ; then - echo - ewarn "The following users have non-existent shells!" - ewarn "${bad_shells}" - fi - fi - - # https://bugs.gentoo.org/361349 - if use kernel_linux; then - mkdir -p "${EROOT}"run - - if ! grep -qs "^tmpfs.*/run " "${ROOT}"proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi - fi -} diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild index bb57d59ef093..d5f5254ba606 100644 --- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild +++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="build kernel_linux" pkg_setup() { diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 4622672eb5ba..20a7143a7421 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -18,11 +18,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="build usrmerge kernel_linux" - -pkg_setup() { - multilib_layout -} +IUSE="usrmerge kernel_linux" # Create our multilib dirs - the Makefile has no knowledge of this multilib_layout() { @@ -136,31 +132,15 @@ multilib_layout() { fi } -pkg_preinst() { - # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of - # the baselayout-1.x ebuild copies all the real configs from the user's - # /etc/conf.d into ${D}, it makes them all appear to be the default - # versions. In order to protect them from being unmerged after this - # upgrade, modify their timestamps. - touch "${EROOT}"/etc/conf.d/* 2>/dev/null +pkg_setup() { + multilib_layout +} +pkg_preinst() { # This is written in src_install (so it's in CONTENTS), but punt all # pending updates to avoid user having to do etc-update (and make the # pkg_postinst logic simpler). rm -f "${EROOT}"/etc/._cfg????_gentoo-release - - # 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 usrmerge; 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 } src_prepare() { @@ -190,15 +170,22 @@ src_prepare() { } src_install() { + if ! use usrmerge; then + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + layout + else + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + layout-usrmerge + fi emake \ OS=$(usex kernel_FreeBSD BSD Linux) \ DESTDIR="${ED}" \ install dodoc ChangeLog - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile } pkg_postinst() { @@ -235,10 +222,6 @@ pkg_postinst() { fi fi - # baselayout leaves behind a lot of .keep files, so let's clean them up - find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null - find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null - # whine about users with invalid shells #215698 if [[ -e "${EROOT}"etc/passwd ]] ; then local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) |