mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 19:42:15 +02:00
dev-util/catalyst: Import latest
Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand
parent
e939704492
commit
ed3e0ac8fb
File diff suppressed because it is too large
Load Diff
@ -1,25 +1,14 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
|
||||
DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
|
||||
EBUILD catalyst-2.0.16.ebuild 3155 SHA256 96330cb79d0a318eb8e71c12832b71e06d8f01483fc3042da809caf16c0577f4 SHA512 b2e5438f39a7627d03d79b7062cb039a5b4cb8c9dbef9f836ca7d34e37ed530c95ba4a288e987a06141b7b61f9c928ea95fa425d2bd03a195000189a2a66d8fe WHIRLPOOL 1264383ed4eb1b31fe647c3ec4f7fed5944b76638669f1473d28d2dcfc5bf5fcf04fa032014f11fd4dd1e024c3fd7a57031ffd9f0ce01ef2865e90e96cdf3f31
|
||||
EBUILD catalyst-2.0.17.ebuild 3149 SHA256 b764e9f01aa95ed08169775ce267a4fa1edff43903f864934ed37f4685330e2d SHA512 c672617d6325a43d0a1975ee6875d6368b939ee11d374cc5355cc3a2771d6dbd523c0ac02c657161f27bc7ff95821ccbb8ab9682ce88d866458dbaff9af81fdb WHIRLPOOL 4c97e1ccf4749dc019091f477193e426ca6cc3210f6af1b62e357db1fe6b552ef27e05b180fc00058df9ff74e0776d5e82b5e97e0202192b057f996f9c1a3a41
|
||||
EBUILD catalyst-2.0.9999.ebuild 3056 SHA256 ca0a13dc03a936b54b0e6bfe64122ed653dcb1bc60976ed2612f4b6a305a91b8 SHA512 c6aa7faba3821edba40612b86ecb265339edf466798d297b251dd1af1e4b51e512c769d271fbb714c9ab72ed3dce55cda2462003b5e8ba4b26dbfda7b6cf82cf WHIRLPOOL 285670aa406f7f7f7f73cef9a7950d276429c10a6cb39796ffac369b9d68f4a53a28adf5122fc2bba56916a9b64c3ed7ce7a20994591c97afeed92dfe7dfa5de
|
||||
EBUILD catalyst-2.9999.ebuild 1632 SHA256 124adf991b51763910ee64979a9d4c17aa2a742d811648011047798f6d7b2c2b SHA512 54f2232cc559dc07edcc5fae49d27e35feba74d79b0ca88113747293654eac0714b75e8ce89fa2f35fe53638d40cc8d07b8c672dee7e829c306150c3a7f4183b WHIRLPOOL d08748d7864942924aaad5d52aad98119918d492f20716307429d72b5ddad25354ba6b43968ae7a529ff372ed443dd18eaea3b33a40dc641c2b39cf29cd8f750
|
||||
EBUILD catalyst-9999.ebuild 1611 SHA256 af96e44b2c122d4f98b268c2da788511faa8308098a7dc8a5261fc9dd3d31050 SHA512 643f4827189b3ef2f56bdfccdd6df2368e51da030e1088e481c358bb9474b4ca7101d597b5429ea998c98b3f41792809037fff82720081e5c51ba93f13581635 WHIRLPOOL a718b1c5d9ca40845e621a9583f63b1e7eda03de2f39ff513df9729bafce8bfd2a37f1aa7d9c172aff3ac4d39aca0211ff972032a7b701192cd970431a830760
|
||||
MISC ChangeLog 58883 SHA256 c010affe23dab7fd35295c0ad156a5a8e97fa42b4e5bda0efda1bafbbe0dca2d SHA512 8c40e24e3fe947e8cafde15297e939b8fe7b8de386e87233c6eb2cf91fb8e12fd2b161dddbe764ed33aa04fb2690f7b768cc65e76f50726fc34f30604c41ad08 WHIRLPOOL 7fcba16fb5973622da2adc9280f3b03d7c9546f80a07d005e256d7dadcb57892a92965b015a31472f4cd7f3af77131fe148a28f709b945f38c6f9ce783a6468b
|
||||
MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
iQF8BAEBCABmBQJTeTjgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
|
||||
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
|
||||
MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLQJEH/jJxodavWG49gkf+3mcEvRsw
|
||||
SJzn7wPobvrdP646Axc74XIVD5FUeOEmrcArKeboJNFLfN4XY6Zlq6UTI8YuoywU
|
||||
AFvjeB5XocwfBPHy469IXaxTDVmLhZUVBKofA0jzeu8lM/nYP1jOwXw6c+QSdJ7p
|
||||
LkZZbwI/sbPBfBAcupmECQaBVAcuT1JQSDf9D8f3A8FVj9i2Rc66CkSbTi5s8snh
|
||||
87o3rKLg+I9YGLm+j4P5jbovG4x0zaJK2zTR3Sa6F4kbdBGvriGF34Qqq6diAyE+
|
||||
DKroG3gRFEQJm6eTXFtsFUZPKxRVl95nrNKBeX5MIuIznfKX5jimHc7YhImv7yE=
|
||||
=VXS3
|
||||
-----END PGP SIGNATURE-----
|
||||
AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 BLAKE2B 921e36d63c3a51f212c3a8a3afd054737e9d21f9870d82249a701a2fb00c27f9f97d7411df46357509477c3cafdd9341752fee77321f94910fd18b9a1d5ffef1 SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f
|
||||
AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9c576b27c25f00adf5d47c60aa6cfa0e6da10b9745e4c6752fc7682f13423180e6f58777c584a7283eee4fc9db02ef34a1f SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205
|
||||
AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
|
||||
AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
|
||||
DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
|
||||
DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
|
||||
DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
|
||||
EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
|
||||
EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
|
||||
EBUILD catalyst-2.0.9999.ebuild 2901 BLAKE2B 6ad35b1e2bce193bdc50de8547c0918036b7b1db8339462b2a1e6bd3f4de680918ca514a5d9243c476af0a9358b8ab2c18409b2585ca0565bfee8b27dd11ae83 SHA512 ede4a30e85f2b9b55fa627ef6b7de8a2f0f83a15bd67cea54596bcbd73b4f89ae991087e55bc34187d3572f25c1c3d9d0f818626f3880e758832a58a3af95f23
|
||||
EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
|
||||
EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
|
||||
EBUILD catalyst-9999.ebuild 1752 BLAKE2B b4dce3d64505cf72d7d546be2107050e4840477a4ceb883cd3aa93ea2c6f5a3fc63470e6dfea172f15c5f37fcff30dc29d2e972314aba46c2890b6a73639904e SHA512 c6548d3b6cfa924e4ca5dab4fe9680d5a4562dcbe8cb1debeaf1088c1c9fd8bbc66c2cf7272a1fea1997fdc0d8f8ae833e3ed6c3b7b6b16a10eae17b61993271
|
||||
MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8
|
||||
|
||||
@ -1,22 +1,19 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.17.ebuild,v 1.1 2014/05/18 22:49:31 dolsen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
SRC_ECLASS="git-2"
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
|
||||
EGIT_MASTER="master"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
@ -25,7 +22,7 @@ PYTHON_COMPAT=( python2_7 )
|
||||
inherit eutils multilib python-single-r1 ${SRC_ECLASS}
|
||||
|
||||
DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -38,9 +35,10 @@ DEPEND="
|
||||
RDEPEND="
|
||||
app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
app-arch/tar[xattr]
|
||||
sys-fs/dosfstools
|
||||
virtual/cdrtools
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
|
||||
@ -49,6 +47,8 @@ RDEPEND="
|
||||
|
||||
REQUIRED_USE=${PYTHON_REQUIRED_USE}
|
||||
|
||||
PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" )
|
||||
|
||||
pkg_setup() {
|
||||
if use ccache ; then
|
||||
einfo "Enabling ccache support for catalyst."
|
||||
@ -68,6 +68,10 @@ pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
@ -107,5 +111,5 @@ src_install() {
|
||||
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"
|
||||
einfo "https://wiki.gentoo.org/wiki/Catalyst"
|
||||
}
|
||||
@ -1,31 +1,28 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.16.ebuild,v 1.2 2014/01/18 11:38:05 vapier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
SRC_ECLASS="git-2"
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
|
||||
EGIT_MASTER="master"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit eutils multilib python-single-r1 ${SRC_ECLASS}
|
||||
|
||||
DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -38,9 +35,10 @@ DEPEND="
|
||||
RDEPEND="
|
||||
app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
app-arch/tar[xattr]
|
||||
sys-fs/dosfstools
|
||||
virtual/cdrtools
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
|
||||
@ -49,6 +47,13 @@ RDEPEND="
|
||||
|
||||
REQUIRED_USE=${PYTHON_REQUIRED_USE}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
|
||||
"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
|
||||
"${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
|
||||
"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use ccache ; then
|
||||
einfo "Enabling ccache support for catalyst."
|
||||
@ -68,6 +73,10 @@ pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
@ -107,5 +116,5 @@ src_install() {
|
||||
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"
|
||||
einfo "https://wiki.gentoo.org/wiki/Catalyst"
|
||||
}
|
||||
@ -1,30 +1,27 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.9999.ebuild,v 1.2 2014/01/18 11:38:05 vapier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
SRC_ECLASS="git-2"
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
|
||||
EGIT_MASTER="master"
|
||||
EGIT_BRANCH="2.X"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit eutils multilib python-single-r1 ${SRC_ECLASS}
|
||||
|
||||
DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -37,9 +34,10 @@ DEPEND="
|
||||
RDEPEND="
|
||||
app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
app-arch/tar[xattr]
|
||||
sys-fs/dosfstools
|
||||
virtual/cdrtools
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
|
||||
@ -106,5 +104,5 @@ src_install() {
|
||||
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"
|
||||
einfo "https://wiki.gentoo.org/wiki/Catalyst"
|
||||
}
|
||||
|
||||
@ -1,30 +1,27 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.13 2014/01/18 11:38:05 vapier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
SRC_ECLASS="git-2"
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
EGIT_MASTER="master"
|
||||
EGIT_BRANCH="3.0"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
|
||||
EGIT_BRANCH="master"
|
||||
S="${WORKDIR}/${PN}"
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
|
||||
|
||||
inherit distutils-r1 multilib ${SRC_ECLASS}
|
||||
|
||||
DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -32,21 +29,23 @@ IUSE="ccache doc kernel_linux"
|
||||
|
||||
DEPEND="
|
||||
app-text/asciidoc
|
||||
>=dev-python/snakeoil-0.5.2
|
||||
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
|
||||
"
|
||||
RDEPEND="
|
||||
>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
|
||||
app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
sys-fs/dosfstools
|
||||
!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
|
||||
x86-fbsd? ( app-arch/libarchive[xattr] )
|
||||
virtual/cdrtools
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
|
||||
"
|
||||
|
||||
python_prepare_all() {
|
||||
python_export_best
|
||||
echo VERSION="${PV}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PV}" "${PYTHON}" setup.py set_version
|
||||
}
|
||||
@ -56,7 +55,7 @@ python_compile_all() {
|
||||
emake
|
||||
}
|
||||
|
||||
python_install_all(){
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
if use doc; then
|
||||
dodoc files/HOWTO.html files/docbook-xsl.css
|
||||
65
sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.1.ebuild
vendored
Normal file
65
sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.1.ebuild
vendored
Normal file
@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
SRC_ECLASS="git-2"
|
||||
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
|
||||
EGIT_BRANCH="master"
|
||||
S="${WORKDIR}/${PN}"
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
|
||||
|
||||
inherit distutils-r1 multilib ${SRC_ECLASS}
|
||||
|
||||
DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="ccache doc kernel_linux"
|
||||
|
||||
DEPEND="
|
||||
app-text/asciidoc
|
||||
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
|
||||
"
|
||||
RDEPEND="
|
||||
>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
|
||||
app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
sys-fs/dosfstools
|
||||
!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
|
||||
kernel_FreeBSD? ( app-arch/libarchive[xattr] )
|
||||
virtual/cdrtools
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
|
||||
"
|
||||
|
||||
python_prepare_all() {
|
||||
python_setup
|
||||
echo VERSION="${PV}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PV}" "${PYTHON}" setup.py set_version || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
# build the man pages and docs
|
||||
emake
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
if use doc; then
|
||||
dodoc files/HOWTO.html files/docbook-xsl.css
|
||||
fi
|
||||
}
|
||||
@ -1,29 +1,27 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.33 2014/03/02 15:54:54 dolsen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
SRC_ECLASS="git-2"
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
|
||||
EGIT_BRANCH="master"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_COMPAT=( python{3_4,3_5,3_6} )
|
||||
|
||||
inherit distutils-r1 multilib ${SRC_ECLASS}
|
||||
|
||||
DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -31,23 +29,27 @@ IUSE="ccache doc kernel_linux"
|
||||
|
||||
DEPEND="
|
||||
app-text/asciidoc
|
||||
>=dev-python/snakeoil-0.5.2
|
||||
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
|
||||
"
|
||||
RDEPEND="
|
||||
=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
|
||||
app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
sys-fs/dosfstools
|
||||
!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
|
||||
kernel_FreeBSD? ( app-arch/libarchive[xattr] )
|
||||
virtual/cdrtools
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
|
||||
"
|
||||
|
||||
python_prepare_all() {
|
||||
python_export_best
|
||||
python_setup
|
||||
echo VERSION="${PV}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PV}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PV}" "${PYTHON}" setup.py set_version || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
@ -55,7 +57,7 @@ python_compile_all() {
|
||||
emake
|
||||
}
|
||||
|
||||
python_install_all(){
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
if use doc; then
|
||||
dodoc files/HOWTO.html files/docbook-xsl.css
|
||||
|
||||
@ -0,0 +1,95 @@
|
||||
From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001
|
||||
From: "Anthony G. Basile" <blueness@gentoo.org>
|
||||
Date: Sun, 18 Jan 2015 22:21:16 -0500
|
||||
Subject: [PATCH] Do not untar with --acls, fixes bug #536762
|
||||
To: gentoo-catalyst@lists.gentoo.org
|
||||
|
||||
---
|
||||
modules/catalyst_support.py | 6 +++---
|
||||
modules/generic_stage_target.py | 18 +++++++++---------
|
||||
2 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
|
||||
index 0e9faac..702887d 100644
|
||||
--- a/modules/catalyst_support.py
|
||||
+++ b/modules/catalyst_support.py
|
||||
@@ -108,9 +108,9 @@ contents_map={
|
||||
# 'find' is disabled because it requires the source path, which is not
|
||||
# always available
|
||||
#"find" :[calc_contents,"find %(path)s"],
|
||||
- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"],
|
||||
- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"],
|
||||
- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"],
|
||||
+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"],
|
||||
+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"],
|
||||
+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"],
|
||||
"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
|
||||
# isoinfo-f should be a last resort only
|
||||
"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
|
||||
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
|
||||
index c7db027..cc24c63 100644
|
||||
--- a/modules/generic_stage_target.py
|
||||
+++ b/modules/generic_stage_target.py
|
||||
@@ -660,10 +660,10 @@ class generic_stage_target(generic_target):
|
||||
self.settings["chroot_path"]+\
|
||||
" (This may take some time) ...\n"
|
||||
if "bz2" == self.settings["chroot_path"][-3:]:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
self.settings["chroot_path"]
|
||||
else:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
self.settings["chroot_path"]
|
||||
error_msg="Tarball extraction of "+\
|
||||
self.settings["source_path"]+" to "+\
|
||||
@@ -675,10 +675,10 @@ class generic_stage_target(generic_target):
|
||||
self.settings["chroot_path"]+\
|
||||
" (This may take some time) ...\n"
|
||||
if "bz2" == self.settings["chroot_path"][-3:]:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
self.settings["chroot_path"]
|
||||
else:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
|
||||
self.settings["chroot_path"]
|
||||
error_msg="Tarball extraction of "+self.settings["source_path"]+\
|
||||
" to "+self.settings["chroot_path"]+" failed."
|
||||
@@ -777,9 +777,9 @@ class generic_stage_target(generic_target):
|
||||
"catalyst-hash")
|
||||
destdir=self.settings["snapshot_cache_path"]
|
||||
if "bz2" == self.settings["chroot_path"][-3:]:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
|
||||
else:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
|
||||
unpack_errmsg="Error unpacking snapshot"
|
||||
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
|
||||
self.settings["snapshot_cache_path"]+\
|
||||
@@ -796,10 +796,10 @@ class generic_stage_target(generic_target):
|
||||
cleanup_msg=\
|
||||
"Cleaning up existing portage tree (This can take a long time)..."
|
||||
if "bz2" == self.settings["chroot_path"][-3:]:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
|
||||
self.settings["chroot_path"]+"/usr"
|
||||
else:
|
||||
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
|
||||
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
|
||||
self.settings["chroot_path"]+"/usr"
|
||||
unpack_errmsg="Error unpacking snapshot"
|
||||
|
||||
@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
|
||||
|
||||
print "Creating stage tarball..."
|
||||
|
||||
- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
|
||||
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
|
||||
self.settings["stage_path"]+" .",\
|
||||
"Couldn't create stage tarball",env=self.env)
|
||||
|
||||
--
|
||||
2.2.2
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001
|
||||
From: "Anthony G. Basile" <blueness@gentoo.org>
|
||||
Date: Thu, 3 Mar 2016 20:48:43 -0500
|
||||
Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow
|
||||
expansion of $1
|
||||
|
||||
This is a backport of commit b2473eff. The single quotes prevented the proper
|
||||
expansion of $1 in setup_pkgmgr(). Since this is usually called as
|
||||
`setup_pkgmgr "build"` during stage1 builds, it is surprising this was
|
||||
not caught earlier.
|
||||
---
|
||||
targets/support/chroot-functions.sh | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
|
||||
index 3b7f77b..6c1a31c 100755
|
||||
--- a/targets/support/chroot-functions.sh
|
||||
+++ b/targets/support/chroot-functions.sh
|
||||
@@ -172,12 +172,12 @@ setup_pkgmgr(){
|
||||
# Use --update or portage might just waste time/cycles and reinstall the same version.
|
||||
# Use --newuse to make sure it rebuilds with any changed use flags.
|
||||
if [ -n "$1" ];then
|
||||
- echo "Adding USE='${USE} $1' to make.conf for portage build"
|
||||
- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf
|
||||
+ echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
|
||||
+ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf
|
||||
run_merge --oneshot --update --newuse sys-apps/portage
|
||||
- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
|
||||
+ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf
|
||||
else
|
||||
- echo "Updating portage with USE='${USE}'"
|
||||
+ echo "Updating portage with USE=\"${USE}\""
|
||||
run_merge --oneshot --update --newuse sys-apps/portage
|
||||
fi
|
||||
}
|
||||
--
|
||||
2.4.10
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001
|
||||
From: "Anthony G. Basile" <blueness@gentoo.org>
|
||||
Date: Fri, 8 Apr 2016 17:58:15 -0400
|
||||
Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for
|
||||
systemd stages
|
||||
|
||||
---
|
||||
targets/support/chroot-functions.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
|
||||
index 6c1a31c..67874a0 100755
|
||||
--- a/targets/support/chroot-functions.sh
|
||||
+++ b/targets/support/chroot-functions.sh
|
||||
@@ -223,6 +223,7 @@ cleanup_stages() {
|
||||
stage1|stage2|stage3|system)
|
||||
rm -f /var/lib/portage/world
|
||||
touch /var/lib/portage/world
|
||||
+ rm -f /etc/machine-id
|
||||
;;
|
||||
*)
|
||||
echo "Skipping removal of world file for ${clst_target}"
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001
|
||||
From: "Anthony G. Basile" <blueness@gentoo.org>
|
||||
Date: Sat, 4 Jun 2016 12:43:44 -0400
|
||||
Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for
|
||||
setup_gcc()
|
||||
|
||||
setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this
|
||||
needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to
|
||||
choose the root directory in which to make the selection. If we don't export
|
||||
ROOT, then setup_gcc is ineffective.
|
||||
|
||||
X-Gentoo-Bug: 584234
|
||||
X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234
|
||||
|
||||
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
|
||||
---
|
||||
targets/stage1/stage1-preclean-chroot.sh | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
|
||||
index a80fc92..dc67521 100755
|
||||
--- a/targets/stage1/stage1-preclean-chroot.sh
|
||||
+++ b/targets/stage1/stage1-preclean-chroot.sh
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
+export ROOT=/tmp/stage1root
|
||||
export RUN_DEFAULT_FUNCS="no"
|
||||
|
||||
source /tmp/chroot-functions.sh
|
||||
@@ -8,8 +9,6 @@ update_env_settings
|
||||
show_debug
|
||||
|
||||
# Now, some finishing touches to initialize gcc-config....
|
||||
-unset ROOT
|
||||
-
|
||||
setup_gcc
|
||||
setup_binutils
|
||||
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>livecd</herd>
|
||||
<maintainer>
|
||||
<maintainer type="project">
|
||||
<email>catalyst@gentoo.org</email>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>livecd@gentoo.org</email>
|
||||
<name>Gentoo LiveCD Project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="ccache">Enables ccache support</flag>
|
||||
</use>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user