From: Mike Frysinger Date: Fri, 13 Apr 2007 18:35:33 +0000 (+0000) Subject: Sync update-modules changes from svn. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9968cca83c1d108070ece3448c9fc5e7cb31478b;p=gentoo.git Sync update-modules changes from svn. Package-Manager: portage-2.1.2.3 --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index f8376177b3f4..6d3755dcd272 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,19 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.412 2007/04/12 16:04:47 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.413 2007/04/13 18:35:33 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-1.12.10-r3 (13 Apr 2007) +*baselayout-1.12.9-r2 (13 Apr 2007) + + 13 Apr 2007; Mike Frysinger -baselayout-1.12.9.ebuild, + -baselayout-1.12.9-r1.ebuild, +baselayout-1.12.9-r2.ebuild, + -baselayout-1.12.10-r1.ebuild, -baselayout-1.12.10-r2.ebuild, + +baselayout-1.12.10-r3.ebuild: + Sync update-modules changes from svn. + *baselayout-1.12.10-r2 (12 Apr 2007) *baselayout-1.12.9-r1 (12 Apr 2007) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 8801c9dc96d3..56321f9161fd 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 SHA1 f61b8f985a27dc9f2dd834001602b008030e79ce SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a MD5 dff93a6f0914f6969d21482d2f36e75e files/baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 files/baselayout-1.11.14-man.patch 768 @@ -27,22 +30,14 @@ EBUILD baselayout-1.11.15-r3.ebuild 18810 RMD160 c2d9d4fc7aee7a26615f37b370871ab MD5 363cb680de3467f3bd044dcd85279974 baselayout-1.11.15-r3.ebuild 18810 RMD160 c2d9d4fc7aee7a26615f37b370871ab3accdf43d baselayout-1.11.15-r3.ebuild 18810 SHA256 7b98c19332ebbf4e23ca9800d3bdbbee4e03aeb92663ec4c21b7270a8ddb1c0f baselayout-1.11.15-r3.ebuild 18810 -EBUILD baselayout-1.12.10-r1.ebuild 18619 RMD160 f02edc22485988e5a4f317d82acbc5abc24e37a0 SHA1 b4d452869acc124694eb89a554062ef5152df9c9 SHA256 4e91321ad80f49ceff824ca0e2305f0429487d5cc80ed2307c03fac70b6ea5ea -MD5 d52fe0db5f2b756bbdd0aa100a4c9e2b baselayout-1.12.10-r1.ebuild 18619 -RMD160 f02edc22485988e5a4f317d82acbc5abc24e37a0 baselayout-1.12.10-r1.ebuild 18619 -SHA256 4e91321ad80f49ceff824ca0e2305f0429487d5cc80ed2307c03fac70b6ea5ea baselayout-1.12.10-r1.ebuild 18619 -EBUILD baselayout-1.12.10-r2.ebuild 18682 RMD160 682d1074488d4b9a71ab3b4a8e0d37d15bfe8204 SHA1 bb09684d2a8d665b4d30d25ddac234214ef59e71 SHA256 f24709d0230d4b7d3689a95314beee1ec756fcd247d54ccd69800b8d8dc0275c -MD5 b2fd0aab82320cc6547fcda110186a39 baselayout-1.12.10-r2.ebuild 18682 -RMD160 682d1074488d4b9a71ab3b4a8e0d37d15bfe8204 baselayout-1.12.10-r2.ebuild 18682 -SHA256 f24709d0230d4b7d3689a95314beee1ec756fcd247d54ccd69800b8d8dc0275c baselayout-1.12.10-r2.ebuild 18682 -EBUILD baselayout-1.12.9-r1.ebuild 18627 RMD160 8a13cd984c02aae7f874f110a441cedda9aca029 SHA1 ac64b1fe7c46577ea48179749cba14d9b005abe4 SHA256 89a7d531f7dc8d3bc10a9e5de4dec37b4e7674e2b57437ebf02ca3ae90660081 -MD5 a5dc04190f6e279ba3e2a1dca447a73c baselayout-1.12.9-r1.ebuild 18627 -RMD160 8a13cd984c02aae7f874f110a441cedda9aca029 baselayout-1.12.9-r1.ebuild 18627 -SHA256 89a7d531f7dc8d3bc10a9e5de4dec37b4e7674e2b57437ebf02ca3ae90660081 baselayout-1.12.9-r1.ebuild 18627 -EBUILD baselayout-1.12.9.ebuild 18567 RMD160 16d288f8eabfaa0b206fe3045699d8b9a2eb7b5f SHA1 1e3311597b0c8db9e9602b01bb9349ca430ae718 SHA256 f13814b2b7376422b37675a737b094e05eb9f892610d4d817e7e166cba754b1a -MD5 02edf939bdb2f94833538a8786522ea1 baselayout-1.12.9.ebuild 18567 -RMD160 16d288f8eabfaa0b206fe3045699d8b9a2eb7b5f baselayout-1.12.9.ebuild 18567 -SHA256 f13814b2b7376422b37675a737b094e05eb9f892610d4d817e7e166cba754b1a baselayout-1.12.9.ebuild 18567 +EBUILD baselayout-1.12.10-r3.ebuild 18766 RMD160 5e033d90a1627fdbd9692ec63090f5dbe7e272ba SHA1 801a770dfdcd07bc98d9cc464ec98f0dfa574df3 SHA256 0c2ab3797b0858bff52eb7833a813da436baba9fbf96e3a91df8894e43f610bb +MD5 2462e7e727c5df9e58f99f5612523334 baselayout-1.12.10-r3.ebuild 18766 +RMD160 5e033d90a1627fdbd9692ec63090f5dbe7e272ba baselayout-1.12.10-r3.ebuild 18766 +SHA256 0c2ab3797b0858bff52eb7833a813da436baba9fbf96e3a91df8894e43f610bb baselayout-1.12.10-r3.ebuild 18766 +EBUILD baselayout-1.12.9-r2.ebuild 18711 RMD160 e66de1d506190d6ca43cf915f91add900b63c39f SHA1 5741bb90fbe588286b4f78de38a7604df2f7f959 SHA256 d88a9f428e49b2038302c93935f96d9809630c974fe126a74f4d7e3b7987cd91 +MD5 ad1031c8c8d354c256a13cb8a27c928b baselayout-1.12.9-r2.ebuild 18711 +RMD160 e66de1d506190d6ca43cf915f91add900b63c39f baselayout-1.12.9-r2.ebuild 18711 +SHA256 d88a9f428e49b2038302c93935f96d9809630c974fe126a74f4d7e3b7987cd91 baselayout-1.12.9-r2.ebuild 18711 EBUILD baselayout-1.13.0_alpha12.ebuild 9966 RMD160 db7de2961b97237d7b2c2e84c925d262aeeb3d50 SHA1 6cfb772f17e7f7a4401976b353ed3b804847a74b SHA256 a81b8db088f4ba1de413bcf4955f295d2e2dd6fac919e4bb607ef737973cfef1 MD5 56dc3d80b5c9847bdb05532fd3fdff71 baselayout-1.13.0_alpha12.ebuild 9966 RMD160 db7de2961b97237d7b2c2e84c925d262aeeb3d50 baselayout-1.13.0_alpha12.ebuild 9966 @@ -51,10 +46,10 @@ EBUILD baselayout-2.0.0_alpha1.ebuild 9885 RMD160 71826b60c5c4e2d935aaa2ae242243 MD5 7e688c4c9e7d0f0eca4a807ce48bab87 baselayout-2.0.0_alpha1.ebuild 9885 RMD160 71826b60c5c4e2d935aaa2ae2422434904334ce7 baselayout-2.0.0_alpha1.ebuild 9885 SHA256 a34392945db74798fbf33da8218cd93f073d98e86992444f79731c62a67e3a45 baselayout-2.0.0_alpha1.ebuild 9885 -MISC ChangeLog 91953 RMD160 f84a5bbeb6be6c1518a526a13eaea1446f32f461 SHA1 eabab345e3681b110b483fb18d059881451e544b SHA256 b5a7fd6b0e4e16957e5ddce9f6336eec5940df1c8d2bf55fb339f17a9ec8c653 -MD5 75215fb1a744a365466319f2538461ac ChangeLog 91953 -RMD160 f84a5bbeb6be6c1518a526a13eaea1446f32f461 ChangeLog 91953 -SHA256 b5a7fd6b0e4e16957e5ddce9f6336eec5940df1c8d2bf55fb339f17a9ec8c653 ChangeLog 91953 +MISC ChangeLog 92302 RMD160 ff853aaf30d5855e1aa32f91516c52b0287a561c SHA1 a4414bdb4b3a0a019e3b8823ae8ce672dbdb6aff SHA256 23cbe5226ea4dbe7891f161f2b90f93ae7463248e2a711c703a90683a3826d4c +MD5 59454075b4d9415fe075e6f7675ff43e ChangeLog 92302 +RMD160 ff853aaf30d5855e1aa32f91516c52b0287a561c ChangeLog 92302 +SHA256 23cbe5226ea4dbe7891f161f2b90f93ae7463248e2a711c703a90683a3826d4c ChangeLog 92302 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -62,21 +57,22 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata MD5 45d5d54f514daeb8d7eedb2a553101b0 files/digest-baselayout-1.11.15-r3 256 RMD160 5e19a5d090c498d3b79d59e869a95a7a05cfe562 files/digest-baselayout-1.11.15-r3 256 SHA256 634668e30943316fee0925f0cda440d80319cb9072270573bcbbdbac5986b40b files/digest-baselayout-1.11.15-r3 256 -MD5 35217fc0dbe272af275b376529e1bd6d files/digest-baselayout-1.12.10-r1 259 -RMD160 66aced9aa6d3c221f86e0aba08d7f7e4c4e3b277 files/digest-baselayout-1.12.10-r1 259 -SHA256 fc42fbfcf2988b6545dc38fd1f31ea5d21da6a25c8bb68ec6cb9c8100a639993 files/digest-baselayout-1.12.10-r1 259 -MD5 35217fc0dbe272af275b376529e1bd6d files/digest-baselayout-1.12.10-r2 259 -RMD160 66aced9aa6d3c221f86e0aba08d7f7e4c4e3b277 files/digest-baselayout-1.12.10-r2 259 -SHA256 fc42fbfcf2988b6545dc38fd1f31ea5d21da6a25c8bb68ec6cb9c8100a639993 files/digest-baselayout-1.12.10-r2 259 -MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9 256 -RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9 256 -SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9 256 -MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9-r1 256 -RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9-r1 256 -SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9-r1 256 +MD5 35217fc0dbe272af275b376529e1bd6d files/digest-baselayout-1.12.10-r3 259 +RMD160 66aced9aa6d3c221f86e0aba08d7f7e4c4e3b277 files/digest-baselayout-1.12.10-r3 259 +SHA256 fc42fbfcf2988b6545dc38fd1f31ea5d21da6a25c8bb68ec6cb9c8100a639993 files/digest-baselayout-1.12.10-r3 259 +MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9-r2 256 +RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9-r2 256 +SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9-r2 256 MD5 73d1269ba801eb1a113e55b5679be37f files/digest-baselayout-1.13.0_alpha12 280 RMD160 82ba1b5b86ef5f414bf202d8cfd1275e7e21bf97 files/digest-baselayout-1.13.0_alpha12 280 SHA256 4e5b7e0884373590a6b434976433e8d06a3fb4d52282f416d5a25dc2d265bd8a files/digest-baselayout-1.13.0_alpha12 280 MD5 ee4d69b5b955d11ad0682ed5276ce5cb files/digest-baselayout-2.0.0_alpha1 274 RMD160 1f7fd2f4bec5e35f7d85e905f80a491daa18f179 files/digest-baselayout-2.0.0_alpha1 274 SHA256 1b8d9bd46ccda9cf47f971c90b3028a54335835083dfca109a7cb5c0d95a621b files/digest-baselayout-2.0.0_alpha1 274 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGH82q8bi6rjpTunYRAjZbAJ98XYFWlXkedA/IMZ9G+6VUAI6a7gCg27L9 +knH2gB8WXpCSmav6uYCDT3Y= +=8hpj +-----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.12.10-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.10-r1.ebuild deleted file mode 100644 index 9009d532a3dd..000000000000 --- a/sys-apps/baselayout/baselayout-1.12.10-r1.ebuild +++ /dev/null @@ -1,587 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.10-r1.ebuild,v 1.1 2007/04/08 07:30:00 vapier Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 - http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 - http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build static unicode" - -# This version of baselayout needs gawk in /bin, but as we do not have -# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" -# or "build" are in USE. -# We need to block old dhcpcd versions as they are no longer in system -# but may not be in users world file either. See bug #143885 -RDEPEND="virtual/init - !build? ( !bootstrap? ( - sys-apps/mktemp - >=sys-libs/readline-5.0-r1 - >=app-shells/bash-3.1_p7 - >=sys-apps/coreutils-5.2.1 - ) ) - !> "${D}/usr/share/baselayout/mkdirs.sh" </dev/null \\ - || ewarn " can't create ${d}" - touch "\${ROOT}/${d}/.keep" 2>/dev/null \\ - || ewarn " can't create ${d}/.keep" -fi -EOF - else - args=("${args[@]}" "${d}") - fi - done -} - -# Continued from kdir above... This function removes any empty -# directories as a temporary workaround for bug 9849. The directories -# (and .keep files) are re-created in pkg_postinst, which means they -# aren't listed in CONTENTS, unfortunately. -unkdir() { - einfo "Running unkdir to workaround bug 9849" - find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null - if [[ $? == 127 ]]; then - ewarn "Problem running unkdir: find command not found" - fi -} - -# Same as kdir above, but for symlinks #103618 -ksym() { - echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \ - >> "${D}"/usr/share/baselayout/mklinks.sh -} - -src_install() { - local dir libdirs libdirs_env rcscripts_dir - - # This directory is to stash away things that will be used in - # pkg_postinst; it's needed first for kdir to function - dodir /usr/share/baselayout - - # Jeremy Huddleston - # For multilib, we want to make sure that all our multilibdirs exist - # and make lib even if it's not listed as one (like on amd64/ppc64 - # which sometimes has lib32/lib64 instead of lib/lib64). - # lib should NOT be a symlink to one of the other libdirs. - # Old systems with symlinks won't be affected by this change, as the - # symlinks already exist and won't get removed, but new systems will - # be setup properly. - # - # I'll be making a script to convert existing systems from symlink to - # nosymlink and putting it in /usr/portage/scripts. - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - # This should be /lib/rcscripts, but we have to support old profiles too. - if [[ ${SYMLINK_LIB} == "yes" ]]; then - rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" - else - rcscripts_dir="/lib/rcscripts" - fi - - einfo "Creating directories..." - kdir /usr - kdir /usr/local - kdir /boot - kdir /dev - kdir /dev/pts - kdir /dev/shm - kdir /etc/conf.d - kdir /etc/cron.daily - kdir /etc/cron.hourly - kdir /etc/cron.monthly - kdir /etc/cron.weekly - kdir /etc/env.d - dodir /etc/init.d # .keep file might mess up init.d stuff - kdir /etc/modules.autoload.d - kdir /etc/modules.d - kdir /etc/opt - kdir /home - kdir ${rcscripts_dir} - kdir ${rcscripts_dir}/awk - kdir ${rcscripts_dir}/sh - kdir ${rcscripts_dir}/net - # Only install /mnt stuff at bootstrap time #88835 / #90022 - if use build ; then - kdir /mnt - kdir -m 0700 /mnt/cdrom - kdir -m 0700 /mnt/floppy - fi - kdir /opt - kdir -o root -g uucp -m0775 /var/lock - kdir /proc - kdir -m 0700 /root - kdir /sbin - kdir /sys # for 2.6 kernels - kdir /usr/bin - kdir /usr/include - kdir /usr/include/asm - kdir /usr/include/linux - kdir /usr/local/bin - kdir /usr/local/games - kdir /usr/local/sbin - kdir /usr/local/share - kdir /usr/local/share/doc - kdir /usr/local/share/man - kdir /usr/local/src - kdir ${PORTDIR} - kdir /usr/sbin - kdir /usr/share/doc - kdir /usr/share/info - kdir /usr/share/man - kdir /usr/share/misc - kdir /usr/src - kdir -m 1777 /tmp - kdir /var - dodir /var/db/pkg # .keep file messes up Portage - kdir /var/lib/misc - kdir /var/lock/subsys - kdir /var/log/news - kdir /var/run - kdir /var/spool - kdir /var/state - kdir -m 1777 /var/tmp - - for dir in ${libdirs}; do - libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} - [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue - kdir /${dir} - kdir /usr/${dir} - kdir /usr/local/${dir} - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib - fi - - # FHS compatibility symlinks stuff - ksym /var/tmp /usr/tmp - ksym share/man /usr/local/man - - # - # Setup files in /etc - # - insopts -m0644 - insinto /etc - doins -r "${S}"/etc/* - fperms 0640 /etc/sysctl.conf - - # Install some files to /usr/share/baselayout instead of /etc to keep from - # (1) overwriting the user's settings, (2) screwing things up when - # attempting to merge files, (3) accidentally packaging up personal files - # with quickpkg - fperms 0600 /etc/shadow - mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout - - # doinitd doesnt respect symlinks - dodir /etc/init.d - cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd" - #doinitd "${S}"/init.d/* || die "doinitd" - doconfd "${S}"/etc/conf.d/* || die "doconfd" - doenvd "${S}"/etc/env.d/* || die "doenvd" - insinto /etc/modules.autoload.d - doins "${S}"/etc/modules.autoload.d/* - insinto /etc/modules.d - doins "${S}"/etc/modules.d/* - - # Special-case uglyness... For people updating from lib32 -> lib amd64 - # profiles, keep lib32 in the search path while it's around - if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - - # List all the multilib libdirs in /etc/env/04multilib (only if they're - # actually different from the normal - if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then - echo "LDPATH=\"${libdirs_env}\"" > 04multilib - doenvd 04multilib - fi - - # As of baselayout-1.10-1-r1, sysvinit is its own package again, and - # provides the inittab itself - rm -f "${D}"/etc/inittab - - # Stash the rc-lists for use during pkg_postinst - cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > ${D}/etc/gentoo-release - - # - # Setup files related to /dev - # - into / - dosbin "${S}"/sbin/MAKEDEV - dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV - dosym ../sbin/MAKEDEV /dev/MAKEDEV - - # - # Setup files in /bin - # - cd "${S}"/bin - dobin rc-status - - # - # Setup files in /sbin - # - cd "${S}"/sbin - into / - dosbin rc rc-update - dosym rc-update /sbin/update-rc - # These moved from /etc/init.d/ to /sbin to help newb systems - # from breaking - dosbin runscript.sh functions.sh - - # Compat symlinks between /etc/init.d and /sbin - # (some stuff have hardcoded paths) - dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh - dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh - dosym ../../sbin/functions.sh /etc/init.d/functions.sh - - # - # Setup files in /lib/rcscripts - # These are support files for other things in baselayout that needn't be - # under CONFIG_PROTECTed /etc - # - cd "${S}"/sbin - exeinto ${rcscripts_dir}/sh - doexe rc-services.sh rc-daemon.sh rc-help.sh - - # We can only install new, fast awk versions of scripts - # if 'build' or 'bootstrap' is not in USE. This will - # change if we have sys-apps/gawk-3.1.1-r1 or later in - # the build image ... - if ! use build; then - # This is for new depscan.sh and env-update.sh - # written in awk - cd "${S}"/sbin - into / - dosbin depscan.sh - dosbin env-update.sh - insinto ${rcscripts_dir}/awk - doins "${S}"/src/awk/*.awk - fi - - # Original design had these in /etc/net.modules.d but that is too - # problematic with CONFIG_PROTECT - dodir ${rcscripts_dir} - cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir} - chown -R root:0 ${D}${rcscripts_dir} - - # - # Install baselayout documentation - # - if ! use build ; then - doman "${S}"/man/*.* - docinto / - dodoc ${FILESDIR}/copyright - dodoc "${S}"/ChangeLog - fi - - # - # Install baselayout utilities - # - local libdir="lib" - [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") - - cd "${S}"/src - make DESTDIR="${D}" LIBDIR="${libdir}" install || die - - # Hack to fix bug 9849, continued in pkg_postinst - unkdir -} - -# Support function for remapping old wireless dns vars -remap_dns_vars() { - local f="$1" - - if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then - sed -e 's/\ ${D}/etc/conf.d/${f} - fi -} - -pkg_preinst() { - # When downgrading from 1.13 we need to erase net.lo as it's a symlink - # and it's about to become a file - this is fatal in /etc - [[ -L "${ROOT}"etc/init.d/net.lo ]] && rm -f "${ROOT}"etc/init.d/net.lo - - # Reincarnate dirs from kdir/unkdir (hack for bug 9849) - # This needs to be in pkg_preinst() rather than pkg_postinst() as - # portage may create some dirs/files that'll screw us up (like /usr/lib/debug) - einfo "Creating directories and .keep files." - einfo "Some of these might fail if they're read-only mounted" - einfo "filesystems, for example /dev or /proc. That's okay!" - source "${D}"/usr/share/baselayout/mkdirs.sh - source "${D}"/usr/share/baselayout/mklinks.sh - echo - - if [[ -f ${ROOT}/etc/modules.autoload && \ - ! -d ${ROOT}/etc/modules.autoload.d ]]; then - mkdir -p ${ROOT}/etc/modules.autoload.d - mv -f ${ROOT}/etc/modules.autoload \ - ${ROOT}/etc/modules.autoload.d/kernel-2.4 - ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload - fi - - # Change some vars introduced in baselayout-1.11.0 before we go stable - # The new names make more sense and allow nis_domain - # for use in baselayout-1.12.0 - remap_dns_vars net - remap_dns_vars wireless -} - -pkg_postinst() { - local x y - - # Create /boot/boot symlink in pkg_postinst because sometimes - # /boot is a FAT filesystem. When that is the case, then the - # symlink will fail. Consequently, if we create it in - # src_install, then merge will fail. AFAIK there is no point to - # this symlink except for misconfigured grubs. See bug 50108 - # (05 May 2004 agriffis) - ln -sn . "${ROOT}"/boot/boot 2>/dev/null - - # For the bootstrap scenario with an empty /dev, let's fill the - # sucker with generic crude ... some day we should think about - # slimming this way down as we've moved on to udev/devfs - if use build ; then - if [[ ! -e ${ROOT}/dev/.devfsd && ! -e ${ROOT}/dev/.udev ]] ; then - echo - einfo "Making device node tarball (this could take a couple minutes)" - cd "${ROOT}"/dev || die - PATH=${ROOT}/sbin:${PATH} create_dev_nodes - fi - fi - - # Set up default runlevel symlinks - # This used to be done in src_install but required knowledge of ${ROOT}, - # which meant that it was effectively broken for binary installs. - if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then - for x in boot default nonetwork single; do - einfo "Creating default runlevel symlinks for ${x}" - mkdir -p "${ROOT}"/etc/runlevels/${x} - for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do - if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then - ewarn "init.d/${y} not found -- ignoring" - else - ln -sfn /etc/init.d/${y} \ - "${ROOT}"/etc/runlevels/${x}/${y} - fi - done - done - fi - - # Create /etc/hosts in pkg_postinst so we don't overwrite an - # existing file during bootstrap - if [[ ! -e ${ROOT}/etc/hosts ]]; then - cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly... see src_install() for why they - # are in /usr/share/baselayout/ - for x in passwd shadow group fstab ; do - if [[ -e ${ROOT}/etc/${x} ]] ; then - touch "${ROOT}/etc/${x}" - else - cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}" - fi - done - - # Under what circumstances would mtab be a symlink? It would be - # nice if there were an explanatory comment here - if [[ -L ${ROOT}/etc/mtab ]]; then - rm -f "${ROOT}/etc/mtab" - if [[ ${ROOT} == / ]]; then - cp /proc/mounts "${ROOT}/etc/mtab" - else - touch "${ROOT}/etc/mtab" - fi - fi - - # We should only install empty files if these files don't already exist. - [[ -e ${ROOT}/var/log/lastlog ]] || \ - touch "${ROOT}/var/log/lastlog" - [[ -e ${ROOT}/var/run/utmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp" - [[ -e ${ROOT}/var/log/wtmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp" - - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then - # Regenerate init.d dependency tree - /sbin/depscan.sh --update &>/dev/null - else - rm -f ${ROOT}/etc/modules.conf - fi - - # This is also written in src_install (so it's in CONTENTS), but - # write it here so that the new version is immediately in the file - # (without waiting for the user to do etc-update) - rm -f ${ROOT}/etc/._cfg????_gentoo-release - echo "Gentoo Base System release ${PV}" > ${ROOT}/etc/gentoo-release - - echo - einfo "Please be sure to update all pending '._cfg*' files in /etc," - einfo "else things might break at your next reboot! You can use 'etc-update'" - einfo "to accomplish this:" - einfo - einfo " # etc-update" - echo - - for f in ${ROOT}etc/init.d/net.* ; do - [[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue - echo - einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" - einfo "They need to be converted to symlinks to net.lo. If you haven't" - einfo "made personal changes to those files, you can update with the" - einfo "following command:" - einfo - einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo" - echo - break - done - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \ - | egrep -q '\<(domain|nameservers|searchdomains)_' ; then - echo - ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net" - ewarn "or ${ROOT}/etc/conf.d/wireless" - ewarn - ewarn "domain_* -> dns_domain_*" - ewarn "nameservers_* -> dns_servers_*" - ewarn "searchdomains_* -> dns_search_domains_*" - ewarn - ewarn "They have been converted for you - ensure that you" - ewarn "update them via 'etc-update'" - echo - fi - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \ - | egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then - echo - ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net" - ewarn - ewarn "You are advised to review the new configuration variables as" - ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no" - ewarn "guarantee that they will work in future versions." - echo - fi - - # Remove old stuff that may cause problems. - if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then - rm -f "${ROOT}"/etc/env.d/01hostname - fi - if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then - rm -f "${ROOT}"/etc/init.d/domainname - rm -f "${ROOT}"/etc/runlevels/*/domainname - ewarn "The domainname init script has been removed in this version." - ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how" - ewarn "to apply dns/nis information to the loopback interface." - fi -} diff --git a/sys-apps/baselayout/baselayout-1.12.10-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.10-r3.ebuild similarity index 99% rename from sys-apps/baselayout/baselayout-1.12.10-r2.ebuild rename to sys-apps/baselayout/baselayout-1.12.10-r3.ebuild index 5677e23214a7..f2a16e207f12 100644 --- a/sys-apps/baselayout/baselayout-1.12.10-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.10-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.10-r2.ebuild,v 1.1 2007/04/12 16:04:47 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.10-r3.ebuild,v 1.1 2007/04/13 18:35:33 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -31,7 +31,7 @@ RDEPEND="virtual/init !> "${D}/usr/share/baselayout/mkdirs.sh" </dev/null \\ - || ewarn " can't create ${d}" - touch "\${ROOT}/${d}/.keep" 2>/dev/null \\ - || ewarn " can't create ${d}/.keep" -fi -EOF - else - args=("${args[@]}" "${d}") - fi - done -} - -# Continued from kdir above... This function removes any empty -# directories as a temporary workaround for bug 9849. The directories -# (and .keep files) are re-created in pkg_postinst, which means they -# aren't listed in CONTENTS, unfortunately. -unkdir() { - einfo "Running unkdir to workaround bug 9849" - find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null - if [[ $? == 127 ]]; then - ewarn "Problem running unkdir: find command not found" - fi -} - -# Same as kdir above, but for symlinks #103618 -ksym() { - echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \ - >> "${D}"/usr/share/baselayout/mklinks.sh -} - -src_install() { - local dir libdirs libdirs_env rcscripts_dir - - # This directory is to stash away things that will be used in - # pkg_postinst; it's needed first for kdir to function - dodir /usr/share/baselayout - - # Jeremy Huddleston - # For multilib, we want to make sure that all our multilibdirs exist - # and make lib even if it's not listed as one (like on amd64/ppc64 - # which sometimes has lib32/lib64 instead of lib/lib64). - # lib should NOT be a symlink to one of the other libdirs. - # Old systems with symlinks won't be affected by this change, as the - # symlinks already exist and won't get removed, but new systems will - # be setup properly. - # - # I'll be making a script to convert existing systems from symlink to - # nosymlink and putting it in /usr/portage/scripts. - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - # This should be /lib/rcscripts, but we have to support old profiles too. - if [[ ${SYMLINK_LIB} == "yes" ]]; then - rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" - else - rcscripts_dir="/lib/rcscripts" - fi - - einfo "Creating directories..." - kdir /usr - kdir /usr/local - kdir /boot - kdir /dev - kdir /dev/pts - kdir /dev/shm - kdir /etc/conf.d - kdir /etc/cron.daily - kdir /etc/cron.hourly - kdir /etc/cron.monthly - kdir /etc/cron.weekly - kdir /etc/env.d - dodir /etc/init.d # .keep file might mess up init.d stuff - kdir /etc/modules.autoload.d - kdir /etc/modules.d - kdir /etc/opt - kdir /home - kdir ${rcscripts_dir} - kdir ${rcscripts_dir}/awk - kdir ${rcscripts_dir}/sh - kdir ${rcscripts_dir}/net - # Only install /mnt stuff at bootstrap time #88835 / #90022 - if use build ; then - kdir /mnt - kdir -m 0700 /mnt/cdrom - kdir -m 0700 /mnt/floppy - fi - kdir /opt - kdir -o root -g uucp -m0775 /var/lock - kdir /proc - kdir -m 0700 /root - kdir /sbin - kdir /sys # for 2.6 kernels - kdir /usr/bin - kdir /usr/include - kdir /usr/include/asm - kdir /usr/include/linux - kdir /usr/local/bin - kdir /usr/local/games - kdir /usr/local/sbin - kdir /usr/local/share - kdir /usr/local/share/doc - kdir /usr/local/share/man - kdir /usr/local/src - kdir ${PORTDIR} - kdir /usr/sbin - kdir /usr/share/doc - kdir /usr/share/info - kdir /usr/share/man - kdir /usr/share/misc - kdir /usr/src - kdir -m 1777 /tmp - kdir /var - dodir /var/db/pkg # .keep file messes up Portage - kdir /var/lib/misc - kdir /var/lock/subsys - kdir /var/log/news - kdir /var/run - kdir /var/spool - kdir /var/state - kdir -m 1777 /var/tmp - - for dir in ${libdirs}; do - libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} - [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue - kdir /${dir} - kdir /usr/${dir} - kdir /usr/local/${dir} - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib - fi - - # FHS compatibility symlinks stuff - ksym /var/tmp /usr/tmp - ksym share/man /usr/local/man - - # - # Setup files in /etc - # - insopts -m0644 - insinto /etc - doins -r "${S}"/etc/* - fperms 0640 /etc/sysctl.conf - - # Install some files to /usr/share/baselayout instead of /etc to keep from - # (1) overwriting the user's settings, (2) screwing things up when - # attempting to merge files, (3) accidentally packaging up personal files - # with quickpkg - fperms 0600 /etc/shadow - mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout - - # doinitd doesnt respect symlinks - dodir /etc/init.d - cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd" - #doinitd "${S}"/init.d/* || die "doinitd" - doconfd "${S}"/etc/conf.d/* || die "doconfd" - doenvd "${S}"/etc/env.d/* || die "doenvd" - insinto /etc/modules.autoload.d - doins "${S}"/etc/modules.autoload.d/* - insinto /etc/modules.d - doins "${S}"/etc/modules.d/* - - # Special-case uglyness... For people updating from lib32 -> lib amd64 - # profiles, keep lib32 in the search path while it's around - if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - - # List all the multilib libdirs in /etc/env/04multilib (only if they're - # actually different from the normal - if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then - echo "LDPATH=\"${libdirs_env}\"" > 04multilib - doenvd 04multilib - fi - - # As of baselayout-1.10-1-r1, sysvinit is its own package again, and - # provides the inittab itself - rm -f "${D}"/etc/inittab - - # Stash the rc-lists for use during pkg_postinst - cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > ${D}/etc/gentoo-release - - # - # Setup files related to /dev - # - into / - dosbin "${S}"/sbin/MAKEDEV - dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV - dosym ../sbin/MAKEDEV /dev/MAKEDEV - - # - # Setup files in /bin - # - cd "${S}"/bin - dobin rc-status - - # - # Setup files in /sbin - # - cd "${S}"/sbin - into / - dosbin rc rc-update - # These moved from /etc/init.d/ to /sbin to help newb systems - # from breaking - dosbin runscript.sh functions.sh - - # Compat symlinks between /etc/init.d and /sbin - # (some stuff have hardcoded paths) - dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh - dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh - dosym ../../sbin/functions.sh /etc/init.d/functions.sh - - # - # Setup files in /lib/rcscripts - # These are support files for other things in baselayout that needn't be - # under CONFIG_PROTECTed /etc - # - cd "${S}"/sbin - exeinto ${rcscripts_dir}/sh - doexe rc-services.sh rc-daemon.sh rc-help.sh - - # We can only install new, fast awk versions of scripts - # if 'build' or 'bootstrap' is not in USE. This will - # change if we have sys-apps/gawk-3.1.1-r1 or later in - # the build image ... - if ! use build; then - # This is for new depscan.sh and env-update.sh - # written in awk - cd "${S}"/sbin - into / - dosbin depscan.sh - dosbin env-update.sh - insinto ${rcscripts_dir}/awk - doins "${S}"/src/awk/*.awk - fi - - # Original design had these in /etc/net.modules.d but that is too - # problematic with CONFIG_PROTECT - dodir ${rcscripts_dir} - cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir} - chown -R root:0 ${D}${rcscripts_dir} - - # - # Install baselayout documentation - # - if ! use build ; then - doman "${S}"/man/*.* - docinto / - dodoc ${FILESDIR}/copyright - dodoc "${S}"/ChangeLog - fi - - # - # Install baselayout utilities - # - local libdir="lib" - [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") - - cd "${S}"/src - make DESTDIR="${D}" LIBDIR="${libdir}" install || die - - # Hack to fix bug 9849, continued in pkg_postinst - unkdir -} - -# Support function for remapping old wireless dns vars -remap_dns_vars() { - local f="$1" - - if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then - sed -e 's/\ ${D}/etc/conf.d/${f} - fi -} - -pkg_preinst() { - # When downgrading from 1.13 we need to erase net.lo as it's a symlink - # and it's about to become a file - this is fatal in /etc - [[ -L "${ROOT}"etc/init.d/net.lo ]] && rm -f "${ROOT}"etc/init.d/net.lo - - # Reincarnate dirs from kdir/unkdir (hack for bug 9849) - # This needs to be in pkg_preinst() rather than pkg_postinst() as - # portage may create some dirs/files that'll screw us up (like /usr/lib/debug) - einfo "Creating directories and .keep files." - einfo "Some of these might fail if they're read-only mounted" - einfo "filesystems, for example /dev or /proc. That's okay!" - source "${D}"/usr/share/baselayout/mkdirs.sh - source "${D}"/usr/share/baselayout/mklinks.sh - echo - - if [[ -f ${ROOT}/etc/modules.autoload && \ - ! -d ${ROOT}/etc/modules.autoload.d ]]; then - mkdir -p ${ROOT}/etc/modules.autoload.d - mv -f ${ROOT}/etc/modules.autoload \ - ${ROOT}/etc/modules.autoload.d/kernel-2.4 - ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload - fi - - # Change some vars introduced in baselayout-1.11.0 before we go stable - # The new names make more sense and allow nis_domain - # for use in baselayout-1.12.0 - remap_dns_vars net - remap_dns_vars wireless -} - -pkg_postinst() { - local x y - - # Create /boot/boot symlink in pkg_postinst because sometimes - # /boot is a FAT filesystem. When that is the case, then the - # symlink will fail. Consequently, if we create it in - # src_install, then merge will fail. AFAIK there is no point to - # this symlink except for misconfigured grubs. See bug 50108 - # (05 May 2004 agriffis) - ln -sn . "${ROOT}"/boot/boot 2>/dev/null - - # For the bootstrap scenario with an empty /dev, let's fill the - # sucker with generic crude ... some day we should think about - # slimming this way down as we've moved on to udev/devfs - if use build ; then - if [[ ! -e ${ROOT}/dev/.devfsd && ! -e ${ROOT}/dev/.udev ]] ; then - echo - einfo "Making device node tarball (this could take a couple minutes)" - cd "${ROOT}"/dev || die - PATH=${ROOT}/sbin:${PATH} create_dev_nodes - fi - fi - - # Set up default runlevel symlinks - # This used to be done in src_install but required knowledge of ${ROOT}, - # which meant that it was effectively broken for binary installs. - if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then - for x in boot default nonetwork single; do - einfo "Creating default runlevel symlinks for ${x}" - mkdir -p "${ROOT}"/etc/runlevels/${x} - for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do - if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then - ewarn "init.d/${y} not found -- ignoring" - else - ln -sfn /etc/init.d/${y} \ - "${ROOT}"/etc/runlevels/${x}/${y} - fi - done - done - fi - - # Create /etc/hosts in pkg_postinst so we don't overwrite an - # existing file during bootstrap - if [[ ! -e ${ROOT}/etc/hosts ]]; then - cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly... see src_install() for why they - # are in /usr/share/baselayout/ - for x in passwd shadow group fstab ; do - if [[ -e ${ROOT}/etc/${x} ]] ; then - touch "${ROOT}/etc/${x}" - else - cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}" - fi - done - - # Under what circumstances would mtab be a symlink? It would be - # nice if there were an explanatory comment here - if [[ -L ${ROOT}/etc/mtab ]]; then - rm -f "${ROOT}/etc/mtab" - if [[ ${ROOT} == / ]]; then - cp /proc/mounts "${ROOT}/etc/mtab" - else - touch "${ROOT}/etc/mtab" - fi - fi - - # We should only install empty files if these files don't already exist. - [[ -e ${ROOT}/var/log/lastlog ]] || \ - touch "${ROOT}/var/log/lastlog" - [[ -e ${ROOT}/var/run/utmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp" - [[ -e ${ROOT}/var/log/wtmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp" - - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then - # Regenerate init.d dependency tree - /sbin/depscan.sh --update &>/dev/null - else - rm -f ${ROOT}/etc/modules.conf - fi - - # This is also written in src_install (so it's in CONTENTS), but - # write it here so that the new version is immediately in the file - # (without waiting for the user to do etc-update) - rm -f ${ROOT}/etc/._cfg????_gentoo-release - echo "Gentoo Base System release ${PV}" > ${ROOT}/etc/gentoo-release - - echo - einfo "Please be sure to update all pending '._cfg*' files in /etc," - einfo "else things might break at your next reboot! You can use 'etc-update'" - einfo "to accomplish this:" - einfo - einfo " # etc-update" - echo - - for f in ${ROOT}etc/init.d/net.* ; do - [[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue - echo - einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" - einfo "They need to be converted to symlinks to net.lo. If you haven't" - einfo "made personal changes to those files, you can update with the" - einfo "following command:" - einfo - einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo" - echo - break - done - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \ - | egrep -q '\<(domain|nameservers|searchdomains)_' ; then - echo - ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net" - ewarn "or ${ROOT}/etc/conf.d/wireless" - ewarn - ewarn "domain_* -> dns_domain_*" - ewarn "nameservers_* -> dns_servers_*" - ewarn "searchdomains_* -> dns_search_domains_*" - ewarn - ewarn "They have been converted for you - ensure that you" - ewarn "update them via 'etc-update'" - echo - fi - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \ - | egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then - echo - ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net" - ewarn - ewarn "You are advised to review the new configuration variables as" - ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no" - ewarn "guarantee that they will work in future versions." - echo - fi - - # Remove old stuff that may cause problems. - if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then - rm -f "${ROOT}"/etc/env.d/01hostname - fi - if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then - rm -f "${ROOT}"/etc/init.d/domainname - rm -f "${ROOT}"/etc/runlevels/*/domainname - ewarn "The domainname init script has been removed in this version." - ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how" - ewarn "to apply dns/nis information to the loopback interface." - fi -} diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.10-r2 b/sys-apps/baselayout/files/digest-baselayout-1.12.10-r2 deleted file mode 100644 index dd60a2f63bb4..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.10-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d312b442ebfda3275d33ddf0aa34232c baselayout-1.12.10.tar.bz2 218940 -RMD160 e499c08af4d73d43c2e354febbf09e48916ac24c baselayout-1.12.10.tar.bz2 218940 -SHA256 1d64cdb9cc42bca7a8eec4045ad0e7e8cafba1d6c3f92b377bc7f6f7ee668674 baselayout-1.12.10.tar.bz2 218940 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.10-r1 b/sys-apps/baselayout/files/digest-baselayout-1.12.10-r3 similarity index 100% rename from sys-apps/baselayout/files/digest-baselayout-1.12.10-r1 rename to sys-apps/baselayout/files/digest-baselayout-1.12.10-r3 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.9-r1 b/sys-apps/baselayout/files/digest-baselayout-1.12.9-r1 deleted file mode 100644 index 75e5ac983212..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.9-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 67dd4522e84b191724baf2eb1352c695 baselayout-1.12.9.tar.bz2 218939 -RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 baselayout-1.12.9.tar.bz2 218939 -SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94 baselayout-1.12.9.tar.bz2 218939 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.9 b/sys-apps/baselayout/files/digest-baselayout-1.12.9-r2 similarity index 100% rename from sys-apps/baselayout/files/digest-baselayout-1.12.9 rename to sys-apps/baselayout/files/digest-baselayout-1.12.9-r2