diff options
author | Roy Marples <uberlord@gentoo.org> | 2005-03-23 14:50:22 +0000 |
---|---|---|
committer | Roy Marples <uberlord@gentoo.org> | 2005-03-23 14:50:22 +0000 |
commit | da217fe2953cf8ed412c5bbc91358ea4eabfdd44 (patch) | |
tree | 09dc9cd0719b6e7f08feba2e73559406ce18978a /sys-apps/baselayout | |
parent | Don't forget to export MOZILLA_LAUNCHER=mozilla, duh (diff) | |
download | gentoo-2-da217fe2953cf8ed412c5bbc91358ea4eabfdd44.tar.gz gentoo-2-da217fe2953cf8ed412c5bbc91358ea4eabfdd44.tar.bz2 gentoo-2-da217fe2953cf8ed412c5bbc91358ea4eabfdd44.zip |
bridge stops removing IP addresses from bridge ports.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r-- | sys-apps/baselayout/ChangeLog | 14 | ||||
-rw-r--r-- | sys-apps/baselayout/Manifest | 52 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10-r3.ebuild | 550 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.12.0_alpha1-r3.ebuild | 553 | ||||
-rw-r--r-- | sys-apps/baselayout/files/baselayout-1.11.10-bridge.patch | 105 | ||||
-rw-r--r-- | sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch | 105 | ||||
-rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-1.11.10-r3 | 1 | ||||
-rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r3 | 1 |
8 files changed, 1352 insertions, 29 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 63484bf25df8..737dacbcb39c 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,22 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.220 2005/03/16 09:38:50 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.221 2005/03/23 14:50:22 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_alpha1-r3 (23 Mar 2005) +*baselayout-1.11.10-r3 (23 Mar 2005) + + 23 Mar 2005; Roy Marples <uberlord@gentoo.org> + +files/baselayout-1.11.10-bridge.patch, + +files/baselayout-1.12.0_alpha1-bridge.patch, +baselayout-1.11.10-r3.ebuild, + +baselayout-1.12.0_alpha1-r3.ebuild: + bridge stops removing IP addresses from bridge ports. + iwconfig no longer tries to get an ESSID from non-wireless interfaces. + ifconfig no longer errors when deleting addresses on a non-existant + interface. + 16 Mar 2005; Martin Schlemmer <azarah@gentoo.org> baselayout-1.12.0_alpha1-r2.ebuild: Stop defaulting WEP key to [1] as it messes with ndiswrapper users. diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index aec7b9ba65ab..11570068c9b9 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,42 +1,38 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 32a232fb46efafb0fdaba5d5246e7572 baselayout-1.11.10-r1.ebuild 16885 -MD5 9235d9c043b0e87a73a7e89120c7d4ba ChangeLog 50147 -MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 MD5 63fe1de96f6485a4e395d1a9132b8b33 baselayout-1.11.8-r3.ebuild 16828 -MD5 30d111c4ff4ffa5712a71ab4ac7e2c02 baselayout-1.11.9-r1.ebuild 17015 -MD5 a564d6194f6a91d76d572a0f934c4faa baselayout-1.9.4-r7.ebuild 18143 MD5 7875c929dd71e995da27936c6d859717 baselayout-1.9.4-r6.ebuild 16862 +MD5 acc78683b0e6e21c1e7a1a7c7064d782 baselayout-1.12.0_alpha1-r3.ebuild 17588 +MD5 71499750a0b6dd7f63e07396d0c85ec0 baselayout-1.11.10-r3.ebuild 17251 MD5 d124ceab1208e23c4d2b5ce5eb2a882b baselayout-1.11.10.ebuild 16827 -MD5 090789f9ee35e61ba4c68e048a474e4a baselayout-1.11.10-r2.ebuild 17000 MD5 9f85c4efd4f7184fe238eff95a1c0877 baselayout-1.12.0_alpha1-r2.ebuild 17338 -MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r1 70 +MD5 090789f9ee35e61ba4c68e048a474e4a baselayout-1.11.10-r2.ebuild 17000 +MD5 30d111c4ff4ffa5712a71ab4ac7e2c02 baselayout-1.11.9-r1.ebuild 17015 +MD5 a564d6194f6a91d76d572a0f934c4faa baselayout-1.9.4-r7.ebuild 18143 +MD5 9235d9c043b0e87a73a7e89120c7d4ba ChangeLog 50147 +MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 +MD5 ac58e9ede6c66a62f98e5689db00a363 files/baselayout-1.11.10-bridge.patch 3547 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443 +MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380 MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10 70 -MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 -MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612 +MD5 b0b2829c9b59059ebca066bcde6410b0 files/baselayout-1.12.0_alpha1-bridge.patch 3500 +MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251 +MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206 MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8-r3 69 -MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387 -MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724 -MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251 -MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134 -MD5 b4092f5ec486d78aa60a04777bb840a8 files/rc-scripts-1.4.16-livecd.patch 1420 -MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r2 70 MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69 -MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134 MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579 -MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380 +MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612 +MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r1 70 +MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r2 70 +MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r3 70 MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266 -MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925 +MD5 2fdc18068389dc7268dddad2bae82dfe files/baselayout-1.12.0_alpha1-modules-return-clobber.patch 550 MD5 4222104e326e50e3c570c82a31070138 files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch 528 MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r2 69 -MD5 2fdc18068389dc7268dddad2bae82dfe files/baselayout-1.12.0_alpha1-modules-return-clobber.patch 550 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCN/9+1ZcsMnZjRyIRAkVGAKCnBaeH0juGDhGOa/IVFXWmNriiQQCdGqUL -sMMCaSzwVoUYThqx8P/5j6M= -=xr+5 ------END PGP SIGNATURE----- +MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r3 69 +MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 +MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724 +MD5 b4092f5ec486d78aa60a04777bb840a8 files/rc-scripts-1.4.16-livecd.patch 1420 +MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925 +MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134 +MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134 diff --git a/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild new file mode 100644 index 000000000000..6a889495aaba --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild @@ -0,0 +1,550 @@ +# 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.10-r3.ebuild,v 1.1 2005/03/23 14:50:22 uberlord Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +SV=1.6.10 # 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" + +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" +PROVIDE="virtual/baselayout" + +src_unpack() { + unpack ${A} + cd ${S} + + # Bug #84999 + epatch ${FILESDIR}/${P}-iwconfig.patch + + # Stop defaulting WEP key to [1] as it messes with ndiswrapper users + epatch ${FILESDIR}/${P}-iwconfig-2.patch + + # Stops removing IP addresses from bridge ports + # Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface + # Fixes ifconfig from erroring when deleting addresses on a non-existant + # interface + epatch ${FILESDIR}/${P}-bridge.patch + + # Fix Sparc specific stuff + if [[ $(tc-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 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 /lib/dev-state + kdir /lib/udev-state + kdir ${rcscripts_dir} + kdir ${rcscripts_dir}/awk + kdir ${rcscripts_dir}/sh + dodir ${rcscripts_dir}/net.modules.d # .keep file messes up net.lo + dodir ${rcscripts_dir}/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 -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 + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib + fi + + # FHS compatibility symlinks stuff + dosym /var/tmp /usr/tmp + dosym share/man /usr/local/man + + # + # Setup files in /etc + # + insopts -m0644 + insinto /etc + find ${S}/etc -maxdepth 1 -type f -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 -maxdepth 1 -type f -print0 | xargs --null doins + + # 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 + + # 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 ${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 -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir} + chown -R root:root ${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 +} + +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 +} diff --git a/sys-apps/baselayout/baselayout-1.12.0_alpha1-r3.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r3.ebuild new file mode 100644 index 000000000000..ef7af3b1548c --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r3.ebuild @@ -0,0 +1,553 @@ +# 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.12.0_alpha1-r3.ebuild,v 1.1 2005/03/23 14:50:22 uberlord Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +SV=1.7.0 # 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" + +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" +PROVIDE="virtual/baselayout" + +src_unpack() { + unpack ${A} + cd ${S} + + # Fix Sparc specific stuff + if [[ $(tc-arch) == "sparc" ]] ; then + sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die + fi + + # Fix my booboo + epatch ${FILESDIR}/${P}-fixup-depends_awk.patch + # Export myservice when starting critical services, as its needed by + # some of the addons (dmcrypt for example). + epatch ${FILESDIR}/${P}-export-myservice-for-critical.patch + # Syntax changes to init.d/modules made last test clobber return. + epatch ${FILESDIR}/${P}-modules-return-clobber.patch + # Stop defaulting WEP key to [1] as it messes with ndiswrapper users + epatch ${FILESDIR}/${PN}-1.11.10-iwconfig-2.patch + # Stops removing IP addresses from bridge ports + # Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface + # Fixes ifconfig from erroring when deleting addresses on a non-existant + # interface + epatch ${FILESDIR}/${P}-bridge.patch +} + +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 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 /lib/dev-state + kdir /lib/udev-state + kdir ${rcscripts_dir} + kdir ${rcscripts_dir}/awk + kdir ${rcscripts_dir}/sh + dodir ${rcscripts_dir}/net.modules.d # .keep file messes up net.lo + dodir ${rcscripts_dir}/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 -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 + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib + fi + + # FHS compatibility symlinks stuff + dosym /var/tmp /usr/tmp + dosym share/man /usr/local/man + + # + # Setup files in /etc + # + insopts -m0644 + insinto /etc + find ${S}/etc -maxdepth 1 -type f -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 -maxdepth 1 -type f -print0 | xargs --null doins + + # 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 + + # 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 ${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 -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir} + chown -R root:root ${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 +} + +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 --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 ${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 +} diff --git a/sys-apps/baselayout/files/baselayout-1.11.10-bridge.patch b/sys-apps/baselayout/files/baselayout-1.11.10-bridge.patch new file mode 100644 index 000000000000..1cf2c588f28a --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.11.10-bridge.patch @@ -0,0 +1,105 @@ +Index: lib/rcscripts/net.modules.d/bridge +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/bridge,v +retrieving revision 1.9.4.7 +diff -u -B -r1.9.4.7 bridge +--- lib/rcscripts/net.modules.d/bridge 8 Mar 2005 16:07:30 -0000 1.9.4.7 ++++ lib/rcscripts/net.modules.d/bridge 23 Mar 2005 13:11:04 -0000 +@@ -113,20 +113,20 @@ + for i in ${ports}; do + interface_exists ${i} && continue + eerror "interface ${i} does not exist" +- bridge_stop ${iface} &>/dev/null + return 1 + done + + for i in ${ports}; do + ebegin "${i}" +- e=$( brctl addif ${iface} ${i} 2>&1 \ +- && interface_del_addresses ${i} \ +- && interface_set_flag ${i} promisc true \ +- && interface_up ${i} ) ++ interface_set_flag ${i} promisc true ++ interface_up ${i} ++ e=$( brctl addif ${iface} ${i} 2>&1 ) + if [[ -n ${e} ]]; then + eend 1 "${e}" ++ interface_set_flag ${i} promisc false + return 1 + fi ++ eend 0 + done + eoutdent + +@@ -150,7 +150,6 @@ + eindent + for i in ${ports}; do + ebegin "Removing port ${i}" +- interface_down ${i} + interface_set_flag ${i} promisc false + brctl delif ${iface} ${i} &>${devnull} + eend $? +Index: lib/rcscripts/net.modules.d/ifconfig +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/ifconfig,v +retrieving revision 1.21.4.7 +diff -u -B -r1.21.4.7 ifconfig +--- lib/rcscripts/net.modules.d/ifconfig 31 Jan 2005 11:17:29 -0000 1.21.4.7 ++++ lib/rcscripts/net.modules.d/ifconfig 23 Mar 2005 13:11:04 -0000 +@@ -150,6 +150,9 @@ + # We don't remove addresses from aliases + [[ ${iface} == *:* ]] && return 0 + ++ # If the interface doesn't exist, don't try and delete ++ ifconfig_exists ${iface} || return 0 ++ + # iproute2 can add many addresses to an iface unlike ifconfig ... + # iproute2 added addresses cause problems for ifconfig + # as we delete an address, a new one appears, so we have to +Index: lib/rcscripts/net.modules.d/iwconfig +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/iwconfig,v +retrieving revision 1.7.2.17 +diff -u -B -r1.7.2.17 iwconfig +--- lib/rcscripts/net.modules.d/iwconfig 21 Mar 2005 16:06:04 -0000 1.7.2.17 ++++ lib/rcscripts/net.modules.d/iwconfig 23 Mar 2005 13:11:05 -0000 +@@ -890,7 +890,10 @@ + # Configures ESSID variable + # Always returns 0 + iwconfig_pre_stop() { +- ESSID=$( iwconfig_get_essid ${1} ) +- ESSIDVAR=${ESSID//[![:word:]]/_} ++ unset ESSID ESSIDVAR ++ if iwconfig_check_extensions $1 ; then ++ ESSID=$( iwconfig_get_essid $1 ) ++ ESSIDVAR=${ESSID//[![:word:]]/_} ++ fi + return 0 + } +Index: lib/rcscripts/net.modules.d/wpa_supplicant +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/wpa_supplicant,v +retrieving revision 1.2.2.12 +diff -u -B -r1.2.2.12 wpa_supplicant +--- lib/rcscripts/net.modules.d/wpa_supplicant 4 Mar 2005 08:00:25 -0000 1.2.2.12 ++++ lib/rcscripts/net.modules.d/wpa_supplicant 23 Mar 2005 13:11:05 -0000 +@@ -217,6 +217,19 @@ + return 0 + } + ++# bool wpa_supplicant_pre_stop(char *iface) ++# ++# Configures ESSID variable ++# Always returns 0 ++wpa_supplicant_pre_stop() { ++ unset ESSID ESSIDVAR ++ if wpa_supplicant_check_extensions $1 ; then ++ ESSID=$( iwconfig_get_essid $1 ) ++ ESSIDVAR=${ESSID//[![:word:]]/_} ++ fi ++ return 0 ++} ++ + # bool wpa_supplicant_post_stop(char *iface) + # + # Stops wpa_supplicant on an interface diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch new file mode 100644 index 000000000000..2c5ada38ec4e --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch @@ -0,0 +1,105 @@ +Index: lib/rcscripts/net.modules.d/bridge +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/bridge,v +retrieving revision 1.17 +diff -u -B -r1.17 bridge +--- lib/rcscripts/net.modules.d/bridge 8 Mar 2005 16:04:18 -0000 1.17 ++++ lib/rcscripts/net.modules.d/bridge 23 Mar 2005 13:16:21 -0000 +@@ -103,20 +103,20 @@ + for i in ${ports}; do + interface_exists ${i} && continue + eerror "interface ${i} does not exist" +- bridge_stop ${iface} &>/dev/null + return 1 + done + + for i in ${ports}; do + ebegin "${i}" +- e=$( brctl addif ${iface} ${i} 2>&1 \ +- && interface_del_addresses ${i} \ +- && interface_set_flag ${i} promisc true \ +- && interface_up ${i} ) ++ interface_set_flag ${i} promisc true ++ interface_up ${i} ++ e=$( brctl addif ${iface} ${i} 2>&1 ) + if [[ -n ${e} ]]; then + eend 1 "${e}" ++ interface_set_flag ${i} promisc false + return 1 + fi ++ eend 0 + done + eoutdent + +@@ -140,7 +140,6 @@ + eindent + for i in ${ports}; do + ebegin "Removing port ${i}" +- interface_down ${i} + interface_set_flag ${i} promisc false + brctl delif ${iface} ${i} &>${devnull} + eend $? +Index: lib/rcscripts/net.modules.d/ifconfig +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/ifconfig,v +retrieving revision 1.32 +diff -u -B -r1.32 ifconfig +--- lib/rcscripts/net.modules.d/ifconfig 10 Feb 2005 17:04:03 -0000 1.32 ++++ lib/rcscripts/net.modules.d/ifconfig 23 Mar 2005 13:16:21 -0000 +@@ -146,6 +146,9 @@ + # We don't remove addresses from aliases + [[ ${iface} == *:* ]] && return 0 + ++ # If the interface doesn't exist, don't try and delete ++ ifconfig_exists ${iface} || return 0 ++ + # iproute2 can add many addresses to an iface unlike ifconfig ... + # iproute2 added addresses cause problems for ifconfig + # as we delete an address, a new one appears, so we have to +Index: lib/rcscripts/net.modules.d/iwconfig +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/iwconfig,v +retrieving revision 1.30 +diff -u -B -r1.30 iwconfig +--- lib/rcscripts/net.modules.d/iwconfig 14 Mar 2005 16:57:44 -0000 1.30 ++++ lib/rcscripts/net.modules.d/iwconfig 23 Mar 2005 13:16:22 -0000 +@@ -893,7 +893,10 @@ + # Configures ESSID variable + # Always returns 0 + iwconfig_pre_stop() { +- ESSID=$( iwconfig_get_essid $1 ) +- ESSIDVAR=${ESSID//[![:word:]]/_} ++ unset ESSID ESSIDVAR ++ if iwconfig_check_extensions $1 ; then ++ ESSID=$( iwconfig_get_essid $1 ) ++ ESSIDVAR=${ESSID//[![:word:]]/_} ++ fi + return 0 + } +Index: lib/rcscripts/net.modules.d/wpa_supplicant +=================================================================== +RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/wpa_supplicant,v +retrieving revision 1.19 +diff -u -B -r1.19 wpa_supplicant +--- lib/rcscripts/net.modules.d/wpa_supplicant 4 Mar 2005 07:59:53 -0000 1.19 ++++ lib/rcscripts/net.modules.d/wpa_supplicant 23 Mar 2005 13:16:22 -0000 +@@ -234,6 +234,19 @@ + return 0 + } + ++# bool wpa_supplicant_pre_stop(char *iface) ++# ++# Configures ESSID variable ++# Always returns 0 ++wpa_supplicant_pre_stop() { ++ unset ESSID ESSIDVAR ++ if wpa_supplicant_check_extensions $1 ; then ++ ESSID=$( iwconfig_get_essid $1 ) ++ ESSIDVAR=${ESSID//[![:word:]]/_} ++ fi ++ return 0 ++} ++ + # bool wpa_supplicant_post_stop(char *iface) + # + # Stops wpa_supplicant on an interface diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r3 b/sys-apps/baselayout/files/digest-baselayout-1.11.10-r3 new file mode 100644 index 000000000000..5be60709a381 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.11.10-r3 @@ -0,0 +1 @@ +MD5 6a585da151e2d8b7acda5e01e737347b rc-scripts-1.6.10.tar.bz2 159096 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r3 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r3 new file mode 100644 index 000000000000..8224a85cdd49 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r3 @@ -0,0 +1 @@ +MD5 afa07a4242fab5d085813c8e97a43345 rc-scripts-1.7.0.tar.bz2 162694 |