diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/baselayout/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild | 283 | ||||
-rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2 | 3 |
3 files changed, 294 insertions, 1 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 6d3755dcd272..0b4ee24779a4 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,17 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.413 2007/04/13 18:35:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.414 2007/05/04 15:29:39 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-2.0.0_alpha2 (04 May 2007) + + 04 May 2007; Roy Marples <uberlord@gentoo.org> + +baselayout-2.0.0_alpha2.ebuild: + New alpha, fixes all known issues caused by alpha1. IE, should be usable by + most people now :) + *baselayout-1.12.10-r3 (13 Apr 2007) *baselayout-1.12.9-r2 (13 Apr 2007) diff --git a/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild b/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild new file mode 100644 index 000000000000..41e30ca0b1cf --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild @@ -0,0 +1,283 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild,v 1.1 2007/05/04 15:29:39 uberlord Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + !build? ( + !bootstrap? ( + kernel_linux? ( >=sys-apps/coreutils-5.2.1 ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + ) + ) + pam? ( virtual/pam ) + !<net-misc/dhcpcd-2.0.0" +DEPEND="virtual/os-headers" +PDEPEND="virtual/init + !build? ( !bootstrap? ( + kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev ) + ) )" + +PROVIDE="virtual/baselayout" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Setup unicode defaults for silly unicode users + if use unicode ; then + sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf + fi + + # SPARC does not like stty, so we disable RC_INTERACTIVE which requires it + # see Gentoo bug #104067. + if use sparc ; then \ + sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die + fi +} + +make_opts() { + local libdir="lib" + [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") + local opts="${opts} LIB=${libdir}" + + if use kernel_linux ; then + opts="${opts} OS=Linux" + else + opts="${opts} OS=BSD" + fi + use pam && opts="${opts} HAVE_PAM=1" + + echo "${opts}" +} + +src_compile() { + use static && append-ldflags -static + emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die +} + +# Support function for remapping old wireless dns vars +remap_dns_vars() { + if [[ -f "${ROOT}/etc/conf.d/$1" ]]; then + sed -e 's/\<domain_/dns_domain_/g' \ + -e 's/\<mac_domain_/mac_dns_domain_/g' \ + -e 's/\<nameservers_/dns_servers_/g' \ + -e 's/\<mac_nameservers_/mac_dns_servers_/g' \ + -e 's/\<searchdomains_/dns_search_domains_/g' \ + -e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \ + "${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1" + fi +} + +pkg_preinst() { + # Move our makefiles to a temporay location + mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + if use build || use bootstrap ; then + local libdirs="$(get_all_libdirs)" dir= + # Create our multilib dirs - the Makefile has no knowledge of this + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + mkdir -p "${ROOT}${dir}" + touch "${ROOT}${dir}"/.keep + mkdir -p "${ROOT}usr/${dir}" + touch "${ROOT}usr/${dir}"/.keep + mkdir -p "${ROOT}usr/local/${dir}" + touch "${ROOT}usr/local/${dir}"/.keep + done + + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [[ ${SYMLINK_LIB} == "yes" ]] ; then + rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null + local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) + ln -s "${lib}" "${ROOT}lib" + ln -s "${lib}" "${ROOT}usr/lib" + ln -s "${lib}" "${ROOT}usr/local/lib" + fi + + make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" + fi + + # Change some vars introduced in baselayout-1.11.0 before we go stable + # The new names make more sense and allow nis_domain + # for use in baselayout-1.12.0 + remap_dns_vars net + remap_dns_vars wireless +} + +src_install() { + make $(make_opts) DESTDIR="${D}" install + dodoc ChangeLog COPYRIGHT + + # Should this belong in another ebuild? Like say binutils? + # 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 + local libdirs="$(get_all_libdirs)" libdirs_env= dir= + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} + done + + # 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib + doenvd "${T}"/04multilib + fi + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release + + # Remove the installed runlevels, as we don't know about $ROOT yet + rm -rf "${D}/etc/runlevels" + + # Copy the make files to /usr/share/baselayout so we can re-use them in + # postinst, otherwise binpkg will break. + insinto /usr/share/baselayout + doins -r Makefile default.mk runlevels* +} + +pkg_postinst() { + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null + fi + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [[ -e "${ROOT}etc/${x}" ]] && continue + [[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue + cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc + done + + # We need to copy svcdir if upgrading + if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then + ( + source "${ROOT}etc/conf.d/rc" + svcdir="${svcdir:-/var/lib/init.d}" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d" + cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d + rm -rf "${ROOT}"lib/rcscripts/init.d/daemons + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + ) + # Install our new init script and mark it started + if use kernel_linux ; then + ln -snf ../../init.d/volumes "${ROOT}"etc/runlevels/boot + ln -snf /etc/init.d/volumes "${ROOT}"lib/rcscripts/init.d/started + fi + elif has_version "<sys-apps/${PN}-2.0.0_alpha" ; then + # The format has changed since 1.13 + rm -rf "${ROOT}lib/rcscripts/init.d/daemons" + fi + + if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then + /$(get_libdir)/rcscripts/bin/rc-depend --update + 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 release ${PV}" > "${ROOT}"/etc/gentoo-release + + echo + einfo "Please be sure to update all pending '._cfg*' files in /etc," + einfo "else things might break at your next reboot! You can use 'etc-update'" + einfo "to accomplish this:" + einfo + einfo " # etc-update" + + local lo="net.lo0" + use kernel_linux && lo="net.lo" + for f in ${ROOT}etc/init.d/net.*; do + [[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue + echo + einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" + einfo "They need to be converted to symlinks to ${lo}. If you haven't" + einfo "made personal changes to those files, you can update with the" + einfo "following command:" + einfo + einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/${lo}$' | xargs -n1 ln -sfvn ${lo}" + break + done + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \ + | egrep -q '\<(domain|nameservers|searchdomains)_' ; then + echo + ewarn "You have depreciated variables in ${ROOT}etc/conf.d/net" + ewarn "or ${ROOT}etc/conf.d/wireless" + ewarn + ewarn "domain_* -> dns_domain_*" + ewarn "nameservers_* -> dns_servers_*" + ewarn "searchdomains_* -> dns_search_domains_*" + ewarn + ewarn "They have been converted for you - ensure that you" + ewarn "update them via 'etc-update'" + fi + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \ + | egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then + echo + ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net" + ewarn + ewarn "You are advised to review the new configuration variables as" + ewarn "found in ${ROOT}etc/conf.d/net.example as there is no" + ewarn "guarantee that they will work in future versions." + fi + + # Remove old stuff that may cause problems. + if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then + rm -f "${ROOT}"/etc/env.d/01hostname + fi + if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then + rm -f "${ROOT}"/etc/{conf.d,init.d}/domainname \ + "${ROOT}"/etc/runlevels/*/domainname + echo + ewarn "The domainname init script has been removed in this version." + ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how" + ewarn "to apply dns/nis information to the loopback interface." + fi +} + +# Handle our downgraders +# We should remove this when <1.13 has been removed from the tree +pkg_postrm() { + # Remove dir if downgrading + if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then + ( + source "${ROOT}etc/conf.d/rc" + svcdir="${svcdir:-/var/lib/init.d}" + einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}" + mkdir -p "${ROOT}${svcdir}" + cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}" + rm -rf "${ROOT}${svcdir}"/daemons + umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null + rm -rf "${ROOT}lib/rcscripts/init.d" + ) + fi +} diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2 new file mode 100644 index 000000000000..915943d49b39 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2 @@ -0,0 +1,3 @@ +MD5 612e328545f421c0c58e1ac61fd0d1f7 baselayout-2.0.0_alpha2.tar.bz2 132406 +RMD160 259b52abf8d706338ba99fded89c503bfeee807b baselayout-2.0.0_alpha2.tar.bz2 132406 +SHA256 7e0b9df754bf55fffa25a112d328a3a37d43425daf94ee48ce80cab34a3df98c baselayout-2.0.0_alpha2.tar.bz2 132406 |