* [gentoo-commits] proj/catalyst:catalyst_2 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: 4d77540ab2d1993fa85122b987b272f74ccb42bc
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 17:09:15 2011 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 17:09:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4d77540a
This is catalyst 2.0.6.915
---
ChangeLog | 10 +++++++++-
catalyst | 4 ++--
targets/support/chroot-functions.sh | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 791f0e3..5cc5e61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
# ChangeLog for catalyst
-# Copyright 1999-2011 Gentoo Foundation; 2008-2010 Various authors (see AUTHORS)
+# Copyright 1999-2011 Gentoo Foundation; 2008-2011 Various authors (see AUTHORS)
# Distributed under the GPL v2
# $Id$
+ 10 Apr 2011; Raúl Porcel <armin76@gentoo.org> catalyst,
+ targets/support/chroot-functions.sh:
+ This is catalyst 2.0.6.915
+
+ 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> catalyst:
This is catalyst 2.0.6.914
diff --git a/catalyst b/catalyst
index b8fd848..fdf8570 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
import catalyst.util
__maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.6.914"
+__version__="2.0.6.915"
conf_values={}
@@ -50,7 +50,7 @@ def usage():
def version():
print "Catalyst, version "+__version__
print "Copyright 2003-2008 Gentoo Foundation"
- print "Copyright 2008-2010 various authors"
+ print "Copyright 2008-2011 various authors"
print "Distributed under the GNU General Public License version 2.1\n"
def parse_config(myconfig):
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 4e07d44..72fee20 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:catalyst_2 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: 8039009c7dd8d17c6e6987593a2f434740f4c2a4
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 10:19:33 2011 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 10:19:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8039009c
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 5cc5e61..4942896 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> catalyst,
targets/support/chroot-functions.sh:
This is catalyst 2.0.6.915
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 6fcb035..239de81 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:catalyst_2 commit in: /, targets/support/
@ 2011-06-25 17:52 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2011-06-25 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 7d6fb00a9d36767fa1f88e81f3e02dbdbdd8d8b3
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:51:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7d6fb00a
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 70681df..61dc5b2 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 72fee20..caaa576 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:catalyst_2 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: b31b2bb2e8c72b8517253e41d89eb6d90f8c2cfd
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 17:05:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b31b2bb2
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 23aa985..b6df4d5 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'
+
26 Jun 2011; Sebastian Pipping <sping@gentoo.org>
modules/catalyst_support.py:
Warn about multiple argument errors at the same time
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 8b03f6c..e739f0a 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:catalyst_2 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: a4968878f0bf3bf32e0c5fb0c4b6d88a0ebb8084
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:05:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a4968878
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 b6df4d5..0e1b89f 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'
26 Jun 2011; Sebastian Pipping <sping@gentoo.org>
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index e739f0a..0b81e65 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:catalyst_2 commit in: /, targets/support/
@ 2011-07-14 1:30 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2011-07-14 1:30 UTC (permalink / raw
To: gentoo-commits
commit: 202e345f8b1910aa17fef4512828ffd5a94e7e15
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 01:29:24 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 01:29:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=202e345f
Revert "chroot-functions.sh: emerge sys-apps/shadow before distcc"
This reverts commit a4968878f0bf3bf32e0c5fb0c4b6d88a0ebb8084.
Shadow is now built in stage 1, so we do not need this.
---
ChangeLog | 4 ----
targets/support/chroot-functions.sh | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e1b89f..b6df4d5 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'
26 Jun 2011; Sebastian Pipping <sping@gentoo.org>
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 0b81e65..e739f0a 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:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-14 1:30 [gentoo-commits] proj/catalyst:catalyst_2 commit in: /, targets/support/ William Hubbs
-- strict thread matches above, loose matches on Subject: below --
2011-06-26 17:06 Matt Turner
2011-06-26 17:06 Matt Turner
2011-06-25 17:52 Matt Turner
2011-04-14 10:20 Raúl Porcel
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