diff options
| author |   Yuta SATOH <nigoro@gentoo.gr.jp> | 2014-10-26 21:32:22 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro@gentoo.gr.jp> | 2014-10-26 21:32:22 +0900 |
| commit | 826d505c1e9476baa293bd59e4cdb0c585091561 (patch) | |
| tree | b9e8a6242524a82aef562b047ecd28183eb99477 /dev-util | |
| parent | scripts/extract-9.0.sh: s/ftp:/http:/g (diff) | |
| download | gentoo-bsd-826d505c1e9476baa293bd59e4cdb0c585091561.tar.gz gentoo-bsd-826d505c1e9476baa293bd59e4cdb0c585091561.tar.bz2 gentoo-bsd-826d505c1e9476baa293bd59e4cdb0c585091561.zip | |
update catalyst-2.0.15-fbsd-extra.patch and stages_builder.sh
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/catalyst/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch | 47 |
2 files changed, 33 insertions, 17 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 042c7a2..522dc45 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,6 +1,9 @@ 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 3631 SHA256 9ff22dbe1e9a2289dd800fae9d61df391ba8b099f51988d6eb6946aeac3b4f7c SHA512 81757926891d27b3e78fa92ac1c26fa7b69dca488e4e7504ee83458a41cce72df93fb3a9443a27408c1388e4a40d03f03f0bb49291b0d70986b229ee21b7b534 WHIRLPOOL d97927a3eb264ed2c44758ad82092cbaa0126d71aff66dcabaf7594019ad9b4f33b813701b59e5a58142b96def2eab152562639f849750268279958b9491d56a 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 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 7027359..596ce5f 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,21 @@ -diff --git a/catalyst-2.0.15/targets/stage1/stage1-chroot.sh b/catalyst-2.0.15/targets/stage1/stage1-chroot.sh -old mode 100644 -new mode 100755 -index ed83f38..7903fac ---- a/catalyst-2.0.15/targets/stage1/stage1-chroot.sh -+++ b/catalyst-2.0.15/targets/stage1/stage1-chroot.sh -@@ -27,11 +27,28 @@ clst_root_path=/ setup_pkgmgr +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..0819b2e +--- a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh ++++ b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh +@@ -21,17 +21,42 @@ then + fi + + ## Setup seed pkgmgr to ensure latest ++ ++if [[ ! -e /usr/lib/python-exec ]]; then ++ emerge -p --nodeps dev-lang/python-exec ++ [[ $? -eq 0 ]] && clst_root_path=/ run_merge "--buildpkg=n --newuse --nodeps dev-lang/python-exec" ++fi + clst_root_path=/ setup_pkgmgr + + # Update stage3 if [ -n "${clst_update_seed}" ]; then if [ "${clst_update_seed}" == "yes" ]; then echo "Updating seed stage..." @@ -23,31 +34,33 @@ index ed83f38..7903fac + [[ -e /etc/portage/profile/package.use.mask ]] && sed -i '/sys-freebsd/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask + clst_root_path=/ USE="-build-kernel" run_merge "--buildpkg=n --update --newuse freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin" + clst_root_path=/ USE="internal-glib" run_merge "--buildpkg=n --update --newuse dev-util/pkgconfig" ++ clst_root_path=/ run_merge "--buildpkg=n dev-libs/libxml2 dev-libs/libxslt dev-libs/glib app-arch/libarchive sys-libs/zlib" ++ unset CHOST ++ clst_root_path=/ run_merge "--buildpkg=n sys-devel/libtool" + fi if [ -n "${clst_update_seed_command}" ]; then - clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" -+ clst_root_path=/ USE="-build-kernel" run_merge "--buildpkg=n ${clst_update_seed_command}" ++ clst_root_path=/ USE="-build-kernel -fortran" run_merge "--buildpkg=n ${clst_update_seed_command}" else - clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" -+ clst_root_path=/ USE="-build-kernel" run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" ++ clst_root_path=/ USE="-build-kernel -fortran" run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" fi -+ [[ $(uname) == "FreeBSD" ]] && unset CHOST ++ [[ $(uname) == "FreeBSD" ]] && clst_root_path=/ run_merge "--buildpkg=n sys-devel/libtool" elif [ "${clst_update_seed}" != "no" ]; then echo "Invalid setting for update_seed: ${clst_update_seed}" exit 1 -diff --git a/catalyst-2.0.15/targets/support/chroot-functions.sh b/catalyst-2.0.15/targets/support/chroot-functions.sh -index 848be40..804bf61 100644 ---- a/catalyst-2.0.15/targets/support/chroot-functions.sh -+++ b/catalyst-2.0.15/targets/support/chroot-functions.sh -@@ -2,7 +2,10 @@ +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 +--- a/catalyst-2.0.17/targets/support/chroot-functions.sh ++++ b/catalyst-2.0.17/targets/support/chroot-functions.sh +@@ -2,6 +2,10 @@ # Set the profile eselect profile set ${clst_target_profile} -- +if [ $? -ne 0 ] ; then + rm -rf /etc/make.profile /etc/portage/make.profile + ln -s ../usr/portage/profiles/${clst_target_profile} /etc/make.profile +fi + # Trap these signals and kill ourselves if recieved # Force ourselves to die if any of these signals are recieved - # most likely our controlling terminal is gone |