Add eradicator's latest multilib patch for amd64. This ebuild is marked
authorAron Griffis <agriffis@gentoo.org>
Wed, 12 Jan 2005 16:25:03 +0000 (16:25 +0000)
committerAron Griffis <agriffis@gentoo.org>
Wed, 12 Jan 2005 16:25:03 +0000 (16:25 +0000)
~amd64 only, but the changes should roll forward for all arches in 1.11.9

sys-apps/baselayout/ChangeLog
sys-apps/baselayout/Manifest
sys-apps/baselayout/baselayout-1.11.7-r2.ebuild
sys-apps/baselayout/baselayout-1.11.8-r1.ebuild [new file with mode: 0644]
sys-apps/baselayout/baselayout-1.11.8.ebuild
sys-apps/baselayout/baselayout-1.9.4-r6.ebuild
sys-apps/baselayout/files/digest-baselayout-1.11.8-r1 [new file with mode: 0644]

index 033a530888d630f38d93d42ac1228683ec953eb3..0e6c0ec4602ba0b71bfa7b6207a00548c95119bc 100644 (file)
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.195 2004/12/16 03:13:34 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.196 2005/01/12 16:25:03 agriffis 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.11.8-r1 (12 Jan 2005)
+
+  12 Jan 2005; Aron Griffis <agriffis@gentoo.org>
+  +baselayout-1.11.8-r1.ebuild:
+  Add eradicator's latest multilib patch for amd64. This ebuild is marked
+  ~amd64 only, but the changes should roll forward for all arches in 1.11.9
+
 *baselayout-1.11.8 (15 Dec 2004)
 
   15 Dec 2004; Mike Frysinger <vapier@gentoo.org> +baselayout-1.11.8.ebuild:
index b1cd15607a5f8aa46881267346624572d3bddd57..748f34e2817ec8eed07662cdd0a0d9f39a1bbcba 100644 (file)
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 06dcdd778f9ef7a40b2f6931d7a99cf1 ChangeLog 44074
-MD5 03598cb7f42925d271d258b732f21739 baselayout-1.11.7-r2.ebuild 15743
-MD5 c32a6b41087ad12b996c4246fe28f492 baselayout-1.11.8.ebuild 15653
-MD5 5a6e60d4a0e6baf8f051488786595d0c baselayout-1.9.4-r6.ebuild 16833
+MD5 2349d3b70df074fa2a993d768394dca1 ChangeLog 44346
+MD5 c79e8a69ea8161be1c6fc7aea865206e baselayout-1.11.7-r2.ebuild 15745
+MD5 d9e60daa58a85965186f7dbecac8516d baselayout-1.11.8.ebuild 15655
+MD5 768d5bda8d55d4299d5248998cfc061d baselayout-1.11.8-r1.ebuild 16091
+MD5 245e39f14052cacd4e495fa02ecf2163 baselayout-1.9.4-r6.ebuild 16835
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8 69
-MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493
 MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r2 69
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
-MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
+MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493
+MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8 69
 MD5 0ba12277a13275a24b5754c0a89010bb files/rc-scripts-1.6.7-dhclient.patch 433
 MD5 ab2cacf47e6d0e69a8d1eb729c840a29 files/rc-scripts-1.6.7-udhcpc.patch 653
-MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
 MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBwP1kroRuSHgZdywRArp1AJ0RgVN4n5MtlXtDcMXPGwHgaOCfkwCggjEp
