* [gentoo-commits] proj/catalyst:master commit in: /, targets/support/
@ 2011-04-10 17:09 Raúl Porcel
0 siblings, 0 replies; 6+ messages in thread
From: Raúl Porcel @ 2011-04-10 17:09 UTC (permalink / raw
To: gentoo-commits
commit: a9fff9100eec3a1d1d2885611b256cee1e3b6d73
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 17:08:13 2011 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 17:08:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a9fff910
Replace virtual/portage with sys-apps/portage, bug #358847
---
ChangeLog | 4 ++++
targets/support/chroot-functions.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2e0f47b..6f9d6a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
# Distributed under the GPL v2
# $Id$
+ 10 Apr 2011; Raúl Porcel <armin76@gentoo.org>
+ targets/support/chroot-functions.sh:
+ Replace virtual/portage with sys-apps/portage, bug #358847
+
05 Feb 2011; Raúl Porcel <armin76@gentoo.org>
modules/catalyst/arch/amd64.py:
Enable new amd64 subarches
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index f1bdb7f..ee605e5 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -167,7 +167,7 @@ setup_pkgmgr(){
# portage to avoid frying our /etc/make.conf file. Otherwise, we could
# just let emerge system could merge it.
[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
- run_merge --oneshot --nodeps virtual/portage
+ run_merge --oneshot --nodeps sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/make.conf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: /, targets/support/
@ 2011-04-14 10:20 Raúl Porcel
0 siblings, 0 replies; 6+ messages in thread
From: Raúl Porcel @ 2011-04-14 10:20 UTC (permalink / raw
To: gentoo-commits
commit: 9b67dbb9f8eed045697744c2368970f6788206a8
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 10:20:02 2011 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 10:20:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9b67dbb9
Add gentoo-ilo option for the bootloader on ia64
---
ChangeLog | 4 ++++
targets/support/bootloader-setup.sh | 5 +++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6f9d6a5..0036fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
# Distributed under the GPL v2
# $Id$
+ 14 Apr 2011; Raúl Porcel <armin76@gentoo.org>
+ targets/support/bootloader-setup.sh:
+ Add gentoo-ilo option for the bootloader on ia64
+
10 Apr 2011; Raúl Porcel <armin76@gentoo.org>
targets/support/chroot-functions.sh:
Replace virtual/portage with sys-apps/portage, bug #358847
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index bd92eb9..ffd6794 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -235,6 +235,11 @@ case ${clst_hostarch} in
echo " initrd=/efi/boot/${x}.igz" >> ${iacfg}
echo >> ${iacfg}
echo "image=/efi/boot/${x}" >> ${iacfg}
+ echo " label=${x}-ilo">> ${iacfg}
+ echo ' append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttyS3,9600"' >> ${iacfg}
+ echo " initrd=/efi/boot/${x}.igz" >> ${iacfg}
+ echo >> ${iacfg}
+ echo "image=/efi/boot/${x}" >> ${iacfg}
echo " label=${x}-sgi">> ${iacfg}
echo ' append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttySG0,115200"' >> ${iacfg}
echo " initrd=/efi/boot/${x}.igz" >> ${iacfg}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: /, targets/support/
@ 2011-06-25 17:51 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2011-06-25 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 46f7d5ca4de8da33e2756078d48d0cd4e9364ce4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 17:50:22 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 17:50:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=46f7d5ca
Use get_libdir instead of hard-coding lib for distcc
---
ChangeLog | 4 ++++
targets/support/chroot-functions.sh | 16 ++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 30eb83a..a449e4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
# $Id$
25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+ targets/support/chroot-functions.sh:
+ Use get_libdir instead of hard-coding lib for distcc
+
+ 25 Jun 2011; Matt Turner <mattst88@gentoo.org>
modules/catalyst/arch/mips.py: add multilib (and missing n64) classes
25 Jun 2011; Matt Turner <mattst88@gentoo.org>
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index ee605e5..395a91c 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -92,11 +92,11 @@ setup_myfeatures(){
# This sets up automatic cross-distcc-fu according to
# http://www.gentoo.org/doc/en/cross-compiling-distcc.xml
CHOST=$(portageq envvar CHOST)
- # TODO: change to use get_libdir
- cd /usr/lib/distcc/bin
+ LIBDIR=$(get_libdir)
+ cd /usr/${LIBDIR}/distcc/bin
rm cc gcc g++ c++ 2>/dev/null
- echo -e '#!/bin/bash\nexec /usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
- chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
+ echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+ chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper
for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
fi
@@ -172,13 +172,13 @@ setup_pkgmgr(){
}
cleanup_distcc() {
+ LIBDIR=$(get_libdir)
rm -rf /etc/distcc/hosts
for i in cc gcc c++ g++; do
- # TODO: change to use get_libdir
- rm -f /usr/lib/distcc/bin/${i}
- ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
+ rm -f /usr/${LIBDIR}/distcc/bin/${i}
+ ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i}
done
- rm -f /usr/lib/distcc/bin/*-wrapper
+ rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper
}
cleanup_icecream() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: /, targets/support/
@ 2011-06-26 17:06 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2011-06-26 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 78d51d40104a65b279800983fa3398db0c73e6e2
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 16:59:11 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Jun 26 16:59:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=78d51d40
chroot-functions.sh: don't run 'distcc-config --install'
distcc-config doesn't have this option anymore, so it's unneeded.
---
ChangeLog | 4 ++++
targets/support/chroot-functions.sh | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b4f2407..965171a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
# Distributed under the GPL v2
# $Id$
+ 26 Jun 2011; Matt Turner <mattst88@gentoo.org>
+ targets/support/chroot-functions.sh:
+ Don't run 'distcc-config --install'
+
25 Jun 2011; Sebastian Pipping <sping@gentoo.org>
targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
targets/support/chroot-functions.sh:
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 0d8b76e..638ef67 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -86,8 +86,6 @@ setup_myfeatures(){
sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
mkdir -p /etc/distcc
echo "${clst_distcc_hosts}" > /etc/distcc/hosts
- # We need to run distcc-config, since it might not have gotten run
- [ -x /usr/bin/distcc-config ] && /usr/bin/distcc-config --install
# This sets up automatic cross-distcc-fu according to
# http://www.gentoo.org/doc/en/cross-compiling-distcc.xml
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: /, targets/support/
@ 2011-06-26 17:06 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2011-06-26 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 11a7b5cb09e2d7b7f4f88496fc7816a7cad030d4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 17:02:22 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Jun 26 17:02:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=11a7b5cb
chroot-functions.sh: emerge sys-apps/shadow before distcc
distcc uses 'useradd' and will fail in stage2 without shadow.
---
ChangeLog | 4 ++++
targets/support/chroot-functions.sh | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 965171a..8130862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
26 Jun 2011; Matt Turner <mattst88@gentoo.org>
targets/support/chroot-functions.sh:
+ Emerge sys-apps/shadow before distcc
+
+ 26 Jun 2011; Matt Turner <mattst88@gentoo.org>
+ targets/support/chroot-functions.sh:
Don't run 'distcc-config --install'
25 Jun 2011; Sebastian Pipping <sping@gentoo.org>
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 638ef67..4e707d2 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -72,18 +72,19 @@ setup_myfeatures(){
export clst_myfeatures="${clst_myfeatures} distcc"
export DISTCC_HOSTS="${clst_distcc_hosts}"
[ -e /etc/make.conf ] && \
- echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf
+ echo 'USE="${USE} -avahi -gtk -gnome -cracklib -pam"' >> /etc/make.conf
# We install distcc to / on stage1, then use --noreplace, so we need to
# have some way to check if we need to reinstall distcc without being
# able to rely on USE, so we check for the distcc user and force a
# reinstall if it isn't found.
if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
then
+ clst_root_path=/ run_merge --oneshot --nodeps sys-apps/shadow || exit 1
clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
else
clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
fi
- sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
+ sed -i '/USE="${USE} -avahi -gtk -gnome -cracklib -pam"/d' /etc/make.conf
mkdir -p /etc/distcc
echo "${clst_distcc_hosts}" > /etc/distcc/hosts
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: /, targets/support/
@ 2011-07-14 1:46 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2011-07-14 1:46 UTC (permalink / raw
To: gentoo-commits
commit: b40988d66fbecca24c21634267131b89f178fca7
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 01:45:02 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 01:45:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b40988d6
Revert "chroot-functions.sh: emerge sys-apps/shadow before distcc"
This reverts commit 11a7b5cb09e2d7b7f4f88496fc7816a7cad030d4.
We do not need this now since shadow is part of stage 1.
---
ChangeLog | 4 ----
targets/support/chroot-functions.sh | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8130862..965171a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,10 +5,6 @@
26 Jun 2011; Matt Turner <mattst88@gentoo.org>
targets/support/chroot-functions.sh:
- Emerge sys-apps/shadow before distcc
-
- 26 Jun 2011; Matt Turner <mattst88@gentoo.org>
- targets/support/chroot-functions.sh:
Don't run 'distcc-config --install'
25 Jun 2011; Sebastian Pipping <sping@gentoo.org>
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 4e707d2..638ef67 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -72,19 +72,18 @@ setup_myfeatures(){
export clst_myfeatures="${clst_myfeatures} distcc"
export DISTCC_HOSTS="${clst_distcc_hosts}"
[ -e /etc/make.conf ] && \
- echo 'USE="${USE} -avahi -gtk -gnome -cracklib -pam"' >> /etc/make.conf
+ echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf
# We install distcc to / on stage1, then use --noreplace, so we need to
# have some way to check if we need to reinstall distcc without being
# able to rely on USE, so we check for the distcc user and force a
# reinstall if it isn't found.
if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
then
- clst_root_path=/ run_merge --oneshot --nodeps sys-apps/shadow || exit 1
clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
else
clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
fi
- sed -i '/USE="${USE} -avahi -gtk -gnome -cracklib -pam"/d' /etc/make.conf
+ sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
mkdir -p /etc/distcc
echo "${clst_distcc_hosts}" > /etc/distcc/hosts
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-14 1:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-14 10:20 [gentoo-commits] proj/catalyst:master commit in: /, targets/support/ Raúl Porcel
-- strict thread matches above, loose matches on Subject: below --
2011-07-14 1:46 William Hubbs
2011-06-26 17:06 Matt Turner
2011-06-26 17:06 Matt Turner
2011-06-25 17:51 Matt Turner
2011-04-10 17:09 Raúl Porcel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox