diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/catalyst/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch | 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 diff --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 @@ |