| 1 |
commit: 47adf3b360d2ae37d1c18aa27c25cd218db0cb95 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 12:40:05 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 12:40:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47adf3b3 |
| 7 |
|
| 8 |
sys-apps/baselayout-prefix: remove last-rited package |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/836114 |
| 11 |
Closes: https://bugs.gentoo.org/196294 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
profiles/package.mask | 4 - |
| 15 |
sys-apps/baselayout-prefix/Manifest | 8 - |
| 16 |
.../baselayout-prefix-2.6-r3.ebuild | 344 --------------------- |
| 17 |
sys-apps/baselayout-prefix/metadata.xml | 10 - |
| 18 |
4 files changed, 366 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 21 |
index c2a184f93289..4867d276a0ab 100644 |
| 22 |
--- a/profiles/package.mask |
| 23 |
+++ b/profiles/package.mask |
| 24 |
@@ -293,10 +293,6 @@ app-admin/logcheck |
| 25 |
<dev-lang/erlang-24 |
| 26 |
~dev-lang/elixir-1.11.4 |
| 27 |
|
| 28 |
-# Fabian Groffen <grobian@g.o> (2022-08-06) |
| 29 |
-# superseeded by sys-apps/baselayout, removal in 30 days. bug #836114 |
| 30 |
-sys-apps/baselayout-prefix |
| 31 |
- |
| 32 |
# Jimi Huotari <chiitoo@g.o> (2022-08-02) |
| 33 |
# Masked for testing. The split of some packages may still |
| 34 |
# change. bug #838970. |
| 35 |
|
| 36 |
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest |
| 37 |
deleted file mode 100644 |
| 38 |
index aa09c5824d1c..000000000000 |
| 39 |
--- a/sys-apps/baselayout-prefix/Manifest |
| 40 |
+++ /dev/null |
| 41 |
@@ -1,8 +0,0 @@ |
| 42 |
-DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b |
| 43 |
-DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9 |
| 44 |
-DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95 |
| 45 |
-DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e |
| 46 |
-DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE2B d9b3135fc77a1941e08c68f0981385bcab412fc4949a70c7b75e11e7f8a6ee1eff6b5be0804d06539ed9f02a6245c0161d3dfd6de9fb0bf68d0d07c724650707 SHA512 822065592f434fcbae42b48d475ac0d188e29773337c3154f162ff830b58dcf44c87e3091933d5a0c0cc7e89e4d0223f60cefc0e525ca29aa3c9a0f9a5e974bf |
| 47 |
-DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6 |
| 48 |
-DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2 |
| 49 |
-DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51 |
| 50 |
|
| 51 |
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild |
| 52 |
deleted file mode 100644 |
| 53 |
index 72df7fd7769c..000000000000 |
| 54 |
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild |
| 55 |
+++ /dev/null |
| 56 |
@@ -1,344 +0,0 @@ |
| 57 |
-# Copyright 1999-2022 Gentoo Authors |
| 58 |
-# Distributed under the terms of the GNU General Public License v2 |
| 59 |
- |
| 60 |
-EAPI=7 |
| 61 |
- |
| 62 |
-inherit multilib |
| 63 |
- |
| 64 |
-# just use "upstream" sources |
| 65 |
-MY_P=${P/-prefix/} |
| 66 |
-MY_PN=${PN/-prefix/} |
| 67 |
-S="${WORKDIR}/${MY_P}" |
| 68 |
- |
| 69 |
-DESCRIPTION="Filesystem baselayout and init scripts" |
| 70 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
| 71 |
-if [[ ${PV} = 9999 ]]; then |
| 72 |
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git" |
| 73 |
- inherit git-r3 |
| 74 |
-else |
| 75 |
- SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2" |
| 76 |
- KEYWORDS="~arm ~arm64 ~ppc64 ~riscv ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 77 |
-fi |
| 78 |
- |
| 79 |
-LICENSE="GPL-2" |
| 80 |
-SLOT="0" |
| 81 |
-IUSE="build +split-usr" |
| 82 |
- |
| 83 |
-RDEPEND="!sys-apps/baselayout" #681760 |
| 84 |
- |
| 85 |
-my_prefix_commits=( |
| 86 |
- # commits in reverse order as listed by: |
| 87 |
- # git log --decorate=no --oneline --no-abbrev-commit origin/master.. |
| 88 |
- bb4c4f5f45b6798f5c9658e0e862077c404c675c # prefix-stack: ROOTPATH needs EPREFIX before BROOT |
| 89 |
- a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release |
| 90 |
- 5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge |
| 91 |
- 395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support |
| 92 |
- 95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support |
| 93 |
- c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout' |
| 94 |
- c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install' |
| 95 |
-) |
| 96 |
-for my_c in ${my_prefix_commits[*]} |
| 97 |
-do |
| 98 |
- SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch" |
| 99 |
- PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" ) |
| 100 |
-done |
| 101 |
-unset my_prefix_commits my_c |
| 102 |
- |
| 103 |
-pkg_setup() { |
| 104 |
- multilib_layout |
| 105 |
-} |
| 106 |
- |
| 107 |
-# Create our multilib dirs - the Makefile has no knowledge of this |
| 108 |
-multilib_layout() { |
| 109 |
- use prefix && return 0 |
| 110 |
- local dir def_libdir libdir libdirs |
| 111 |
- local prefix prefix_lst |
| 112 |
- def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) |
| 113 |
- libdirs=$(get_all_libdirs) |
| 114 |
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... |
| 115 |
- |
| 116 |
- if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then |
| 117 |
- prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) |
| 118 |
- for prefix in ${prefix_lst[@]}; do |
| 119 |
- for libdir in ${libdirs}; do |
| 120 |
- dir="${prefix}${libdir}" |
| 121 |
- if [[ -e "${dir}" ]]; then |
| 122 |
- [[ ! -d "${dir}" ]] && |
| 123 |
- die "${dir} exists but is not a directory" |
| 124 |
- continue |
| 125 |
- fi |
| 126 |
- if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then |
| 127 |
- einfo "symlinking ${dir} to usr/${libdir}" |
| 128 |
- ln -s usr/${libdir} ${dir} || |
| 129 |
- die " Unable to make ${dir} symlink" |
| 130 |
- else |
| 131 |
- einfo "creating directory ${dir}" |
| 132 |
- mkdir -p "${dir}" || |
| 133 |
- die "Unable to create ${dir} directory" |
| 134 |
- fi |
| 135 |
- done |
| 136 |
- done |
| 137 |
- return 0 |
| 138 |
- fi |
| 139 |
- |
| 140 |
- [ -z "${def_libdir}" ] && |
| 141 |
- die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" |
| 142 |
- |
| 143 |
- # figure out which paths should be symlinks and which should be directories |
| 144 |
- local dirs syms exp d |
| 145 |
- for libdir in ${libdirs} ; do |
| 146 |
- if use split-usr ; then |
| 147 |
- exp=( {,usr/,usr/local/}${libdir} ) |
| 148 |
- else |
| 149 |
- exp=( {usr/,usr/local/}${libdir} ) |
| 150 |
- fi |
| 151 |
- for d in "${exp[@]}" ; do |
| 152 |
- # most things should be dirs |
| 153 |
- if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then |
| 154 |
- [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" |
| 155 |
- else |
| 156 |
- [ -h "${d}" ] && syms+=" ${d}" |
| 157 |
- fi |
| 158 |
- done |
| 159 |
- done |
| 160 |
- if [ -n "${syms}${dirs}" ] ; then |
| 161 |
- ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" |
| 162 |
- ewarn "have these paths configured as follows:" |
| 163 |
- [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" |
| 164 |
- [ -n "${syms}" ] && ewarn "directories:${syms}" |
| 165 |
- ewarn "The ebuild will attempt to fix these, but only for trivial conversions." |
| 166 |
- ewarn "If things fail, you will need to manually create/move the directories." |
| 167 |
- echo |
| 168 |
- fi |
| 169 |
- |
| 170 |
- # setup symlinks and dirs where we expect them to be; do not migrate |
| 171 |
- # data ... just fall over in that case. |
| 172 |
- if use split-usr ; then |
| 173 |
- prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) |
| 174 |
- else |
| 175 |
- prefix_lst=( "${EROOT}"{usr/,usr/local/} ) |
| 176 |
- fi |
| 177 |
- for prefix in "${prefix_lst[@]}"; do |
| 178 |
- if [ "${SYMLINK_LIB}" = yes ] ; then |
| 179 |
- # we need to make sure "lib" points to the native libdir |
| 180 |
- if [ -h "${prefix}lib" ] ; then |
| 181 |
- # it's already a symlink! assume it's pointing to right place ... |
| 182 |
- continue |
| 183 |
- elif [ -d "${prefix}lib" ] ; then |
| 184 |
- # "lib" is a dir, so need to convert to a symlink |
| 185 |
- ewarn "Converting ${prefix}lib from a dir to a symlink" |
| 186 |
- rm -f "${prefix}lib"/.keep |
| 187 |
- if rmdir "${prefix}lib" 2>/dev/null ; then |
| 188 |
- ln -s ${def_libdir} "${prefix}lib" || die |
| 189 |
- else |
| 190 |
- die "non-empty dir found where we needed a symlink: ${prefix}lib" |
| 191 |
- fi |
| 192 |
- else |
| 193 |
- # nothing exists, so just set it up sanely |
| 194 |
- ewarn "Initializing ${prefix}lib as a symlink" |
| 195 |
- mkdir -p "${prefix}" || die |
| 196 |
- rm -f "${prefix}lib" || die |
| 197 |
- ln -s ${def_libdir} "${prefix}lib" || die |
| 198 |
- mkdir -p "${prefix}${def_libdir}" #423571 |
| 199 |
- fi |
| 200 |
- else |
| 201 |
- # we need to make sure "lib" is a dir |
| 202 |
- if [ -h "${prefix}lib" ] ; then |
| 203 |
- # "lib" is a symlink, so need to convert to a dir |
| 204 |
- ewarn "Converting ${prefix}lib from a symlink to a dir" |
| 205 |
- rm -f "${prefix}lib" || die |
| 206 |
- if [ -d "${prefix}lib32" ] ; then |
| 207 |
- ewarn "Migrating ${prefix}lib32 to ${prefix}lib" |
| 208 |
- mv "${prefix}lib32" "${prefix}lib" || die |
| 209 |
- else |
| 210 |
- mkdir -p "${prefix}lib" || die |
| 211 |
- fi |
| 212 |
- elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then |
| 213 |
- # make sure the old "lib" ABI location does not exist; we |
| 214 |
- # only symlinked the lib dir on systems where we moved it |
| 215 |
- # to "lib32" ... |
| 216 |
- case ${CHOST} in |
| 217 |
- *-gentoo-freebsd*) ;; # We want it the other way on fbsd. |
| 218 |
- i?86*|x86_64*|powerpc*|sparc*|s390*) |
| 219 |
- if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then |
| 220 |
- rm -f "${prefix}lib32"/.keep |
| 221 |
- if ! rmdir "${prefix}lib32" 2>/dev/null ; then |
| 222 |
- ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" |
| 223 |
- die "non-empty dir found where there should be none: ${prefix}lib32" |
| 224 |
- fi |
| 225 |
- fi |
| 226 |
- ;; |
| 227 |
- esac |
| 228 |
- else |
| 229 |
- # nothing exists, so just set it up sanely |
| 230 |
- ewarn "Initializing ${prefix}lib as a dir" |
| 231 |
- mkdir -p "${prefix}lib" || die |
| 232 |
- fi |
| 233 |
- fi |
| 234 |
- done |
| 235 |
- if ! use split-usr ; then |
| 236 |
- for libdir in ${libdirs}; do |
| 237 |
- if [[ ! -e "${EROOT}${libdir}" ]]; then |
| 238 |
- ln -s usr/"${libdir}" "${EROOT}${libdir}" |
| 239 |
- fi |
| 240 |
- done |
| 241 |
- fi |
| 242 |
-} |
| 243 |
- |
| 244 |
-pkg_preinst() { |
| 245 |
- # This is written in src_install (so it's in CONTENTS), but punt all |
| 246 |
- # pending updates to avoid user having to do etc-update (and make the |
| 247 |
- # pkg_postinst logic simpler). |
| 248 |
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release |
| 249 |
- |
| 250 |
- # We need to install directories and maybe some dev nodes when building |
| 251 |
- # stages, but they cannot be in CONTENTS. |
| 252 |
- # Also, we cannot reference $S as binpkg will break so we do this. |
| 253 |
- multilib_layout |
| 254 |
- if use build ; then |
| 255 |
- if use split-usr ; then |
| 256 |
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout |
| 257 |
- else |
| 258 |
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge |
| 259 |
- fi |
| 260 |
- fi |
| 261 |
- rm -f "${ED}"/usr/share/${PN}/Makefile |
| 262 |
-} |
| 263 |
- |
| 264 |
-src_prepare() { |
| 265 |
- default |
| 266 |
- |
| 267 |
- # handle multilib paths. do it here because we want this behavior |
| 268 |
- # regardless of the C library that you're using. we do explicitly |
| 269 |
- # list paths which the native ldconfig searches, but this isn't |
| 270 |
- # problematic as it doesn't change the resulting ld.so.cache or |
| 271 |
- # take longer to generate. similarly, listing both the native |
| 272 |
- # path and the symlinked path doesn't change the resulting cache. |
| 273 |
- local libdir ldpaths |
| 274 |
- for libdir in $(get_all_libdirs) ; do |
| 275 |
- ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" |
| 276 |
- ldpaths+=":${EPREFIX}/usr/local/${libdir}" |
| 277 |
- done |
| 278 |
- echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout |
| 279 |
-} |
| 280 |
- |
| 281 |
-src_configure() { |
| 282 |
- local OS |
| 283 |
- # although having a prefix, RAP uses full Linux baselayout |
| 284 |
- OS=$(usex prefix-stack prefix-stack \ |
| 285 |
- $(usex prefix-guest prefix-guest \ |
| 286 |
- Linux ) ) |
| 287 |
- # set up immutable Makefile variables once |
| 288 |
- sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \ |
| 289 |
- -e "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \ |
| 290 |
- -e "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \ |
| 291 |
- -i Makefile || die |
| 292 |
-} |
| 293 |
- |
| 294 |
-src_install() { |
| 295 |
- emake ROOT="${ROOT}" DESTDIR="${D}" install |
| 296 |
- dodoc ChangeLog |
| 297 |
- |
| 298 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 299 |
- # add SDK path which contains development manpages |
| 300 |
- echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \ |
| 301 |
- > "${ED}"/etc/env.d/98macos-sdk |
| 302 |
- fi |
| 303 |
- |
| 304 |
- # need the makefile in pkg_preinst |
| 305 |
- insinto /usr/share/${PN} |
| 306 |
- doins Makefile |
| 307 |
- |
| 308 |
- use prefix-guest || return 0 |
| 309 |
- |
| 310 |
- # add a dummy to avoid Portage shebang errors |
| 311 |
- dodir sbin |
| 312 |
- cat > "${ED}"/sbin/runscript <<- EOF |
| 313 |
- #!/usr/bin/env sh |
| 314 |
- source "${EPREFIX}/lib/gentoo/functions.sh" |
| 315 |
- |
| 316 |
- eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 |
| 317 |
- exit 1 |
| 318 |
- EOF |
| 319 |
- chmod 755 "${ED}"/sbin/runscript || die |
| 320 |
- cp "${ED}"/sbin/{runscript,openrc-run} || die |
| 321 |
-} |
| 322 |
- |
| 323 |
-pkg_postinst() { |
| 324 |
- local x |
| 325 |
- |
| 326 |
- # We installed some files to /usr/share/baselayout instead of /etc to stop |
| 327 |
- # (1) overwriting the user's settings |
| 328 |
- # (2) screwing things up when attempting to merge files |
| 329 |
- # (3) accidentally packaging up personal files with quickpkg |
| 330 |
- # If they don't exist then we install them |
| 331 |
- for x in master.passwd passwd shadow group fstab ; do |
| 332 |
- [ -e "${EROOT}/etc/${x}" ] && continue |
| 333 |
- [ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue |
| 334 |
- cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc |
| 335 |
- done |
| 336 |
- |
| 337 |
- # Force shadow permissions to not be world-readable #260993 |
| 338 |
- for x in shadow ; do |
| 339 |
- [ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}" |
| 340 |
- done |
| 341 |
- |
| 342 |
- # Take care of the etc-update for the user |
| 343 |
- if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then |
| 344 |
- mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release |
| 345 |
- fi |
| 346 |
- |
| 347 |
- # whine about users that lack passwords #193541 |
| 348 |
- if [[ -e "${EROOT}"/etc/shadow ]] ; then |
| 349 |
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) |
| 350 |
- if [[ -n ${bad_users} ]] ; then |
| 351 |
- echo |
| 352 |
- ewarn "The following users lack passwords!" |
| 353 |
- ewarn ${bad_users} |
| 354 |
- fi |
| 355 |
- fi |
| 356 |
- |
| 357 |
- # whine about users with invalid shells #215698 |
| 358 |
- if [[ -e "${EROOT}"/etc/passwd ]] ; then |
| 359 |
- local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort) |
| 360 |
- if [[ -n ${bad_shells} ]] ; then |
| 361 |
- echo |
| 362 |
- ewarn "The following users have non-existent shells!" |
| 363 |
- ewarn "${bad_shells}" |
| 364 |
- fi |
| 365 |
- fi |
| 366 |
- |
| 367 |
- # https://bugs.gentoo.org/361349 |
| 368 |
- if use kernel_linux; then |
| 369 |
- mkdir -p "${EROOT}"/run |
| 370 |
- |
| 371 |
- local found fstype mountpoint |
| 372 |
- while read -r _ mountpoint fstype _; do |
| 373 |
- [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 |
| 374 |
- done < "${ROOT}"/proc/mounts |
| 375 |
- [[ -z ${found} ]] && |
| 376 |
- ewarn "You should reboot now to get /run mounted with tmpfs!" |
| 377 |
- fi |
| 378 |
- |
| 379 |
- for x in ${REPLACING_VERSIONS}; do |
| 380 |
- if ver_test ${x} -lt 2.4; then |
| 381 |
- ewarn "After updating ${EROOT}/etc/profile, please run" |
| 382 |
- ewarn "env-update && . ${EPREFIX}/etc/profile" |
| 383 |
- fi |
| 384 |
- |
| 385 |
- if ver_test ${x} -lt 2.6; then |
| 386 |
- ewarn "Please run env-update then log out and back in to" |
| 387 |
- ewarn "update your path." |
| 388 |
- fi |
| 389 |
- # clean up after 2.5 typos |
| 390 |
- # https://bugs.gentoo.org/show_bug.cgi?id=656380 |
| 391 |
- if [[ ${x} == 2.5 ]]; then |
| 392 |
- rm -fr "${EROOT}{,usr" |
| 393 |
- fi |
| 394 |
- done |
| 395 |
- |
| 396 |
- if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then |
| 397 |
- ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" |
| 398 |
- ewarn "Please migrate your changes." |
| 399 |
- fi |
| 400 |
-} |
| 401 |
|
| 402 |
diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml |
| 403 |
deleted file mode 100644 |
| 404 |
index 217a87b6d507..000000000000 |
| 405 |
--- a/sys-apps/baselayout-prefix/metadata.xml |
| 406 |
+++ /dev/null |
| 407 |
@@ -1,10 +0,0 @@ |
| 408 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 409 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 410 |
-<pkgmetadata> |
| 411 |
-<maintainer type="project"> |
| 412 |
- <email>prefix@g.o</email> |
| 413 |
-</maintainer> |
| 414 |
-<use> |
| 415 |
- <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag> |
| 416 |
-</use> |
| 417 |
-</pkgmetadata> |
Archives