mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-11 09:43:40 +02:00
catalyst: random stuff I've been holding which I think are critical. probably shouldn't do this but I am anyway
This commit is contained in:
Zero_Chaos
parent
f544e68e95
commit
7932a98dfc
7 changed files with 290 additions and 2 deletions
|
|
@ -1,2 +1,9 @@
|
|||
DIST catalyst-2.0.9.tar.bz2 907063 RMD160 1ad592d3f58653aa4fe3b23955838878fbf65732 SHA1 36ff594232441eab5aab0181b9842a7f1557ae30 SHA256 a6b1eccc9fb48b527e31e85d62a7c8ba15ff831b40e66719452fefa4664e9151
|
||||
EBUILD catalyst-2.0.9.ebuild 3310 RMD160 4a8533b7a7184df397c5b64cb71b6623b8144e5e SHA1 30c3271fe4d89df8f73c2823efe11365a0f5794f SHA256 209f5200809e6cae79ab45e7beb4b5e5d037ba3b45e501c52a0012e1e20da543
|
||||
AUX 0001-make.conf-and-make.profile-moved-to-etc-portage.patch 1536 SHA256 cb7895dd62f46db2395e78ea80998b7583bcc3fc1d6ca8b4b1d26ee6b37439f1 SHA512 646daa2e3793480bc9aed8775ef15c7068a4d7eaac44cbfab813671f576f21c7b26e1b6d89e534a3ebf17eaab1fb97692a8eb4585818adb2a71c7366d4021c2e WHIRLPOOL 652539ddd1e9c5b2729c899d3072c84e6b1f4cc5941417e04338ebaf5410219c6a806083baa0d0fd457f8e6c96a3c09c8fc0e2ff43125c6fd37ae7ebeff354af
|
||||
AUX 2.0.8.1-arm-softfp.patch 1551 SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc SHA512 93b90a36a1c9d737a06b5b78df583f0b99ef26704b6fd615bb01dda4e101d3287ae4c4d65df2d51ce1b1ed21a2a267d6c32c7c26de785fc5b4f83b7ed480b49d WHIRLPOOL 6de731b98cec1c28280992b0228885a03beab7d281582ad27f3980771c3e521178bd88cb33791ab15be2ccd9e2d1e169c6158967fdc614cfba3b528cdcfa2bfd
|
||||
AUX chaotic-fixes.patch 1644 SHA256 c091f32cf05e4e95eb05ecef9fb2c4eb1ad2e3906d55683c52200fc31fef35c0 SHA512 c71e3735ccf1be858cd93da0e1f693fdac2f9854556fafbfd0648711e20b45e0875ee7491a5a5d9e35c1c07a3ce5eedcd3958f030a8b776787f13898363ea477 WHIRLPOOL e56d5c73d7452b6dc72bf82d9dba54a6e55b1d05b4fb196f8fc823d94f83404a57bf0434630450fe110f12bf94b1ebd9a87887f715155b4b992d6d5499399652
|
||||
AUX jmb.patch 1604 SHA256 0d3a6eb75eaa540838b0e8decca9313dcf62e4d0db512076b2604d56b1c66a8a SHA512 42936f8ca588e0cfc68b7f5d177ae8283c548b153056f8c3d46fa8a1b065ac520a61f66d32d7ae69baab2b4e9d8c8f84e820ab311453413cfc770c189aa6337f WHIRLPOOL 74727079d849c937609bfe1fd9c0d6d42d188ef2c1529d961b9f04daa05c0dcc20a8f14f2bddb5de60b77a66f046feb3d3cd864bc8e7cac0ee5408fee28711b3
|
||||
AUX more_portage_fixes.diff 908 SHA256 0ec0bc871ec07b1ec4f9b5e34599c2ad97ad8b9fd6e0883f1bfa9d0bb211d79a SHA512 b6dafdb6ce56d9a39691cbb9937758d46b9ef8297fdb8c294827b9c60ba2df0e9df5691e0f5a8fddfb529f2dba8dec484028ecd019cbc5568305866c3acf9723 WHIRLPOOL 286837bd399837f8486cca78c4dc985d79dd9213b05d5690c98274a2f4019aed55c1eb43068c4b2dd5f4d3ed18bf48b6e4f24f812281a55df732e913e7cd91fa
|
||||
DIST catalyst-2.0.10.1.tar.bz2 909073 SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed SHA512 b21e576a41926b8f71a76410c2e3e593267994cb5bdb39639add001a610f6c481ac7506ec88caf6016f65ecc09c86bae9a78812b3dc2879e32046e118c0e5671 WHIRLPOOL 168d20e1ff19005b647230852d249552fd98d50e9ece0ca19b5e3b743a971255f9065f8832fb7e29ef8f561ca8f40fe1f9f8732f54c4d9d233cd2df8ab7c42ad
|
||||
DIST catalyst-2.0.9.tar.bz2 907063 SHA256 a6b1eccc9fb48b527e31e85d62a7c8ba15ff831b40e66719452fefa4664e9151 SHA512 ef76a1a527e6b8955fd986b933c9224c31a9688cedfbe5a25ba637774bb811925f3b71a6be5fa44bef00ef459250b47b149ba5e96d3a415d56d9cf0ac5929d5c WHIRLPOOL d0cd90a52eae9e40778c03bd9364b79ea4a2c67186eb10a370c35314ed046530deaedb8e0303bdf36bb6828834476bdddd4d898413cfb755927a52b2bafda3be
|
||||
EBUILD catalyst-2.0.10.1.ebuild 3498 SHA256 7af281274e3f338c5d0816c81be88b281f8434a8d80cf1358e59bb439feab3cc SHA512 b75b67f6b4f837b87e06a32a61f875fc2464500351cfd5b9582351ce5bb4bbc4a4fde46057bfbb18978b1499a1abd007e732d53d01508d61e3cb0679ce833506 WHIRLPOOL 14c4b5b9c79a6243a98a14b0cc1bbe7d8077093a29e807cf75c61612ebf6f6b76500593851422a79eb932acaf05552961df96f55f4b2cc70b19f5e0b5c820b41
|
||||
EBUILD catalyst-2.0.9.ebuild 3310 SHA256 209f5200809e6cae79ab45e7beb4b5e5d037ba3b45e501c52a0012e1e20da543 SHA512 801b271e3d7c416bbb9439d8680c5dd39b823e84cd2c2caa7cfb7e1fab0b38202da62c8588edbac84c1081fac1da7d25bdb3f106e76e2c04d06c3b835a40de6f WHIRLPOOL 42f14f42ca34eae0ea179aea7b87f5066f1d76b2f6d6c43995d1f12144c34d0fb43438f8867a1fde4aa8433b52e2840367cdaaf0646e04615635d226238573c5
|
||||
|
|
|
|||
105
dev-util/catalyst/catalyst-2.0.10.1.ebuild
Normal file
105
dev-util/catalyst/catalyst-2.0.10.1.ebuild
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
# 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 $
|
||||
|
||||
# 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
|
||||
epatch "${FILESDIR}"/0001-make.conf-and-make.profile-moved-to-etc-portage.patch
|
||||
epatch "${FILESDIR}"/more_portage_fixes.diff
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From 90d5b57bc1ea5453d5caefff5db1cb9fe7a99269 Mon Sep 17 00:00:00 2001
|
||||
From: Rick Farina <sidhayn@gmail.com>
|
||||
Date: Fri, 27 Jul 2012 04:53:52 -0400
|
||||
Subject: [PATCH] make.conf and make.profile moved to /etc/portage so stop
|
||||
cleaning it to avoid multiple fatal errors
|
||||
|
||||
|
||||
Signed-off-by: Rick Farina <sidhayn@gmail.com>
|
||||
---
|
||||
modules/stage1_target.py | 3 +--
|
||||
modules/stage2_target.py | 1 -
|
||||
2 files changed, 1 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/modules/stage1_target.py b/modules/stage1_target.py
|
||||
index 32e6334..560efdb 100644
|
||||
--- a/modules/stage1_target.py
|
||||
+++ b/modules/stage1_target.py
|
||||
@@ -31,8 +31,7 @@ class stage1_target(generic_stage_target):
|
||||
"/usr/lib/python2.2/lib-tk", "/usr/lib/python2.3/test",\
|
||||
"/usr/lib/python2.3/email", "/usr/lib/python2.3/lib-tk",\
|
||||
"/usr/lib/python2.4/test", "/usr/lib/python2.4/email",\
|
||||
- "/usr/lib/python2.4/lib-tk", "/usr/share/zoneinfo",\
|
||||
- "/etc/portage"])
|
||||
+ "/usr/lib/python2.4/lib-tk", "/usr/share/zoneinfo"])
|
||||
|
||||
# XXX: How do these override_foo() functions differ from the ones in generic_stage_target and why aren't they in stage3_target?
|
||||
|
||||
diff --git a/modules/stage2_target.py b/modules/stage2_target.py
|
||||
index f529721..97ea7fe 100644
|
||||
--- a/modules/stage2_target.py
|
||||
+++ b/modules/stage2_target.py
|
||||
@@ -35,7 +35,6 @@ class stage2_target(generic_stage_target):
|
||||
|
||||
def set_cleanables(self):
|
||||
generic_stage_target.set_cleanables(self)
|
||||
- self.settings["cleanables"].extend(["/etc/portage"])
|
||||
|
||||
def override_chost(self):
|
||||
if self.settings.has_key("chost"):
|
||||
--
|
||||
1.7.8.6
|
||||
|
||||
36
dev-util/catalyst/files/2.0.8.1-arm-softfp.patch
Normal file
36
dev-util/catalyst/files/2.0.8.1-arm-softfp.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
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):
|
||||
39
dev-util/catalyst/files/chaotic-fixes.patch
Normal file
39
dev-util/catalyst/files/chaotic-fixes.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
|
||||
index c4ef239..6415381 100644
|
||||
--- a/modules/generic_stage_target.py
|
||||
+++ b/modules/generic_stage_target.py
|
||||
@@ -813,9 +813,8 @@ class generic_stage_target(generic_target):
|
||||
cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
|
||||
"Error zapping profile link",env=self.env)
|
||||
cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/")
|
||||
- cmd("ln -sf ../../usr/portage/profiles/"+\
|
||||
+ cmd("eselect set "+\
|
||||
self.settings["target_profile"]+" "+\
|
||||
- self.settings["chroot_path"]+"/etc/portage/make.profile",\
|
||||
"Error creating profile link",env=self.env)
|
||||
touch(self.settings["autoresume_path"]+"config_profile_link")
|
||||
|
||||
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
|
||||
index 3c348ce..b481605 100644
|
||||
--- a/targets/stage1/stage1-controller.sh
|
||||
+++ b/targets/stage1/stage1-controller.sh
|
||||
@@ -7,14 +7,14 @@ case $1 in
|
||||
;;
|
||||
run)
|
||||
cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
|
||||
-
|
||||
+
|
||||
# Setup "ROOT in chroot" dir
|
||||
- install -d ${clst_chroot_path}/${clst_root_path}/etc
|
||||
-
|
||||
+ install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
|
||||
+
|
||||
# Setup make.conf and make.profile link in "ROOT in chroot":
|
||||
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc
|
||||
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/profile
|
||||
copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
|
||||
- /${clst_root_path}/etc
|
||||
+ /${clst_root_path}/etc/profile
|
||||
|
||||
# Enter chroot, execute our build script
|
||||
exec_in_chroot \
|
||||
35
dev-util/catalyst/files/jmb.patch
Normal file
35
dev-util/catalyst/files/jmb.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
|
||||
index 5947e9a..3a41751 100644
|
||||
--- a/modules/generic_stage_target.py
|
||||
+++ b/modules/generic_stage_target.py
|
||||
@@ -816,9 +816,8 @@ class generic_stage_target(generic_target):
|
||||
cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
|
||||
"Error zapping profile link",env=self.env)
|
||||
cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/")
|
||||
- cmd("ln -sf ../../usr/portage/profiles/"+\
|
||||
- self.settings["target_profile"]+" "+\
|
||||
- self.settings["chroot_path"]+"/etc/portage/make.profile",\
|
||||
+ cmd("eselect profile set "+\
|
||||
+ self.settings["target_profile"],
|
||||
"Error creating profile link",env=self.env)
|
||||
touch(self.settings["autoresume_path"]+"config_profile_link")
|
||||
|
||||
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
|
||||
index 3c348ce..97c66d9 100644
|
||||
--- a/targets/stage1/stage1-controller.sh
|
||||
+++ b/targets/stage1/stage1-controller.sh
|
||||
@@ -10,11 +10,12 @@ case $1 in
|
||||
|
||||
# Setup "ROOT in chroot" dir
|
||||
install -d ${clst_chroot_path}/${clst_root_path}/etc
|
||||
+ install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
|
||||
|
||||
# Setup make.conf and make.profile link in "ROOT in chroot":
|
||||
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc
|
||||
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
|
||||
copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
|
||||
- /${clst_root_path}/etc
|
||||
+ /${clst_root_path}/etc/portage
|
||||
|
||||
# Enter chroot, execute our build script
|
||||
exec_in_chroot \
|
||||
24
dev-util/catalyst/files/more_portage_fixes.diff
Normal file
24
dev-util/catalyst/files/more_portage_fixes.diff
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
|
||||
index 3c348ce..b481605 100644
|
||||
--- a/targets/stage1/stage1-controller.sh
|
||||
+++ b/targets/stage1/stage1-controller.sh
|
||||
@@ -7,14 +7,14 @@ case $1 in
|
||||
;;
|
||||
run)
|
||||
cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
|
||||
-
|
||||
+
|
||||
# Setup "ROOT in chroot" dir
|
||||
- install -d ${clst_chroot_path}/${clst_root_path}/etc
|
||||
-
|
||||
+ install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
|
||||
+
|
||||
# Setup make.conf and make.profile link in "ROOT in chroot":
|
||||
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc
|
||||
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
|
||||
copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
|
||||
- /${clst_root_path}/etc
|
||||
+ /${clst_root_path}/etc/portage
|
||||
|
||||
# Enter chroot, execute our build script
|
||||
exec_in_chroot \
|
||||
Loading…
Reference in a new issue