diff options
author | 2012-12-11 22:12:36 +0900 | |
---|---|---|
committer | 2012-12-11 22:12:36 +0900 | |
commit | fd12286db2defd3beca83b48e23ffbde0f5f5d48 (patch) | |
tree | a005f21e6ce1c43a5fd507a76f2f165be02f0285 /dev-util/catalyst | |
parent | gfbsd stages builder, ready to build 9.1-RELEASE (diff) | |
download | gentoo-bsd-fd12286db2defd3beca83b48e23ffbde0f5f5d48.tar.gz gentoo-bsd-fd12286db2defd3beca83b48e23ffbde0f5f5d48.tar.bz2 gentoo-bsd-fd12286db2defd3beca83b48e23ffbde0f5f5d48.zip |
catalyst -- removed old, and added 2.0.12.2
Diffstat (limited to 'dev-util/catalyst')
-rw-r--r-- | dev-util/catalyst/Manifest | 11 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-2.0.10.1.ebuild | 104 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-2.0.11.ebuild | 109 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-2.0.12.2.ebuild (renamed from dev-util/catalyst/catalyst-2.0.12.1.ebuild) | 7 | ||||
-rw-r--r-- | dev-util/catalyst/files/2.0.8.1-arm-softfp.patch | 36 | ||||
-rw-r--r-- | dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch | 171 | ||||
-rw-r--r-- | dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch | 110 |
7 files changed, 7 insertions, 541 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 9f141fe..c69a3eb 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,10 +1,3 @@ -AUX 2.0.8.1-arm-softfp.patch 1551 SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc SHA512 93b90a36a1c9d737a06b5b78df583f0b99ef26704b6fd615bb01dda4e101d3287ae4c4d65df2d51ce1b1ed21a2a267d6c32c7c26de785fc5b4f83b7ed480b49d WHIRLPOOL 6de731b98cec1c28280992b0228885a03beab7d281582ad27f3980771c3e521178bd88cb33791ab15be2ccd9e2d1e169c6158967fdc614cfba3b528cdcfa2bfd -AUX catalyst-2.0.10.1-fbsd.patch 7223 SHA256 ea4d2ee2cc2dae5f2d3b12109fbe11ab930db926d00618279a76ce4cf11980ef SHA512 2e13ee67ef4bfed1433ab02a200908321effba3bcf6ad82396cf6df7116f21dbadea7e1c88c40ccec506a5d9f3edc51db703ba07f108f5584a38d6aa8d16f8f0 WHIRLPOOL b206dbc0bd7567eea2f9172ea9dad3e67946c669b67814d3dfe0b1a24c5cdf1b5abaa2c707ade9b209911601fab6a1a3e89bb2cd7c56b00e0fb8ccfa0defc0c0 -AUX catalyst-2.0.11-fbsd.patch 4763 SHA256 35cb646dd3a12142bfe25e2f7f4f99b067ca18d948291f3391bee0208423209f SHA512 9fc2d595825e8b07b77d1a06862c04b8c58517a4e86bebe922c442e7fdabe834c6331936f8b8002aa220d7110595e1c7b14df50df08f544bfad3ab52dc522fdc WHIRLPOOL 1358eacd093678b48fe190d43d7048ec4d325350dca04509790ce26522e405185260c8fcd7884ba68f57912a63553b6356462c481babf28dc4b96670fdf39653 AUX catalyst-2.0.12.1-fbsd.patch 9706 SHA256 6029c3d323bf1928727d807ecdf1f090732d5bd885269e0a8d9d0dc7e58aa0db SHA512 b1e6bd89fb947782c5386c4fdf6d0689800106c14c7281af2a4367d888f38b7b415873fdf71c46ca442a0e552858f8495342b77fa2511f63c7ca5ab744c489ca WHIRLPOOL a3ccee2d90222df0d6418d87a769ef96cd2818399deb754740a3dd867e4897eefe236b5318f49b78d09a0ab509abb3e2c80cd1fea2419bf37776d6711e81617c -DIST catalyst-2.0.10.1.tar.bz2 909073 SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed SHA512 b21e576a41926b8f71a76410c2e3e593267994cb5bdb39639add001a610f6c481ac7506ec88caf6016f65ecc09c86bae9a78812b3dc2879e32046e118c0e5671 WHIRLPOOL 168d20e1ff19005b647230852d249552fd98d50e9ece0ca19b5e3b743a971255f9065f8832fb7e29ef8f561ca8f40fe1f9f8732f54c4d9d233cd2df8ab7c42ad -DIST catalyst-2.0.11.tar.bz2 909191 SHA256 6fed91ac834179f676905f6fa544fb642b18b95ec1c89420432ef05fb9fde7da SHA512 935d42f72bc5e181ef0eff4862e414a52914b7ac82d6e75c2d80c1a4d055b428da2c2d255c35cf851bcb729aca1a9c8ee0301923433d4c7fedb03bc1f06d5ca3 WHIRLPOOL e91a01b2d0f17e2d7c371d05362a658e7ddc7142982ae84efb71db9327e933227651d6efaeb8c86b0d5305e350632a2adac0ff81fed888588fe6078cb049ab7b -DIST catalyst-2.0.12.1.tar.bz2 908119 SHA256 91bc71a0140da9977fda4969a137a25ed04c3dd6fa2c038404806b7f562eda62 SHA512 1f448b4c849567d5097246f0c6e140e25781b0c3f093bec8c616cf83d2ad86af5dbebfaf4bafd1e240db41c3213e0f3ea9da77a22b1ee73480a0d1c39d6d0a8f WHIRLPOOL 9c2c3f491611c0cb99694aabb24af1f2b45576e6c5f056335fb5f028a93e9d91e1beba652bf7aaf3a93f54a1abb6bdb827624659845dfb01f8ea4bee6868e48e -EBUILD catalyst-2.0.10.1.ebuild 3331 SHA256 e16830ca69796659ed19fb00121a920b3ef66a0be9db63d09261b08f76eeb111 SHA512 48f60b6350f567f028e6ca466eacbdafcdf2defc5f9fcc98f9be109aed871cab5b5c5f67a42b1fb1909160ded86fdb1451449aca0de7329765afbe536efa96a1 WHIRLPOOL 35efea44ffa1af504daacbf4202b7aa28b26a35f4bc0d9b0d351e88f48c575883170f1547a3f8d02d5e1f9d86f98302d3481f17e8f9cf50305eb0c6f21fa2801 -EBUILD catalyst-2.0.11.ebuild 3387 SHA256 5183cf2f1bfbfd3d3650090a6294dff6fd8f8cf1633c344f30efe986839d04a5 SHA512 f07297968a9a0a2af2c016f13cd7a4b162eb391c88da54cb43d6805682df35da5a467a57d71ded187829f131f82695104a9e5cd1e1d6e07681c67bafe40156f0 WHIRLPOOL 9a8807cf2ce2c88acc11db4521463f8acd9436c919841638c73bae6517ffa80e9d6cca0a2a5a4c3dc874b0315b636ad2eb9c4781af26ece0bacd321463616384 -EBUILD catalyst-2.0.12.1.ebuild 3403 SHA256 121f97286ce9d99de654f9e5c50ec399abf86f04d635490ae8b2e88580936b7c SHA512 b53c57bb61ceece3af690be8a05bee15cd9f83852cb7ce7d3d52cee2b6d1306135ad4141077c753a03b136f5b14f6a6392574d3a8a88830dc1b15e1346e0468e WHIRLPOOL b729ceead96c35ac3fa129c806c8be952e910de58b63705863787dc68061a49a99ac1fb37281f4d73778af68c451cf4e90bfdc7c52c6d77f96830484bd21939f +DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7 +EBUILD catalyst-2.0.12.2.ebuild 3660 SHA256 4b0714dbb8eb96a9588f6b95e5e9021ddb62144c1a2e47f717111d70a84593a2 SHA512 f5ca61ec95864928d27e93ac72c2b441fdc04d30a27ebb3cedff6ec327147cee51a213b06d5f8e82bfda50ebc9e2eff51d77f43d3b699018459a4094b691ff4f WHIRLPOOL 1a558bd6eba2f278e4f6fcc4c846d884cf3fe79961204e6cf04bdb41889c96dd5f0af447eb14a6e8d17eac0622d8874cc6be20ff97e59d9632114495c77c2019 diff --git a/dev-util/catalyst/catalyst-2.0.10.1.ebuild b/dev-util/catalyst/catalyst-2.0.10.1.ebuild deleted file mode 100644 index f5da4f3..0000000 --- a/dev-util/catalyst/catalyst-2.0.10.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# catalyst-9999 -> latest Git -# catalyst-2.9999 -> catalyst_2 branch from Git -# catalyst-VER -> normal catalyst release - -EAPI=3 -PYTHON_DEPEND="2" - -if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git" - inherit git-2 - SRC_URI="" - S="${WORKDIR}/${PN}" - KEYWORDS="" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi -inherit eutils multilib python - -DESCRIPTION="release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="" -IUSE="ccache kernel_linux" - -DEPEND="app-text/asciidoc" -RDEPEND="app-crypt/shash - virtual/cdrtools - ccache? ( dev-util/ccache ) - ia64? ( sys-fs/dosfstools ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )" - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then - ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains" - ewarn "work-in-progress code. Be aware that it's likely that it will not" - ewarn "be in a working state at any given point. Please do not file bugs" - ewarn "until you have posted on the gentoo-catalyst mailing list and we" - ewarn "have asked you to do so." - fi - python_set_active_version 2 -} - -src_prepare() { - python_convert_shebangs 2 catalyst modules/catalyst_lock.py - - epatch "${FILESDIR}"/2.0.8.1-arm-softfp.patch - use elibc_FreeBSD && epatch "${FILESDIR}"/${PN}-2.0.10.1-fbsd.patch -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - if [[ ${PV} == 9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README ChangeLog AUTHORS - doman files/catalyst.1 - # Here is where we actually enable ccache - use ccache && \ - dosed 's:options="autoresume kern:options="autoresume ccache kern:' \ - /etc/catalyst/catalyst.conf - dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - /etc/catalyst/catalyst.conf -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml" - echo -} diff --git a/dev-util/catalyst/catalyst-2.0.11.ebuild b/dev-util/catalyst/catalyst-2.0.11.ebuild deleted file mode 100644 index 4c1503a..0000000 --- a/dev-util/catalyst/catalyst-2.0.11.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# catalyst-9999 -> latest Git -# catalyst-2.9999 -> catalyst_2 branch from Git -# catalyst-3.9999 -> catalyst_3 branch from Git -# catalyst-VER -> normal catalyst release - -EAPI=3 -PYTHON_DEPEND="2" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git" - inherit git-2 - SRC_URI="" - S="${WORKDIR}/${PN}" - KEYWORDS="" - - case ${PV} in - 2.9999) EGIT_BRANCH="catalyst_2" ;; - 3.9999) EGIT_BRANCH="catalyst_3" ;; - esac -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi -inherit eutils multilib python - -DESCRIPTION="release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="" -IUSE="ccache kernel_linux" - -DEPEND="app-text/asciidoc" -RDEPEND="app-crypt/shash - virtual/cdrtools - ccache? ( dev-util/ccache ) - ia64? ( sys-fs/dosfstools ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )" - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - if [[ ${PV} == *9999* ]]; then - ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains" - ewarn "work-in-progress code. Be aware that it's likely that it will not" - ewarn "be in a working state at any given point. Please do not file bugs" - ewarn "until you have posted on the gentoo-catalyst mailing list and we" - ewarn "have asked you to do so." - fi - python_set_active_version 2 -} - -src_prepare() { - python_convert_shebangs 2 catalyst modules/catalyst_lock.py - - use elibc_FreeBSD && epatch "${FILESDIR}"/${PN}-2.0.11-fbsd.patch -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README ChangeLog AUTHORS - doman files/catalyst.1 - # Here is where we actually enable ccache - use ccache && \ - dosed 's:options="autoresume kern:options="autoresume ccache kern:' \ - /etc/catalyst/catalyst.conf - dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - /etc/catalyst/catalyst.conf -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml" - echo -} diff --git a/dev-util/catalyst/catalyst-2.0.12.1.ebuild b/dev-util/catalyst/catalyst-2.0.12.2.ebuild index 655566e..40ff2be 100644 --- a/dev-util/catalyst/catalyst-2.0.12.1.ebuild +++ b/dev-util/catalyst/catalyst-2.0.12.2.ebuild @@ -69,8 +69,7 @@ pkg_setup() { src_prepare() { python_convert_shebangs 2 catalyst modules/catalyst_lock.py - - use elibc_FreeBSD && epatch "${FILESDIR}"/${PN}-2.0.12.1-fbsd.patch + epatch "${FILESDIR}"/${PN}-2.0.12.1-fbsd.patch } src_install() { @@ -106,4 +105,8 @@ pkg_postinst() { einfo "catalyst project page at:" einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml" echo + elog "update_seed syntax has changed to make it more flexible." + elog "This is an optional setting supported by stage1 that runs an emerge" + elog "command on the seed stage before starting the stage1 build. (example:" + elog "`--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`)" } diff --git a/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch b/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch deleted file mode 100644 index 51ae1e7..0000000 --- a/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur catalyst-2.0.8.1.orig//arch/arm.py catalyst-2.0.8.1/arch/arm.py ---- catalyst-2.0.8.1.orig//arch/arm.py 2012-07-07 20:28:46.788719269 +0200 -+++ catalyst-2.0.8.1/arch/arm.py 2012-07-07 20:29:28.099721112 +0200 -@@ -67,28 +67,28 @@ - "Builder class for armv6j target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) -- self.settings["CHOST"]="armv6j-unknown-linux-gnueabi" -+ self.settings["CHOST"]="armv6j-softfp-linux-gnueabi" - self.settings["CFLAGS"]+=" -march=armv6j -mfpu=vfp -mfloat-abi=softfp" - - class arch_armv6z(generic_arm): - "Builder class for armv6z target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) -- self.settings["CHOST"]="armv6z-unknown-linux-gnueabi" -+ self.settings["CHOST"]="armv6z-softfp-linux-gnueabi" - self.settings["CFLAGS"]+=" -march=armv6z -mfpu=vfp -mfloat-abi=softfp" - - class arch_armv6zk(generic_arm): - "Builder class for armv6zk target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) -- self.settings["CHOST"]="armv6zk-unknown-linux-gnueabi" -+ self.settings["CHOST"]="armv6zk-softfp-linux-gnueabi" - self.settings["CFLAGS"]+=" -march=armv6zk -mfpu=vfp -mfloat-abi=softfp" - - class arch_armv7a(generic_arm): - "Builder class for armv7a target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) -- self.settings["CHOST"]="armv7a-unknown-linux-gnueabi" -+ self.settings["CHOST"]="armv7a-softfp-linux-gnueabi" - self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp" - - class arch_armv6j_hardfp(generic_arm):
\ No newline at end of file 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 deleted file mode 100644 index 423cf79..0000000 --- a/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch +++ /dev/null @@ -1,171 +0,0 @@ -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(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.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)" - - source /tmp/chroot-functions.sh -+sed_selector - - # Setup our environment - BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" -@@ -23,7 +24,7 @@ - [ -e /etc/portage/make.conf ] && \ - echo 'USE="${USE} -build"' >> /etc/portage/make.conf - run_merge "--oneshot --nodeps sys-apps/baselayout" --sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf -+${SED} -i '/USE="${USE} -build"/d' /etc/portage/make.conf - - # Next, we install the package manager - clst_root_path=/ setup_pkgmgr -@@ -34,5 +35,5 @@ - echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \ - >> /etc/portage/make.conf - run_merge "--oneshot ${clst_buildpkgs}" --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.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/make.conf - update_env_settings - show_debug - -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 @@ - } - - setup_myfeatures(){ -+ sed_selector - setup_myemergeopts - export FEATURES="-news" - if [ -n "${clst_CCACHE}" ] -@@ -84,7 +85,7 @@ - else - clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 - fi -- sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf -+ ${SED} -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf - mkdir -p /etc/distcc - echo "${clst_distcc_hosts}" > /etc/distcc/hosts - -@@ -168,7 +169,8 @@ - # Use --update or portage won't reinstall the same version. - [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf - run_merge --oneshot --nodeps --update sys-apps/portage -- sed -i '/USE="${USE} build"/d' /etc/portage/make.conf -+ sed_selector -+ ${SED} -i '/USE="${USE} build"/d' /etc/portage/make.conf - } - - cleanup_distcc() { -@@ -234,7 +236,8 @@ - - make_destpath() { - # ROOT is / by default, so remove any ROOT= settings from make.conf -- sed -i '/ROOT=/d' /etc/portage/make.conf -+ sed_selector -+ ${SED} -i '/ROOT=/d' /etc/portage/make.conf - export ROOT=/ - if [ "${1}" != "/" -a -n "${1}" ] - then -@@ -410,6 +413,14 @@ - Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop - } - -+sed_selector() { -+ if [ -e "/usr/bin/gsed" ]; then -+ SED="gsed" -+ else -+ SED="sed" -+ fi -+} -+ - # We do this everywhere, so why not put it in this script - run_default_funcs - -diff -Nur catalyst-2.0.10.1.orig/arch/x86.py catalyst-2.0.10.1/arch/x86.py ---- catalyst-2.0.10.1.orig/arch/x86.py 2012-08-23 23:03:36.000000000 +0900 -+++ catalyst-2.0.10.1/arch/x86.py 2012-08-23 23:07:27.000000000 +0900 -@@ -7,9 +7,12 @@ - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - if self.settings["buildarch"]=="amd64": -- if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): -- raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" -- self.settings["CHROOT"]="linux32 chroot" -+ if os.uname()[0] == "Linux": -+ if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): -+ raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" -+ self.settings["CHROOT"]="linux32 chroot" -+ else: -+ self.settings["CHROOT"]="chroot" - self.settings["crosscompile"] = False; - else: - self.settings["CHROOT"]="chroot" diff --git a/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch deleted file mode 100644 index 0fa2321..0000000 --- a/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -Nur catalyst-2.0.11.orig/arch/x86.py catalyst-2.0.11/arch/x86.py ---- catalyst-2.0.11.orig/arch/x86.py 2012-09-09 06:38:02.000000000 +0900 -+++ catalyst-2.0.11/arch/x86.py 2012-10-13 17:25:26.000000000 +0900 -@@ -7,9 +7,12 @@ - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - if self.settings["buildarch"]=="amd64": -- if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): -- raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" -- self.settings["CHROOT"]="linux32 chroot" -+ if os.uname()[0] == "Linux": -+ if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): -+ raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" -+ self.settings["CHROOT"]="linux32 chroot" -+ else: -+ self.settings["CHROOT"]="chroot" - self.settings["crosscompile"] = False; - else: - self.settings["CHROOT"]="chroot" -diff -Nur catalyst-2.0.11.orig/modules/generic_stage_target.py catalyst-2.0.11/modules/generic_stage_target.py ---- catalyst-2.0.11.orig/modules/generic_stage_target.py 2012-09-09 06:38:02.000000000 +0900 -+++ catalyst-2.0.11/modules/generic_stage_target.py 2012-10-13 17:32:58.000000000 +0900 -@@ -400,7 +400,7 @@ - - def set_cleanables(self): - self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/tmp/*",\ -- "/root/*","/usr/portage"] -+ "/root/*","/usr/portage","/etc/portage/make.conf.catalyst"] - - def set_snapshot_path(self): - self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\ -@@ -1083,9 +1083,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(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.11.orig/modules/stage1_target.py catalyst-2.0.11/modules/stage1_target.py ---- catalyst-2.0.11.orig/modules/stage1_target.py 2012-09-09 06:38:02.000000000 +0900 -+++ catalyst-2.0.11/modules/stage1_target.py 2012-10-13 17:25:26.000000000 +0900 -@@ -92,10 +92,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 set_update_seed(self): - if self.settings.has_key("update_seed"): -diff -Nur catalyst-2.0.11.orig/targets/stage3/stage3-chroot.sh catalyst-2.0.11/targets/stage3/stage3-chroot.sh ---- catalyst-2.0.11.orig/targets/stage3/stage3-chroot.sh 2012-09-09 06:38:02.000000000 +0900 -+++ catalyst-2.0.11/targets/stage3/stage3-chroot.sh 2012-10-13 17:25:26.000000000 +0900 -@@ -5,4 +5,11 @@ - ## START BUILD - setup_pkgmgr - --run_merge "-e system" -+if [[ $(uname) == "FreeBSD" ]] ; then -+ # workaround fix bug 438112 -+ run_merge "-e @system --exclude=sys-apps/portage" -+ run_merge "sys-apps/portage" -+else -+ run_merge "-e system" -+fi -+ -diff -Nur catalyst-2.0.11.orig/targets/support/chroot-functions.sh catalyst-2.0.11/targets/support/chroot-functions.sh ---- catalyst-2.0.11.orig/targets/support/chroot-functions.sh 2012-09-09 06:38:02.000000000 +0900 -+++ catalyst-2.0.11/targets/support/chroot-functions.sh 2012-10-13 17:25:26.000000000 +0900 -@@ -413,5 +413,22 @@ - Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop - } - -+# GNU sed wrapper -+sed(){ -+ if [ -e /usr/bin/gsed ] -+ then -+ /usr/bin/gsed "$@" -+ elif [ -e /bin/sed ] -+ then -+ /bin/sed "$@" -+ elif [ -e /usr/bin/sed ] -+ then -+ /usr/bin/sed "$@" -+ else -+ echo "ERROR: failed the selection of sed." -+ exit 1 -+ fi -+} -+ - # We do this everywhere, so why not put it in this script - run_default_funcs |