From 2f1be9a0abab3bf928e0b45c76d66ecbb8fb0981 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 13 May 2010 01:45:28 +0000 Subject: [PATCH] fix binpkg merging support for aufs2; you don't need an unpacked kernel to merge the sucker Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-fs/aufs2/ChangeLog | 6 +++++- sys-fs/aufs2/Manifest | 16 +++++++--------- sys-fs/aufs2/aufs2-0_p20100308.ebuild | 5 ++++- sys-fs/aufs2/aufs2-0_p20100405.ebuild | 6 +++++- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index 32d2d6301645..24ee840824a0 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/aufs2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.18 2010/04/05 12:37:30 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.19 2010/05/13 01:45:28 ferringb Exp $ + + 13 May 2010; Brian Harring aufs2-0_p20100308.ebuild, + aufs2-0_p20100405.ebuild: + re-enable merging of aufs2 binpkgs on systems lacking an unpacked kernel *aufs2-0_p20100405 (05 Apr 2010) diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest index b012c7ed4c0a..4af9366f183d 100644 --- a/sys-fs/aufs2/Manifest +++ b/sys-fs/aufs2/Manifest @@ -17,16 +17,14 @@ AUX aufs2-standalone-33.patch 8629 RMD160 948926f2067e122a075a5aa03d5a4d5b2d3cf1 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62 DIST aufs2-0_p20100308.tar.bz2 5279852 RMD160 d9399bcaf02037c0e6b9cff2c0e2c5430a4bb174 SHA1 d9e69bd75b7290dd661eebfea7c3e6e9643a13c5 SHA256 6216f67753dddb42fdcc5c54267be151e9acb9ee76d409f3a322128a12e91057 DIST aufs2-0_p20100405.tar.bz2 7105573 RMD160 69c638543e247730cb6be3de3741d18db20be08b SHA1 ccbe21cab7bf67c63e9986d620f2d037557242ea SHA256 8d09d5c101186f01a49bd40acf83f97c9161b5c26e307f0592f55fd0b88a5701 -EBUILD aufs2-0_p20100308.ebuild 2928 RMD160 b1cad9e075cfdc73c2620031d0c44d3ccc8514dd SHA1 f9706098e2da6fe799bdae446ec26531eff437a6 SHA256 cd4cd8dd09f19151c3acdecbbe6cab5d80461312de52b587f706221f29fae0d9 -EBUILD aufs2-0_p20100405.ebuild 2928 RMD160 474598e2d711f929fd9e0044e892d55c85e85dd2 SHA1 ddb7b11e92b309063c3b832a3ebb192a72e5667d SHA256 c4abfe8f18fdc94f819560136fbb38f743f161c7bfd0b8226ced89103db57f74 -MISC ChangeLog 4153 RMD160 5f5dd728ec86ac932eb03444d160181583b8c207 SHA1 5f48cdb6fcb31868980ad1b62b76a461cccb3666 SHA256 ed9a74b5b4e1de023879004ffdd92300c1d5fda16c50221b01ea404826e22d1d +EBUILD aufs2-0_p20100308.ebuild 3099 RMD160 e8f48485e9a4f239a2a255f7afb2bfa77c1bdc3c SHA1 ce065d62c622f8d1abb2b7fdd625d83903379039 SHA256 03eff3988ec89d768260dc89cb99c36d7fb98b5a22559a4818f26cd9c017ef8f +EBUILD aufs2-0_p20100405.ebuild 3103 RMD160 2b165357bbf05d5f0f6cc25e5fccde3e9d1f3dc0 SHA1 4d71254263a23d8fa423fe7b72b6087ebcae350b SHA256 560bbc06e81198242fb314d085c7c14f9b14997de48953f78ab0ee4c7cb9f0e2 +MISC ChangeLog 4337 RMD160 b49854b4b3418ba174464bd5dd06de7ae6c9c176 SHA1 a9303c0157303457056eae4ec7080b66346a916f SHA256 706e38c25f7a54e799f74ef54eaf5e6f8bccefab2946d18ebfd6b883e7503c66 MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iJwEAQECAAYFAku52ZkACgkQG7kqcTWJkGcs2gP8D6ciIPKo4CCPoXM2Hr1IN2ro -54Fb0xVf9OoKu+uPA0sjCnu3gslN3DuFqnTHFNuuRTsMJa6MRwZYOfuxJivol1YC -jnMzpDUVuEA64fYaX6RE65N4gHIrSYsGldIuKylo27V2isL9QCCtmyAz2ahu+BgK -mmhIoUZnDulmQ+dLH2M= -=Hhcw +iEYEARECAAYFAkvrWcEACgkQsiLx3HvNzgcS9gCbBDbQ7FqhvNgX76Tk7CzXM/zG +X8oAn1keAognmrB2CuB8mwzExdfEnxAX +=66pP -----END PGP SIGNATURE----- diff --git a/sys-fs/aufs2/aufs2-0_p20100308.ebuild b/sys-fs/aufs2/aufs2-0_p20100308.ebuild index 12c6ab4f21b2..35d4bdd29849 100644 --- a/sys-fs/aufs2/aufs2-0_p20100308.ebuild +++ b/sys-fs/aufs2/aufs2-0_p20100308.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100308.ebuild,v 1.2 2010/03/17 15:42:57 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100308.ebuild,v 1.3 2010/05/13 01:45:28 ferringb Exp $ EAPI="2" @@ -23,6 +23,8 @@ S=${WORKDIR}/${PN}-standalone MODULE_NAMES="aufs(misc:${S})" pkg_setup() { + # uesd to allow merging of binpkg aufs2 on systems lacking kernel sources + [ -n "$PKG_SETUP_HAS_ALREADY_BEEN_RAN" ] && return get_version kernel_is lt 2 6 27 && die "kernel too old" kernel_is gt 2 6 33 && die "kernel too new" @@ -46,6 +48,7 @@ pkg_setup() { fi fi linux-mod_pkg_setup + export PKG_SETUP_HAS_ALREADY_BEEN_RAN=1 } src_prepare() { diff --git a/sys-fs/aufs2/aufs2-0_p20100405.ebuild b/sys-fs/aufs2/aufs2-0_p20100405.ebuild index 23442a49ef1b..2c5f297c9cde 100644 --- a/sys-fs/aufs2/aufs2-0_p20100405.ebuild +++ b/sys-fs/aufs2/aufs2-0_p20100405.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100405.ebuild,v 1.1 2010/04/05 12:37:30 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100405.ebuild,v 1.2 2010/05/13 01:45:28 ferringb Exp $ EAPI="2" @@ -23,6 +23,9 @@ S=${WORKDIR}/${PN}-standalone MODULE_NAMES="aufs(misc:${S})" pkg_setup() { + # this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + get_version kernel_is lt 2 6 27 && die "kernel too old" kernel_is gt 2 6 33 && die "kernel too new" @@ -46,6 +49,7 @@ pkg_setup() { fi fi linux-mod_pkg_setup + export PKG_SETUP_HAS_BEEN_RAN=1 } src_prepare() { -- 2.26.2