diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2005-11-12 15:20:44 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2005-11-12 15:20:44 +0000 |
commit | 4873600c1e9398c3cd85921a3c86053cabc2c0d0 (patch) | |
tree | 6836c880ab17a071a51e2be49400973a5292cb16 /sys-apps/baselayout-vserver | |
parent | Version bump upstream (diff) | |
download | gentoo-2-4873600c1e9398c3cd85921a3c86053cabc2c0d0.tar.gz gentoo-2-4873600c1e9398c3cd85921a3c86053cabc2c0d0.tar.bz2 gentoo-2-4873600c1e9398c3cd85921a3c86053cabc2c0d0.zip |
add ~amd64 keywords
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'sys-apps/baselayout-vserver')
6 files changed, 17 insertions, 449 deletions
diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog index 54ba88dc33b7..c1279a9e9091 100644 --- a/sys-apps/baselayout-vserver/ChangeLog +++ b/sys-apps/baselayout-vserver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/baselayout-vserver # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.15 2005/10/04 13:51:26 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.16 2005/11/12 15:20:44 hollow Exp $ + + 12 Nov 2005; Benedikt Boehm <hollow@gentoo.org> + -baselayout-vserver-1.11.13.ebuild, baselayout-vserver-1.11.13-r1.ebuild, + baselayout-vserver-1.12.0_pre8-r2.ebuild: + add ~amd64 keywords 03 Oct 2005; Benedikt Boehm <hollow@gentoo.org> baselayout-vserver-1.11.13-r1.ebuild: diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest index 71096d1772d7..e2b8e4e472bf 100644 --- a/sys-apps/baselayout-vserver/Manifest +++ b/sys-apps/baselayout-vserver/Manifest @@ -1,24 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 46e247600447ce78388ecfd354e97fb4 ChangeLog 3014 -MD5 62648662d2305c044a9c92f90c624098 baselayout-vserver-1.11.13.ebuild 12918 -MD5 61e88d37b9d7a2ab226edbbfe3b94180 baselayout-vserver-1.12.0_pre8-r2.ebuild 12599 -MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231 -MD5 3378cf09f1593e8249dfbe25239ec005 baselayout-vserver-1.11.13-r1.ebuild 13179 +MD5 ae223d6c44076e798fba959db43cdcac ChangeLog 3207 +MD5 604b4bcd9df1c13df1abed0620d867a3 baselayout-vserver-1.11.13-r1.ebuild 13186 +MD5 08b68175fe562f2e5439ba3851cef7c2 baselayout-vserver-1.12.0_pre8-r2.ebuild 12606 +MD5 cf693ea87e77c1dc6f72cf58c32b7143 files/baselayout-vserver-1.11.13-cleanup.patch 18552 MD5 cd1ba3815d5592a3c65f185cc7585107 files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch 339 MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch 1236 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 -MD5 51a97031d54d767b45fb247d60727e9d files/fakelog.initd 449 -MD5 76a9437d29bd77c416f76fbcf0cf2af2 files/vserver-changes 1642 -MD5 cf693ea87e77c1dc6f72cf58c32b7143 files/baselayout-vserver-1.11.13-cleanup.patch 18552 MD5 a551ddae4bfb1b2bd7cbc16c57f481d3 files/digest-baselayout-vserver-1.11.13-r1 78 -MD5 a551ddae4bfb1b2bd7cbc16c57f481d3 files/digest-baselayout-vserver-1.11.13 78 MD5 d1b600f26f783320972a6692720df0d3 files/digest-baselayout-vserver-1.12.0_pre8-r2 83 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDQolzmPFBzbX68WERAhnlAJ9Ne3gNzC+9ZNrX81V0gSWxhIN3PgCfUNuT -rlExHZhHbJ+a2Ys4bLaGvfA= -=hA33 ------END PGP SIGNATURE----- +MD5 51a97031d54d767b45fb247d60727e9d files/fakelog.initd 449 +MD5 76a9437d29bd77c416f76fbcf0cf2af2 files/vserver-changes 1642 +MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231 diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild index 50d6e3272bdf..ded3da1ce368 100644 --- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild +++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild,v 1.3 2005/10/04 13:51:26 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild,v 1.4 2005/11/12 15:20:44 hollow Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/baselayout/rc-scripts-${SV}${SVREV}-vserver.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86" +KEYWORDS="x86 ~amd64" IUSE="bootstrap build fakelog static" # This version of baselayout needs gawk in /bin, but as we do not have diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13.ebuild deleted file mode 100644 index f3ff3b83db65..000000000000 --- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13.ebuild +++ /dev/null @@ -1,424 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13.ebuild,v 1.3 2005/09/04 18:25:28 hollow Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -SV=1.6.13 # rc-scripts version -SVREV= # rc-scripts rev - -S="${WORKDIR}/rc-scripts-${SV}${SVREV}-vserver" -DESCRIPTION="Filesystem baselayout and init scripts for Linux-VServer" -HOMEPAGE="http://dev.gentoo.org/~hollow/vserver" -SRC_URI="${HOMEPAGE}/baselayout/rc-scripts-${SV}${SVREV}-vserver.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="bootstrap build fakelog static" - -# 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-r10 - >=sys-apps/coreutils-5.2.1 - ) ) - !sys-apps/baselayout - !sys-apps/baselayout-lite" -DEPEND="virtual/os-headers" -PROVIDE="virtual/baselayout" - -src_compile() { - use static && append-ldflags -static - - make -C "${S}"/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \ - CFLAGS="${CFLAGS}" || die -} - -# 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 /dev - kdir /dev/pts - 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/opt - kdir /home - kdir ${rcscripts_dir} - kdir ${rcscripts_dir}/awk - kdir ${rcscripts_dir}/sh - kdir /opt - kdir -o root -g uucp -m0775 /var/lock - kdir /proc - kdir -m 0700 /root - kdir /sbin - kdir /sys # for 2.6 kernels - kdir /usr/bin - kdir /usr/include - kdir /usr/include/asm - kdir /usr/include/linux - kdir /usr/local/bin - kdir /usr/local/games - kdir /usr/local/sbin - kdir /usr/local/share - kdir /usr/local/share/doc - kdir /usr/local/share/man - kdir /usr/local/src - kdir ${PORTDIR} - kdir /usr/sbin - kdir /usr/share/doc - kdir /usr/share/info - kdir /usr/share/man - kdir /usr/share/misc - kdir /usr/src - kdir -m 1777 /tmp - kdir /var - dodir /var/db/pkg # .keep file messes up Portage - kdir /var/lib/misc - kdir /var/lock/subsys - kdir /var/log/news - kdir /var/run - kdir /var/spool - kdir /var/state - kdir -m 1777 /var/tmp - - for dir in ${libdirs}; do - libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} - [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue - kdir /${dir} - kdir /usr/${dir} - kdir /usr/local/${dir} - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null - 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 - doins -r "${S}"/etc/* - - # 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,hosts,issue.devfix} "${D}"/usr/share/baselayout - - insopts -m0755 - insinto /etc/init.d - doins ${S}/init.d/* - use fakelog && newins ${FILESDIR}/fakelog.initd fakelog - - # link dummy init scripts - cd ${D}/etc/init.d - for i in checkfs checkroot clock consolefont localmount modules net netmount; do - ln -sf dummy $i - done - - insinto /etc/conf.d - doins ${S}/etc/conf.d/* - - insinto /etc/env.d - doins ${S}/etc/env.d/* - - # Special-case uglyness... For people updating from lib32 -> lib amd64 - # profiles, keep lib32 in the search path while it's around - if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - - # List all the multilib libdirs in /etc/env/04multilib (only if they're - # actually different from the normal - if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then - echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib - fi - - # As of baselayout-1.10-1-r1, sysvinit is its own package again, and - # provides the inittab itself - # <hollow@gentoo.org> We need our own inittab for vservers here - #rm -f "${D}"/etc/inittab - - # Stash the rc-lists for use during pkg_postinst - cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System version ${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 - - # - # Setup files in /sbin - # - cd "${S}"/sbin - into / - dosbin rc rc-update - # These moved from /etc/init.d/ to /sbin to help newb systems - # from breaking - dosbin runscript.sh functions.sh - - # Compat symlinks between /etc/init.d and /sbin - # (some stuff have hardcoded paths) - dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh - dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh - dosym ../../sbin/functions.sh /etc/init.d/functions.sh - - # - # Setup files in /lib/rcscripts - # These are support files for other things in baselayout that needn't be - # under CONFIG_PROTECTed /etc - # - cd "${S}"/sbin - exeinto ${rcscripts_dir}/sh - doexe rc-services.sh rc-daemon.sh rc-help.sh - - # We can only install new, fast awk versions of scripts - # if 'build' or 'bootstrap' is not in USE. This will - # change if we have sys-apps/gawk-3.1.1-r1 or later in - # the build image ... - if ! use build; then - # This is for new depscan.sh and env-update.sh - # written in awk - cd "${S}"/sbin - into / - dosbin depscan.sh - dosbin env-update.sh - insinto ${rcscripts_dir}/awk - doins "${S}"/src/awk/*.awk - fi - - # - # 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 - - # Normal baselayout generate devices in pkg_postinst(), but we keep - # it here because - # (1) devices would show up in CONTENTS - # (2) we just generate the devices if either build or bootstrap is useflags - # (3) it is not likely that anyone uses devfsd inside a vserver (nor udev) - # 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 pkg_postinst(). Nor is - # it in the update case, as neither build nor bootstrap will be in - # the active use flags. - - if use build || use bootstrap; then - cd ${D}/dev || die - - ebegin "Making and populating /dev with safe device nodes..." - ./MAKEDEV generic-vserver - eend $? || die - fi - - # Hack to fix bug 9849, continued in pkg_postinst - unkdir -} - -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 - - # 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; 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; 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 - 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 -} diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild index 9b106046ce3c..bb19f3d235b8 100644 --- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild +++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild,v 1.1 2005/09/22 10:11:52 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild,v 1.2 2005/11/12 15:20:44 hollow Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~hollow/vserver/baselayout/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="bootstrap build static" # This version of baselayout needs gawk in /bin, but as we do not have diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13 deleted file mode 100644 index 766bbacfab04..000000000000 --- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 5674a604ea63c1ffd4568c0b3237642b rc-scripts-1.6.13-vserver.tar.bz2 104663 |