| 1 |
commit: 936fadf862479f1b171f96497ce654e5e3f0c3ed |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Thu Nov 22 11:49:44 2012 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Thu Nov 22 11:49:44 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=936fadf8 |
| 7 |
|
| 8 |
catalyst-2.0.12.1 -- drop lbzip2 support and add tmpfs function on FreeBSD |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/catalyst/Manifest | 3 +- |
| 12 |
dev-util/catalyst/catalyst-2.0.12.1.ebuild | 12 +++++-- |
| 13 |
.../catalyst/files/catalyst-2.0.12.1-fbsd.patch | 32 ++++++++++++++++++++ |
| 14 |
3 files changed, 42 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest |
| 17 |
index 390543b..85aaad7 100644 |
| 18 |
--- a/dev-util/catalyst/Manifest |
| 19 |
+++ b/dev-util/catalyst/Manifest |
| 20 |
@@ -1,9 +1,10 @@ |
| 21 |
AUX 2.0.8.1-arm-softfp.patch 1551 SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc SHA512 93b90a36a1c9d737a06b5b78df583f0b99ef26704b6fd615bb01dda4e101d3287ae4c4d65df2d51ce1b1ed21a2a267d6c32c7c26de785fc5b4f83b7ed480b49d WHIRLPOOL 6de731b98cec1c28280992b0228885a03beab7d281582ad27f3980771c3e521178bd88cb33791ab15be2ccd9e2d1e169c6158967fdc614cfba3b528cdcfa2bfd |
| 22 |
AUX catalyst-2.0.10.1-fbsd.patch 7223 SHA256 ea4d2ee2cc2dae5f2d3b12109fbe11ab930db926d00618279a76ce4cf11980ef SHA512 2e13ee67ef4bfed1433ab02a200908321effba3bcf6ad82396cf6df7116f21dbadea7e1c88c40ccec506a5d9f3edc51db703ba07f108f5584a38d6aa8d16f8f0 WHIRLPOOL b206dbc0bd7567eea2f9172ea9dad3e67946c669b67814d3dfe0b1a24c5cdf1b5abaa2c707ade9b209911601fab6a1a3e89bb2cd7c56b00e0fb8ccfa0defc0c0 |
| 23 |
AUX catalyst-2.0.11-fbsd.patch 4763 SHA256 35cb646dd3a12142bfe25e2f7f4f99b067ca18d948291f3391bee0208423209f SHA512 9fc2d595825e8b07b77d1a06862c04b8c58517a4e86bebe922c442e7fdabe834c6331936f8b8002aa220d7110595e1c7b14df50df08f544bfad3ab52dc522fdc WHIRLPOOL 1358eacd093678b48fe190d43d7048ec4d325350dca04509790ce26522e405185260c8fcd7884ba68f57912a63553b6356462c481babf28dc4b96670fdf39653 |
| 24 |
+AUX catalyst-2.0.12.1-fbsd.patch 1392 SHA256 d8641861c4a8631f28c49493ee27afbc4904b807f47cce8fa2af1f4197ca9e62 SHA512 53ec18ad967ca7fd60390ab58f5d742ec1d685383afc7c5442be16162a0e5e98124fb839f71145bfcc3152782e193518cb463d38710fe27def5b60b0a939f2a9 WHIRLPOOL 2efc6284d7999284649c65563fc17c13938c18cfb1f9cef6da40138ec2f06871175b8d95e27e5f5dcbff3f3701b2a61c6dc0f1a767235995e9a58d55d4bc0d65 |
| 25 |
DIST catalyst-2.0.10.1.tar.bz2 909073 SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed SHA512 b21e576a41926b8f71a76410c2e3e593267994cb5bdb39639add001a610f6c481ac7506ec88caf6016f65ecc09c86bae9a78812b3dc2879e32046e118c0e5671 WHIRLPOOL 168d20e1ff19005b647230852d249552fd98d50e9ece0ca19b5e3b743a971255f9065f8832fb7e29ef8f561ca8f40fe1f9f8732f54c4d9d233cd2df8ab7c42ad |
| 26 |
DIST catalyst-2.0.11.tar.bz2 909191 SHA256 6fed91ac834179f676905f6fa544fb642b18b95ec1c89420432ef05fb9fde7da SHA512 935d42f72bc5e181ef0eff4862e414a52914b7ac82d6e75c2d80c1a4d055b428da2c2d255c35cf851bcb729aca1a9c8ee0301923433d4c7fedb03bc1f06d5ca3 WHIRLPOOL e91a01b2d0f17e2d7c371d05362a658e7ddc7142982ae84efb71db9327e933227651d6efaeb8c86b0d5305e350632a2adac0ff81fed888588fe6078cb049ab7b |
| 27 |
DIST catalyst-2.0.12.1.tar.bz2 908119 SHA256 91bc71a0140da9977fda4969a137a25ed04c3dd6fa2c038404806b7f562eda62 SHA512 1f448b4c849567d5097246f0c6e140e25781b0c3f093bec8c616cf83d2ad86af5dbebfaf4bafd1e240db41c3213e0f3ea9da77a22b1ee73480a0d1c39d6d0a8f WHIRLPOOL 9c2c3f491611c0cb99694aabb24af1f2b45576e6c5f056335fb5f028a93e9d91e1beba652bf7aaf3a93f54a1abb6bdb827624659845dfb01f8ea4bee6868e48e |
| 28 |
EBUILD catalyst-2.0.10.1.ebuild 3331 SHA256 e16830ca69796659ed19fb00121a920b3ef66a0be9db63d09261b08f76eeb111 SHA512 48f60b6350f567f028e6ca466eacbdafcdf2defc5f9fcc98f9be109aed871cab5b5c5f67a42b1fb1909160ded86fdb1451449aca0de7329765afbe536efa96a1 WHIRLPOOL 35efea44ffa1af504daacbf4202b7aa28b26a35f4bc0d9b0d351e88f48c575883170f1547a3f8d02d5e1f9d86f98302d3481f17e8f9cf50305eb0c6f21fa2801 |
| 29 |
EBUILD catalyst-2.0.11.ebuild 3387 SHA256 5183cf2f1bfbfd3d3650090a6294dff6fd8f8cf1633c344f30efe986839d04a5 SHA512 f07297968a9a0a2af2c016f13cd7a4b162eb391c88da54cb43d6805682df35da5a467a57d71ded187829f131f82695104a9e5cd1e1d6e07681c67bafe40156f0 WHIRLPOOL 9a8807cf2ce2c88acc11db4521463f8acd9436c919841638c73bae6517ffa80e9d6cca0a2a5a4c3dc874b0315b636ad2eb9c4781af26ece0bacd321463616384 |
| 30 |
-EBUILD catalyst-2.0.12.1.ebuild 3402 SHA256 94f183b11bad05d5de4ae8bc7f002ca47765425ee305aeb6278c67999ff98279 SHA512 c3b9bfb8c48f9eb0a5e6996fa9b59b2adf04f2cd8dcb8ffba0ff02359aef5a8b9e94251d95aae4f80dd43ddd0c9746e70f5fbcffd12c243dcd42fb14b505d942 WHIRLPOOL 1516ab9919e903b9a9fa275dc7b30a322dbdb4d791cb2ac94240413e11933cbee933ab929629d728f12f84db5bbc36d27801dbbe5ca8107076bf5b1834749288 |
| 31 |
+EBUILD catalyst-2.0.12.1.ebuild 3561 SHA256 9ad5a45a59c49f767baf5220a82c6262b5038cf8e3b869e2ab8d63be25b2c2a8 SHA512 e6de9ce5b5931666980d70764792ffe933384c94c74b3b8b63c9fce717a449481b1dbb26496d60ea0b8b3f47767e6c007080035fac4e61b9429210bae1beedd6 WHIRLPOOL f3e79136337be9602f8aee4cb2a84108ee2de9bf30cc590786da08dec8f2cd6312d431229dac057a2ce58f2fbed3f0c7ef43df8b86ae3e55edbd7da2e8356f97 |
| 32 |
|
| 33 |
diff --git a/dev-util/catalyst/catalyst-2.0.12.1.ebuild b/dev-util/catalyst/catalyst-2.0.12.1.ebuild |
| 34 |
index d876cb5..c766851 100644 |
| 35 |
--- a/dev-util/catalyst/catalyst-2.0.12.1.ebuild |
| 36 |
+++ b/dev-util/catalyst/catalyst-2.0.12.1.ebuild |
| 37 |
@@ -37,12 +37,11 @@ RESTRICT="" |
| 38 |
IUSE="ccache kernel_linux" |
| 39 |
|
| 40 |
DEPEND="app-text/asciidoc" |
| 41 |
-RDEPEND="app-arch/lbzip2 |
| 42 |
- app-crypt/shash |
| 43 |
+RDEPEND="app-crypt/shash |
| 44 |
virtual/cdrtools |
| 45 |
ccache? ( dev-util/ccache ) |
| 46 |
ia64? ( sys-fs/dosfstools ) |
| 47 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )" |
| 48 |
+ kernel_linux? ( app-arch/lbzip2 app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )" |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
if use ccache ; then |
| 52 |
@@ -71,7 +70,12 @@ pkg_setup() { |
| 53 |
src_prepare() { |
| 54 |
python_convert_shebangs 2 catalyst modules/catalyst_lock.py |
| 55 |
|
| 56 |
- use elibc_FreeBSD && epatch "${FILESDIR}"/${PN}-2.0.11-fbsd.patch |
| 57 |
+ if use elibc_FreeBSD ; then |
| 58 |
+ epatch "${FILESDIR}"/${PN}-2.0.11-fbsd.patch |
| 59 |
+ epatch "${FILESDIR}"/${PN}-2.0.12.1-fbsd.patch |
| 60 |
+ # BSD's tar doesn't support lbzip2 |
| 61 |
+ find . -type f -exec gsed -i 's:tar -I lbzip2:tar:g' {} \; |
| 62 |
+ fi |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
|
| 67 |
diff --git a/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch |
| 68 |
new file mode 100644 |
| 69 |
index 0000000..9cd8751 |
| 70 |
--- /dev/null |
| 71 |
+++ b/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch |
| 72 |
@@ -0,0 +1,32 @@ |
| 73 |
+diff -Nur catalyst-2.0.12.1.orig/modules/generic_stage_target.py catalyst-2.0.12.1/modules/generic_stage_target.py |
| 74 |
+--- catalyst-2.0.12.1.orig/modules/generic_stage_target.py 2012-11-22 20:03:11.000000000 +0900 |
| 75 |
++++ catalyst-2.0.12.1/modules/generic_stage_target.py 2012-11-22 20:07:05.000000000 +0900 |
| 76 |
+@@ -901,18 +901,18 @@ |
| 77 |
+ src=self.mountmap[x] |
| 78 |
+ if self.settings.has_key("SNAPCACHE") and x == "/usr/portage": |
| 79 |
+ self.snapshot_lock_object.read_lock() |
| 80 |
+- if os.uname()[0] == "FreeBSD": |
| 81 |
+- if src == "/dev": |
| 82 |
+- retval=os.system("mount -t devfs none "+\ |
| 83 |
+- self.settings["chroot_path"]+x) |
| 84 |
+- else: |
| 85 |
+- retval=os.system("mount_nullfs "+src+" "+\ |
| 86 |
++ if src == "tmpfs": |
| 87 |
++ if self.settings.has_key("var_tmpfs_portage"): |
| 88 |
++ retval=os.system("mount -t tmpfs -o size="+\ |
| 89 |
++ self.settings["var_tmpfs_portage"]+"G "+src+" "+\ |
| 90 |
+ self.settings["chroot_path"]+x) |
| 91 |
+ else: |
| 92 |
+- if src == "tmpfs": |
| 93 |
+- if self.settings.has_key("var_tmpfs_portage"): |
| 94 |
+- retval=os.system("mount -t tmpfs -o size="+\ |
| 95 |
+- self.settings["var_tmpfs_portage"]+"G "+src+" "+\ |
| 96 |
++ if os.uname()[0] == "FreeBSD": |
| 97 |
++ if src == "/dev": |
| 98 |
++ retval=os.system("mount -t devfs none "+\ |
| 99 |
++ self.settings["chroot_path"]+x) |
| 100 |
++ else: |
| 101 |
++ retval=os.system("mount_nullfs "+src+" "+\ |
| 102 |
+ self.settings["chroot_path"]+x) |
| 103 |
+ else: |
| 104 |
+ retval=os.system("mount --bind "+src+" "+\ |
Archives