diff options
author | 2012-10-13 00:25:30 +0900 | |
---|---|---|
committer | 2012-10-13 00:25:30 +0900 | |
commit | c7f71c4823b1cf76bf415e97f44cbcd5f5a90f82 (patch) | |
tree | c67b02e8eadfcffb70e05d28966d4d712cb1c9ac /dev-util/catalyst | |
parent | eselect -- Fixed problem that can not set profile on gfbsd bug #437986 (diff) | |
download | gentoo-bsd-c7f71c4823b1cf76bf415e97f44cbcd5f5a90f82.tar.gz gentoo-bsd-c7f71c4823b1cf76bf415e97f44cbcd5f5a90f82.tar.bz2 gentoo-bsd-c7f71c4823b1cf76bf415e97f44cbcd5f5a90f82.zip |
added catalyst-2.0.11 and catalyst-2.0.11-fbsd.patch
Diffstat (limited to 'dev-util/catalyst')
-rw-r--r-- | dev-util/catalyst/Manifest | 11 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-2.0.11.ebuild | 109 | ||||
-rw-r--r-- | dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch | 188 |
3 files changed, 304 insertions, 4 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 491ad89..377b4e5 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,4 +1,7 @@ -AUX 2.0.8.1-arm-softfp.patch 1551 RMD160 20b47d803443136ab511ef5ad5b7d5b2ea0e0715 SHA1 c51b4dc05bffaed7911d447bea7993400854152e SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc -AUX catalyst-2.0.10.1-fbsd.patch 7223 RMD160 c084ddbd41a53c4d9f9e2087978419ca630c0ab1 SHA1 c7b1b05e3e7c86f06278bc34fa16fe9fb1aecda7 SHA256 ea4d2ee2cc2dae5f2d3b12109fbe11ab930db926d00618279a76ce4cf11980ef -DIST catalyst-2.0.10.1.tar.bz2 909073 RMD160 48d4eeb7e3dfd14f1c1f04542371580999d97e63 SHA1 c8cc79c635b531fdc5592a8cf230706817a8458a SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed -EBUILD catalyst-2.0.10.1.ebuild 3331 RMD160 544075a6dce9a081035403c5adf2159b389d166a SHA1 923f804f2e715235e89aa0d29d33ff546de14d9f SHA256 e16830ca69796659ed19fb00121a920b3ef66a0be9db63d09261b08f76eeb111 +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 8054 SHA256 fedfca6a7472bf2821cae642cf0b9ac0b4f5c2a732079b22ac272dab8d7c4988 SHA512 510cd04fa31d9ab5c4cebe1935c3a2b2326f58792de23c0c7a1616977270803d4f77809d3b05f1d90be5e31b1ad449121c8de0d925387e4c9f9a713076e346bd WHIRLPOOL 9d300c280ed2967d926a4d7ca38f4463f2d5e4cfb251105366627c448eb938908ac3ce3d7a1a8f104cd11275c56301f45c4efee48e30a08b5d13510ff5e1452d +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 +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 diff --git a/dev-util/catalyst/catalyst-2.0.11.ebuild b/dev-util/catalyst/catalyst-2.0.11.ebuild new file mode 100644 index 0000000..4c1503a --- /dev/null +++ b/dev-util/catalyst/catalyst-2.0.11.ebuild @@ -0,0 +1,109 @@ +# 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/files/catalyst-2.0.11-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch new file mode 100644 index 0000000..07201d3 --- /dev/null +++ b/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch @@ -0,0 +1,188 @@ +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-12 23:34:15.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-12 23:34:15.000000000 +0900 +@@ -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-12 23:34:15.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/modules/stage3_target.py catalyst-2.0.11/modules/stage3_target.py +--- catalyst-2.0.11.orig/modules/stage3_target.py 2012-09-09 06:38:02.000000000 +0900 ++++ catalyst-2.0.11/modules/stage3_target.py 2012-10-12 23:34:15.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.11.orig/targets/stage1/stage1-chroot.sh catalyst-2.0.11/targets/stage1/stage1-chroot.sh +--- catalyst-2.0.11.orig/targets/stage1/stage1-chroot.sh 2012-09-09 06:38:02.000000000 +0900 ++++ catalyst-2.0.11/targets/stage1/stage1-chroot.sh 2012-10-12 23:36:40.000000000 +0900 +@@ -1,6 +1,7 @@ + #!/bin/bash + + source /tmp/chroot-functions.sh ++sed_selector + + # We do this first, so we know our package list for --debug + export clst_buildpkgs="$(/tmp/build.py)" +@@ -32,7 +33,13 @@ + 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 ++## dirty fix ++#The following USE changes are necessary to proceed: ++#required by dev-perl/XML-Parser-2.410.0-r1, required by dev-util/intltool-0.50.2, required by x11-misc/shared-mime-info-1.0, required by dev-libs/glib-2.32.4-r1, required by dev-util/pkgconfig-0.27.1[-internal-glib], required by virtual/pkgconfig-0, required by net-misc/wget-1.14, required by wget (argument) ++#>=dev-lang/perl-5.16.1 -build ++ROOT=/ emerge -q "dev-util/gtk-doc-am" ++ ++${SED} -i '/USE="${USE} -build"/d' /etc/portage/make.conf + + # Next, we install the package manager + clst_root_path=/ setup_pkgmgr +@@ -43,5 +50,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.11.orig/targets/stage1/stage1-preclean-chroot.sh catalyst-2.0.11/targets/stage1/stage1-preclean-chroot.sh +--- catalyst-2.0.11.orig/targets/stage1/stage1-preclean-chroot.sh 2012-09-09 06:38:02.000000000 +0900 ++++ catalyst-2.0.11/targets/stage1/stage1-preclean-chroot.sh 2012-10-12 23:34:15.000000000 +0900 +@@ -4,6 +4,8 @@ + + source /tmp/chroot-functions.sh + ++sed_selector ++${SED} -i '/^PORTDIR_OVERLAY/d' /etc/portage/make.conf + update_env_settings + show_debug + +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-12 23:40:02.000000000 +0900 +@@ -6,3 +6,8 @@ + setup_pkgmgr + + run_merge "-e system" ++ ++## dirty fix ++# bug 438112 ++emerge -q "app-admin/eselect" ++ +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-12 23:34:15.000000000 +0900 +@@ -63,6 +63,7 @@ + } + + setup_myfeatures(){ ++ sed_selector + setup_myemergeopts + export FEATURES="-news" + if [ -n "${clst_CCACHE}" ] +@@ -87,7 +88,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 + +@@ -171,7 +172,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() { +@@ -237,7 +239,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 +@@ -413,5 +416,13 @@ + 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 |