-oeeCcmV/jRG/01Y86MiRmtU=
-=7E8w
------END PGP SIGNATURE-----
+MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
+MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8-r1 69
index 1c22d7790c9b9fd298c2b959702f88212e5b77f3..b59d85ab76c7c8376420cea83ab07db144fdf473 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild,v 1.3 2004/12/07 03:14:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild,v 1.4 2005/01/12 16:25:03 agriffis Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
diff --git a/sys-apps/baselayout/baselayout-1.11.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.8-r1.ebuild
new file mode 100644 (file)
index 0000000..d12a837
--- /dev/null
@@ -0,0 +1,522 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8-r1.ebuild,v 1.1 2005/01/12 16:25:03 agriffis Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+SV=1.6.8               # rc-scripts version
+SVREV=                 # rc-scripts rev
+
+S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
+       http://dev.gentoo.org/~vapier/dist/rc-scripts-${SV}${SVREV}.tar.bz2"
+#      http://dev.gentoo.org/~agriffis/rc-scripts/rc-scripts-${SV}${SVREV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bootstrap build livecd static uclibc"
+
+# 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.84
+       !build? ( !bootstrap? (
+               >=sys-libs/readline-5.0-r1
+               >=app-shells/bash-3.0-r7
+       ) )"
+DEPEND="virtual/os-headers"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       # Fix Sparc specific stuff
+       if [[ ${ARCH} == sparc ]] ; then
+               sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
+       fi
+}
+
+src_compile() {
+       use static && append-ldflags -static
+
+       make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
+               CFLAGS="${CFLAGS}" || die
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+       case ${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 ${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
+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"
+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
+}
+
+src_install() {
+       local dir libdirs libdirs_env
+
+       # 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
+
+       einfo "Creating directories..."
+       kdir /usr
+       kdir /usr/local
+       kdir /usr/X11R6/
+       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 /lib/dev-state
+       kdir /lib/udev-state
+       kdir /lib/rcscripts/awk
+       kdir /lib/rcscripts/sh
+       dodir /lib/rcscripts/net.modules.d      # .keep file messes up net.lo
+       dodir /lib/rcscripts/net.modules.d/helpers.d
+       kdir /mnt
+       kdir -m 0700 /mnt/cdrom
+       kdir -m 0700 /mnt/floppy
+       kdir /opt
+       kdir -o root -g uucp -m0755 /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 /usr/portage
+       kdir /usr/sbin
+       kdir /usr/share/doc
+       kdir /usr/share/info
+       kdir /usr/share/man
+       kdir /usr/share/misc
+       kdir /usr/src
+       kdir /usr/X11R6/include/GL
+       kdir /usr/X11R6/include/X11
+       kdir /usr/X11R6/man
+       kdir /usr/X11R6/share
+       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
+
+       # 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...
+       for dir in libdirs; do
+               kdir /${dir}
+               kdir /usr/${dir}
+               kdir /usr/local/${dir}
+               kdir /usr/X11R6/${dir}
+               libdirs_env="${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}"
+       done
+
+       # FHS compatibility symlinks stuff
+       dosym /var/tmp /usr/tmp
+       dosym ../../share/info  /usr/X11R6/share/info
+       dosym /usr/X11R6/include/X11 /usr/include/X11
+       dosym /usr/X11R6/include/GL /usr/include/GL
+       dosym /usr/X11R6/lib/X11 /usr/lib/X11
+       dosym share/man /usr/local/man
+
+       #
+       # Setup files in /etc
+       #
+       dosym  ../proc/filesystems /etc/filesystems
+
+       insopts -m0644
+       insinto /etc
+       find ${S}/etc -type f -maxdepth 1 -print0 | xargs --null doins
+
+       # 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
+
+       cp -P ${S}/init.d/* ${D}/etc/init.d
+       chmod a+x ${D}/etc/init.d/*
+       insinto /etc/conf.d
+       doins ${S}/etc/conf.d/*
+       insinto /etc/env.d
+       doins ${S}/etc/env.d/*
+       insinto /etc/modules.autoload.d
+       doins ${S}/etc/modules.autoload.d/*
+       insinto /etc/modules.d
+       doins ${S}/etc/modules.d/*
+       insinto /etc/skel
+       find ${S}/etc/skel -type f -maxdepth 1 -print0 | xargs --null doins
+
+       # List all the multilib libdirs in /etc/env/04multilib
+       echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
+
+       # 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
+
+       # uclibc doesn't need nsswitch.conf... added by solar
+       use uclibc && rm -f ${D}/etc/nsswitch.conf
+
+       # rc-scripts version for testing of features that *should* be present
+       echo "Gentoo Base System version ${SV}" > ${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
+       if use livecd; then
+               dobin bashlogin
+       fi
+
+       #
+       # 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
+       use livecd && dosbin livecd-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 /lib/rcscripts/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 /lib/rcscripts/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 /lib/rcscripts
+       cp -a ${S}/lib/rcscripts/net.modules.d ${D}/lib/rcscripts
+
+       #
+       # 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
+}
+
+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
+}
+
+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
+
+       # 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 cjlpf "${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 ${ROOT}/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 &>/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 ${SV}" > ${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
+}
index 21aae176d5260283520c144e96a7660f4222a92a..fd2c125a4ccc469f983d56addc1e7cd441ce88af 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8.ebuild,v 1.1 2004/12/16 03:13:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8.ebuild,v 1.2 2005/01/12 16:25:03 agriffis Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
index 31bec4f2a9f717886d44abefa54e05a8f1d4dfc3..45207edf9326e4a9281b4b24d3efdfcd7af4175d 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.3 2004/11/12 15:37:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.4 2005/01/12 16:25:03 agriffis Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.8-r1 b/sys-apps/baselayout/files/digest-baselayout-1.11.8-r1
new file mode 100644 (file)
index 0000000..1c2c95a
--- /dev/null
@@ -0,0 +1 @@
+MD5 fb0da609476e9f85f4f1905526d47d42 rc-scripts-1.6.8.tar.bz2 161013