diff options
| author |   Brad House <brad_mssw@gentoo.org> | 2003-12-15 00:55:39 +0000 |
|---|---|---|
| committer | Brad House <brad_mssw@gentoo.org> | 2003-12-15 00:55:39 +0000 |
| commit | 1488b77dbd00c47266fd31c0748152b64dc39caf (patch) | |
| tree | d4313f65d9ebdc835fda104f1cf2b488173cc57b /sys-apps | |
| parent | AMD64 keywords (diff) | |
| download | gentoo-2-1488b77dbd00c47266fd31c0748152b64dc39caf.tar.gz gentoo-2-1488b77dbd00c47266fd31c0748152b64dc39caf.tar.bz2 gentoo-2-1488b77dbd00c47266fd31c0748152b64dc39caf.zip | |
baselayout fixes for catalyst stage builds
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild | 25 |
3 files changed, 26 insertions, 13 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index ce3d1265f33d..62d211e229d9 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # 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.108 2003/12/14 23:40:41 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.109 2003/12/15 00:55:36 brad_mssw Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 14 Dec 2003; Brad House <brad_mssw@gentoo.org> + baselayout-1.8.6.12-r2.ebuild: + baselayout fixes for catalyst stage builds + 15 Dec 2003; <spider@gentoo.org> baselayout-1.8.5.9.ebuild, baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.8-r1.ebuild: QA: fixing chown user.group to user:group, bug #35127 diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 1fea685f899a..b9c365c7ccd6 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,12 +1,12 @@ -MD5 5defc09f0cb6af0660ce07763abe31a2 ChangeLog 20694 +MD5 4b308ae1901f4dc3e422e113ac3bd74a ChangeLog 20825 MD5 588528d3d2aad56bc41812645cb30ab9 baselayout-1.8.5.9.ebuild 15443 MD5 d304fea0294facb045627f3d616d7141 baselayout-1.8.6.10-r1.ebuild 19917 -MD5 b543be37b46351d69116d99bd947056a baselayout-1.8.6.12-r2.ebuild 20390 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 3df11c6ed2d63b0aabdfc70566d28f72 baselayout-1.8.6.8-r1.ebuild 19208 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 0c780bcbcdb83e7b2108ce780302d803 baselayout-1.8.6.12-r2.ebuild 20733 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 -MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137 MD5 791058728d722586ebd7f7d93efac22f files/digest-baselayout-1.8.5.9 134 +MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137 MD5 a6c521e030d8c87b9617f701fa1ec0f8 files/digest-baselayout-1.8.6.8-r1 136 MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138 diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild index f47c357f00e6..ae5fbe793ec1 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild @@ -1,6 +1,6 @@ # 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.6.12-r2.ebuild,v 1.4 2003/12/14 20:22:02 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.5 2003/12/15 00:55:36 brad_mssw Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -22,7 +22,7 @@ HOMEPAGE="http://www.gentoo.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~arm ~hppa ~ia64" +KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm ~hppa ~ia64" DEPEND="virtual/os-headers >=sys-apps/portage-2.0.23" @@ -549,17 +549,26 @@ pkg_postinst() { 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/.udev" -a \ + + # Added devfs check + # brad_mssw@gentoo.org 12/14/2003 + if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a ! -e "${ROOT}/dev/.devfsd" -a \ -f "${ROOT}/lib/udev-state/devices.tar.bz2" ] then - if [ -z "$(use build)" -a -z "$(use bootstrap)" ] || \ - ([ -n "$(use selinux)" ] && \ - [ -n "$(use build)" -o -n "$(use bootstrap)" ]) - then + # USE="-* build" in catalyst, so this never gets called when + # creating a stage1 build. So I'm commenting out this + # elaborate if statement + # brad_mssw@gentoo.org 12/14/2003 + einfo "populating /dev in base system" +# if [ -z "$(use build)" -a -z "$(use bootstrap)" ] || \ +# ([ -n "$(use selinux)" ] && \ +# [ -n "$(use build)" -o -n "$(use bootstrap)" ]) +# then + mkdir -p "${ROOT}/dev" einfo "Populating /dev with device nodes..." tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \ -C "${ROOT}/dev" - fi +# fi fi echo |