diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 19 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.12.0_pre17-r2.ebuild | 628 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/baselayout-1.12.0_pre17-1980.patch | 252 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-1.12.0_pre17-r2 | 3 |
5 files changed, 901 insertions, 11 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index b8064eefa6ec..4abb232fc0a0 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,18 @@ # 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.314 2006/04/11 14:54:46 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.315 2006/04/12 15:57:17 uberlord Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup +*baselayout-1.12.0_pre17-r2 (12 Apr 2006) + + 12 Apr 2006; Roy Marples <uberlord@gentoo.org> + +files/baselayout-1.12.0_pre17-1980.patch, + +baselayout-1.12.0_pre17-r2.ebuild: + Pulled Spankys dm-crypt stuff from #128908. + #128283 fixed too. + *baselayout-1.12.0_pre17-r1 (11 Apr 2006) 11 Apr 2006; Roy Marples <uberlord@gentoo.org> diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index ba8510aa9cb0..a814013a071b 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 a717fe19a5bc366e780228678e2998ea ChangeLog 72090 RMD160 15f7d435644f942ceafddd34bd96a3a934f75184 ChangeLog 72090 SHA256 e750b852d7f67d12f5789dcb306c4d7f7e5ce1d5ae135e8f82a10debae1f3627 ChangeLog 72090 @@ -19,6 +16,9 @@ SHA256 bd5def9cf7b389e7866ae944344d95c6383aab20b46224f9ef7707a8f66c639c baselayo MD5 cce7d94746ff6e496e9053bcf921961b baselayout-1.12.0_pre17-r1.ebuild 19919 RMD160 011a365f240c5498355f754ab8a8c15661e7404f baselayout-1.12.0_pre17-r1.ebuild 19919 SHA256 a2cff5bfae0590291586a368ef151f22a90bf0988fc8601094c4e29571bd0781 baselayout-1.12.0_pre17-r1.ebuild 19919 +MD5 431840d2cd5871fdb3ffc1e7043dfc6d baselayout-1.12.0_pre17-r2.ebuild 19919 +RMD160 3b92dab5eeadb1233a15376922158af4fb05124b baselayout-1.12.0_pre17-r2.ebuild 19919 +SHA256 38143c9cb88f6e66912d723fcc1048858a04fbd436e41c0d17f8920e143175b3 baselayout-1.12.0_pre17-r2.ebuild 19919 MD5 1d3a41684700da19c585deb8a07b6829 baselayout-1.12.0_pre17.ebuild 19786 RMD160 4fa8a52da6f8c8161f7acd3aad61cff4d3ce3da9 baselayout-1.12.0_pre17.ebuild 19786 SHA256 38c26b33e33728d92fe514ce81efcbeb4a393fcc985895424962ddc1fd213f70 baselayout-1.12.0_pre17.ebuild 19786 @@ -55,6 +55,9 @@ SHA256 e68b407eabbfd65e097dc6863b5cd8aa834a59a6051df952c1a522c980bb626a files/ba MD5 ddd83e64a002a0e78c72faf4502224c4 files/baselayout-1.12.0_pre17-1975.patch 8299 RMD160 a59144710782422c1cbfdf62c4457f096269ccbf files/baselayout-1.12.0_pre17-1975.patch 8299 SHA256 7850e0aa4c25e5ef427de5376dde696f86e026b40ea65bba30fed98159c8e47e files/baselayout-1.12.0_pre17-1975.patch 8299 +MD5 6e9439c8b6f41c85bfc029b3b407cb08 files/baselayout-1.12.0_pre17-1980.patch 8763 +RMD160 10fda47b32f59c96001b9ae335f20489e3704899 files/baselayout-1.12.0_pre17-1980.patch 8763 +SHA256 c834da93cbcc58852472d07a45cd0f702e587c686dc1129b0e8053a01affeb0f files/baselayout-1.12.0_pre17-1980.patch 8763 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099 @@ -76,13 +79,9 @@ SHA256 b402993965f1966e2b1dc15bb82ae7ca967c39ee6c11323bdb235700864b8fc4 files/di MD5 9320336a070776b1cbb6b259829e7f14 files/digest-baselayout-1.12.0_pre17-r1 274 RMD160 f9d171553d6780f16569e2982362574d0d4d404c files/digest-baselayout-1.12.0_pre17-r1 274 SHA256 b402993965f1966e2b1dc15bb82ae7ca967c39ee6c11323bdb235700864b8fc4 files/digest-baselayout-1.12.0_pre17-r1 274 +MD5 9320336a070776b1cbb6b259829e7f14 files/digest-baselayout-1.12.0_pre17-r2 274 +RMD160 f9d171553d6780f16569e2982362574d0d4d404c files/digest-baselayout-1.12.0_pre17-r2 274 +SHA256 b402993965f1966e2b1dc15bb82ae7ca967c39ee6c11323bdb235700864b8fc4 files/digest-baselayout-1.12.0_pre17-r2 274 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFEO8gMEbVyYKaZ/NERAq4pAJ4yKzIk1UtwLy0naPaRdes0BJCTHgCeNrOs -3tF+romqlAiIZyhz4fnha2Q= -=F93D ------END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre17-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre17-r2.ebuild new file mode 100644 index 000000000000..379689aab8f9 --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.12.0_pre17-r2.ebuild @@ -0,0 +1,628 @@ +# 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.12.0_pre17-r2.ebuild,v 1.1 2006/04/12 15:57:17 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 ~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. +RDEPEND=">=sys-apps/sysvinit-2.86-r3 + !build? ( !bootstrap? ( + >=sys-libs/readline-5.0-r1 + >=app-shells/bash-3.1_p7 + >=sys-apps/coreutils-5.2.1 + ) )" +DEPEND="virtual/os-headers + >=sys-apps/portage-2.0.51" +PROVIDE="virtual/baselayout" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Brings us upto svn rev 1975 + # Fixes #128283, #129331, #129437 and the ccwgroup module. + epatch "${FILESDIR}/${P}-1980.patch" + + # Setup unicode defaults for silly unicode users + if use unicode ; then + sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf + fi + + # Tweak arch-specific details + cd "${S}" + + case $(tc-arch) in + sparc) + sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die + # Disable interactive boot on sparc due to stty calls, #104067 + sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die + ;; + esac + + # Use correct path to filefuncs.so on multilib systems + sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \ + ${S}/src/awk/{cachedepends,genenviron}.awk || die +} + +src_compile() { + local libdir="lib" + + use static && append-ldflags -static + + [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + make -C "${S}"/src \ + CC="$(tc-getCC)" \ + LD="$(tc-getCC) ${LDFLAGS}" \ + CFLAGS="${CFLAGS}" \ + LIBDIR="${libdir}" || die +} + +# ${PATH} should include where to get MAKEDEV when calling this +# function +create_dev_nodes() { + case $(tc-arch) in + # amd64 must use generic-i386 because amd64/x86_64 does not have + # a generic option at this time, and the default 'generic' ends + # up erroring out, because MAKEDEV internally doesn't know what + # to use + arm) suffix=-arm ;; + alpha) suffix=-alpha ;; + amd64) suffix=-i386 ;; + hppa) suffix=-hppa ;; + ia64) suffix=-ia64 ;; + m68k) suffix=-m68k ;; + mips) suffix=-mips ;; + ppc*) suffix=-powerpc ;; + s390) suffix=-s390 ;; + sparc*) suffix=-sparc ;; + x86) suffix=-i386 ;; + esac + + einfo "Using generic${suffix} to make $(tc-arch) device nodes..." + MAKEDEV generic${suffix} + MAKEDEV sg scd rtc hde hdf hdg hdh input audio video +} + +# This is a temporary workaround until bug 9849 is completely solved +# in portage. We need to create the directories so they're available +# during src_install, but when src_install is finished, call unkdir +# to remove any empty directories instead of leaving them around. +kdir() { + typeset -a args + typeset d + + # Create the directories for the remainder of src_install, and + # remember how to create the directories later. + for d in "$@"; do + if [[ $d == /* ]]; then + install -d "${args[@]}" "${D}/${d}" + cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF +if [ ! -d "\${ROOT}/${d}" ] ; then \\ + install -d ${args[@]} "\${ROOT}/${d}" 2>/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 <eradicator@gentoo.org> + # 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.modules.d + kdir ${rcscripts_dir}/net.modules.d/helpers.d + # 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 + + kdir /lib/dev-state + kdir /lib/udev-state + + # 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}\"" > ${D}/etc/env.d/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 version ${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 + # Need this in /sbin, as it could be run before + # /usr is mounted. + dosbin modules-update + # Compat symlinks until I can get things synced. + dosym modules-update /sbin/update-modules + dosym ../../sbin/modules-update /usr/sbin/update-modules + # 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.modules.d ${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 + # + cd "${S}"/src + make DESTDIR="${D}" 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/\<domain_/dns_domain_/g' \ + -e 's/\<mac_domain_/mac_dns_domain_/g' \ + -e 's/\<nameservers_/dns_servers_/g' \ + -e 's/\<mac_nameservers_/mac_dns_servers_/g' \ + -e 's/\<searchdomains_/dns_search_domains_/g' \ + -e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \ + ${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f} + fi +} + +pkg_preinst() { + 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 + + # Reincarnate dirs from kdir/unkdir (hack for bug 9849) + 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 "${ROOT}"/usr/share/baselayout/mkdirs.sh + source "${ROOT}"/usr/share/baselayout/mklinks.sh + + # This could be done in src_install, which would have the benefit of + # (1) devices.tar.bz2 would show up in CONTENTS + # (2) binary installations would be faster... just untar the devices tarball + # instead of needing to run MAKEDEV + # However the most common cases are that people are either updating + # baselayout or installing from scratch. In the installation case, it's no + # different to have here instead of src_install. In the update case, we + # save a couple minutes time by refraining from building the unnecessary + # tarball. + if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then + # Create a directory in which to work + x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \ + && cd "${x}" || die 'mktemp failed' + + # Create temp device nodes + echo + einfo "Making device node tarball (this could take a couple minutes)" + PATH=${ROOT}/sbin:${PATH} create_dev_nodes + + # Now create tarball that can also be used for udev. + # Need GNU tar for -j so call it by absolute path. + /bin/tar --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" * + rm -r * + cd .. + rmdir "${x}" + fi + + # We don't want to create devices if this is not a bootstrap and devfs + # is used, as this was the cause for all the devfs problems we had + if use build || use bootstrap; then + if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then + einfo "Populating /dev with device nodes..." + cd ${ROOT}/dev || die + /bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die + fi + fi + + # 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 + + # 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 + + # Regenerate /etc/modules.conf, else it will fail at next boot + einfo "Updating module dependencies..." + /sbin/modules-update force &>/dev/null + else + rm -f ${ROOT}/etc/modules.conf + fi + + # Enable shadow groups (we need ROOT=/ here, as grpconv only + # operate on / ...). + if [[ ${ROOT} == / && \ + ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]] + then + if /usr/sbin/grpck -r &>/dev/null; then + /usr/sbin/grpconv + else + echo + ewarn "Running 'grpck' returned errors. Please run it by hand, and then" + ewarn "run 'grpconv' afterwards!" + echo + fi + 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 + + for f in /etc/init.d/net.eth*; do + [[ -L ${f} ]] && continue + echo + einfo "WARNING: You have older net.eth* 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 /etc/init.d/net.eth* | 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 '\<(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/baselayout-1.12.0_pre17-1980.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre17-1980.patch new file mode 100644 index 000000000000..300947c4ac7e --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.12.0_pre17-1980.patch @@ -0,0 +1,252 @@ +--- ChangeLog (revision 1964) ++++ ChangeLog (working copy) +@@ -1,6 +1,23 @@ + # ChangeLog for Gentoo System Intialization ("rc") scripts + # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 + ++ 12 Apr 2006; Roy Marples <uberlord@gentoo.org>: ++ ++ vlans can now be configured with their own interface scripts, which ++ means that they can now be renamed, #128283. ++ Thanks to Jonathan deBoer. ++ ++ 11 Apr 2006; Roy Marples <uberlord@gentoo.org>: ++ ++ udhcpc.sh now works with the -q|--quit option again, #129437. ++ ++ 09 Apr 2006; Roy Marples <uberlord@gentoo.org>: ++ ++ RC_COLDPLUG now controls if we add coldplugged services to the boot ++ runlevel or not, #129331. ++ ++ The ccwgroup module now really works! ++ + * baselayout-1.12.0_pre17 (08 Apr 2006) + + 07 Apr 2006; Roy Marples <uberlord@gentoo.org>: +--- etc/conf.d/rc (revision 1964) ++++ etc/conf.d/rc (working copy) +@@ -16,6 +16,17 @@ + + RC_INTERACTIVE="yes" + ++# Dynamic /dev managers can trigger coldplug events which cause services to ++# start before we are ready for them. If this happens, we can defer these ++# services to start in the boot runlevel. If you don't want this then set ++# RC_COLDPLUG to no. ++# For more fine grained control you can list full service names to allow ++# them to coldplug and prefix them with ! so they don't coldplug. ++# Example - RC_COLDLUG="net.wlan !net.*" ++# This allows net.wlan and any service not matching net.* to coldplug. ++ ++RC_COLDPLUG="yes" ++ + # RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service. + # The following values are allowed: + # none - The 'net' service is always considered up. +--- lib/rcscripts/net.modules.d/udhcpc.sh (revision 1964) ++++ lib/rcscripts/net.modules.d/udhcpc.sh (working copy) +@@ -126,9 +126,15 @@ + fi + fi + +- eval start-stop-daemon --start --exec /sbin/udhcpc \ +- --pidfile "${pidfile}" \ +- -- "${opts}" --interface="${iface}" --now \ ++ # Don't use s-s-d if the user wants to quit on lease. ++ if [[ " ${opts} " == *" -q "* || " ${opts} " == *" --quit "* ]]; then ++ x="/sbin/udhcpc" ++ else ++ x="start-stop-daemon --start --exec /sbin/udhcpc \ ++ --pidfile \"${pidfile}\" --" ++ fi ++ ++ eval "${x}" "${opts}" --interface="${iface}" --now \ + --script=/lib/rcscripts/sh/udhcpc.sh \ + --pidfile="${pidfile}" >/dev/null + eend $? || return 1 +--- lib/rcscripts/net.modules.d/ifconfig.sh (revision 1964) ++++ lib/rcscripts/net.modules.d/ifconfig.sh (working copy) +@@ -109,7 +109,7 @@ + ifconfig_is_up() { + local check="\<UP\>" addr="${2:-false}" + ${addr} && check="\<inet addr:.*${check}" +- ifconfig "$1" | grep -Eq "${check}" && return 0 ++ ifconfig "$1" | tr '\n' ' ' | grep -Eq "${check}" && return 0 + return 1 + } + +--- lib/rcscripts/net.modules.d/ccwgroup.sh (revision 1964) ++++ lib/rcscripts/net.modules.d/ccwgroup.sh (working copy) +@@ -11,30 +11,44 @@ + + ccwgroup_pre_start() { + local iface="$1" ifvar="$(bash_variable "$1")" +- local ccwgroup="ccwgroup_${ifvar}[@]" ++ local ccw="ccwgroup_${ifvar}[@]" ++ local -a ccwgroup=( "${!ccw}" ) + +- [[ -z ${!ccwgroup} ]] && return 0 ++ [[ -z ${!ccw} ]] && return 0 + if [[ ! -d /sys/bus/ccwgroup ]] ; then + eerror "ccwgroup support missing in kernel" + return 1 + fi + + einfo "Enabling ccwgroup on ${iface}" +- echo "${!ccwgroup// /,}" > /sys/bus/ccwgroup/drivers/qeth/group +- echo "1" > /sys/devices/qeth/"${!ccwgroup[0]}"/online ++ echo "${!ccw// /,}" > /sys/bus/ccwgroup/drivers/qeth/group ++ echo "1" > /sys/devices/qeth/"${ccwgroup[0]}"/online + eend $? + } + +-ccwgroup_post_stop() { ++ccwgroup_pre_stop() { + local iface="$1" ++ ++ # Erase any existing ccwgroup to be safe ++ save_options ccwgroup_device "" + + [[ ! -L /sys/class/net/"${iface}"/driver ]] && return 0 + local driver="$(readlink /sys/class/net/"${iface}"/driver)" + [[ ${driver} != *"/bus/ccwgroup/"* ]] && return 0 ++ ++ local device="$(readlink /sys/class/net/"${iface}"/device)" ++ device="${device##*/}" ++ save_options ccwgroup_device "${device}" ++} ++ ++ccwgroup_post_stop() { ++ local iface="$1" device="$(get_options ccwgroup_device)" + ++ [[ -z ${device} ]] && return 0 ++ + einfo "Disabling ccwgroup on ${iface}" +- echo "0" > /sys/class/net/"${iface}"/device/online +- echo "1" > /sys/class/net/"${iface}"/device/ungroup ++ echo "0" > /sys/devices/qeth/"${device}"/online ++ echo "1" > /sys/devices/qeth/"${device}"/ungroup + eend $? + } + +--- lib/rcscripts/net.modules.d/vlan.sh (revision 1964) ++++ lib/rcscripts/net.modules.d/vlan.sh (working copy) +@@ -98,9 +98,9 @@ + # + # Always returns 0 (true) + vlan_post_start() { +- local iface="$1" vlan vlans vlans_old e ifname ifvar="$(bash_variable "$1")" +- ++ local iface="$1" vlan vlans vlans_old ifname ifvar="$(bash_variable "$1")" + vlans="vlans_${ifvar}[@]" ++ local start="vlan_start_${ifvar}" + + # BACKWARD COMPATIBILITY: check for old vlan variable name + vlans_old="iface_${ifvar}_vlans" +@@ -121,6 +121,11 @@ + fi + eend 0 + ++ # We may not want to start the vlan ourselves, but ++ # as a seperate init script. This allows the vlan to be ++ # renamed if needed. ++ [[ -n ${!start} && ${!start} != "yes" ]] && continue ++ + # We need to work out the interface name of our new vlan id + ifname="$( \ + sed -n -e 's/^\([^ \t]*\) *| '"${vlan}"' *| .*'"${iface}"'$/\1/p' \ +--- init.d/net.lo (revision 1964) ++++ init.d/net.lo (working copy) +@@ -1086,19 +1086,6 @@ + # which localises variables and unsets functions + start() { + declare -r IFACE="${SVCNAME#*.}" +- if [[ ${IN_HOTPLUG} == "1" ]] ; then +- # If we've been called by hotplug, check if we have +- # a policy for the interface for not starting +- local x ifvar="$(bash_variable "${IFACE}")" +- x="hotplug_${ifvar}" +- if [[ ${!x} == "no" || ${!x} == "false" ]] ; then +- eerror "Not starting interface ${IFACE} due to hotplug policy" +- unset -f exit +- mark_service_stopped "net.${IFACE}" +- exit 1 +- fi +- fi +- + einfo "Starting ${IFACE}" + run "${IFACE}" start + } +--- etc/conf.d/net.example (revision 1964) ++++ etc/conf.d/net.example (working copy) +@@ -21,15 +21,6 @@ + # read through the rest of this file. + + ############################################################################## +-# DEFAULTS +-# +-# hotplug_eth0="yes" +-# Do we allow hotplug to bring up interfaces or not? The default is we do, +-# otherwise put no in the above value. +-# NOTE: hotplug just has to be installed for hotplugging to work - it does +-# not matter if it's in any runlevel or not. +- +-############################################################################## + # MODULES + # + # We now support modular networking scripts which means we can easily +@@ -325,7 +316,16 @@ + # NOTE: Vlans are controlled by their physical interface and not per vlan + # This means you do not need to create init scripts in /etc/init.d for each + # vlan, you must need to create one for the physical interface. ++# If you wish to control the configuration of each vlan through a seperate ++# script, or wish to rename the vlan interface to something that vconfig ++# cannot then you need to do this. ++#vlan_start_eth0="no + ++# If you do the above then you may want to depend on eth0 like so ++# depend_vlan1() { ++# need net.eth0 ++# } ++ + #----------------------------------------------------------------------------- + # Bonding + # For link bonding/trunking emerge net-misc/ifenslave +@@ -361,7 +361,7 @@ + #link_ppp0="/dev/ttyS0" # Most PPP links will use a serial port + #link_ppp0="eth0" # PPPoE requires an ethernet interface + #link_ppp0="/dev/null" # PPPoA and ISDN links should have this +-#link_ppp0="pty $(your_link_command)" # PPP links over ssh, rsh, etc ++#link_ppp0="pty 'your_link_command'" # PPP links over ssh, rsh, etc + # + # Here you should specify what pppd plugins you want to use + # Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius, +--- sbin/runscript.sh (revision 1964) ++++ sbin/runscript.sh (working copy) +@@ -27,6 +27,14 @@ + # until after rc sysinit has completed so we punt them to the boot runlevel + if [[ -e /dev/.rcsysinit ]] ; then + eerror "ERROR: cannot run ${SVCNAME} until sysinit completes" ++ [[ ${RC_COLDPLUG} == "no" ]] && exit 1 ++ if [[ ${RC_COLDPLUG} != "yes" ]] ; then ++ for x in ${RC_COLDPLUG} ; do ++ # We don't quote ${x} so we can do globbing ++ [[ ${SVCNAME} == ${x} ]] && break ++ [[ "!${SVCNAME}" == ${x} ]] && exit 1 ++ done ++ fi + eerror "${SVCNAME} will be started in the ${BOOTLEVEL} runlevel" + if [[ ! -L /dev/.rcboot/"${SVCNAME}" ]] ; then + [[ ! -d /dev/.rcboot ]] && mkdir /dev/.rcboot +--- sbin/rc (revision 1964) ++++ sbin/rc (working copy) +@@ -164,7 +164,7 @@ + CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}" + done + else +- CRITICAL_SERVICES="checkroot modules checkfs localmount clock bootmisc" ++ CRITICAL_SERVICES="checkroot modules checkfs localmount clock" + fi + + export CRITICAL_SERVICES diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre17-r2 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre17-r2 new file mode 100644 index 000000000000..47f43b58e760 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre17-r2 @@ -0,0 +1,3 @@ +MD5 42e6986a537fb6441ae54458c3eecdce baselayout-1.12.0_pre17.tar.bz2 211742 +RMD160 42e8cdabcca13987f94c22863e05a97d20a69336 baselayout-1.12.0_pre17.tar.bz2 211742 +SHA256 c45fd4f38c6ce2e090b95ff267a5344debb23b1a39e37cda48faf7db787991fa baselayout-1.12.0_pre17.tar.bz2 211742 |