From: "Yuta SATOH" <nigoro.gentoo@0x100.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/files/, dev-util/catalyst/
Date: Sat, 28 Jul 2012 15:45:52 +0000 (UTC) [thread overview]
Message-ID: <1343489959.9c0aa7a0d10d93e0ead66eec9109ffeb499b049f.yuta_satoh@gentoo> (raw)
commit: 9c0aa7a0d10d93e0ead66eec9109ffeb499b049f
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Jul 28 15:39:19 2012 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Jul 28 15:39:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=9c0aa7a0
update catalyst-2.0.10.1-fbsd.patch
stage1, remove PORTAGE_OVERLAY from /tmp/stage1root/etc/make.conf
stage2, fixes cannot run sed /etc/portage/make.conf
stage3, change to enable the option chost
---
dev-util/catalyst/Manifest | 4 +-
dev-util/catalyst/catalyst-2.0.10.1.ebuild | 2 +-
.../catalyst/files/catalyst-2.0.10.1-fbsd.patch | 99 ++++++++++++--------
3 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 26fe9ee..dcf9114 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,4 @@
AUX 2.0.8.1-arm-softfp.patch 1551 RMD160 20b47d803443136ab511ef5ad5b7d5b2ea0e0715 SHA1 c51b4dc05bffaed7911d447bea7993400854152e SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc
-AUX catalyst-2.0.10.1-fbsd.patch 5415 RMD160 481b6eccbac39d389443a7907ea36e47fe05db15 SHA1 47a03f8ead1b72714da89bdf4b7881293d88c4fc SHA256 a071a7e6816b0df2e5f658b2d2ff086bf8630f705dbf3fa37858ca7e16579bc5
+AUX catalyst-2.0.10.1-fbsd.patch 6248 RMD160 c5bf9c3ef1ab84dc02a57c30163aad102dc5985c SHA1 2a5d2b268fc96a293d00df3e25df23f2a50890d0 SHA256 958e7f773121eb6a10e9f6b4c551216658221985e2487b8f62a0c601164fd666
DIST catalyst-2.0.10.1.tar.bz2 909073 RMD160 48d4eeb7e3dfd14f1c1f04542371580999d97e63 SHA1 c8cc79c635b531fdc5592a8cf230706817a8458a SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed
-EBUILD catalyst-2.0.10.1.ebuild 3440 RMD160 751e7cf35536bcbbf3f6ef1d9ab1792eb7fe9a32 SHA1 35af1d15ee5557e65103155a3847fc7f6f0c3557 SHA256 14b53f8a934c12a9f08e91f9f80de6d65799e8bc9e606408a26fbb0f28f5b0fa
+EBUILD catalyst-2.0.10.1.ebuild 3331 RMD160 544075a6dce9a081035403c5adf2159b389d166a SHA1 923f804f2e715235e89aa0d29d33ff546de14d9f SHA256 e16830ca69796659ed19fb00121a920b3ef66a0be9db63d09261b08f76eeb111
diff --git a/dev-util/catalyst/catalyst-2.0.10.1.ebuild b/dev-util/catalyst/catalyst-2.0.10.1.ebuild
index cf9d830..f5da4f3 100644
--- a/dev-util/catalyst/catalyst-2.0.10.1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.10.1.ebuild,v 1.1 2012/07/27 05:14:07 jmbsvicetto Exp $
+# $Header: $
# catalyst-9999 -> latest Git
# catalyst-2.9999 -> catalyst_2 branch from Git
diff --git a/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch
index 406ddd8..45d8744 100644
--- a/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch
+++ b/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch
@@ -1,27 +1,64 @@
-diff -Nur catalyst-2.0.8.1.orig/modules/generic_stage_target.py catalyst-2.0.8.1/modules/generic_stage_target.py
---- catalyst-2.0.8.1.orig/modules/generic_stage_target.py 2012-05-12 05:19:57.000000000 +0900
-+++ catalyst-2.0.8.1/modules/generic_stage_target.py 2012-06-04 00:36:35.000000000 +0900
-@@ -1078,9 +1078,14 @@
+diff -Nur catalyst-2.0.10.1.orig/modules/generic_stage_target.py catalyst-2.0.10.1/modules/generic_stage_target.py
+--- catalyst-2.0.10.1.orig/modules/generic_stage_target.py 2012-07-27 13:43:50.000000000 +0900
++++ catalyst-2.0.10.1/modules/generic_stage_target.py 2012-07-28 22:14:36.000000000 +0900
+@@ -1075,9 +1075,15 @@
if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):
cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\
"Could not remove /usr/local/portage",env=self.env)
- cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
- "/etc/portage/make.conf",\
- "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
-+ if os.path.exists("/usr/bin/gsed"):
-+ cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
-+ "/etc/portage/make.conf",\
-+ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
-+ else:
-+ cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
-+ "/etc/portage/make.conf",\
-+ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
++ if os.path.exists(self.settings["chroot_path"]+"/etc/portage/make.conf"):
++ if os.path.exists("/usr/bin/gsed"):
++ cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
++ "/etc/portage/make.conf",\
++ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
++ else:
++ cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
++ "/etc/portage/make.conf",\
++ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
""" Clean up old and obsoleted files in /etc """
if os.path.exists(self.settings["stage_path"]+"/etc"):
-diff -Nur catalyst-2.0.8.1.orig/targets/stage1/stage1-chroot.sh catalyst-2.0.8.1/targets/stage1/stage1-chroot.sh
---- catalyst-2.0.8.1.orig/targets/stage1/stage1-chroot.sh 2012-05-12 05:19:57.000000000 +0900
-+++ catalyst-2.0.8.1/targets/stage1/stage1-chroot.sh 2012-06-04 00:36:35.000000000 +0900
+diff -Nur catalyst-2.0.10.1.orig/modules/stage1_target.py catalyst-2.0.10.1/modules/stage1_target.py
+--- catalyst-2.0.10.1.orig/modules/stage1_target.py 2012-07-27 13:43:50.000000000 +0900
++++ catalyst-2.0.10.1/modules/stage1_target.py 2012-07-28 22:14:36.000000000 +0900
+@@ -90,10 +90,14 @@
+ # stage_path/proc probably doesn't exist yet, so create it
+ if not os.path.exists(self.settings["stage_path"]+"/proc"):
+ os.makedirs(self.settings["stage_path"]+"/proc")
++ if not os.path.exists(self.settings["stage_path"]+"/dev"):
++ os.makedirs(self.settings["stage_path"]+"/dev")
+
+ # alter the mount mappings to bind mount proc onto it
+ self.mounts.append("/tmp/stage1root/proc")
+ self.mountmap["/tmp/stage1root/proc"]="/proc"
++ self.mounts.append("/tmp/stage1root/dev")
++ self.mountmap["/tmp/stage1root/dev"]="/dev"
+
+
+ def register(foo):
+diff -Nur catalyst-2.0.10.1.orig/modules/stage3_target.py catalyst-2.0.10.1/modules/stage3_target.py
+--- catalyst-2.0.10.1.orig/modules/stage3_target.py 2012-07-27 13:43:50.000000000 +0900
++++ catalyst-2.0.10.1/modules/stage3_target.py 2012-07-28 22:17:10.000000000 +0900
+@@ -12,9 +12,13 @@
+ """
+ def __init__(self,spec,addlargs):
+ self.required_values=[]
+- self.valid_values=[]
++ self.valid_values=["chost"]
+ generic_stage_target.__init__(self,spec,addlargs)
+
++ def override_chost(self):
++ if self.settings.has_key("chost"):
++ self.settings["CHOST"]=list_to_string(self.settings["chost"])
++
+ def set_portage_overlay(self):
+ generic_stage_target.set_portage_overlay(self)
+ if self.settings.has_key("portage_overlay"):
+diff -Nur catalyst-2.0.10.1.orig/targets/stage1/stage1-chroot.sh catalyst-2.0.10.1/targets/stage1/stage1-chroot.sh
+--- catalyst-2.0.10.1.orig/targets/stage1/stage1-chroot.sh 2012-07-27 13:43:50.000000000 +0900
++++ catalyst-2.0.10.1/targets/stage1/stage1-chroot.sh 2012-07-28 22:14:36.000000000 +0900
@@ -4,6 +4,7 @@
export clst_buildpkgs="$(/tmp/build.py)"
@@ -46,21 +83,21 @@ diff -Nur catalyst-2.0.8.1.orig/targets/stage1/stage1-chroot.sh catalyst-2.0.8.1
-sed -i "/USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
+${SED} -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
/etc/portage/make.conf
-diff -Nur catalyst-2.0.8.1.orig/targets/stage1/stage1-preclean-chroot.sh catalyst-2.0.8.1/targets/stage1/stage1-preclean-chroot.sh
---- catalyst-2.0.8.1.orig/targets/stage1/stage1-preclean-chroot.sh 2012-05-12 05:19:57.000000000 +0900
-+++ catalyst-2.0.8.1/targets/stage1/stage1-preclean-chroot.sh 2012-06-04 00:36:35.000000000 +0900
+diff -Nur catalyst-2.0.10.1.orig/targets/stage1/stage1-preclean-chroot.sh catalyst-2.0.10.1/targets/stage1/stage1-preclean-chroot.sh
+--- catalyst-2.0.10.1.orig/targets/stage1/stage1-preclean-chroot.sh 2012-07-27 13:43:50.000000000 +0900
++++ catalyst-2.0.10.1/targets/stage1/stage1-preclean-chroot.sh 2012-07-28 22:14:36.000000000 +0900
@@ -4,6 +4,8 @@
source /tmp/chroot-functions.sh
+sed_selector
-+${SED} -i '/^PORTDIR_OVERLAY/d' /etc/portage/make.conf
++${SED} -i '/^PORTDIR_OVERLAY/d' /etc/make.conf
update_env_settings
show_debug
-diff -Nur catalyst-2.0.8.1.orig/targets/support/chroot-functions.sh catalyst-2.0.8.1/targets/support/chroot-functions.sh
---- catalyst-2.0.8.1.orig/targets/support/chroot-functions.sh 2012-05-12 05:19:57.000000000 +0900
-+++ catalyst-2.0.8.1/targets/support/chroot-functions.sh 2012-06-04 00:38:07.000000000 +0900
+diff -Nur catalyst-2.0.10.1.orig/targets/support/chroot-functions.sh catalyst-2.0.10.1/targets/support/chroot-functions.sh
+--- catalyst-2.0.10.1.orig/targets/support/chroot-functions.sh 2012-07-27 13:43:50.000000000 +0900
++++ catalyst-2.0.10.1/targets/support/chroot-functions.sh 2012-07-28 22:14:36.000000000 +0900
@@ -60,6 +60,7 @@
}
@@ -113,21 +150,3 @@ diff -Nur catalyst-2.0.8.1.orig/targets/support/chroot-functions.sh catalyst-2.0
# We do this everywhere, so why not put it in this script
run_default_funcs
-diff -Nur catalyst.orig-2.0.8.1/modules/stage1_target.py catalyst-2.0.8.1/modules/stage1_target.py
---- catalyst-2.0.8.1.orig/modules/stage1_target.py 2012-06-04 00:43:34.000000000 +0900
-+++ catalyst-2.0.8.1/modules/stage1_target.py 2012-06-04 00:50:19.000000000 +0900
-@@ -87,10 +87,14 @@
- # stage_path/proc probably doesn't exist yet, so create it
- if not os.path.exists(self.settings["stage_path"]+"/proc"):
- os.makedirs(self.settings["stage_path"]+"/proc")
-+ if not os.path.exists(self.settings["stage_path"]+"/dev"):
-+ os.makedirs(self.settings["stage_path"]+"/dev")
-
- # alter the mount mappings to bind mount proc onto it
- self.mounts.append("/tmp/stage1root/proc")
- self.mountmap["/tmp/stage1root/proc"]="/proc"
-+ self.mounts.append("/tmp/stage1root/dev")
-+ self.mountmap["/tmp/stage1root/dev"]="/dev"
-
-
- def register(foo):
next reply other threads:[~2012-07-28 15:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 15:45 Yuta SATOH [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-12-09 22:29 [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/files/, dev-util/catalyst/ Yuta SATOH
2014-10-29 12:16 Yuta SATOH
2013-08-29 15:34 Yuta SATOH
2012-12-23 8:30 Yuta SATOH
2012-12-11 13:21 Yuta SATOH
2012-11-23 13:06 Yuta SATOH
2012-11-22 12:26 Yuta SATOH
2012-10-13 9:33 Yuta SATOH
2012-10-12 15:25 Yuta SATOH
2012-07-27 12:44 Yuta SATOH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343489959.9c0aa7a0d10d93e0ead66eec9109ffeb499b049f.yuta_satoh@gentoo \
--to=nigoro.gentoo@0x100.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox