diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-05-21 09:01:37 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-05-21 09:01:37 +0000 |
| commit | ab160f2acea93cccd6060c5948a803c4f1253493 (patch) | |
| tree | 93d9b171a0ceb867a84aaab4b123178228e2fdad /sys-apps | |
| parent | Fix major bug (diff) | |
| download | gentoo-2-ab160f2acea93cccd6060c5948a803c4f1253493.tar.gz gentoo-2-ab160f2acea93cccd6060c5948a803c4f1253493.tar.bz2 gentoo-2-ab160f2acea93cccd6060c5948a803c4f1253493.zip | |
Fix major bug
Diffstat (limited to 'sys-apps')
15 files changed, 11 insertions, 1929 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 84e3a551801a..bac6a4a390ef 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.78 2003/05/20 20:49:30 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.79 2003/05/21 09:01:14 azarah Exp $ + +*baselayout-1.8.6.8-r1 (21 May 2003) + + 21 May 2003; Martin Schlemmer <azaraht@gentoo.org> Manifest, baselayout-1.8.6.8-r1.ebuild, + files/rc-scripts-1.4.3.8p1.tar.bz2: + Fix a bad bug that I missed, bug #21376. *baselayout-1.8.6.8 (20 May 2003) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 7d63e412bfb5..65d9dccbf358 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,24 +1,12 @@ -MD5 6943a2fd5703a109484802892e9bbe11 ChangeLog 15015 -MD5 41752745c674aec9b15d556f9a3a9d42 baselayout-1.8.6.5.ebuild 18884 -MD5 22cacb1440a77ed686fa6ff4ae9a1191 baselayout-1.8.5.8.ebuild 15844 +MD5 19e274c5049372966b29341f413fdbf3 ChangeLog 15228 MD5 f2ed226803abb346ff0091271418b6a2 baselayout-1.8.5.9.ebuild 15939 -MD5 a0bfa5606b3f2887d0bc579ac23e7818 baselayout-1.8.6.6.ebuild 18880 -MD5 3c2b98a48aad4d582fc3b8a0151d4fd7 baselayout-1.8.6.8-r1.ebuild 19303 +MD5 1e68909674c8670e39b41c756be15ced baselayout-1.8.6.8-r1.ebuild 19306 MD5 190bd92a210e53f4c8334d09d3ec40fc baselayout-1.8.6.7.ebuild 19402 -MD5 50337182e7b4257fc8f052281370db58 baselayout-1.8.6.8.ebuild 19301 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 MD5 a0bbfe8eed08e0f2faced365b96e3bad files/rc-scripts-1.4.3.8p1.tar.bz2 95476 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.8 64 -MD5 a32a9e5e0459deedba5c8355ec21b463 files/rc-scripts-1.4.3.5.tar.bz2 89804 -MD5 1854fffe49998cb27f6b093fb79d3b40 files/rc-scripts-1.4.2.8.tar.bz2 79003 MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.9 64 MD5 963a1c8eb93fbf75d215a832b039c65a files/rc-scripts-1.4.2.9.tar.bz2 78886 -MD5 3c138c67dda0de11752896ea4347e060 files/rc-scripts-1.4.3.6.tar.bz2 90790 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.6 64 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.8 64 -MD5 bf73ae12c68f95c2849cb6896780fc98 files/rc-scripts-1.4.3.8.tar.bz2 93659 MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.7 64 MD5 e052f896b2ab38e3b7804083c2e182c7 files/rc-scripts-1.4.3.7.tar.bz2 94779 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.5 64 MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.8-r1 64 diff --git a/sys-apps/baselayout/baselayout-1.8.5.8.ebuild b/sys-apps/baselayout/baselayout-1.8.5.8.ebuild deleted file mode 100644 index 4794bc14af4f..000000000000 --- a/sys-apps/baselayout/baselayout-1.8.5.8.ebuild +++ /dev/null @@ -1,565 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.8.ebuild,v 1.10 2003/03/11 11:30:08 zwelch Exp $ - -IUSE="bootstrap build" - -SV="1.4.2.8" -SVREV="" -# SysvInit version -SVIV="2.84" - -S="${WORKDIR}/rc-scripts-${SV}" -S2="${WORKDIR}/sysvinit-${SVIV}/src" -DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)" -SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz - ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz" -# http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2" -HOMEPAGE="http://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc alpha mips hppa arm" - -DEPEND="virtual/os-headers - >=sys-apps/portage-2.0.23" -# We need at least portage-2.0.23 to handle these DEPEND's properly. - -RDEPEND="${DEPEND} - || ( >=sys-apps/gawk-3.1.1-r1 - ( !build? ( >=sys-apps/gawk-3.1.1-r1 ) ) - ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r1 ) ) - )" -# 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. - - -# This ebuild needs to be merged "live". You can't simply make a package -# of it and merge it later. - -pkg_setup() { - - if [ "${ROOT}" = "/" ] - then - # Make sure we do not kill X because of the earlier bad /etc/inittab we used. - if [ -L ${svcdir}/started/xdm ] && \ - [ -n "`egrep 'x:3:respawn:/etc/X11/startDM.sh' /etc/inittab`" ] && \ - [ -n "`ps -A | egrep "X"`" ] - then - echo - einfo "!!! With the current version of baselayout installed (1.7.3-r1), merging" - einfo " this version of baselayout will cause X to die if you started it" - einfo " with the /etc/init.d/xdm script!!!!" - echo - einfo "Please quit X and then merge this again." - die - fi - fi -} - -src_unpack() { - - unpack sysvinit-${SVIV}.tar.gz - - echo ">>> Unpacking rc-scripts-${SV}${SVREV}.tar.bz2" - tar -jxf ${FILESDIR}/rc-scripts-${SV}${SVREV}.tar.bz2 || die - - # Fix CFLAGS for sysvinit stuff - cd ${S2} - cp Makefile Makefile.orig - sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die - if [ -n "`use build`" ] - then - # Do not build sulogin, as it needs libcrypt which is not in the - # build image. - cp Makefile Makefile.orig - sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \ - Makefile.orig > Makefile || die - fi - - # Fix Sparc specific stuff - if [ "${ARCH}" = "sparc" ] - then - cd ${S}/etc - cp rc.conf rc.conf.orig - sed -e 's:KEYMAP="us":KEYMAP="sun":' rc.conf.orig >rc.conf || die - rm -f rc.conf.orig - - cp inittab inittab.orig - sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ - inittab.orig > inittab || die - rm -f inittab.orig - fi - - # Fix mips specific stuff - if [ "${ARCH}" = "mips" ] - then - cd ${S}/etc - cp inittab inittab.orig - sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ - inittab.orig > inittab || die - rm -f inittab.orig - fi -} - -src_compile() { - - cp ${S}/sbin/runscript.c ${T} - cp ${S}/sbin/start-stop-daemon.c ${T} - - cd ${T} - gcc ${CFLAGS} runscript.c -o runscript || die "cant compile runscript.c" - gcc ${CFLAGS} start-stop-daemon.c -o start-stop-daemon || die "cant compile start-stop-daemon.c" - echo ${ROOT} > ${T}/ROOT - - if [ -z "`use build`" ] - then - # Build sysvinit stuff - cd ${S2} - einfo "Building sysvinit..." - emake LDFLAGS="" || die "problem compiling sysvinit" - - if [ -f /usr/include/awk/awk.h ] - then - # Build gawk module - cd ${S}/src - einfo "Building awk module..." - make || { - eerror "Failed to build gawk module. Make sure you have" - eerror "sys-apps/gawk-3.1.1-r1 or later installed" - die "problem compiling gawk module" - } - fi - fi -} - -defaltmerge() { - - # Define the "altmerge" variable. - altmerge=0 - # Special ${T}/ROOT hack because ROOT gets automatically unset during src_install() - # (because it conflicts with some makefiles) - local ROOT="" - ROOT="`cat ${T}/ROOT`" - if [ -z "`use bootstrap`" -a -z "`use build`" -a -e ${ROOT}/dev/.devfsd ] - then - # We're installing to a system that has devfs enabled; don't create device - # nodes. - altmerge=1 - fi -} - - -src_install() { - - local foo="" - defaltmerge - keepdir /sbin /usr/sbin - exeinto /sbin - doexe ${T}/runscript - doexe ${T}/start-stop-daemon - # Need this in /sbin, as it could be run before - # /usr is mounted. - doexe ${S}/sbin/modules-update - # Compat symlinks until I can get things synced. - dosym modules-update /sbin/update-modules - dosym ../../sbin/modules-update /usr/sbin/update-modules - - keepdir /usr - keepdir /usr/bin - keepdir /usr/lib - # Dont install run-crons anymore, as sys-apps/cronbase installs it now - #dosbin ${S}/sbin/MAKEDEV ${S}/sbin/run-crons - dosbin ${S}/sbin/MAKEDEV - keepdir /var /var/run /var/lock/subsys /var/state - dosym ../var/tmp /usr/tmp - - keepdir /home - keepdir /usr/include /usr/src /usr/portage - keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib - - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 - - #dosym ../src/linux/include/linux /usr/include/linux - #dosym ../src/linux/include/asm-i386 /usr/include/asm - # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. - # We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of - # the currently-installed includes in /usr/src and copies them to /usr/include/linux and - # /usr/include/asm. This is the recommended approach so that kernel includes can remain - # constant. The kernel includes should really only be upgraded when you upgrade glibc. - keepdir /usr/include/linux /usr/include/asm - keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc - - for foo in games lib sbin share bin share/doc share/man src - do - keepdir /usr/local/${foo} - done - # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc - - # FHS compatibility symlinks stuff - dosym share/man /usr/man - dosym share/doc /usr/doc - dosym share/info /usr/info - keepdir /usr/X11R6/share - dosym ../../share/info /usr/X11R6/share/info - # End FHS compatibility symlinks stuff - - for foo in doman ${FILESDIR}/MAKEDEV.8 ${S}/man/* - do - [ -f ${foo} ] && doman ${foo} - done - dodoc ${FILESDIR}/copyright - dodoc ${S}/ChangeLog - keepdir /usr/X11R6/lib /usr/X11R6/man - keepdir /var/log/news - - # Supervise stuff depreciated - #dodir /var/lib/supervise - #install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control - #install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services - # End supervise stuff - - keepdir /opt - - # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg - keepdir /var/spool /var/tmp /var/lib/misc - chmod 1777 ${D}/var/tmp - keepdir /root - - # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - - chmod go-rx ${D}/root - keepdir /tmp /var/lock - chmod 1777 ${D}/tmp - chmod 1777 ${D}/var/tmp - chown root.uucp ${D}/var/lock - chmod 775 ${D}/var/lock - insopts -m0644 - - # Bug #5359 (FHS complience) - keepdir /etc/opt - - insinto /etc - ln -s ../proc/filesystems ${D}/etc/filesystems - for foo in hourly daily weekly monthly - do - keepdir /etc/cron.${foo} - done - for foo in ${S}/etc/* - do - # Install files, not dirs - [ -f ${foo} ] && doins ${foo} - done - chmod go-rwx ${D}/etc/shadow - keepdir /lib /mnt/floppy /mnt/cdrom - chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom - - keepdir /lib/dev-state - if [ "${altmerge}" -eq "1" ] - then - # rootfs and devfs - dosym /usr/sbin/MAKEDEV /lib/dev-state/MAKEDEV - # This is not needed anymore... - #keepdir /lib/dev-state/pts /lib/dev-state/shm - else - # Normal - keepdir /dev - keepdir /dev/pts /dev/shm - dosym /usr/sbin/MAKEDEV /dev/MAKEDEV - fi - - cd ${S}/sbin - into / - dosbin rc rc-update - - if [ -z "`use build`" ] - then - # Install sysvinit stuff - cd ${S2} - into / - dosbin init halt killall5 runlevel shutdown sulogin - dosym init /sbin/telinit - dobin last mesg utmpdump wall - dosym killall5 /sbin/pidof - dosym halt /sbin/reboot - dosym halt /sbin/poweroff - - # SysvInit docs - cd ${S2}/../ - doman man/*.[1-9] - docinto sysvinit-${SVIV} - dodoc COPYRIGHT README doc/* - fi - - # env-update stuff - keepdir /etc/env.d - insinto /etc/env.d - doins ${S}/etc/env.d/00basic - - keepdir /etc/devfs.d - - keepdir /etc/modules.d - insinto /etc/modules.d - doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 - - keepdir /etc/conf.d - insinto /etc/conf.d - for foo in ${S}/etc/conf.d/* - do - [ -f ${foo} ] && doins ${foo} - done - # /etc/conf.d/net.ppp* should only be readible by root - chmod 0600 ${D}/etc/conf.d/net.ppp* - - # This seems the best place for templates .. any ideas ? - # NB: if we move this, then $TEMPLATEDIR in net.ppp0 need to be updated as well - keepdir /etc/ppp - insinto /etc/ppp - doins ${S}/etc/ppp/chat-default - - dodir /etc/init.d - exeinto /etc/init.d - for foo in ${S}/init.d/* - do - [ -f ${foo} ] && doexe ${foo} - done - # /etc/init.d/net.ppp* should only be readible by root - #chmod 0600 ${D}/etc/init.d/net.ppp* - - # These moved from /etc/init.d/ to /sbin to help newb systems - # from breaking - exeinto /sbin - doexe ${S}/sbin/runscript.sh - doexe ${S}/sbin/functions.sh - cp ${S}/sbin/functions.sh ${S}/sbin/functions.sh.orig - sed '/logger/s: \$\*: "$*":' < ${S}/sbin/functions.sh.orig > ${S}/sbin/functions.sh 2>/dev/null - rm -f ${S}/sbin/functions.sh.orig - - doexe ${S}/sbin/rc-daemon.sh - doexe ${S}/sbin/rc-help.sh - # Compat symlinks (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 - - # 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 [ -z "`use build`" -a -z "`use bootstrap`" ] - then - # This is for new depscan and rc-envupdate.sh - # written in awk - exeinto /sbin - doexe ${S}/sbin/depscan.sh - doexe ${S}/sbin/rc-envupdate.sh - exeinto /lib/rcscripts - doexe ${S}/src/filefuncs.so - insinto /lib/rcscripts/awk - doins ${S}/src/awk/*.awk - else - # This is the old bash ones - exeinto /sbin - newexe ${S}/sbin/depscan.sh.bash depscan.sh - newexe ${S}/sbin/rc-envupdate.sh.bash rc-envupdate.sh - fi - - dodir /etc/skel - insinto /etc/skel - for foo in $(find ${S}/etc/skel -type f -maxdepth 1) - do - [ -f ${foo} ] && doins ${foo} - done - - keepdir ${svcdir} >/dev/null 2>&1 - - # Skip this if we are merging to ROOT - [ "${ROOT}" = "/" ] && return 0 - - # Set up default runlevel symlinks - local bar="" - for foo in default boot nonetwork single - do - keepdir /etc/runlevels/${foo} - for bar in $(cat ${S}/rc-lists/${foo}) - do - [ -e ${S}/init.d/${bar} ] && \ - dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar} - done - done - -} - -pkg_preinst() { - # Make sure symlinks of these get installed. - if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/depscan.sh ] - then - rm -f ${ROOT}/etc/init.d/depscan.sh - fi - if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/runscript.sh ] - then - rm -f ${ROOT}/etc/init.d/runscript.sh - fi - if [ -e ${ROOT}/etc/init.d/functions.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/functions.sh ] - then - rm -f ${ROOT}/etc/init.d/functions.sh - fi - if [ -e ${ROOT}/etc/init.d/rc-help.sh ] - then - rm -f ${ROOT}/etc/init.d/rc-help.sh - fi - - # This one was borked, so make sure fixed one gets installed. - if [ -L ${ROOT}/usr/lib/X11 ] - then - rm -f ${ROOT}/usr/lib/X11 - fi -} - -pkg_postinst() { - - # Doing device node creation in pkg_postinst() now so they aren't recorded in CONTENTS. - # latest CVS-only version of Portage doesn't record device nodes in CONTENTS at all. - defaltmerge - # We dont 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 [ "${altmerge}" -eq "0" ] - then - cd ${ROOT}/dev - # These devices are also needed by many people and should be included - einfo "Making device nodes (this could take a minute or so...)" - - case ${ARCH} in - x86) - einfo "Using generic-i386 to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-i386 - ;; - ppc) - einfo "Using generic-powerpc to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-powerpc - ;; - sparc) - einfo "Using generic-sparc to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-sparc - ;; - mips) - einfo "Using generic-mips to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-mips - ;; - *) - einfo "Using generic-i386 to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-i386 - ;; - esac - - ${ROOT}/usr/sbin/MAKEDEV sg - ${ROOT}/usr/sbin/MAKEDEV scd - ${ROOT}/usr/sbin/MAKEDEV rtc - ${ROOT}/usr/sbin/MAKEDEV audio - ${ROOT}/usr/sbin/MAKEDEV hde - ${ROOT}/usr/sbin/MAKEDEV hdf - ${ROOT}/usr/sbin/MAKEDEV hdg - ${ROOT}/usr/sbin/MAKEDEV hdh - fi - # We create the /boot directory here so that /boot doesn't get deleted when a previous - # baselayout is unmerged with /boot unmounted. - install -d ${ROOT}/boot - if [ ! -L ${ROOT}/boot/boot ] - then - ln -snf . ${ROOT}/boot/boot - fi - # We create this here so we don't overwrite an existing /etc/hosts during bootstrap - if [ ! -e ${ROOT}/etc/hosts ] - then - cat << EOF >> ${ROOT}/etc/hosts -127.0.0.1 localhost -EOF - fi - 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. - local x="" - for x in log/lastlog run/utmp log/wtmp - do - [ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x} - done - for x in run/utmp log/wtmp - do - chgrp utmp ${ROOT}/var/${x} - chmod 0664 ${ROOT}/var/${x} - done - - - # Handle the ${svcdir} that changed in location - if [ ! -d ${ROOT}/${svcdir}/started/ ] && \ - [ -z "`use bootstrap`" -a -z "`use build`" ] - then - mkdir -p ${ROOT}/${svcdir} - mount -t tmpfs tmpfs ${ROOT}/${svcdir} - if [ -d ${ROOT}/dev/shm/.init.d ] - then - cp -ax ${ROOT}/dev/shm/.init.d/. ${ROOT}/${svcdir} - fi - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly. thus remove all ._cfg files if - # we are not busy with a bootstrap. - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - ewarn "Removing invalid backup copies of critical config files..." - rm -f ${ROOT}/etc/._cfg????_{passwd,shadow} - fi - - # 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ] - then - # Do not return an error if this fails - /sbin/init U &>/dev/null || : - - # We need to regenerate /etc/modules.conf, else it will fail at next - # boot. - /sbin/modules-update force &> /dev/null - - elif [ -f ${ROOT}/etc/modules.conf ] - then - rm -f ${ROOT}/etc/modules.conf - fi - - # Simple Release version for testing of features that *should* be - # present in the rc-scripts, etc. - echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release - - echo - einfo "Please note that /sbin/update-modules moved to /sbin/modules-update" - einfo "for consistency reasons." - echo -} - -pkg_postrm() { - - # Fix problematic links - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 -} diff --git a/sys-apps/baselayout/baselayout-1.8.6.5.ebuild b/sys-apps/baselayout/baselayout-1.8.6.5.ebuild deleted file mode 100644 index 2640687795b0..000000000000 --- a/sys-apps/baselayout/baselayout-1.8.6.5.ebuild +++ /dev/null @@ -1,672 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.5.ebuild,v 1.1 2003/04/07 03:27:20 azarah Exp $ - -# This ebuild needs to be merged "live". You can't simply make a package -# of it and merge it later. - -IUSE="bootstrap build" - -SV="1.4.3.5" -SVREV="" -# SysvInit version -SVIV="2.84" - -S="${WORKDIR}/rc-scripts-${SV}" -S2="${WORKDIR}/sysvinit-${SVIV}/src" -DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)" -SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz - ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz" -# http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2" -HOMEPAGE="http://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~arm ~hppa" - -DEPEND="virtual/os-headers - >=sys-apps/portage-2.0.23" -# We need at least portage-2.0.23 to handle these DEPEND's properly. - -RDEPEND="${DEPEND} - || ( >=sys-apps/gawk-3.1.1-r2 - ( !build? ( >=sys-apps/gawk-3.1.1-r2 ) ) - ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) ) - )" -# 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. - -src_unpack() { - - unpack sysvinit-${SVIV}.tar.gz - - echo ">>> Unpacking rc-scripts-${SV}${SVREV}.tar.bz2" - tar -jxf ${FILESDIR}/rc-scripts-${SV}${SVREV}.tar.bz2 || die - - # Fix CFLAGS for sysvinit stuff - cd ${S2} - cp Makefile Makefile.orig - sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die - if [ -n "`use build`" ] - then - # Do not build sulogin, as it needs libcrypt which is not in the - # build image. - cp Makefile Makefile.orig - sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \ - Makefile.orig > Makefile || die - fi - - cd ${S}/etc - - # Fix Sparc specific stuff - if [ "${ARCH}" = "sparc" ] - then - cp rc.conf rc.conf.orig - sed -e 's:KEYMAP="us":KEYMAP="sun":' rc.conf.orig >rc.conf || die - rm -f rc.conf.orig - fi - - # Add serial console ... - case ${ARCH} in - sparc|mips) - cp inittab inittab.orig - sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ - inittab.orig > inittab || die - rm -f inittab.orig - ;; - esac - - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - # Sanity check to see if has version works - if has_version '>=sys-apps/baselayout-1.8' &> /dev/null - then - einfo "Checking if we need to tweak CONFIG_PROTECT_MASK" - # Make sure user get things updated first time he merge 1.8.6 ... - if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null - then - touch "${WORKDIR}/update_init_d" - fi - fi - fi -} - -src_compile() { - - [ -z "${CC}" ] && CC="gcc" - - echo "${ROOT}" > ${T}/ROOT - - cd ${S}/src - einfo "Building utilities..." - make CC="${CC}" LD="${CC}" \ - CFLAGS="${CFLAGS}" || die "problem compiling utilities" - - if [ -z "`use build`" ] - then - # Build sysvinit stuff - cd ${S2} - einfo "Building sysvinit..." - emake CC="${CC}" LD="${CC}" \ - LDFLAGS="" || die "problem compiling sysvinit" - - # We let gawk now install filefuncs.so, and that is as a symlink to a - # versioned .so ... - if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] - then - # Build gawk module - cd ${S}/src/filefuncs - einfo "Building awk module..." - make CC="${CC}" LD="${CC}" || { - eerror "Failed to build gawk module. Make sure you have" - eerror "sys-apps/gawk-3.1.1-r1 or later installed" - die "problem compiling gawk module" - } - fi - fi -} - -defaltmerge() { - - # Define the "altmerge" variable. - altmerge=0 - # Special ${T}/ROOT hack because ROOT gets automatically unset during src_install() - # (because it conflicts with some makefiles) - local ROOT="" - ROOT="`cat ${T}/ROOT`" - if [ -z "`use bootstrap`" -a -z "`use build`" -a -e ${ROOT}/dev/.devfsd ] - then - # We're installing to a system that has devfs enabled; don't create device - # nodes. - altmerge=1 - fi -} - - -src_install() { - - local bar= - local foo= - - defaltmerge - keepdir /sbin /usr/sbin - - keepdir /usr - keepdir /usr/bin - keepdir /usr/lib - keepdir /var /var/run /var/lock/subsys /var/state - keepdir /var/spool /var/tmp /var/lib/misc - keepdir /var/log/news - dosym ../var/tmp /usr/tmp - - keepdir /home - keepdir /usr/include /usr/src - keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib - keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share - - # If it already exist, do not recreate, else we get - # problems when /usr/portage mounted as ro NFS, etc. - if [ ! -d "${ROOT}/usr/portage" ] - then - keepdir /usr/portage - fi - - #dosym ../src/linux/include/linux /usr/include/linux - #dosym ../src/linux/include/asm-i386 /usr/include/asm - # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. - # We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of - # the currently-installed includes in /usr/src and copies them to /usr/include/linux and - # /usr/include/asm. This is the recommended approach so that kernel includes can remain - # constant. The kernel includes should really only be upgraded when you upgrade glibc. - keepdir /usr/include/linux /usr/include/asm - keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc - - for foo in games lib sbin share bin share/doc share/man src - do - keepdir /usr/local/${foo} - done - # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc - - # FHS compatibility symlinks stuff - dosym share/man /usr/man - dosym share/doc /usr/doc - dosym share/info /usr/info - dosym ../../share/info /usr/X11R6/share/info - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 - # End FHS compatibility symlinks stuff - - # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg - chmod 1777 ${D}/var/tmp - keepdir /root - - # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - - chmod go-rx ${D}/root - keepdir /tmp /var/lock - chmod 1777 ${D}/tmp - chmod 1777 ${D}/var/tmp - chown root.uucp ${D}/var/lock - chmod 775 ${D}/var/lock - insopts -m0644 - - keepdir /opt /etc/opt - - insinto /etc - ln -s ../proc/filesystems ${D}/etc/filesystems - for foo in hourly daily weekly monthly - do - keepdir /etc/cron.${foo} - done - for foo in ${S}/etc/* - do - # Install files, not dirs - [ -f ${foo} ] && doins ${foo} - done - chmod go-rwx ${D}/etc/shadow - keepdir /lib /mnt/floppy /mnt/cdrom - chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom - - into / - dosbin ${S}/sbin/MAKEDEV - keepdir /lib/dev-state - if [ "${altmerge}" -eq "1" ] - then - # rootfs and devfs - dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV - # This is not needed anymore... - #keepdir /lib/dev-state/pts /lib/dev-state/shm - else - # Normal - keepdir /dev - keepdir /dev/pts /dev/shm - dosym ../sbin/MAKEDEV /dev/MAKEDEV - fi - - 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 rc-daemon.sh rc-help.sh - - dodir /etc/init.d - exeinto /etc/init.d - for foo in ${S}/init.d/* - do - [ -f ${foo} ] && doexe ${foo} - done - - cd ${S}/sbin - # 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 [ -z "`use build`" -a -z "`use bootstrap`" ] - then - # This is for new depscan and rc-envupdate.sh - # written in awk - into / - dosbin depscan.sh - dosbin rc-envupdate.sh - insinto /lib/rcscripts/awk - for foo in ${S}/src/awk/*.awk - do - [ -f ${foo} ] && doins ${foo} - done - - if [ ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] - then - exeinto /lib/rcscripts - doexe ${S}/src/filefuncs/filefuncs.so - fi - else - # This is the old bash ones - into / - newsbin depscan.sh.bash depscan.sh - newsbin rc-envupdate.sh.bash rc-envupdate.sh - fi - - # Compat symlinks (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 - - cd ${S}/src - einfo "Installing utilities..." - make DESTDIR="${D}" install || die "problem installing utilities" - - if [ -z "`use build`" ] - then - # Install sysvinit stuff - cd ${S2} - einfo "Installing sysvinit..." - into / - dosbin init halt killall5 runlevel shutdown sulogin - dosym init /sbin/telinit - dobin last mesg utmpdump wall - dosym killall5 /sbin/pidof - dosym halt /sbin/reboot - dosym halt /sbin/poweroff - - # SysvInit docs - cd ${S2}/../ - for foo in ${S2}/../man/*.[1-9] - do - [ -f ${foo} ] && doman ${foo} - done - docinto sysvinit-${SVIV} - dodoc COPYRIGHT README doc/* - fi - - for foo in ${S}/man/* - do - [ -f ${foo} ] && doman ${foo} - done - dodoc ${FILESDIR}/copyright - dodoc ${S}/ChangeLog - - # env-update stuff - keepdir /etc/env.d - insinto /etc/env.d - doins ${S}/etc/env.d/00basic - - keepdir /etc/devfs.d - - keepdir /etc/modules.autoload.d - insinto /etc/modules.autoload.d - for foo in in ${S}/etc/modules.autoload.d/* - do - [ -f ${foo} ] && doins ${foo} - done - - keepdir /etc/modules.d - insinto /etc/modules.d - doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 - - keepdir /etc/conf.d - insinto /etc/conf.d - for foo in ${S}/etc/conf.d/* - do - [ -f ${foo} ] && doins ${foo} - done - # /etc/conf.d/net.ppp* should only be readible by root - chmod 0600 ${D}/etc/conf.d/net.ppp* - - # This seems the best place for templates .. any ideas ? - # NB: if we move this, then $TEMPLATEDIR in net.ppp0 need to be updated as well - keepdir /etc/ppp - insinto /etc/ppp - doins ${S}/etc/ppp/chat-default - - dodir /etc/skel - insinto /etc/skel - for foo in $(find ${S}/etc/skel -type f -maxdepth 1) - do - [ -f ${foo} ] && doins ${foo} - done - - keepdir ${svcdir} >/dev/null 2>&1 - - # Skip this if we are merging to ROOT - [ "${ROOT}" = "/" ] && return 0 - - # Set up default runlevel symlinks - for foo in default boot nonetwork single - do - keepdir /etc/runlevels/${foo} - for bar in $(cat ${S}/rc-lists/${foo}) - do - [ -e ${S}/init.d/${bar} ] && \ - dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar} - done - done - -} - -pkg_preinst() { - # Make sure symlinks of these get installed. - if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/depscan.sh ] - then - rm -f ${ROOT}/etc/init.d/depscan.sh - fi - if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/runscript.sh ] - then - rm -f ${ROOT}/etc/init.d/runscript.sh - fi - if [ -e ${ROOT}/etc/init.d/functions.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/functions.sh ] - then - rm -f ${ROOT}/etc/init.d/functions.sh - fi - if [ -e ${ROOT}/etc/init.d/rc-help.sh ] - then - rm -f ${ROOT}/etc/init.d/rc-help.sh - fi - - # This one was borked, so make sure fixed one gets installed. - if [ -L ${ROOT}/usr/lib/X11 ] - then - rm -f ${ROOT}/usr/lib/X11 - fi - - if [ -f ${ROOT}/etc/modules.autoload -a ! -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 - - # Make sure user get things updated first time he merge 1.8.6 ... - if [ -f "${WORKDIR}/update_init_d" ] - then - # Update CONFIG_PROTECT_MASK to exclude /etc/init.d from - # CONFIG_PROTECT ... - ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..." - echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \ - > ${ROOT}/etc/env.d/99foo - env-update &> /dev/null - export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d" - - if [ -d "${ROOT}/etc/init.d" ] - then - # Backup /etc/init.d if it exists ... - einfo "Backing up /etc/init.d ..." - cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old" - fi - fi -} - -pkg_postinst() { - - echo - # Doing device node creation in pkg_postinst() now so they aren't recorded - # in CONTENTS. Latest CVS-only version of Portage doesn't record device - # nodes in CONTENTS at all. - defaltmerge - # We dont 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 [ "${altmerge}" -eq "0" -a ! -e ${ROOT}/dev/.devfsd ] - then - cd ${ROOT}/dev - # These devices are also needed by many people and should be included - einfo "Making device nodes (this could take a minute or so...)" - - case ${ARCH} in - x86) - einfo "Using generic-i386 to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-i386 - ;; - ppc) - einfo "Using generic-powerpc to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-powerpc - ;; - sparc) - einfo "Using generic-sparc to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-sparc - ;; - mips) - einfo "Using generic-mips to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-mips - ;; - arm) - einfo "Using generic-arm to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-arm - ;; - hppa) - einfo "Using generic-hppa to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-hppa - ;; - *) - einfo "Using generic to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic - ;; - esac - - ${ROOT}/usr/sbin/MAKEDEV sg - ${ROOT}/usr/sbin/MAKEDEV scd - ${ROOT}/usr/sbin/MAKEDEV rtc - ${ROOT}/usr/sbin/MAKEDEV audio - ${ROOT}/usr/sbin/MAKEDEV hde - ${ROOT}/usr/sbin/MAKEDEV hdf - ${ROOT}/usr/sbin/MAKEDEV hdg - ${ROOT}/usr/sbin/MAKEDEV hdh - fi - # We create the /boot directory here so that /boot doesn't get deleted when a previous - # baselayout is unmerged with /boot unmounted. - install -d ${ROOT}/boot - touch ${ROOT}/boot/.keep - if [ ! -L ${ROOT}/boot/boot ] - then - ln -snf . ${ROOT}/boot/boot - fi - # We create this here so we don't overwrite an existing /etc/hosts during bootstrap - if [ ! -e ${ROOT}/etc/hosts ] - then - cat << EOF >> ${ROOT}/etc/hosts -127.0.0.1 localhost -EOF - fi - 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. - local x="" - for x in log/lastlog run/utmp log/wtmp - do - [ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x} - done - for x in run/utmp log/wtmp - do - chgrp utmp ${ROOT}/var/${x} - chmod 0664 ${ROOT}/var/${x} - done - - # Make sure we get everything ready for $svcdir that moved to - # /var/lib/init.d .... - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - local oldsvcdir="${svcdir}" - local rcconfd="/etc/conf.d/rc" - local inittab="/etc/inittab" - - # Remove old backup /etc/conf.d/rc files ... - rm -f ${ROOT}/etc/conf.d/._cfg????_rc - # Remove old backup /etc/inittab files ... - rm -f ${ROOT}/etc/._cfg????_inittab - - # Replace and backup /etc/conf.d/rc (unless already in new format) - if [ -f "${ROOT}/${rcconfd}" ] && \ - ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \ - [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ]) - #svcdir="/var/lib/init.d" - then - ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!" - ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to" - ewarn "/var/state/init.d" - echo - cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old" - cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}" - fi - - # Replace and backup /etc/inittab (unless already in new format) - if [ -f "${ROOT}/${inittab}" ] && \ - [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ] - then - ewarn "Backing up your old /etc/inittab, and replacing with new!" - ewarn "This is needed, as there were critical changes to /sbin/rc" - echo - cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old" - cp -f "${S}/${inittab}" "${ROOT}/${inittab}" - fi - - source ${ROOT}/etc/conf.d/rc - - # Handle the ${svcdir} that changed in location - if [ ! -d "${ROOT}/${svcdir}/started" ] - then - einfo "Trying to move SVCDIR to new location..." - echo - mkdir -p "${ROOT}/${svcdir}" -# mount -t tmpfs tmpfs ${ROOT}/${svcdir} - if [ -d "${ROOT}/${oldsvcdir}/started" ] - then - cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}" - - elif [ -d "${ROOT}/mnt/.init.d/started" ] - then - cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}" - fi - fi - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly. thus remove all ._cfg files if - # we are not busy with a bootstrap. - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - ewarn "Removing invalid backup copies of critical config files..." - rm -f ${ROOT}/etc/._cfg????_{passwd,shadow} - fi - - # 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ] - then - # Do not return an error if this fails - /sbin/init U &>/dev/null || : - - # We need to regenerate /etc/modules.conf, else it will fail at next - # boot. - /sbin/modules-update force &> /dev/null - - elif [ -f ${ROOT}/etc/modules.conf ] - then - rm -f ${ROOT}/etc/modules.conf - fi - - # Simple Release version for testing of features that *should* be - # present in the rc-scripts, etc. - echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release - - echo - ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated," - ewarn "else things might break at your next reboot! You can use 'etc-update'" - ewarn "to accomplish this:" - echo - ewarn " # etc-update" - echo - - if [ -f "${ROOT}/etc/env.d/99foo" ] - then - echo - ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d" - ewarn "have been updated automatically. If you did make any changes directly" - ewarn "to your old files, they can be found in /etc/init_d.old. Please just" - ewarn "make sure to edit the new files, and not just copy the old over!" - echo - - rm -f "${ROOT}/etc/env.d/99foo" - fi - - echo - einfo "Please note that /sbin/update-modules moved to /sbin/modules-update" - einfo "for consistency reasons." - echo - - echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 - echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 - sleep 8 -} - -pkg_postrm() { - - # Fix problematic links - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 -} - diff --git a/sys-apps/baselayout/baselayout-1.8.6.6.ebuild b/sys-apps/baselayout/baselayout-1.8.6.6.ebuild deleted file mode 100644 index 272982e4a8bc..000000000000 --- a/sys-apps/baselayout/baselayout-1.8.6.6.ebuild +++ /dev/null @@ -1,672 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.6.ebuild,v 1.3 2003/04/28 20:56:17 azarah Exp $ - -# This ebuild needs to be merged "live". You can't simply make a package -# of it and merge it later. - -IUSE="bootstrap build" - -SV="1.4.3.6" -SVREV="" -# SysvInit version -SVIV="2.84" - -S="${WORKDIR}/rc-scripts-${SV}" -S2="${WORKDIR}/sysvinit-${SVIV}/src" -DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)" -SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz - ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz" -# http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2" -HOMEPAGE="http://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~arm ~hppa" - -DEPEND="virtual/os-headers - >=sys-apps/portage-2.0.23" -# We need at least portage-2.0.23 to handle these DEPEND's properly. - -RDEPEND="${DEPEND} - || ( >=sys-apps/gawk-3.1.1-r2 - ( !build? ( >=sys-apps/gawk-3.1.1-r2 ) ) - ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) ) - )" -# 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. - -src_unpack() { - - unpack sysvinit-${SVIV}.tar.gz - - echo ">>> Unpacking rc-scripts-${SV}${SVREV}.tar.bz2" - tar -jxf ${FILESDIR}/rc-scripts-${SV}${SVREV}.tar.bz2 || die - - # Fix CFLAGS for sysvinit stuff - cd ${S2} - cp Makefile Makefile.orig - sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die - if [ -n "`use build`" ] - then - # Do not build sulogin, as it needs libcrypt which is not in the - # build image. - cp Makefile Makefile.orig - sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \ - Makefile.orig > Makefile || die - fi - - cd ${S}/etc - - # Fix Sparc specific stuff - if [ "${ARCH}" = "sparc" ] - then - cp rc.conf rc.conf.orig - sed -e 's:KEYMAP="us":KEYMAP="sun":' rc.conf.orig >rc.conf || die - rm -f rc.conf.orig - fi - - # Add serial console ... - case ${ARCH} in - sparc|mips) - cp inittab inittab.orig - sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ - inittab.orig > inittab || die - rm -f inittab.orig - ;; - esac - - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - # Sanity check to see if has version works - if has_version '>=sys-apps/baselayout-1.8' &> /dev/null - then - einfo "Checking if we need to tweak CONFIG_PROTECT_MASK" - # Make sure user get things updated first time he merge 1.8.6 ... - if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null - then - touch "${WORKDIR}/update_init_d" - fi - fi - fi -} - -src_compile() { - - echo "${ROOT}" > ${T}/ROOT - - cd ${S}/src - einfo "Building utilities..." - make CC="${CC:-gcc}" LD="${CC:-gcc}" \ - CFLAGS="${CFLAGS}" || die "problem compiling utilities" - - if [ -z "`use build`" ] - then - # Build sysvinit stuff - cd ${S2} - einfo "Building sysvinit..." - emake CC="${CC:-gcc}" LD="${CC:-gcc}" \ - LDFLAGS="" || die "problem compiling sysvinit" - - # We let gawk now install filefuncs.so, and that is as a symlink to a - # versioned .so ... - if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] - then - # Build gawk module - cd ${S}/src/filefuncs - einfo "Building awk module..." - make CC="${CC:-gcc}" LD="${CC:-gcc}" || { - eerror "Failed to build gawk module. Make sure you have" - eerror "sys-apps/gawk-3.1.1-r1 or later installed" - die "problem compiling gawk module" - } - fi - fi -} - -defaltmerge() { - - # Define the "altmerge" variable. - altmerge=0 - # Special ${T}/ROOT hack because ROOT gets automatically unset during src_install() - # (because it conflicts with some makefiles) - local ROOT="" - ROOT="`cat ${T}/ROOT`" - if [ -z "`use bootstrap`" -a -z "`use build`" -a -e ${ROOT}/dev/.devfsd ] - then - # We're installing to a system that has devfs enabled; don't create device - # nodes. - altmerge=1 - fi -} - - -src_install() { - - local bar= - local foo= - - defaltmerge - keepdir /sbin /usr/sbin - - keepdir /usr - keepdir /usr/bin - keepdir /usr/lib - keepdir /var /var/run /var/lock/subsys /var/state - keepdir /var/spool /var/tmp /var/lib/misc - keepdir /var/log/news - dosym ../var/tmp /usr/tmp - - keepdir /home - keepdir /usr/include /usr/src - keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib - keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share - - # If it already exist, do not recreate, else we get - # problems when /usr/portage mounted as ro NFS, etc. - if [ ! -d "${ROOT}/usr/portage" ] - then - keepdir /usr/portage - fi - - #dosym ../src/linux/include/linux /usr/include/linux - #dosym ../src/linux/include/asm-i386 /usr/include/asm - # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. - # We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of - # the currently-installed includes in /usr/src and copies them to /usr/include/linux and - # /usr/include/asm. This is the recommended approach so that kernel includes can remain - # constant. The kernel includes should really only be upgraded when you upgrade glibc. - keepdir /usr/include/linux /usr/include/asm - keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc - - for foo in games lib sbin share bin share/doc share/man src - do - keepdir /usr/local/${foo} - done - # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc - - # FHS compatibility symlinks stuff - dosym share/man /usr/man - dosym share/doc /usr/doc - dosym share/info /usr/info - dosym ../../share/info /usr/X11R6/share/info - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 - # End FHS compatibility symlinks stuff - - # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg - chmod 1777 ${D}/var/tmp - keepdir /root - - # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - - chmod go-rx ${D}/root - keepdir /tmp /var/lock - chmod 1777 ${D}/tmp - chmod 1777 ${D}/var/tmp - chown root.uucp ${D}/var/lock - chmod 775 ${D}/var/lock - insopts -m0644 - - keepdir /opt /etc/opt - - insinto /etc - ln -s ../proc/filesystems ${D}/etc/filesystems - for foo in hourly daily weekly monthly - do - keepdir /etc/cron.${foo} - done - for foo in ${S}/etc/* - do - # Install files, not dirs - [ -f ${foo} ] && doins ${foo} - done - chmod go-rwx ${D}/etc/shadow - keepdir /lib /mnt/floppy /mnt/cdrom - chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom - - into / - dosbin ${S}/sbin/MAKEDEV - dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV - keepdir /lib/dev-state - if [ "${altmerge}" -eq "1" ] - then - # rootfs and devfs - dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV - # This is not needed anymore... - #keepdir /lib/dev-state/pts /lib/dev-state/shm - else - # Normal - keepdir /dev - keepdir /dev/pts /dev/shm - dosym ../sbin/MAKEDEV /dev/MAKEDEV - fi - - 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 rc-daemon.sh rc-help.sh - - dodir /etc/init.d - exeinto /etc/init.d - for foo in ${S}/init.d/* - do - [ -f ${foo} ] && doexe ${foo} - done - - cd ${S}/sbin - # 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 [ -z "`use build`" -a -z "`use bootstrap`" ] - then - # This is for new depscan and rc-envupdate.sh - # written in awk - into / - dosbin depscan.sh - dosbin rc-envupdate.sh - insinto /lib/rcscripts/awk - for foo in ${S}/src/awk/*.awk - do - [ -f ${foo} ] && doins ${foo} - done - - if [ ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] - then - exeinto /lib/rcscripts - doexe ${S}/src/filefuncs/filefuncs.so - fi - else - # This is the old bash ones - into / - newsbin depscan.sh.bash depscan.sh - newsbin rc-envupdate.sh.bash rc-envupdate.sh - fi - - # Compat symlinks (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 - - cd ${S}/src - einfo "Installing utilities..." - make DESTDIR="${D}" install || die "problem installing utilities" - - if [ -z "`use build`" ] - then - # Install sysvinit stuff - cd ${S2} - einfo "Installing sysvinit..." - into / - dosbin init halt killall5 runlevel shutdown sulogin - dosym init /sbin/telinit - dobin last mesg utmpdump wall - dosym killall5 /sbin/pidof - dosym halt /sbin/reboot - dosym halt /sbin/poweroff - - # SysvInit docs - cd ${S2}/../ - for foo in ${S2}/../man/*.[1-9] - do - [ -f ${foo} ] && doman ${foo} - done - docinto sysvinit-${SVIV} - dodoc COPYRIGHT README doc/* - fi - - for foo in ${S}/man/* - do - [ -f ${foo} ] && doman ${foo} - done - docinto / - dodoc ${FILESDIR}/copyright - dodoc ${S}/ChangeLog - - # env-update stuff - keepdir /etc/env.d - insinto /etc/env.d - doins ${S}/etc/env.d/00basic - - keepdir /etc/devfs.d - - keepdir /etc/modules.autoload.d - insinto /etc/modules.autoload.d - for foo in in ${S}/etc/modules.autoload.d/* - do - [ -f ${foo} ] && doins ${foo} - done - - keepdir /etc/modules.d - insinto /etc/modules.d - doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 - - keepdir /etc/conf.d - insinto /etc/conf.d - for foo in ${S}/etc/conf.d/* - do - [ -f ${foo} ] && doins ${foo} - done - # /etc/conf.d/net.ppp* should only be readible by root - chmod 0600 ${D}/etc/conf.d/net.ppp* - - # This seems the best place for templates .. any ideas ? - # NB: if we move this, then $TEMPLATEDIR in net.ppp0 need to be updated as well - keepdir /etc/ppp - insinto /etc/ppp - doins ${S}/etc/ppp/chat-default - - dodir /etc/skel - insinto /etc/skel - for foo in $(find ${S}/etc/skel -type f -maxdepth 1) - do - [ -f ${foo} ] && doins ${foo} - done - - keepdir ${svcdir} >/dev/null 2>&1 - - # Skip this if we are merging to ROOT - [ "${ROOT}" = "/" ] && return 0 - - # Set up default runlevel symlinks - for foo in default boot nonetwork single - do - keepdir /etc/runlevels/${foo} - for bar in $(cat ${S}/rc-lists/${foo}) - do - [ -e ${S}/init.d/${bar} ] && \ - dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar} - done - done - -} - -pkg_preinst() { - # Make sure symlinks of these get installed. - if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/depscan.sh ] - then - rm -f ${ROOT}/etc/init.d/depscan.sh - fi - if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/runscript.sh ] - then - rm -f ${ROOT}/etc/init.d/runscript.sh - fi - if [ -e ${ROOT}/etc/init.d/functions.sh ] && \ - [ ! -L ${ROOT}/etc/init.d/functions.sh ] - then - rm -f ${ROOT}/etc/init.d/functions.sh - fi - if [ -e ${ROOT}/etc/init.d/rc-help.sh ] - then - rm -f ${ROOT}/etc/init.d/rc-help.sh - fi - - # This one was borked, so make sure fixed one gets installed. - if [ -L ${ROOT}/usr/lib/X11 ] - then - rm -f ${ROOT}/usr/lib/X11 - fi - - if [ -f ${ROOT}/etc/modules.autoload -a ! -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 - - # Make sure user get things updated first time he merge 1.8.6 ... - if [ -f "${WORKDIR}/update_init_d" ] - then - # Update CONFIG_PROTECT_MASK to exclude /etc/init.d from - # CONFIG_PROTECT ... - ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..." - echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \ - > ${ROOT}/etc/env.d/99foo - env-update &> /dev/null - export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d" - - if [ -d "${ROOT}/etc/init.d" ] - then - # Backup /etc/init.d if it exists ... - einfo "Backing up /etc/init.d ..." - cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old" - fi - fi -} - -pkg_postinst() { - - echo - # Doing device node creation in pkg_postinst() now so they aren't recorded - # in CONTENTS. Latest CVS-only version of Portage doesn't record device - # nodes in CONTENTS at all. - defaltmerge - # We dont 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 [ "${altmerge}" -eq "0" -a ! -e ${ROOT}/dev/.devfsd ] - then - cd ${ROOT}/dev - # These devices are also needed by many people and should be included - einfo "Making device nodes (this could take a minute or so...)" - - case ${ARCH} in - x86) - einfo "Using generic-i386 to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic-i386 - ;; - ppc) - einfo "Using generic-powerpc to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic-powerpc - ;; - sparc) - einfo "Using generic-sparc to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic-sparc - ;; - mips) - einfo "Using generic-mips to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic-mips - ;; - arm) - einfo "Using generic-arm to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic-arm - ;; - hppa) - einfo "Using generic-hppa to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic-hppa - ;; - *) - einfo "Using generic to make device nodes..." - ${ROOT}/sbin/MAKEDEV generic - ;; - esac - - ${ROOT}/sbin/MAKEDEV sg - ${ROOT}/sbin/MAKEDEV scd - ${ROOT}/sbin/MAKEDEV rtc - ${ROOT}/sbin/MAKEDEV audio - ${ROOT}/sbin/MAKEDEV hde - ${ROOT}/sbin/MAKEDEV hdf - ${ROOT}/sbin/MAKEDEV hdg - ${ROOT}/sbin/MAKEDEV hdh - fi - # We create the /boot directory here so that /boot doesn't get deleted when a previous - # baselayout is unmerged with /boot unmounted. - install -d ${ROOT}/boot - touch ${ROOT}/boot/.keep - if [ ! -L ${ROOT}/boot/boot ] - then - ln -snf . ${ROOT}/boot/boot - fi - # We create this here so we don't overwrite an existing /etc/hosts during bootstrap - if [ ! -e ${ROOT}/etc/hosts ] - then - cat << EOF >> ${ROOT}/etc/hosts -127.0.0.1 localhost -EOF - fi - 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. - local x="" - for x in log/lastlog run/utmp log/wtmp - do - [ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x} - done - for x in run/utmp log/wtmp - do - chgrp utmp ${ROOT}/var/${x} - chmod 0664 ${ROOT}/var/${x} - done - - # Make sure we get everything ready for $svcdir that moved to - # /var/lib/init.d .... - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - local oldsvcdir="${svcdir}" - local rcconfd="/etc/conf.d/rc" - local inittab="/etc/inittab" - - # Remove old backup /etc/conf.d/rc files ... - rm -f ${ROOT}/etc/conf.d/._cfg????_rc - # Remove old backup /etc/inittab files ... - rm -f ${ROOT}/etc/._cfg????_inittab - - # Replace and backup /etc/conf.d/rc (unless already in new format) - if [ -f "${ROOT}/${rcconfd}" ] && \ - ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \ - [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ]) - #svcdir="/var/lib/init.d" - then - ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!" - ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to" - ewarn "/var/state/init.d" - echo - cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old" - cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}" - fi - - # Replace and backup /etc/inittab (unless already in new format) - if [ -f "${ROOT}/${inittab}" ] && \ - [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ] - then - ewarn "Backing up your old /etc/inittab, and replacing with new!" - ewarn "This is needed, as there were critical changes to /sbin/rc" - echo - cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old" - cp -f "${S}/${inittab}" "${ROOT}/${inittab}" - fi - - source ${ROOT}/etc/conf.d/rc - - # Handle the ${svcdir} that changed in location - if [ ! -d "${ROOT}/${svcdir}/started" ] - then - einfo "Trying to move SVCDIR to new location..." - echo - mkdir -p "${ROOT}/${svcdir}" -# mount -t tmpfs tmpfs ${ROOT}/${svcdir} - if [ -d "${ROOT}/${oldsvcdir}/started" ] - then - cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}" - - elif [ -d "${ROOT}/mnt/.init.d/started" ] - then - cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}" - fi - fi - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly. thus remove all ._cfg files if - # we are not busy with a bootstrap. - if [ -z "`use build`" -a -z "`use bootstrap`" ] - then - ewarn "Removing invalid backup copies of critical config files..." - rm -f ${ROOT}/etc/._cfg????_{passwd,shadow} - fi - - # 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ] - then - # Do not return an error if this fails - /sbin/init U &>/dev/null || : - - # We need to regenerate /etc/modules.conf, else it will fail at next - # boot. - /sbin/modules-update force &> /dev/null - - elif [ -f ${ROOT}/etc/modules.conf ] - then - rm -f ${ROOT}/etc/modules.conf - fi - - # Simple Release version for testing of features that *should* be - # present in the rc-scripts, etc. - echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release - - echo - ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated," - ewarn "else things might break at your next reboot! You can use 'etc-update'" - ewarn "to accomplish this:" - echo - ewarn " # etc-update" - echo - - if [ -f "${ROOT}/etc/env.d/99foo" ] - then - echo - ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d" - ewarn "have been updated automatically. If you did make any changes directly" - ewarn "to your old files, they can be found in /etc/init_d.old. Please just" - ewarn "make sure to edit the new files, and not just copy the old over!" - echo - - rm -f "${ROOT}/etc/env.d/99foo" - fi - - echo - einfo "Please note that /sbin/update-modules moved to /sbin/modules-update" - einfo "for consistency reasons." - echo - - echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 - echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 - sleep 8 -} - -pkg_postrm() { - - # Fix problematic links - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 -} - diff --git a/sys-apps/baselayout/baselayout-1.8.6.8.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild index e51c8bb375f4..dfd906d747e4 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.8.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8.ebuild,v 1.1 2003/05/20 20:49:31 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.1 2003/05/21 09:01:18 azarah Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. IUSE="bootstrap build" -SV="1.4.3.8" +SV="1.4.3.8p1" SVREV="" # SysvInit version SVIV="2.84" diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.5 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.5 deleted file mode 100644 index 369032eee571..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.6 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.6 deleted file mode 100644 index 369032eee571..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.8 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.8 deleted file mode 100644 index 369032eee571..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.5.8 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.8-r1 index 369032eee571..369032eee571 100644 --- a/sys-apps/baselayout/files/digest-baselayout-1.8.5.8 +++ b/sys-apps/baselayout/files/digest-baselayout-1.8.6.8-r1 diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.2.8.tar.bz2 b/sys-apps/baselayout/files/rc-scripts-1.4.2.8.tar.bz2 Binary files differdeleted file mode 100644 index 0a3459eae401..000000000000 --- a/sys-apps/baselayout/files/rc-scripts-1.4.2.8.tar.bz2 +++ /dev/null diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.3.5.tar.bz2 b/sys-apps/baselayout/files/rc-scripts-1.4.3.5.tar.bz2 Binary files differdeleted file mode 100644 index cbe8eb7a3684..000000000000 --- a/sys-apps/baselayout/files/rc-scripts-1.4.3.5.tar.bz2 +++ /dev/null diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.3.6.tar.bz2 b/sys-apps/baselayout/files/rc-scripts-1.4.3.6.tar.bz2 Binary files differdeleted file mode 100644 index d6f5fc7c7f71..000000000000 --- a/sys-apps/baselayout/files/rc-scripts-1.4.3.6.tar.bz2 +++ /dev/null diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.3.8.tar.bz2 b/sys-apps/baselayout/files/rc-scripts-1.4.3.8.tar.bz2 Binary files differdeleted file mode 100644 index 6039088debe7..000000000000 --- a/sys-apps/baselayout/files/rc-scripts-1.4.3.8.tar.bz2 +++ /dev/null diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.3.8p1.tar.bz2 b/sys-apps/baselayout/files/rc-scripts-1.4.3.8p1.tar.bz2 Binary files differnew file mode 100644 index 000000000000..b6f2d3eb143d --- /dev/null +++ b/sys-apps/baselayout/files/rc-scripts-1.4.3.8p1.tar.bz2 |