From 8991fbb48f63d53292253545a32c86f369a69c57 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 6 Nov 2006 13:14:27 +0000 Subject: [PATCH] Fix a few key bugs regarding stage building on Linux and service ordering. Package-Manager: portage-2.1.2_rc1-r3 --- sys-apps/baselayout/ChangeLog | 9 +- sys-apps/baselayout/Manifest | 19 +- .../baselayout-1.13.0_alpha5-r1.ebuild | 273 ++++++++++++++++++ .../files/baselayout-1.13.0_alpha5-2364.patch | 71 +++++ .../files/digest-baselayout-1.13.0_alpha5-r1 | 3 + 5 files changed, 370 insertions(+), 5 deletions(-) create mode 100644 sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild create mode 100644 sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch create mode 100644 sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1 diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 638f7d8f2d44..b1f5382008e6 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,17 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.360 2006/11/02 16:45:49 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.361 2006/11/06 13:14:27 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_alpha5-r1 (06 Nov 2006) + + 06 Nov 2006; Roy Marples + +files/baselayout-1.13.0_alpha5-2364.patch, + +baselayout-1.13.0_alpha5-r1.ebuild: + Fix a few key bugs regarding stage building on Linux and service ordering. + *baselayout-1.13.0_alpha5 (02 Nov 2006) 02 Nov 2006; Roy Marples diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 90a05a86dfbd..cf04af5ce98d 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -86,6 +86,10 @@ AUX baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 RMD160 c2af027058e61f0f68f0b136b MD5 049706d1fa5f3818384f37200a304cde files/baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 RMD160 c2af027058e61f0f68f0b136b5603a850eaea956 files/baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 SHA256 4574ae66e6ad61a75b7dd8431a53e2c241e1a63b63e3989787cd2c3ed84008de files/baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 +AUX baselayout-1.13.0_alpha5-2364.patch 2119 RMD160 029e0c34899603e4bb822b0ad13e9daa15b2255c SHA1 de222d9ba99d8cece07e1d3665f4087e4209e8fb SHA256 6c7fcc07214fe8e88e4e3fad7fc013427354f662505fa95f657e5634cb3adbc8 +MD5 28f5df04fa58d76dd0188d9d4cb9879a files/baselayout-1.13.0_alpha5-2364.patch 2119 +RMD160 029e0c34899603e4bb822b0ad13e9daa15b2255c files/baselayout-1.13.0_alpha5-2364.patch 2119 +SHA256 6c7fcc07214fe8e88e4e3fad7fc013427354f662505fa95f657e5634cb3adbc8 files/baselayout-1.13.0_alpha5-2364.patch 2119 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 @@ -136,14 +140,18 @@ EBUILD baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254ed MD5 89fe580a63cdf58624f048520d6408b2 baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254edfdaf501556b baselayout-1.13.0_alpha4.ebuild 9086 SHA256 0c4b5f1fd4fc75a29741a8d2bb872a75a4a8aa93fffc31ec8d68d713d8cd1483 baselayout-1.13.0_alpha4.ebuild 9086 +EBUILD baselayout-1.13.0_alpha5-r1.ebuild 9153 RMD160 68c623365cca7613a15bdc8ea43d6cdfca453bee SHA1 0cd5a1d67769e73cc856028f9f0776613254d8e9 SHA256 4e9827ec374154287a3a77586579725864e286b57a3b4770fd2a070f00a33ca7 +MD5 3e3e80b2ac3e67a57c43bf89a04d8588 baselayout-1.13.0_alpha5-r1.ebuild 9153 +RMD160 68c623365cca7613a15bdc8ea43d6cdfca453bee baselayout-1.13.0_alpha5-r1.ebuild 9153 +SHA256 4e9827ec374154287a3a77586579725864e286b57a3b4770fd2a070f00a33ca7 baselayout-1.13.0_alpha5-r1.ebuild 9153 EBUILD baselayout-1.13.0_alpha5.ebuild 9089 RMD160 1b12e9c963e219edeac3d736e10cb7530104fe7a SHA1 6b217a09866f6223c7e0894eb18d997d1d56bd7d SHA256 d30fb2f1d79a88b4f71e85a0184532080e2f1b7b61ace28b10eca866e802897f MD5 db8c9169bf375ba0ea2d0c3c496a2606 baselayout-1.13.0_alpha5.ebuild 9089 RMD160 1b12e9c963e219edeac3d736e10cb7530104fe7a baselayout-1.13.0_alpha5.ebuild 9089 SHA256 d30fb2f1d79a88b4f71e85a0184532080e2f1b7b61ace28b10eca866e802897f baselayout-1.13.0_alpha5.ebuild 9089 -MISC ChangeLog 81625 RMD160 8ba5f2a34bcf104197eaf67f1627706b0b12199e SHA1 f1d48e4a00aa1ae5b639995bf33815ac30cdff52 SHA256 eaa6ca7187d22d1189ad1b56dee59eeccd23afb2735e9847386e91c873a2b60b -MD5 a8a3e2e294df71f8c6b1f1b6554d7fcd ChangeLog 81625 -RMD160 8ba5f2a34bcf104197eaf67f1627706b0b12199e ChangeLog 81625 -SHA256 eaa6ca7187d22d1189ad1b56dee59eeccd23afb2735e9847386e91c873a2b60b ChangeLog 81625 +MISC ChangeLog 81881 RMD160 6adfa6d0df0212434bc7e9b9c789b355a5ea0f37 SHA1 9742232110689c4ed212a17f363395a1d32e1059 SHA256 2b959c68b988e31c07b7317b05d887ef1c58b891d3025739a7f925ae90f17685 +MD5 e2af6ee81b02ea0f99fe3d6889fa1105 ChangeLog 81881 +RMD160 6adfa6d0df0212434bc7e9b9c789b355a5ea0f37 ChangeLog 81881 +SHA256 2b959c68b988e31c07b7317b05d887ef1c58b891d3025739a7f925ae90f17685 ChangeLog 81881 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -178,3 +186,6 @@ SHA256 e52a8b9a85ec4e43c953e049af003a16c75a32b356fb405c5fc72c41e992fc44 files/di MD5 efde442d3cc9833ca1767c882e52c2c5 files/digest-baselayout-1.13.0_alpha5 277 RMD160 817f36d15a293973a46ffd6a0fd48fc07f904d58 files/digest-baselayout-1.13.0_alpha5 277 SHA256 ef10f75c32a61411af0ed5b62d18257b1c34752776dbdec49c5479a6dda07ce2 files/digest-baselayout-1.13.0_alpha5 277 +MD5 efde442d3cc9833ca1767c882e52c2c5 files/digest-baselayout-1.13.0_alpha5-r1 277 +RMD160 817f36d15a293973a46ffd6a0fd48fc07f904d58 files/digest-baselayout-1.13.0_alpha5-r1 277 +SHA256 ef10f75c32a61411af0ed5b62d18257b1c34752776dbdec49c5479a6dda07ce2 files/digest-baselayout-1.13.0_alpha5-r1 277 diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild new file mode 100644 index 000000000000..c26b6284cc61 --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2006 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_alpha5-r1.ebuild,v 1.1 2006/11/06 13:14:27 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="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 ) + !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 + sys-process/pidof-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}" + + # 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= + : ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/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() { + # 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 + make -C "${T}" $(make_opts) layout || die "failed to layout filesystem" + fi + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + make -C "${T}" $(make_opts) runlevels_install >/dev/null + fi + + if use kernel_linux ; then + if use build || use bootstrap ; then + # Create base directories + if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then + einfo "Creating dev nodes" + PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \ + dev || die "failed to create /dev nodes" + fi + fi + 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 + + # 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 + # We need to copy svcdir if it's empty + if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then + ( + source "${ROOT}etc/conf.d/rc" + svcdir="${svcdir:-/var/lib/init.d}" + if [[ -e ${ROOT}${svcdir}/deptree ]] ; then + cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d + fi + ) + fi + + # Regenerate init.d dependency tree + /sbin/depscan.sh --update >/dev/null + + # Regenerate /etc/modules.conf, else it will fail at next boot + if [[ -x /sbin/modules-update ]] ; then + einfo "Updating module dependencies..." + /sbin/modules-update force >/dev/null + fi + 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 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" + echo + + local lo="net.lo0" + use kernel_linux && lo="net.lo" + for f in ${ROOT}etc/init.d/net.*; do + [[ -L ${f} ]] && 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}" + 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 '\<(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/{conf.d,init.d}/domainname \ + "${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/baselayout-1.13.0_alpha5-2364.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch new file mode 100644 index 000000000000..84ecf7d52e24 --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch @@ -0,0 +1,71 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 2359) ++++ Makefile (working copy) +@@ -23,7 +23,7 @@ + /var/lock /var/run + + ifeq ($(OS),Linux) +- KEEP_DIRS += /dev /proc /sys ++ KEEP_DIRS += /dev /sys + NET_LO = net.lo + endif + ifneq ($(OS),Linux) +Index: ChangeLog +=================================================================== +--- ChangeLog (revision 2359) ++++ ChangeLog (working copy) +@@ -1,6 +1,11 @@ + # ChangeLog for Gentoo System Intialization ("rc") scripts + # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 + ++ 05 Nov 2006; Roy Marples : ++ ++ Don't create /proc on Linux as build scripts like to handle it now. ++ Fixes #154126. ++ + * baselayout-1.13.0_alpha5 (02 Nov 2006) + + 02 Nov 2006; Roy Marples : +Index: sbin/rc +=================================================================== +--- sbin/rc (revision 2359) ++++ sbin/rc (working copy) +@@ -267,7 +267,7 @@ + + for x in $(dolisting "${svcdir}/inactive/") \ + $(dolisting "${svcdir}/started/") ; do +- list="${list} ${x##*/}" ++ list="${x##*/} ${list}" + done + + [[ -n ${list} ]] && reverse_list $(rc-depend -ineed -iuse -iafter ${list}) +@@ -442,7 +442,7 @@ + rm -rf "${svcdir}/failed" &>/dev/null + + # If $svcdir is mounted in ram, save it back to disk and unmount +-if [[ $'\n'$(get_mounts) =~ $'\n'"${svcdir} " ]] ; then ++if [[ $'\n'$(get_mounts) =~ $'\n'${svcdir}\ ]] ; then + # Function to show the timeout message + timeout= + do_timeout() { +Index: sbin/depscan.sh +=================================================================== +--- sbin/depscan.sh (revision 2359) ++++ sbin/depscan.sh (working copy) +@@ -149,6 +149,7 @@ + if [[ ${retval} == "0" ]] ; then + DEPTREE="deptree" + export DEPTREE ++ cd /etc/init.d + bash "${mysvcdir}/depcache" | \ + awk \ + -f /lib/rcscripts/awk/functions.awk \ +@@ -187,6 +188,7 @@ + if [[ ${retval} == "0" ]] ; then + DEPTREE="netdeptree" + export DEPTREE ++ cd "${svclib}/net" + bash "${mysvcdir}/netdepcache" | \ + awk \ + -f /lib/rcscripts/awk/functions.awk \ diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1 new file mode 100644 index 000000000000..1cb36c05fbb1 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1 @@ -0,0 +1,3 @@ +MD5 2e6ef285409b00b435121f9326eab2d1 baselayout-1.13.0_alpha5.tar.bz2 255507 +RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 baselayout-1.13.0_alpha5.tar.bz2 255507 +SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e baselayout-1.13.0_alpha5.tar.bz2 255507 -- 2.26.2