* [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
@ 2014-11-16 7:44 Yuta SATOH
0 siblings, 0 replies; 4+ messages in thread
From: Yuta SATOH @ 2014-11-16 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 069c9360d560db4669175991c7ffe790846c68ac
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Nov 16 07:42:46 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Nov 16 07:42:46 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=069c9360
update catalyst-2.0.15-fbsd-extra.patch, source x86-fbsd 9.0 stage3 support. workaround fix PAM implementation not identified sys-auth/pambase
---
dev-util/catalyst/Manifest | 2 +-
| 50 ++++++++++++++++++----
2 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 27df8a8..b9a8134 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
AUX catalyst-2.0.12.1-fbsd.patch 9713 SHA256 c66f856b7f3b0b9988984cf7eac1ab332d6103ac4bbcc855dbfdb0f4de8e6692 SHA512 335b29e7bda61c1875a66694031924a3f04851b056651b6ee8f3572209bf216d5f63520513223ca996f3b9404eeefacf7cfe40d0feddbebd5c3782bf8db36d4d WHIRLPOOL b63adab3d5ead0950a06d9a6490cfbef9d07ca420e45eaee99b9bef87f3b96d93cdaada2212faa368c1473360f917db094f8319f34bdbc1dd673390fb55cc9bf
AUX catalyst-2.0.14-fbsd.patch 10559 SHA256 c4f53aa4a29eceb01a19b76b08b898efab1244b045b7657430c81ac796ebd8f3 SHA512 344193243bea083c8af3c641f69b70362635af7eaec9887cb0a5aa92957f951b53bbc8ea68f62e66395a2efa63b3b69bb2da7aeac489f88df70abf117a6108b7 WHIRLPOOL 3c54e14b0a05e272403ff738c2a5ba25eaa5c034148f35317809c5ccb758f245490ccead2d6554b36ef3f4e6a592faa2988974f901f01096eefe1466de058272
-AUX catalyst-2.0.15-fbsd-extra.patch 3972 SHA256 0f66298139b65fc46aaa198afe5bee6d2a7eb1c3e50a5b9d003967fe5467a9fe SHA512 7d5346fe10f24a10ddc4a933e523268300df5dfa5471df9e3ed4fbd68488d304f08631a5259b744f424a281b69020e7138311c057748740a033bfb205f94a0d4 WHIRLPOOL 4cdd3eb20a151ea8010047ce76ace4ca496ec62f8f9689d7495712d3034fb96ec9ccdd850a6a5d1473eb0b5bd71efb7036c1101266a53766e0662b1fb4eb05c0
+AUX catalyst-2.0.15-fbsd-extra.patch 5180 SHA256 3f9cfe533be0050e936d47f2d4392f7ca5110cecb4a5dcd68e7cb79c59b25efb SHA512 dc930e063cf3870048a395577ba5c7d8fce96a150345af7766c4156109ec9539455e05b59a7c5873dfc596ab240e9d7dde55dc954410054fd85eaf289def7a1c WHIRLPOOL 78be8967fdce9b2c247f720d3389a41ff056d9ce3d270f2951dbd2318e8c93519c91ea4b6c889aced17775ea187180899f7a8a13450334c1b7df76611f944f9f
DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
DIST catalyst-2.0.15.tar.bz2 873335 SHA256 80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512 9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd WHIRLPOOL 03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
--git a/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch b/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
index 87a7401..8f32ce0 100644
--- a/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
+++ b/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
@@ -1,10 +1,19 @@
diff --git a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
-old mode 100755
-new mode 100644
-index ed83f38..1f7137e
+index ed83f38..09bfee6 100644
--- a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
+++ b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
-@@ -21,17 +21,48 @@ then
+@@ -1,5 +1,9 @@
+ #!/bin/bash
+-
++if [[ -e /usr/lib/portage/pym/portage/const.py ]] ; then
++ if [[ $(grep EAPI /usr/lib/portage/pym/portage/const.py | awk '{print $3}') -eq 4 ]] ; then
++ find /usr/portage/profiles -name eapi -exec bash -c 'echo 4 > {}' \;
++ fi
++fi
+ source /tmp/chroot-functions.sh
+
+ # We do this first, so we know our package list for --debug
+@@ -21,17 +25,53 @@ then
fi
## Setup seed pkgmgr to ensure latest
@@ -13,8 +22,6 @@ index ed83f38..1f7137e
+ emerge -p --nodeps dev-lang/python-exec
+ if [[ $? -eq 0 ]]; then
+ clst_root_path=/ run_merge "--buildpkg=n --newuse --nodeps dev-lang/python-exec"
-+ else
-+ find /usr/portage/profiles -name eapi -exec bash -c 'echo 4 > {}' \;
+ fi
+fi
clst_root_path=/ setup_pkgmgr
@@ -25,10 +32,17 @@ index ed83f38..1f7137e
if [ "${clst_update_seed}" == "yes" ]; then
echo "Updating seed stage..."
+ if [ $(uname) == "FreeBSD" ] ; then
-+ if [ $(uname -p) == "amd64" ] && [ ! -e /libexec/ld-elf32.so.1 ] ; then
++ if [ $(uname -p) == "amd64" ] && [ ! -e /libexec/ld-elf32.so.1 ] ; then
+ [[ ! -e /etc/portage/profile ]] && mkdir -p /etc/portage/profile
+ echo "sys-freebsd/freebsd-libexec abi_x86_32" >> /etc/portage/profile/package.use.mask
+ fi
++ if [ $(uname -p) == "i386" ] ; then
++ if [ ! -d /etc/portage/package.mask ] ; then
++ echo ">app-misc/pax-utils-0.8" >> /etc/portage/package.mask
++ else
++ echo ">app-misc/pax-utils-0.8" >> /etc/portage/package.mask/pax-utils
++ fi
++ fi
+ gcc -v &> /tmp/gccv.result
+ export CHOST=`grep Target /tmp/gccv.result | awk '{print $2}'`
+ [[ ! -e /usr/bin/cc ]] && cp /usr/bin/gcc /usr/bin/cc
@@ -55,8 +69,28 @@ index ed83f38..1f7137e
elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"
exit 1
+@@ -57,6 +97,19 @@ sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
+ [ -e /etc/portage/make.conf ] && \
+ echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
+ >> /etc/portage/make.conf
++[[ $(uname) == "FreeBSD" ]] && run_merge "--oneshot sys-auth/openpam"
+ run_merge "--oneshot ${clst_buildpkgs}"
+ sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
+ /etc/portage/make.conf
++
++if [ $(uname) == "FreeBSD" ] ; then
++ if [ -n "${clst_update_seed}" ]; then
++ if [ $(uname -p) == "i386" ] ; then
++ if [ ! -d /etc/portage/package.mask ] ; then
++ sed -i "/pax-utils/d" /etc/portage/package.mask
++ else
++ rm /etc/portage/package.mask/pax-utils
++ fi
++ fi
++ fi
++fi
diff --git a/catalyst-2.0.17/targets/support/chroot-functions.sh b/catalyst-2.0.17/targets/support/chroot-functions.sh
-index 5c30537..ab96a1f 100755
+index 848be40..d0212c5 100644
--- a/catalyst-2.0.17/targets/support/chroot-functions.sh
+++ b/catalyst-2.0.17/targets/support/chroot-functions.sh
@@ -2,6 +2,10 @@
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
@ 2016-10-31 16:17 Yuta SATOH
0 siblings, 0 replies; 4+ messages in thread
From: Yuta SATOH @ 2016-10-31 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 5bedc2513a1f3bdc91e0e0793f451f55fca8d6cd
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Mon Oct 31 16:16:43 2016 +0000
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Mon Oct 31 16:16:43 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=5bedc251
dev-util/catalyst: added -9999 patches.
dev-util/catalyst/Manifest | 3 +
dev-util/catalyst/catalyst-9999.ebuild | 10 +-
dev-util/catalyst/files/catalyst-9999-sed.patch | 302 ++++++++++++++++++++++
dev-util/catalyst/files/catalyst-9999-tmpfs.patch | 40 +++
4 files changed, 353 insertions(+), 2 deletions(-)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index b9a8134..5a8318f 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,9 +1,12 @@
AUX catalyst-2.0.12.1-fbsd.patch 9713 SHA256 c66f856b7f3b0b9988984cf7eac1ab332d6103ac4bbcc855dbfdb0f4de8e6692 SHA512 335b29e7bda61c1875a66694031924a3f04851b056651b6ee8f3572209bf216d5f63520513223ca996f3b9404eeefacf7cfe40d0feddbebd5c3782bf8db36d4d WHIRLPOOL b63adab3d5ead0950a06d9a6490cfbef9d07ca420e45eaee99b9bef87f3b96d93cdaada2212faa368c1473360f917db094f8319f34bdbc1dd673390fb55cc9bf
AUX catalyst-2.0.14-fbsd.patch 10559 SHA256 c4f53aa4a29eceb01a19b76b08b898efab1244b045b7657430c81ac796ebd8f3 SHA512 344193243bea083c8af3c641f69b70362635af7eaec9887cb0a5aa92957f951b53bbc8ea68f62e66395a2efa63b3b69bb2da7aeac489f88df70abf117a6108b7 WHIRLPOOL 3c54e14b0a05e272403ff738c2a5ba25eaa5c034148f35317809c5ccb758f245490ccead2d6554b36ef3f4e6a592faa2988974f901f01096eefe1466de058272
AUX catalyst-2.0.15-fbsd-extra.patch 5180 SHA256 3f9cfe533be0050e936d47f2d4392f7ca5110cecb4a5dcd68e7cb79c59b25efb SHA512 dc930e063cf3870048a395577ba5c7d8fce96a150345af7766c4156109ec9539455e05b59a7c5873dfc596ab240e9d7dde55dc954410054fd85eaf289def7a1c WHIRLPOOL 78be8967fdce9b2c247f720d3389a41ff056d9ce3d270f2951dbd2318e8c93519c91ea4b6c889aced17775ea187180899f7a8a13450334c1b7df76611f944f9f
+AUX catalyst-9999-sed.patch 12970 SHA256 279d0ba5b32bc7e921e9a6038a85981da2229773edc1b7519e144e05f34614c2 SHA512 f90d9e64079c88380508c42c5f408a106d7cc6fe07732d25722f92c94ddea84c9a592c61e403585b29e16612c2a8b59f1245e3259e7d7587aeb11881c6e84932 WHIRLPOOL 6e4db5701884eb976b2b893dbc3ec73297096ef30319ff7a2dbec43861403ad2444dc0af40fe5b03143f5694ccd7806b6e057a6ab7cc58d59c19aa245ae86eb1
+AUX catalyst-9999-tmpfs.patch 1531 SHA256 23cdf7e169129343d7a55e62870a70f971b8746c721cf6acf8b19027d8f9cf6e SHA512 1ff41b0c994336ff73e69c54258f6d0aa75b235eeeefbfe67ebc6c20322b9c27bf7554e6236b0f7376a06e115abdb80e6947b32afe94ff73755290f80b85a68d WHIRLPOOL 8715a0fb31c323ec76e30be6e4dd9fd864d5acdf61c3633e9a194c4355c250d6da6570d99de68bc487e7419eac396ce2f722d44aa639662f5032f3ca59b1c6cd
DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
DIST catalyst-2.0.15.tar.bz2 873335 SHA256 80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512 9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd WHIRLPOOL 03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
EBUILD catalyst-2.0.12.2.ebuild 3660 SHA256 4b0714dbb8eb96a9588f6b95e5e9021ddb62144c1a2e47f717111d70a84593a2 SHA512 f5ca61ec95864928d27e93ac72c2b441fdc04d30a27ebb3cedff6ec327147cee51a213b06d5f8e82bfda50ebc9e2eff51d77f43d3b699018459a4094b691ff4f WHIRLPOOL 1a558bd6eba2f278e4f6fcc4c846d884cf3fe79961204e6cf04bdb41889c96dd5f0af447eb14a6e8d17eac0622d8874cc6be20ff97e59d9632114495c77c2019
EBUILD catalyst-2.0.15.ebuild 3166 SHA256 90063f74c89fa79969cfc35c695cadd20aadce8c922dd9d9444d8243b08f974e SHA512 1e0a83a4c65679c0f2c11b3ccbb96695a7f551f97c875bb0d81453db1f6803873a1ef8838eee884a9b34bb69dd97bbdb80344deac103301882d9e95dd61e8b55 WHIRLPOOL 6239a89daa41d5bc983cf020eb2fd6486c3e990ebc5cccd27260ce54ade5fb9a1e20c256d8a6861c728fa9286f54d0f6b7fa7e63949222147f178bcbd2e0a3b7
EBUILD catalyst-2.0.17.ebuild 3162 SHA256 1f9aacf9e56f5184fa791583ea7c9d332b7ab4a1504bde50ae77f7f879a17a2c SHA512 31ab393441dd34eeb030703e75c91c4b01ecb32354728e0bedff40ec1c2a6f70ba4868eeeb1e63ff4f68c500d62abea0d2e2d17743b89c37c000d6cb18b8aa7c WHIRLPOOL b424423dfaaf07b8df3317e93d0b93eac341d0b82fe201f9ed71ef8c7dda365434a5796cf9abbe5a2c9ef21c45702649220524675e8113e6ef76d7e05000bd62
+EBUILD catalyst-9999.ebuild 1758 SHA256 f5f551262785dfb504bc8f1b8fd37ed4db4c2e7b416a97c0bd3821ef7f07dc95 SHA512 f5a56f1d6f2ca9a91e398a20400c6fe40619a4aa32b8db17254203a849e9ef745efd1318ea15c069c4b893d7931205c52ec148ee70dca54f5261e16166ad9e1c WHIRLPOOL 58cc2bd7c78fd8cd11dca0ce64b125985972fe6e432802e7ed43be7fb7a6aa8e99ff521a747742cbc719ea6cfd73445a1475ae1a5dd152156f952706ed9f9afc
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index adc1244..e19b49c 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -36,18 +36,24 @@ RDEPEND="
=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
app-arch/lbzip2
app-crypt/shash
- app-arch/tar[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 )
+ kernel_linux? ( app-arch/tar[xattr] app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-9999-sed.patch
+ epatch "${FILESDIR}"/${PN}-9999-tmpfs.patch
+}
+
python_prepare_all() {
echo VERSION="${PV}" "${PYTHON}" setup.py set_version
VERSION="${PV}" "${PYTHON}" setup.py set_version
+
+ distutils-r1_python_prepare_all
}
python_compile_all() {
diff --git a/dev-util/catalyst/files/catalyst-9999-sed.patch b/dev-util/catalyst/files/catalyst-9999-sed.patch
new file mode 100644
index 0000000..d7ef1b3
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-9999-sed.patch
@@ -0,0 +1,302 @@
+diff --git a/catalyst-3.0_rc1/catalyst/defaults.py b/catalyst-3.0_rc1/catalyst/defaults.py
+index a0e3ea8..67ad8f7 100644
+--- a/catalyst-3.0_rc1/catalyst/defaults.py
++++ b/catalyst-3.0_rc1/catalyst/defaults.py
+@@ -39,6 +39,7 @@ confdefaults={
+ "PythonDir": "./catalyst",
+ "repo_basedir": "/usr",
+ "repo_name": "portage",
++ "sed": "sed",
+ "sharedir": "/usr/share/catalyst",
+ "shdir": "/usr/share/catalyst/targets/",
+ "snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
+diff --git a/catalyst-3.0_rc1/catalyst/main.py b/catalyst-3.0_rc1/catalyst/main.py
+index 6608b86..4a0e515 100644
+--- a/catalyst-3.0_rc1/catalyst/main.py
++++ b/catalyst-3.0_rc1/catalyst/main.py
+@@ -343,6 +343,12 @@ def _main(parser, opts):
+ conf_values['compress_definitions'] = COMPRESS_DEFINITIONS
+ # TODO add capability to config/spec new definitions
+
++ # detect GNU sed
++ for sed in ('/usr/bin/gsed', '/bin/sed', '/usr/bin/sed'):
++ if os.path.exists(sed):
++ conf_values["sed"] = sed
++ break
++
+ # Start checking that digests are valid now that hash_map is initialized
+ if "digests" in conf_values:
+ digests = set(conf_values['digests'].split())
+diff --git a/catalyst-3.0_rc1/targets/stage1/stage1-chroot.sh b/catalyst-3.0_rc1/targets/stage1/stage1-chroot.sh
+index fbda84b..28bd743 100755
+--- a/catalyst-3.0_rc1/targets/stage1/stage1-chroot.sh
++++ b/catalyst-3.0_rc1/targets/stage1/stage1-chroot.sh
+@@ -49,7 +49,7 @@ make_destpath /tmp/stage1root
+ # First, we drop in a known-good baselayout
+ [ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
+ run_merge "--oneshot --nodeps sys-apps/baselayout"
+-sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
++${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
+
+ # Now, we install our packages
+ if [ -e ${clst_make_conf} ]; then
+@@ -62,10 +62,10 @@ if [ -e ${clst_make_conf} ]; then
+ fi
+
+ run_merge "--oneshot ${clst_buildpkgs}"
+-sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
++${clst_sed} -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
+ ${clst_make_conf}
+ for useexpand in ${clst_HOSTUSEEXPAND}; do
+ x="clst_${useexpand}"
+- sed -i "/${useexpand}=\"${!x}\"/d" \
++ ${clst_sed} -i "/${useexpand}=\"${!x}\"/d" \
+ ${clst_make_conf}
+ done
+diff --git a/catalyst-3.0_rc1/targets/stage2/stage2-chroot.sh b/catalyst-3.0_rc1/targets/stage2/stage2-chroot.sh
+index 38dfea3..30dc47a 100755
+--- a/catalyst-3.0_rc1/targets/stage2/stage2-chroot.sh
++++ b/catalyst-3.0_rc1/targets/stage2/stage2-chroot.sh
+@@ -21,5 +21,5 @@ fi
+ ${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
+
+ # Clean-up USE again
+-sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+-sed -i "/USE=\"bindist\"/d" "${clst_make_conf}"
++${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
++${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"
+diff --git a/catalyst-3.0_rc1/targets/support/bootloader-setup.sh b/catalyst-3.0_rc1/targets/support/bootloader-setup.sh
+index d9e2620..ffe7be2 100755
+--- a/catalyst-3.0_rc1/targets/support/bootloader-setup.sh
++++ b/catalyst-3.0_rc1/targets/support/bootloader-setup.sh
+@@ -79,7 +79,7 @@ case ${clst_hostarch} in
+ echo "message=/boot/boot.msg" >> ${icfg}
+
+ # Here is where I fix up the boot.msg file.
+- sed -e 's/ARCH/PowerPC/' \
++ ${clst_sed} -e 's/ARCH/PowerPC/' \
+ -e 's/HARDWARE/Apple and IBM hardware/' \
+ -i $kmsg
+
+diff --git a/catalyst-3.0_rc1/targets/support/chroot-functions.sh b/catalyst-3.0_rc1/targets/support/chroot-functions.sh
+index 456ae4c..004e7c3 100755
+--- a/catalyst-3.0_rc1/targets/support/chroot-functions.sh
++++ b/catalyst-3.0_rc1/targets/support/chroot-functions.sh
+@@ -87,7 +87,7 @@ setup_myfeatures(){
+ else
+ clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1
+ fi
+- sed -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}
++ ${clst_sed} -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}
+ mkdir -p /etc/distcc
+ echo "${clst_distcc_hosts}" > /etc/distcc/hosts
+
+@@ -186,7 +186,7 @@ setup_pkgmgr(){
+ echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"
+ [ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}"
+ run_merge --oneshot --update --newuse sys-apps/portage
+- sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
++ ${clst_sed} -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
+ else
+ run_merge --oneshot --update --newuse sys-apps/portage
+ fi
+@@ -241,8 +241,8 @@ cleanup_stages() {
+
+ # Remove bindist from use
+ # this is handled independantly in stage2, changes here should be mirrored there
+- sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+- sed -i "/USE=\"bindist\"/d" "${clst_make_conf}"
++ ${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
++ ${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"
+
+ [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*
+ }
+@@ -260,7 +260,7 @@ die() {
+
+ make_destpath() {
+ # ROOT is / by default, so remove any ROOT= settings from make.conf
+- sed -i '/ROOT=/d' ${clst_make_conf}
++ ${clst_sed} -i '/ROOT=/d' ${clst_make_conf}
+ export ROOT=/
+ if [ "${1}" != "/" -a -n "${1}" ]
+ then
+diff --git a/catalyst-3.0_rc1/targets/support/kmerge.sh b/catalyst-3.0_rc1/targets/support/kmerge.sh
+index 3d4afea..68cd3f2 100755
+--- a/catalyst-3.0_rc1/targets/support/kmerge.sh
++++ b/catalyst-3.0_rc1/targets/support/kmerge.sh
+@@ -245,7 +245,7 @@ then
+ if [ ! "${clst_kextraversion}" = "" ]
+ then
+ echo "Setting extraversion to ${clst_kextraversion}"
+- sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
++ ${clst_sed} -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
+ echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
+ else
+ touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
+@@ -262,7 +262,7 @@ $(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2
+ if [ ! "${clst_kextraversion}" = "" ]
+ then
+ echo "Setting extraversion to ${clst_kextraversion}"
+- sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
++ ${clst_sed} -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
+ fi
+ fi
+
+@@ -275,12 +275,12 @@ make_destpath
+
+
+ build_kernel
+-sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}
++${clst_sed} -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}
+ # grep out the kernel version so that we can do our modules magic
+ VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
+ PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
+ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
+-EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
++EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | ${clst_sed} -e "s/EXTRAVERSION =//" -e "s/ //g"`
+ clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
+
+ unset USE
+diff --git a/catalyst-3.0_rc1/targets/support/livecdfs-update.sh b/catalyst-3.0_rc1/targets/support/livecdfs-update.sh
+index 31cdf04..2c551b4 100755
+--- a/catalyst-3.0_rc1/targets/support/livecdfs-update.sh
++++ b/catalyst-3.0_rc1/targets/support/livecdfs-update.sh
+@@ -7,7 +7,7 @@ source /tmp/chroot-functions.sh
+ # Allow root logins to our CD by default
+ if [ -e /etc/ssh/sshd_config ]
+ then
+- sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
++ ${clst_sed} -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
+ /etc/ssh/sshd_config
+ fi
+
+@@ -73,7 +73,7 @@ fi
+ # Setup sudoers
+ if [ -f /etc/sudoers ]
+ then
+- sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
++ ${clst_sed} -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
+ fi
+
+ # Setup links for ethernet devices
+@@ -113,7 +113,7 @@ echo "####################################################" >> ${clst_make_conf}
+ cat ${clst_make_conf}.old >> ${clst_make_conf}
+
+ # devfs tweaks
+-[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
++[ -e /etc/devfsd.conf ] && ${clst_sed} -i '/dev-state/ s:^:#:' /etc/devfsd.conf
+
+ # Add some helpful aliases
+ echo "alias cp='cp -i'" >> /etc/profile
+@@ -153,10 +153,10 @@ fi
+ # Setup configured display manager
+ if [ -n "${clst_livecd_xdm}" ]
+ then
+- sed -i \
++ ${clst_sed} -i \
+ -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
+ /etc/rc.conf
+- sed -i \
++ ${clst_sed} -i \
+ -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
+ /etc/conf.d/xdm
+ fi
+@@ -175,21 +175,21 @@ case ${clst_livecd_type} in
+ gentoo-release-universal)
+ cat /etc/generic.motd.txt /etc/universal.motd.txt \
+ /etc/minimal.motd.txt > /etc/motd
+- sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
++ ${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
+ ;;
+ gentoo-release-minimal)
+ cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
+- sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
++ ${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
+ ;;
+ gentoo-release-live*)
+ cat /etc/generic.motd.txt \
+ /etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
+- sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
++ ${clst_sed} -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
+ -e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
+ ;;
+ gentoo-gamecd)
+ cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
+- sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
++ ${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
+ ;;
+ esac
+
+@@ -200,7 +200,7 @@ if [ -n "${clst_livecd_splash_theme}" ]
+ then
+ if [ -d /etc/splash/${clst_livecd_splash_theme} ]
+ then
+- sed -i \
++ ${clst_sed} -i \
+ -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
+ -e "/^# SPLASH_TTYS=/ s/^#//" \
+ /etc/conf.d/splash
+@@ -229,7 +229,7 @@ case ${clst_livecd_type} in
+ rm /tmp/gamecd.conf
+
+ # Here we replace out game information into several files
+- sed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd
++ ${clst_sed} -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd
+
+ # Here we setup our xinitrc
+ echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc
+@@ -276,7 +276,7 @@ case ${clst_livecd_type} in
+ /etc/X11/gdm/custom.conf
+ else
+ cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
+- sed -i \
++ ${clst_sed} -i \
+ -e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
+ -e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
+ -e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \
+@@ -286,7 +286,7 @@ case ${clst_livecd_type} in
+
+ if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
+ then
+- sed -i \
++ ${clst_sed} -i \
+ -e "s:TimedLogin=:TimedLogin=${first_user}:" \
+ /etc/X11/gdm/gdm.conf
+ fi
+@@ -296,7 +296,7 @@ case ${clst_livecd_type} in
+ # This gives us our list of system packages for the installer
+ mkdir -p /usr/livecd
+ ### XXX: Andrew says we don't need this anymore
+- USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
++ USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | ${clst_sed} -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
+
+ # This is my hack to reduce tmpfs usage
+ cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd
+@@ -331,10 +331,10 @@ case ${clst_livecd_type} in
+ /home/${username}/Desktop
+ cp -f /usr/share/applications/installer-dialog.desktop \
+ /home/${username}/Desktop
+- sed -i -e \
++ ${clst_sed} -i -e \
+ 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
+ /home/${username}/Desktop/installer-dialog.desktop
+- sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
++ ${clst_sed} -i -e 's:Exec=installer-gtk:Exec=installer:' \
+ /home/${username}/Desktop/installer-gtk.desktop
+ fi
+ chown -R ${username}:100 /home/${username}
+@@ -369,12 +369,12 @@ esac
+ # We want the first user to be used when auto-starting X
+ if [ -e /etc/startx ]
+ then
+- sed -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc
++ ${clst_sed} -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc
+ fi
+
+ if [ -e /lib/rcscripts/addons/udev-start.sh ]
+ then
+- sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
++ ${clst_sed} -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
+ fi
+
+ env-update
diff --git a/dev-util/catalyst/files/catalyst-9999-tmpfs.patch b/dev-util/catalyst/files/catalyst-9999-tmpfs.patch
new file mode 100644
index 0000000..9a41f49
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-9999-tmpfs.patch
@@ -0,0 +1,40 @@
+diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
+index 68ccb79..966d872 100644
+--- a/catalyst/base/stagebase.py
++++ b/catalyst/base/stagebase.py
+@@ -935,21 +935,22 @@ class StageBase(TargetBase, ClearBase, GenBase):
+ if "snapcache" in self.settings["options"] and x == "portdir":
+ self.snapcache_lock.read_lock()
+ _cmd = None
+- if os.uname()[0] == "FreeBSD":
+- if src == "/dev":
+- _cmd = ['mount', '-t', 'devfs', 'none', target]
+- else:
+- _cmd = ['mount_nullfs', src, target]
++ if src == "tmpfs":
++ if "var_tmpfs_portage" in self.settings:
++ _cmd = ['mount', '-t', 'tmpfs',
++ '-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G',
++ src, target]
+ else:
+- if src == "tmpfs":
+- if "var_tmpfs_portage" in self.settings:
+- _cmd = ['mount', '-t', 'tmpfs',
+- '-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G',
+- src, target]
+- elif src == "shmfs":
+- _cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev', 'shm', target]
++ if os.uname()[0] == "FreeBSD":
++ if src == "/dev":
++ _cmd = ['mount', '-t', 'devfs', 'none', target]
++ else:
++ _cmd = ['mount_nullfs', src, target]
+ else:
+- _cmd = ['mount', '--bind', src, target]
++ if src == "shmfs":
++ _cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev', 'shm', target]
++ else:
++ _cmd = ['mount', '--bind', src, target]
+ if _cmd:
+ log.debug('bind(); _cmd = %s', _cmd)
+ cmd(_cmd, env=self.env, fail_func=self.unbind)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
@ 2017-12-09 22:29 Yuta SATOH
0 siblings, 0 replies; 4+ messages in thread
From: Yuta SATOH @ 2017-12-09 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 577e2305cbb5ee32eb808b3728dd84b291f02db2
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sat Dec 9 22:29:07 2017 +0000
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Dec 9 22:29:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=577e2305
dev-util/catalyst: add the patches for Gentoo/FreeBSD.
dev-util/catalyst/Manifest | 5 ++-
dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 21 +++++++--
.../catalyst-2.0.18-fbsd-add-tmpfs-support.patch | 48 ++++++++++++++++++++
.../files/catalyst-2.0.18-fbsd-fix-linux32.patch | 22 +++++++++
.../files/catalyst-2.0.18-fbsd-fix-sed.patch | 52 ++++++++++++++++++++++
5 files changed, 143 insertions(+), 5 deletions(-)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 3ba594e..40152ac 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,7 +1,10 @@
AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 SHA256 2b8160bba1207cf45412a8133b6ed3b039d6705f76074651b6d42c4488b9bc1e SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f WHIRLPOOL f348eb0507d9fed5d5e05ba27b4b662fa1fd25e5d87afd886732a45173d2c3b27fee18ad4435c0fdefdb92d6606d0b11a9c54dff459692eff5db3aeb05f2c459
+AUX catalyst-2.0.18-fbsd-add-tmpfs-support.patch 1916 SHA256 a917386049e8a6dc9ac7656a2ebcb6ae909c2528994f93dce0df10cbacd3787a SHA512 90bdb046b348d6c661c8321443b65041f8ccfd0e9834f4a76a73dc8136d632a7641b9c394db1bbf4f49b07c20572d82f24f4c76c812d400386b09f773c9463ce WHIRLPOOL 43c7d81ec56c44e76f9e6fbee98c06c3b3b673f6ba6cc529b4cd9b926f585abb7930767da9b6091bcb46c703eadf82c296c5cf51924931baefc0eb405041f19f
+AUX catalyst-2.0.18-fbsd-fix-linux32.patch 1008 SHA256 633abcdb6fc1b36a1335c7b203d9db7fd14e4efdd1d45907c63c56fcdbfb5757 SHA512 d10d96bba17be410b88a38e3d341617d7a9a27e6439106dfb907347fcdcaf6d47d2e15fe3ec63f1fa52f773d69bab5fe94825090959bd4364e43d35c16d83a71 WHIRLPOOL a35ca75490b453e4952b996b4c52ec10b75c7b7b11c0f7c7c8ae0bbbb5638380885c9e678e37e093069f02bfe9947e4b976eb13c0b0e0b7d5b6943f91c3ed905
+AUX catalyst-2.0.18-fbsd-fix-sed.patch 1878 SHA256 cec0e2edc73a021a28e700465e752ce576e70a9a8d21719bd89fe2be06332a54 SHA512 7abd0aec481c2c32b9fc0664d3db968f6447d77cc7533808d4f122ccd8515b86b90343b8455a964793694a3bf4c7a1c2d38b19e9aeaa0b5e75735925ff975e28 WHIRLPOOL 4443334e2bf791c2a30a98fe76a6b56198a28b11e06973c0be6f7e17f2b1c2520f84407880d5cd8b582fc50ea95440feff528227f59140aa4c8eb6cf1fedb6a0
AUX catalyst-2.0.18-fix-quotes.patch 1663 SHA256 5d99b200bef45e3a69003687d00a1939e9ab696bd1d2653f7a76f7ea66972c88 SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205 WHIRLPOOL 7b9434459c31207e8d36bcbf57df7751739848b2c8e5e081b7b219029deb7257f33652027ca22a94fa0452439e6e97e16467554423435a5bd17cdb293d1942a2
AUX catalyst-2.0.18-remove-machine-id.patch 778 SHA256 dc40a3c469a80e40eed68c46ea61ce6ac802aa56ade300eee372c3eb79741d33 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6 WHIRLPOOL 1645f5ccf29272d2cb97c86dbd638021d452051e167231807bbf5ecc75f9c059230e3009ff1adc3224694901a392104ad0418b591ce474ef03b96866d247b7af
AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 SHA256 bfd9470df1b53c0313731c22d740a4f0ce613326037144808cf37e2c3c280690 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113 WHIRLPOOL b3f4b7678ff196ee00e65961894b19ec58868c2e769bc573ab4cb0570fbbbbebb7b5ca0b5f2e3534bc4582db872e4da4f49d9d98fc9d82c473a627194bd63c0b
DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
-EBUILD catalyst-2.0.18-r4.ebuild 3297 SHA256 5dba6296b5cb985f89946b1575d9e2ce07fda0820ee47ce346abecbbbfcd14ac SHA512 e397fb7205d4bf4823b5d328fb9059aa37ed8ad97deb2fa0fd7a7b1cafe694daa2f9f5705ff1a83905101b9679755b875a79063039a63743f6ef2e96dce4efea WHIRLPOOL f78adcfbac9738183d489c2f59992fce333b77f98b46e757731342660454de1bb342b3483a096d820601ea5e8cdba5093cb1872ecbbd3e3f4426102e1e8f6218
+EBUILD catalyst-2.0.18-r4.ebuild 3958 SHA256 6041422e3dfe0a210ad4ab10404965af161c79f7f58937fffb95508c9c32e076 SHA512 11ac663fd9fba8222ac1450ad693f32d4dd51f26a4ff5154b60a4461b80a25953c77d0e52c9fec55b191096fa159e7919a59edaa39b62d5fec8a8f4e63f16cdc WHIRLPOOL 0bbad9897ef184195549bdafc93182e3ec547fb99a25de9b16dfe24b50a3066b87b569d9ee5c7272b3c74703e90f0d1deddc0fad71395179587778a54bcedb5c
MISC metadata.xml 417 SHA256 7368ace310e6ad01b264004c144e7c690f0f3106c851514190df206122ceb357 SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8 WHIRLPOOL 32a9aa02498e87b255aab36b0195bec07d95ecc9cb10eb3f5eb8393cc3a5910263ef2e4cb507924a29b822845b5ccc54af25ac5e226e3900bdc379d72e1d2cc6
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index 45b66c3..08d2610 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -14,7 +14,7 @@ else
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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
PYTHON_COMPAT=( python2_7 )
@@ -26,7 +26,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
LICENSE="GPL-2"
SLOT="0"
-IUSE="ccache kernel_linux"
+IUSE="ccache kernel_linux kernel_FreeBSD"
DEPEND="
app-text/asciidoc
@@ -35,13 +35,12 @@ DEPEND="
RDEPEND="
app-arch/lbzip2
app-crypt/shash
- app-arch/tar[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 )
+ kernel_linux? ( app-arch/tar[xattr] app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
${PYTHON_DEPS}
"
@@ -52,6 +51,9 @@ PATCHES=(
"${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"
+ "${FILESDIR}/catalyst-2.0.18-fbsd-add-tmpfs-support.patch"
+ "${FILESDIR}/catalyst-2.0.18-fbsd-fix-linux32.patch"
+ "${FILESDIR}/catalyst-2.0.18-fbsd-fix-sed.patch"
)
pkg_setup() {
@@ -75,6 +77,17 @@ pkg_setup() {
src_prepare() {
epatch "${PATCHES[@]}"
+
+ if use kernel_FreeBSD ; then
+ # FreeBSD's tar doesn't support the --xattrs and -I lbzip2 options.
+ sed -i 's:--xattrs::g' "${S}"/modules/catalyst_support.py
+ sed -i 's:tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux:tar:g' \
+ "${S}"/modules/generic_stage_target.py
+ for f in modules/catalyst_support.py modules/generic_stage_target.py modules/snapshot_target.py
+ do
+ sed -i 's:-I lbzip2:-j:g' "${S}/${f}"
+ done
+ fi
}
src_install() {
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fbsd-add-tmpfs-support.patch b/dev-util/catalyst/files/catalyst-2.0.18-fbsd-add-tmpfs-support.patch
new file mode 100644
index 0000000..dee3183
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-fbsd-add-tmpfs-support.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/show_bug.cgi?id=363577
+
+diff --git a/catalyst-2.0.18/modules/generic_stage_target.py b/catalyst-2.0.18/modules/generic_stage_target.py
+index cc24c63..75101e7 100644
+--- a/catalyst-2.0.18/modules/generic_stage_target.py
++++ b/catalyst-2.0.18/modules/generic_stage_target.py
+@@ -911,25 +911,26 @@ class generic_stage_target(generic_target):
+ src=self.mountmap[x]
+ if "SNAPCACHE" in self.settings and x == "/usr/portage":
+ self.snapshot_lock_object.read_lock()
+- if os.uname()[0] == "FreeBSD":
+- if src == "/dev":
+- retval=os.system("mount -t devfs none "+\
+- self.settings["chroot_path"]+x)
+- else:
+- retval=os.system("mount_nullfs "+src+" "+\
++ if src == "tmpfs":
++ if "var_tmpfs_portage" in self.settings:
++ retval=os.system("mount -t tmpfs -o size="+\
++ self.settings["var_tmpfs_portage"]+"G "+src+" "+\
+ self.settings["chroot_path"]+x)
+ else:
+- if src == "tmpfs":
+- if "var_tmpfs_portage" in self.settings:
+- retval=os.system("mount -t tmpfs -o size="+\
+- self.settings["var_tmpfs_portage"]+"G "+src+" "+\
++ if os.uname()[0] == "FreeBSD":
++ if src == "/dev":
++ retval=os.system("mount -t devfs none "+\
++ self.settings["chroot_path"]+x)
++ else:
++ retval=os.system("mount_nullfs "+src+" "+\
+ self.settings["chroot_path"]+x)
+- elif src == "shmfs":
+- retval=os.system("mount -t tmpfs -o noexec,nosuid,nodev shm "+\
+- self.settings["chroot_path"]+x)
+ else:
+- retval=os.system("mount --bind "+src+" "+\
+- self.settings["chroot_path"]+x)
++ if src == "shmfs":
++ retval=os.system("mount -t tmpfs -o noexec,nosuid,nodev shm "+\
++ self.settings["chroot_path"]+x)
++ else:
++ retval=os.system("mount --bind "+src+" "+\
++ self.settings["chroot_path"]+x)
+ if retval!=0:
+ self.unbind()
+ raise CatalystError,"Couldn't bind mount "+src
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fbsd-fix-linux32.patch b/dev-util/catalyst/files/catalyst-2.0.18-fbsd-fix-linux32.patch
new file mode 100644
index 0000000..8a394f2
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-fbsd-fix-linux32.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=363577
+
+diff --git a/catalyst-2.0.18/arch/x86.py b/catalyst-2.0.18/arch/x86.py
+index 0391b79..2b67dba 100644
+--- a/catalyst-2.0.18/arch/x86.py
++++ b/catalyst-2.0.18/arch/x86.py
+@@ -7,9 +7,12 @@ class generic_x86(builder.generic):
+ 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 --git a/dev-util/catalyst/files/catalyst-2.0.18-fbsd-fix-sed.patch b/dev-util/catalyst/files/catalyst-2.0.18-fbsd-fix-sed.patch
new file mode 100644
index 0000000..33e5325
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-fbsd-fix-sed.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/show_bug.cgi?id=363577
+
+diff --git a/catalyst-2.0.18/modules/generic_stage_target.py b/catalyst-2.0.18/modules/generic_stage_target.py
+index cc24c63..ad8138d 100644
+--- a/catalyst-2.0.18/modules/generic_stage_target.py
++++ b/catalyst-2.0.18/modules/generic_stage_target.py
+@@ -1124,11 +1124,17 @@ class generic_stage_target(generic_target):
+ self.settings["chroot_path"]+"/etc/hosts",\
+ "Could not replace /etc/hosts",env=self.env)
+
++ """ GNU sed should be used on Gentoo/FreeBSD """
++ if os.uname()[0] == "FreeBSD":
++ self.settings["sed"]="gsed"
++ else:
++ self.settings["sed"]="sed"
++
+ """ Remove our overlay """
+ 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"]+\
++ cmd(self.settings["sed"]+" -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
+ "/etc/portage/make.conf",\
+ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
+
+diff --git a/catalyst-2.0.18/targets/support/chroot-functions.sh b/catalyst-2.0.18/targets/support/chroot-functions.sh
+index 67874a0..983a3a7 100755
+--- a/catalyst-2.0.18/targets/support/chroot-functions.sh
++++ b/catalyst-2.0.18/targets/support/chroot-functions.sh
+@@ -422,5 +422,22 @@ Comment=This is a link to the local copy of the Gentoo Linux Handbook.
+ Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
+ }
+
++# GNU sed wrapper
++sed(){
++ if [ -e /usr/bin/gsed ]
++ then
++ /usr/bin/gsed "$@"
++ elif [ -e /bin/sed ]
++ then
++ /bin/sed "$@"
++ elif [ -e /usr/bin/sed ]
++ then
++ /usr/bin/sed "$@"
++ else
++ echo "ERROR: Failed to select sed."
++ exit 1
++ fi
++}
++
+ # We do this everywhere, so why not put it in this script
+ run_default_funcs
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
@ 2017-12-09 22:29 Yuta SATOH
0 siblings, 0 replies; 4+ messages in thread
From: Yuta SATOH @ 2017-12-09 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 751d0ad85386de84b94fd33acfe42db0e45362b3
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sat Dec 9 22:15:54 2017 +0000
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Dec 9 22:15:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=751d0ad8
dev-util/catalyst: import from the main tree.
dev-util/catalyst/Manifest | 7 ++
dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 120 +++++++++++++++++++++
.../catalyst-2.0.18-Do-notuntarwith--acls.patch | 95 ++++++++++++++++
.../files/catalyst-2.0.18-fix-quotes.patch | 38 +++++++
.../files/catalyst-2.0.18-remove-machine-id.patch | 25 +++++
.../files/catalyst-2.0.18-stage1-export-ROOT.patch | 42 ++++++++
dev-util/catalyst/metadata.xml | 14 +++
7 files changed, 341 insertions(+)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
new file mode 100644
index 0000000..3ba594e
--- /dev/null
+++ b/dev-util/catalyst/Manifest
@@ -0,0 +1,7 @@
+AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 SHA256 2b8160bba1207cf45412a8133b6ed3b039d6705f76074651b6d42c4488b9bc1e SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f WHIRLPOOL f348eb0507d9fed5d5e05ba27b4b662fa1fd25e5d87afd886732a45173d2c3b27fee18ad4435c0fdefdb92d6606d0b11a9c54dff459692eff5db3aeb05f2c459
+AUX catalyst-2.0.18-fix-quotes.patch 1663 SHA256 5d99b200bef45e3a69003687d00a1939e9ab696bd1d2653f7a76f7ea66972c88 SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205 WHIRLPOOL 7b9434459c31207e8d36bcbf57df7751739848b2c8e5e081b7b219029deb7257f33652027ca22a94fa0452439e6e97e16467554423435a5bd17cdb293d1942a2
+AUX catalyst-2.0.18-remove-machine-id.patch 778 SHA256 dc40a3c469a80e40eed68c46ea61ce6ac802aa56ade300eee372c3eb79741d33 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6 WHIRLPOOL 1645f5ccf29272d2cb97c86dbd638021d452051e167231807bbf5ecc75f9c059230e3009ff1adc3224694901a392104ad0418b591ce474ef03b96866d247b7af
+AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 SHA256 bfd9470df1b53c0313731c22d740a4f0ce613326037144808cf37e2c3c280690 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113 WHIRLPOOL b3f4b7678ff196ee00e65961894b19ec58868c2e769bc573ab4cb0570fbbbbebb7b5ca0b5f2e3534bc4582db872e4da4f49d9d98fc9d82c473a627194bd63c0b
+DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
+EBUILD catalyst-2.0.18-r4.ebuild 3297 SHA256 5dba6296b5cb985f89946b1575d9e2ce07fda0820ee47ce346abecbbbfcd14ac SHA512 e397fb7205d4bf4823b5d328fb9059aa37ed8ad97deb2fa0fd7a7b1cafe694daa2f9f5705ff1a83905101b9679755b875a79063039a63743f6ef2e96dce4efea WHIRLPOOL f78adcfbac9738183d489c2f59992fce333b77f98b46e757731342660454de1bb342b3483a096d820601ea5e8cdba5093cb1872ecbbd3e3f4426102e1e8f6218
+MISC metadata.xml 417 SHA256 7368ace310e6ad01b264004c144e7c690f0f3106c851514190df206122ceb357 SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8 WHIRLPOOL 32a9aa02498e87b255aab36b0195bec07d95ecc9cb10eb3f5eb8393cc3a5910263ef2e4cb507924a29b822845b5ccc54af25ac5e226e3900bdc379d72e1d2cc6
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
new file mode 100644
index 0000000..45b66c3
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -0,0 +1,120 @@
+# 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="anongit.gentoo.org/proj/catalyst.git"
+ EGIT_MASTER="master"
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="mirror://gentoo/${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
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${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 kernel_linux"
+
+DEPEND="
+ app-text/asciidoc
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ app-arch/lbzip2
+ app-crypt/shash
+ app-arch/tar[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_DEPS}
+"
+
+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."
+ 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
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+}
+
+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
+
+ # Here is where we actually enable ccache
+ use ccache && \
+ sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+ files/catalyst.conf
+
+ sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+ files/catalyst.conf
+
+ 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 AUTHORS
+ doman files/catalyst.1 files/catalyst-spec.5
+
+ python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+ python_optimize "${ED}"
+}
+
+pkg_postinst() {
+ einfo "You can find more information about catalyst by checking out the"
+ einfo "catalyst project page at:"
+ einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
new file mode 100644
index 0000000..f4cbcfb
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
@@ -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
+
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
new file mode 100644
index 0000000..ccaffbe
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
@@ -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
+
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
new file mode 100644
index 0000000..1c641fd
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
@@ -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
+
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
new file mode 100644
index 0000000..67fc2c6
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
@@ -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
+
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
new file mode 100644
index 0000000..6c4b9cd
--- /dev/null
+++ b/dev-util/catalyst/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <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>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-12-09 22:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-09 22:29 [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/ Yuta SATOH
-- strict thread matches above, loose matches on Subject: below --
2017-12-09 22:29 Yuta SATOH
2016-10-31 16:17 Yuta SATOH
2014-11-16 7:44 Yuta SATOH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox