summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2007-01-16 14:05:26 +0000
committerSimon Stelling <blubb@gentoo.org>2007-01-16 14:05:26 +0000
commite2bb14120a7f92501f42c908b3e3a7b355f4f2e8 (patch)
tree84ba9a8ba745d62ef6462c1b2bd835a4184e0e01 /app-emulation/x86-chroot
parentAdded ~x86-fbsd keyword. (diff)
downloadgentoo-2-e2bb14120a7f92501f42c908b3e3a7b355f4f2e8.tar.gz
gentoo-2-e2bb14120a7f92501f42c908b3e3a7b355f4f2e8.tar.bz2
gentoo-2-e2bb14120a7f92501f42c908b3e3a7b355f4f2e8.zip
fix bug 162353 and remove old version
(Portage version: 2.1.2_rc4-r6)
Diffstat (limited to 'app-emulation/x86-chroot')
-rw-r--r--app-emulation/x86-chroot/ChangeLog8
-rw-r--r--app-emulation/x86-chroot/files/initd3
-rw-r--r--app-emulation/x86-chroot/files/x86-chroot1
3 files changed, 8 insertions, 4 deletions
diff --git a/app-emulation/x86-chroot/ChangeLog b/app-emulation/x86-chroot/ChangeLog
index c86a8b11c1d7..3bd6c3a6cb1a 100644
--- a/app-emulation/x86-chroot/ChangeLog
+++ b/app-emulation/x86-chroot/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/x86-chroot
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/x86-chroot/ChangeLog,v 1.4 2006/10/04 08:57:08 blubb Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/x86-chroot/ChangeLog,v 1.5 2007/01/16 14:05:26 blubb Exp $
+
+ 16 Jan 2007; <blubb@gentoo.org> files/initd, files/x86-chroot,
+ -x86-chroot-2006.0.ebuild:
+ fix bug 162353 and remove old version
04 Oct 2006; Simon Stelling <blubb@gentoo.org> x86-chroot-2006.1.ebuild:
tweak make.conf for bug 150022
diff --git a/app-emulation/x86-chroot/files/initd b/app-emulation/x86-chroot/files/initd
index 084447a474fc..0bd9bb1d52ea 100644
--- a/app-emulation/x86-chroot/files/initd
+++ b/app-emulation/x86-chroot/files/initd
@@ -15,7 +15,7 @@ start() {
mount -o bind ${loc} ${CHROOT_LOCATION}${loc} >/dev/null
done
eval "$(portageq envvar -v PORTDIR DISTDIR)"
- [[ -d ${PORTDIR}/distfiles ]] || mkdir ${PORTDIR}/distfiles
+ [[ -d ${CHROOT_LOCATION}/usr/portage/distfiles ]] || mkdir -p ${CHROOT_LOCATION}/usr/portage/distfiles
mount -o bind ${PORTDIR} ${CHROOT_LOCATION}/usr/portage >/dev/null
mount -o bind ${DISTDIR} ${CHROOT_LOCATION}/usr/portage/distfiles >/dev/null
eend $? "An error occured while attempting to mount 32bit chroot directories"
@@ -25,7 +25,6 @@ start() {
[[ -f /etc/${conffile} ]] && cp -pf /etc/${conffile} ${CHROOT_LOCATION}/etc >/dev/null &
done
cp -Ppf /etc/localtime ${CHROOT_LOCATION}/etc >/dev/null &
- which xhost &>/dev/null && xhost local:localhost &>/dev/null
eend $? "An error occured while attempting to copy 32 bits chroot files."
}
diff --git a/app-emulation/x86-chroot/files/x86-chroot b/app-emulation/x86-chroot/files/x86-chroot
index 966c4dac086f..6233c243d91d 100644
--- a/app-emulation/x86-chroot/files/x86-chroot
+++ b/app-emulation/x86-chroot/files/x86-chroot
@@ -1,3 +1,4 @@
#!/bin/bash
source /etc/conf.d/x86-chroot
+which xhost &>/dev/null && xhost local:localhost &>/dev/null
linux32 chroot ${CHROOT_LOCATION} /bin/bash