From 7bce164665c8cd4c6667f93e995aac3092bb98e6 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 8 Jan 2007 23:06:53 +0000 Subject: [PATCH] Upgrade/downgrade is now sane between 1.12.8-r2 and 1.13.0_alpha10-r2 Package-Manager: portage-2.1.2_rc4-r6 --- sys-apps/baselayout/ChangeLog | 6 ++++- sys-apps/baselayout/Manifest | 24 +++++++++---------- .../baselayout/baselayout-1.12.8-r2.ebuild | 6 ++++- .../baselayout-1.13.0_alpha10-r2.ebuild | 20 +++++++--------- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 3fc626a981b4..5426469f1693 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # 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.385 2007/01/06 05:17:06 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.386 2007/01/08 23:06:53 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 08 Jan 2007; Roy Marples + baselayout-1.12.8-r2.ebuild, baselayout-1.13.0_alpha10-r2.ebuild: + Upgrade/downgrade is now sane between 1.12.8-r2 and 1.13.0_alpha10-r2 + 06 Jan 2007; Tom Gall baselayout-1.12.8-r1: stable on ppc64, moving forward aggressively diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index e1862b1ce244..64097c58e598 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -92,10 +92,10 @@ EBUILD baselayout-1.12.8-r1.ebuild 17220 RMD160 c9396e0da6d59e99438f3ef1c5df33d2 MD5 65cff3b923fddb76573fdf804d315e80 baselayout-1.12.8-r1.ebuild 17220 RMD160 c9396e0da6d59e99438f3ef1c5df33d23881be9f baselayout-1.12.8-r1.ebuild 17220 SHA256 d63c5069bf6a0f89104c1203582da6d9978d31ffa02845fa0e403d02ef3ef77d baselayout-1.12.8-r1.ebuild 17220 -EBUILD baselayout-1.12.8-r2.ebuild 17265 RMD160 6dce7734d90493714e91ee587936a8b303449f3a SHA1 ab9481155805a2810682ed464171ea4fcc6460d1 SHA256 817f4944e9f846eba46e4c2254d1d4d827534dbb2d7a4f2ccef737c0c9382407 -MD5 ef33dc78218831ab3158adedca75aeab baselayout-1.12.8-r2.ebuild 17265 -RMD160 6dce7734d90493714e91ee587936a8b303449f3a baselayout-1.12.8-r2.ebuild 17265 -SHA256 817f4944e9f846eba46e4c2254d1d4d827534dbb2d7a4f2ccef737c0c9382407 baselayout-1.12.8-r2.ebuild 17265 +EBUILD baselayout-1.12.8-r2.ebuild 17470 RMD160 fa1e64fd299e16f6a0281a468d72cdba4cdc54a1 SHA1 0d014b5951d0ef8772b4d23e384ad7facca7ad96 SHA256 f4a0ace6d2860add38b659053c2989f6eabaa7d974a9ad1f396692feb1205bff +MD5 ec7535105e3b1c8e7971025c28dbf780 baselayout-1.12.8-r2.ebuild 17470 +RMD160 fa1e64fd299e16f6a0281a468d72cdba4cdc54a1 baselayout-1.12.8-r2.ebuild 17470 +SHA256 f4a0ace6d2860add38b659053c2989f6eabaa7d974a9ad1f396692feb1205bff baselayout-1.12.8-r2.ebuild 17470 EBUILD baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 SHA1 a2110deb651437e356ae4f9ce9b7d5b0d6e4f89e SHA256 2de062a8fff51618f17af46395ab9a202d229d86e8e0f8fe713da344ec3d4d9a MD5 082aa588289d254af8bbdfbf37f0a05e baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 baselayout-1.12.8.ebuild 17035 @@ -104,18 +104,18 @@ EBUILD baselayout-1.13.0_alpha10-r1.ebuild 10022 RMD160 34d043897f9f887ceb23c14d MD5 a10b36ce27df1a86fcc4c4f7172ed47c baselayout-1.13.0_alpha10-r1.ebuild 10022 RMD160 34d043897f9f887ceb23c14d33b6376457502393 baselayout-1.13.0_alpha10-r1.ebuild 10022 SHA256 7aa0fa9cccbfab2ae027f0d86689bdf234b643d35a1e2aab2e512402bee0e168 baselayout-1.13.0_alpha10-r1.ebuild 10022 -EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10991 RMD160 ab8e0fc46022cec467b7534cf7a43ba1e78bdd5e SHA1 ec092bbb66e042a11449d5ac9ebb954525cc95b3 SHA256 1511f9f2bab2ca6a3d078c0eb16921916e156b676959f852e77b3dee10e17432 -MD5 3216dfc6ea546f69ebbb83f59b9fbf5b baselayout-1.13.0_alpha10-r2.ebuild 10991 -RMD160 ab8e0fc46022cec467b7534cf7a43ba1e78bdd5e baselayout-1.13.0_alpha10-r2.ebuild 10991 -SHA256 1511f9f2bab2ca6a3d078c0eb16921916e156b676959f852e77b3dee10e17432 baselayout-1.13.0_alpha10-r2.ebuild 10991 +EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10936 RMD160 6bae9e16b20e87907f2d0cca0a2753c9a52b00bc SHA1 637ae1c184c72341ece93e7bc62d97ef2a43c5da SHA256 54927e5781c016ae93ce65afe439c16069cb5086b58cb981758a337fbcf82073 +MD5 14f0d647289126d4eb088c8a74f2a357 baselayout-1.13.0_alpha10-r2.ebuild 10936 +RMD160 6bae9e16b20e87907f2d0cca0a2753c9a52b00bc baselayout-1.13.0_alpha10-r2.ebuild 10936 +SHA256 54927e5781c016ae93ce65afe439c16069cb5086b58cb981758a337fbcf82073 baselayout-1.13.0_alpha10-r2.ebuild 10936 EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 SHA1 c677943150955e11a42236be5906f25d4cb9f4ff SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979 SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 baselayout-1.13.0_alpha10.ebuild 9979 -MISC ChangeLog 87133 RMD160 28b2b8d4c551ae3d5e7210fc64f7c1ff31c50e30 SHA1 d8a614d43cfdda261664231f4b192dc08d721163 SHA256 e3bf296a23f3e191ba5d09f7019d94198dacfb7245399b2c0ad040e512593e0f -MD5 8243677cf7007a1f0278a5da4b9e9038 ChangeLog 87133 -RMD160 28b2b8d4c551ae3d5e7210fc64f7c1ff31c50e30 ChangeLog 87133 -SHA256 e3bf296a23f3e191ba5d09f7019d94198dacfb7245399b2c0ad040e512593e0f ChangeLog 87133 +MISC ChangeLog 87326 RMD160 26fd838dc1d8928e24e14d410f591e03a52f5269 SHA1 751224a3ee031a603460ca03f7390af7fb38d82f SHA256 a9a958ffe86fd4a48dbdcb6e6aeb0db17ec26977f94fcf1318a74a182c5d905b +MD5 145cd4e393689c7954429ebad891e6bd ChangeLog 87326 +RMD160 26fd838dc1d8928e24e14d410f591e03a52f5269 ChangeLog 87326 +SHA256 a9a958ffe86fd4a48dbdcb6e6aeb0db17ec26977f94fcf1318a74a182c5d905b ChangeLog 87326 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 diff --git a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild index 6eaea16989fb..5d26b6e1621a 100644 --- a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild @@ -1,6 +1,6 @@ # 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-1.12.8-r2.ebuild,v 1.1 2007/01/05 18:23:55 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild,v 1.2 2007/01/08 23:06:53 uberlord Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -379,6 +379,10 @@ remap_dns_vars() { } pkg_preinst() { + # When downgrading from 1.13 we need to erase net.lo as it's a symlink + # and it's about to become a file - this is fatal in /etc + [[ -L "${ROOT}"etc/init.d/net.lo ]] && rm -f "${ROOT}"etc/init.d/net.lo + # Reincarnate dirs from kdir/unkdir (hack for bug 9849) # This needs to be in pkg_preinst() rather than pkg_postinst() as # portage may create some dirs/files that'll screw us up (like /usr/lib/debug) diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild index e76a95133f4b..df56c1858241 100644 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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-1.13.0_alpha10-r2.ebuild,v 1.4 2006/12/30 15:59:00 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild,v 1.5 2007/01/08 23:06:53 uberlord Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -62,13 +62,9 @@ src_unpack() { } make_opts() { - # Standard options - local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\" CC=\"$(tc-getCC)\"" local libdir="lib" - [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") - - opts="${opts} LIB=${libdir}" + local opts="${opts} LIB=${libdir}" if use kernel_linux ; then opts="${opts} OS=Linux" @@ -83,7 +79,7 @@ make_opts() { src_compile() { use static && append-ldflags -static - emake $(make_opts) || die + emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die } # Support function for remapping old wireless dns vars @@ -128,7 +124,7 @@ pkg_preinst() { ln -s "${lib}" "${ROOT}usr/local/lib" fi - make -C "${T}" $(make_opts) layout || die "failed to layout filesystem" + 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 @@ -181,7 +177,7 @@ pkg_postinst() { if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then einfo "Creating dev nodes" PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \ - dev || die "failed to create /dev nodes" + DESTDIR="${ROOT}" dev || die "failed to create /dev nodes" fi fi fi @@ -189,7 +185,7 @@ 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) runlevels_install >/dev/null + 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 @@ -210,6 +206,7 @@ pkg_postinst() { 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}${svcdir}" ) # Install our new init script and mark it started if use kernel_linux ; then @@ -311,6 +308,5 @@ pkg_postrm() { umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null rm -rf "${ROOT}lib/rcscripts/init.d" ) - ewarn "You will need to re-emerge ${PN} to restore ${ROOT}etc/init.d/net.lo" fi } -- 2.26.2