From: Roy Marples Date: Wed, 17 Jan 2007 15:06:23 +0000 (+0000) Subject: New release, fixes the last race issues hopefully. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bb4525b85b1051a0ab58b61a47f7045840db898;p=gentoo.git New release, fixes the last race issues hopefully. xinit users will require 1.0.3-r1 or they'll get cirular loops. Package-Manager: portage-2.1.2 --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index e41fccdaeb1e..b1fa12f71fd9 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,17 @@ # 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.396 2007/01/17 13:03:34 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.397 2007/01/17 15:06:23 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-1.13.0_alpha12 (17 Jan 2007) + + 17 Jan 2007; Roy Marples + +baselayout-1.13.0_alpha12.ebuild: + New release, fixes the last race issues hopefully. + xinit users will require 1.0.3-r1 or they'll get cirular loops. + *baselayout-1.12.9 (17 Jan 2007) 17 Jan 2007; Roy Marples +baselayout-1.12.9.ebuild: diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index eb0d6ed07b63..06e0dfedf0c9 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -89,6 +89,7 @@ DIST baselayout-1.12.8.tar.bz2 218298 RMD160 2a47bf00db9c1e15ad2dd90e02dc55a896e DIST baselayout-1.12.9.tar.bz2 218939 RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 SHA1 0e5745d95412db3427961c5f796827f7867aa35b SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94 DIST baselayout-1.13.0_alpha10.tar.bz2 255190 RMD160 930065e8fd850ad1247c639293ab05ff499409d1 SHA1 ae5f9e403610335a8e9e6e7ec4eed9a1ab62bd7f SHA256 ea78f92f45801c306458bc66a076d566893cac11e3dac429810629aea0738ef4 DIST baselayout-1.13.0_alpha11.tar.bz2 229777 RMD160 4b34817bff86699077304a17e118e060e078615d SHA1 d20a86ad03f063b9e07860ecf549a71dadb68ab7 SHA256 993ca18543d74f33e9b6d570d4f5ecdb40940e34e2b5fd97bcdc31321a87a1c6 +DIST baselayout-1.13.0_alpha12.tar.bz2 230982 RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 SHA1 a565b934427e0ba8eb41869fb6b30f294198a2b2 SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a EBUILD baselayout-1.11.15-r3.ebuild 18814 RMD160 3477a96752088ec670ba87c8cc5a825e504374a9 SHA1 dffb788310268b4bbccc21dc55e8ce247b0100f5 SHA256 6568e5b5762128fdfd353dd359581cf6f7aafc60e5ffb2194a675df2aeeb6fda MD5 c13ac4da7c024396714a0f52c15bcb58 baselayout-1.11.15-r3.ebuild 18814 @@ -134,10 +135,14 @@ EBUILD baselayout-1.13.0_alpha11-r2.ebuild 10612 RMD160 856832d3baa97bec1a4faace MD5 1ee70c462f6526e7b660a197ec96ec6d baselayout-1.13.0_alpha11-r2.ebuild 10612 RMD160 856832d3baa97bec1a4faace2a9453733247d288 baselayout-1.13.0_alpha11-r2.ebuild 10612 SHA256 09788dd3421a845285df8873c96baa93a8666178fe6baa60971d8f40fc8472e0 baselayout-1.13.0_alpha11-r2.ebuild 10612 -MISC ChangeLog 89591 RMD160 1524a112ac3b9996c5a6743a263c185df5e058f7 SHA1 6d3832020fc12751c70b08bd3ff81d0ce005d242 SHA256 4860bd83331f23e1c7b73c4c564680a2be9c742f957a481db358c0f4e187134a -MD5 7ae9bf87f704ea2f85b25e060b6c3465 ChangeLog 89591 -RMD160 1524a112ac3b9996c5a6743a263c185df5e058f7 ChangeLog 89591 -SHA256 4860bd83331f23e1c7b73c4c564680a2be9c742f957a481db358c0f4e187134a ChangeLog 89591 +EBUILD baselayout-1.13.0_alpha12.ebuild 9954 RMD160 e7fe931ddc4237cd3a16cc12da430e9849359d6f SHA1 20f7798614df5acd76fe60d0d86106aa230cbadd SHA256 ae861d6f05324665d31db8ee669cbe117e26c2793ac394d3e0d1d53627d83946 +MD5 5bb70047b99f3f97ed8c26b2b3308ffe baselayout-1.13.0_alpha12.ebuild 9954 +RMD160 e7fe931ddc4237cd3a16cc12da430e9849359d6f baselayout-1.13.0_alpha12.ebuild 9954 +SHA256 ae861d6f05324665d31db8ee669cbe117e26c2793ac394d3e0d1d53627d83946 baselayout-1.13.0_alpha12.ebuild 9954 +MISC ChangeLog 89839 RMD160 340fc9cb5d1d9a84438bb54311c975ded3d37b1d SHA1 eee95b4dcc714b7301f7bacc7f1aa9875cc25f08 SHA256 8fc7c5949e6c270897d40767616c42cca132c1c9fa68bda0db71ff024c77f5e9 +MD5 e5cd3a425c30f4e70bcf0833efb5434d ChangeLog 89839 +RMD160 340fc9cb5d1d9a84438bb54311c975ded3d37b1d ChangeLog 89839 +SHA256 8fc7c5949e6c270897d40767616c42cca132c1c9fa68bda0db71ff024c77f5e9 ChangeLog 89839 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -175,3 +180,6 @@ SHA256 43fd9d1cfeacfd464916cb9011db751d238122f899172a0cc69a56bc8ccabca8 files/di MD5 4a006d4e3be6f90b2c3c79f1776b1aea files/digest-baselayout-1.13.0_alpha11-r2 280 RMD160 98dea4cb5f5b9ead0e0f9b3499a62bf5d60d9bdd files/digest-baselayout-1.13.0_alpha11-r2 280 SHA256 43fd9d1cfeacfd464916cb9011db751d238122f899172a0cc69a56bc8ccabca8 files/digest-baselayout-1.13.0_alpha11-r2 280 +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 diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild new file mode 100644 index 000000000000..25357bad9198 --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild @@ -0,0 +1,284 @@ +# 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.13.0_alpha12.ebuild,v 1.1 2007/01/17 15:06:23 uberlord 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 ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD" + +# This version of baselayout needs awk 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. +RDEPEND="virtual/init + !build? ( + !bootstrap? ( + >=sys-libs/readline-5.0-r1 + >=app-shells/bash-3.2_p3-r1 + kernel_linux? ( >=sys-apps/coreutils-5.2.1 ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + ) + ) + pam? ( virtual/pam ) + ! "${IMAGE}/etc/conf.d/$1" + fi +} + +pkg_preinst() { + # Move our makefiles to a temporay location + mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" + + # 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. + if use build || use bootstrap ; then + local libdirs="$(get_all_libdirs)" dir= + # Create our multilib dirs - the Makefile has no knowledge of this + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + mkdir -p "${ROOT}${dir}" + touch "${ROOT}${dir}"/.keep + mkdir -p "${ROOT}usr/${dir}" + touch "${ROOT}usr/${dir}"/.keep + mkdir -p "${ROOT}usr/local/${dir}" + touch "${ROOT}usr/local/${dir}"/.keep + done + + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [[ ${SYMLINK_LIB} == "yes" ]] ; then + rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null + local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) + ln -s "${lib}" "${ROOT}lib" + ln -s "${lib}" "${ROOT}usr/lib" + ln -s "${lib}" "${ROOT}usr/local/lib" + fi + + make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" + 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 +} + +src_install() { + make $(make_opts) DESTDIR="${D}" install + dodoc ChangeLog COPYRIGHT + + # Should this belong in another ebuild? Like say binutils? + # 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 + local libdirs="$(get_all_libdirs)" libdirs_env= dir= + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} + done + + # 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib + doenvd "${T}"/04multilib + fi + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System version ${PV}" > "${D}"/etc/gentoo-release + + # Remove the installed runlevels, as we don't know about $ROOT yet + rm -rf "${D}/etc/runlevels" + + # Copy the make files to /usr/share/baselayout so we can re-use them in + # postinst, otherwise binpkg will break. + insinto /usr/share/baselayout + doins -r Makefile default.mk runlevels* +} + +pkg_postinst() { + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null + fi + + # 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 "${ROOT}etc/${x}" ]] && continue + [[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue + cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc + done + + # We need to copy svcdir if upgrading + if has_version "/dev/null + rm -rf "${ROOT}${svcdir}" + ) + # Install our new init script and mark it started + if use kernel_linux ; then + ln -snf ../../init.d/volumes "${ROOT}"etc/runlevels/boot + ln -snf /etc/init.d/volumes "${ROOT}"lib/rcscripts/init.d/started + fi + fi + + if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then + /sbin/depscan.sh --force >/dev/null + 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 version ${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" + + local lo="net.lo0" + use kernel_linux && lo="net.lo" + for f in ${ROOT}etc/init.d/net.*; do + [[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue + echo + einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" + einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}" + 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'" + fi + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \ + | egrep -q '\<(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." + 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/{conf.d,init.d}/domainname \ + "${ROOT}"/etc/runlevels/*/domainname + echo + 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 +} + +# Handle our downgraders +# We should remove this when <1.13 has been removed from the tree +pkg_postrm() { + # Remove dir if downgrading + if has_version "/dev/null + rm -rf "${ROOT}lib/rcscripts/init.d" + ) + fi +} diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12 new file mode 100644 index 000000000000..d4f6ab3b89ac --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12 @@ -0,0 +1,3 @@ +MD5 8de97deb8317f58da52c688f06439e4d baselayout-1.13.0_alpha12.tar.bz2 230982 +RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 baselayout-1.13.0_alpha12.tar.bz2 230982 +SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054 baselayout-1.13.0_alpha12.tar.bz2 230982