[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 16d90e98675553918427b67b098c40fc03de0e01 Author: Yuta SATOH gmail com> AuthorDate: Wed Jan 3 11:18:28 2018 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Jan 3 11:18:28 2018 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=16d90e98 automatic_updater.sh: change to be upgraded on x86-fbsd. scripts/automatic_updater.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 58e8ced..6dcd73a 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -136,10 +136,10 @@ update_toolchain(){ # https://bugs.gentoo.org/629128 [[ ! -e /etc/portage/package.unmask ]] && mkdir -p /etc/portage/package.unmask echo "sys-devel/binutils" > /etc/portage/package.unmask/toolchain-oldversion - echo "sys-devel/gcc" >> /etc/portage/package.unmask/toolchain-oldversion + echo "> /etc/portage/package.unmask/toolchain-oldversion emerge -u '
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 3762c6fa6c5c4214698512376fc10e0581956c6e Author: Yuta SATOH gmail com> AuthorDate: Tue Jan 2 13:39:07 2018 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Jan 2 13:39:07 2018 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3762c6fa automatic_updater.sh: add the missing code to upgrade correctly. scripts/automatic_updater.sh | 36 ++-- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 2afa6f6..58e8ced 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -42,7 +42,7 @@ move_makeconf(){ } update_portage(){ - local dl_portage_ver="2.3.8" + local dl_portage_ver="2.3.6" echo "Updating the sys-apps/portage with a manual method..." @@ -63,8 +63,8 @@ update_portage(){ eselect python set 1 } -update_bmake(){ - echo "Updating the bmake..." +update_bmake_command(){ + echo "Updating bmake..." [[ -e /usr/local/bin/make ]] && exit 1 @@ -73,15 +73,32 @@ update_bmake(){ make cp -a make /usr/local/bin/ cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) clean + + env-update + source /etc/profile +} + +update_config_command(){ + echo "Updating config..." + + [[ -e /usr/local/sbin/config ]] && exit 1 + + cd "${PORTDIR}/sys-freebsd/freebsd-usbin" && ebuild $(ls -1 freebsd-usbin-${TARGETVER}*.ebuild | tail -n 1) prepare + cd "${PORTAGE_TMPDIR}"/portage/sys-freebsd/freebsd-usbin-${TARGETVER}*/work/usr.sbin/config + /usr/local/bin/make -m /usr/share/mk/system + cp -a config /usr/local/sbin/ + cd "${PORTDIR}/sys-freebsd/freebsd-usbin" && ebuild $(ls -1 freebsd-usbin-${TARGETVER}*.ebuild | tail -n 1) clean } update_minimal(){ echo "Updating the minimal packages to upgrade the Gentoo/FreeBSD..." emerge -u sys-devel/gcc-config --exclude sys-freebsd/* - update_bmake + update_bmake_command emerge --nodeps sys-freebsd/freebsd-mk-defs + update_config_command + emerge -u 'https://bugs.gentoo.org/629128 [[ ! -e /etc/portage/package.unmask ]] && mkdir -p /etc/portage/package.unmask - echo "sys-devel/binutils" > /etc/portage/package.unmask/binutils-oldversion + echo "sys-devel/binutils" > /etc/portage/package.unmask/toolchain-oldversion + echo "sys-devel/gcc" >> /etc/portage/package.unmask/toolchain-oldversion emerge -u '
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/doc/
commit: ee565f34c2963f007b451592c719d05507af74b4 Author: Yuta SATOH gmail com> AuthorDate: Sun Dec 10 12:14:03 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Dec 10 12:14:03 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=ee565f34 add how to use mkstages scripts. .../mkstages/doc/how_to_use_create_forcestage3.txt | 66 ++ scripts/mkstages/doc/how_to_use_stages_builder.txt | 51 + 2 files changed, 117 insertions(+) diff --git a/scripts/mkstages/doc/how_to_use_create_forcestage3.txt b/scripts/mkstages/doc/how_to_use_create_forcestage3.txt new file mode 100644 index 000..6d1e90a --- /dev/null +++ b/scripts/mkstages/doc/how_to_use_create_forcestage3.txt @@ -0,0 +1,66 @@ +How to use create_forcestage3.sh + +This script will create a source file for dev-utils/catalyst. +If you want to create new stages, this script will help you. + +Usage: +Please don't forget to create a log file! It's very useful. + +amd64-fbsd) +SET_MAKEOPTS=3 \ +TARGETVER=11.1 \ +TARGETARCH=amd64 \ +OLDSTAGE3="http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2; \ +bash /tmp/create_forcestage3.sh 2>&1 | tee ~/create_source_amd64_11.1.log + +amd64-fbsd/clang) +SET_MAKEOPTS=3 \ +TARGETVER=11.1 \ +TARGETARCH=amd64 \ +OLDSTAGE3="http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/clang/stage3-amd64-clangfbsd-9.1.tar.bz2; \ +CLANG=1 \ +bash /tmp/create_forcestage3.sh 2>&1 | tee ~/create_source_amd64_clang_11.1.log + +x86-fbsd) +SET_MAKEOPTS=3 \ +TARGETVER=11.1 \ +TARGETARCH=x86 \ +OLDSTAGE3="http://dev.gentoo.org/~aballier/fbsd9.0/x86/stage3-i686-freebsd-9.0.tar.bz2; \ +bash /tmp/create_forcestage3.sh 2>&1 | tee ~/create_source_x86_11.1.log + + +Require environment variables: +You need to set some environment variables: + +TARGETVER +Set the target version. e.g.) 11.1 + +TARGETARCH +Set the target architecture. You can set amd64 or x86. + +OLDSTAGE3 +Set the old version of stage3 file. You can set local file name or URL. + +Tested stages list: +amd64-fbsd) +http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2 +amd64-fbsd/clang) +http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/clang/stage3-amd64-clangfbsd-9.1.tar.bz2 +x86-fbsd) This URL is 404... +http://dev.gentoo.org/~aballier/fbsd9.0/x86/stage3-i686-freebsd-9.0.tar.bz2 + + +Optional environment variables: +Also, you can set some additional environment variables: + +SET_MAKEOPTS +If you set 1 or more, your input number will be set. + +CLANG +If you want to create clang stages, please set 1. + +PORTDIR +If you aren't using /usr/portage, please set it. + +TMPFS +If you set 1, the tmpfs will be used for /var/tmp/portage. diff --git a/scripts/mkstages/doc/how_to_use_stages_builder.txt b/scripts/mkstages/doc/how_to_use_stages_builder.txt new file mode 100644 index 000..2836b13 --- /dev/null +++ b/scripts/mkstages/doc/how_to_use_stages_builder.txt @@ -0,0 +1,51 @@ +How to use stages_builder.sh + +This script will create stage files with dev-utils/catalyst. +If you want to create new stages, this script will help you. + +Usage: +Please don't forget to create a log file! It's very useful. + +amd64-fbsd) +WORKDATE=20171201 \ +TARGETVER=11.1 \ +SOURCE_STAGE=stage3-amd64-fbsd-11.1-forcestage3 \ +bash /tmp/stages_builder.sh 2>&1 | tee ~/create_stages_amd64_11.1.log + +amd64-fbsd/clang) +WORKDATE=20171201 \ +TARGETVER=11.1 \ +SOURCE_STAGE=stage3-amd64-fbsd-11.1-forcestage3-cl \ +CLANG=1 \ +bash /tmp/stages_builder.sh 2>&1 | tee ~/create_stages_amd64_clang_11.1.log + +x86-fbsd) +TARGETARCH=x86 \ +WORKDATE=20171201 \ +TARGETVER=11.1 \ +SOURCE_STAGE=stage3-x86-fbsd-11.1-forcestage3 \ +bash /tmp/stages_builder.sh 2>&1 | tee ~/create_stages_x86_11.1.log + + +Require environment variables: +You need to set some environment variables: + +WORKDATE +Set the date of the portage snapshot. +If it doesn't exist, it will be created using your /usr/portage. + +TARGETVER +Set the target version. e.g.) 11.1 + +SOURCE_STAGE +Set a source file. + + +Optional environment variables: +Also, you can set some additional environment variables: + +CLANG +If you want to create clang stages, please set 1. + +TARGETARCH +If you want to create x86 stages on amd64-fbsd, please set x86.
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 08210ba682ff8d7344958fd9f2cfb2059d01297a Author: Yuta SATOH gmail com> AuthorDate: Sat Dec 9 21:43:02 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Dec 9 21:43:02 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=08210ba6 create_forcestage3.sh: remove unnecessary code. scripts/mkstages/create_forcestage3.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh index c34631e..26210d9 100755 --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -88,8 +88,6 @@ chroot_update(){ echo 'USE="${USE} -fortran -build-kernel"' >> "${makeconf}" export EMERGE_DEFAULT_OPTS="-q" - mkdir -p "${WORKDIR}"/etc/portage/patches/sys-apps - cp -a /etc/portage/patches/sys-apps/portage "${WORKDIR}"/etc/portage/patches/sys-apps chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} kernel chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} freebsd_userland if [[ -e "${WORKDIR}"/usr/bin/git ]]; then
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 05c5df43befd234a462824bc4bd604c687ca4878 Author: Yuta SATOH gmail com> AuthorDate: Sat Dec 9 21:44:56 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Dec 9 21:44:56 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=05c5df43 create_forcestage3.sh: use wget to get the old stage3. scripts/mkstages/create_forcestage3.sh | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh index 26210d9..a70a174 100755 --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -40,7 +40,11 @@ prepare(){ if [[ "${OLDSTAGE3}" =~ ^http ]]; then if [[ ! -e /tmp/$(basename ${OLDSTAGE3}) ]]; then cd /tmp - fetch "${OLDSTAGE3}" + if type -P wget &> /dev/null ; then + wget -q "${OLDSTAGE3}" + else + fetch "${OLDSTAGE3}" + fi fi else cp -a "${OLDSTAGE3}" /tmp
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/files/, dev-util/catalyst/
commit: 01e50adad417fadd8d4bc4546ba617b2e312d159 Author: Yuta SATOH gmail com> AuthorDate: Sat Dec 9 22:07:32 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Dec 9 22:07:32 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=01e50ada dev-util/catalyst: remove old. dev-util/catalyst/Manifest | 12 - dev-util/catalyst/catalyst-2.0.12.2.ebuild | 112 dev-util/catalyst/catalyst-2.0.15.ebuild | 100 --- dev-util/catalyst/catalyst-2.0.17.ebuild | 115 dev-util/catalyst/catalyst-.ebuild | 69 - .../catalyst/files/catalyst-2.0.12.1-fbsd.patch| 219 --- dev-util/catalyst/files/catalyst-2.0.14-fbsd.patch | 236 .../files/catalyst-2.0.15-fbsd-extra.patch | 106 dev-util/catalyst/files/catalyst--sed.patch| 302 - dev-util/catalyst/files/catalyst--tmpfs.patch | 40 --- 10 files changed, 1311 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest deleted file mode 100644 index 5a8318f..000 --- a/dev-util/catalyst/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -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--sed.patch 12970 SHA256 279d0ba5b32bc7e921e9a6038a85981da2229773edc1b7519e144e05f34614c2 SHA512 f90d9e64079c88380508c42c5f408a106d7cc6fe07732d25722f92c94ddea84c9a592c61e403585b29e16612c2a8b59f1245e3259e7d7587aeb11881c6e84932 WHIRLPOOL 6e4db5701884eb976b2b893dbc3ec73297096ef30319ff7a2dbec43861403ad2444dc0af40fe5b03143f5694ccd7806b6e057a6ab7cc58d59c19aa245ae86eb1 -AUX catalyst--tmpfs.patch 1531 SHA256 23cdf7e169129343d7a55e62870a70f971b8746c721cf6acf8b19027d8f9cf6e SHA512 1ff41b0c994336ff73e69c54258f6d0aa75b235fbfe67ebc6c20322b9c27bf7554e6236b0f7376a06e115abdb80e6947b32afe94ff73755290f80b85a68d 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 WHI
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
commit: 751d0ad85386de84b94fd33acfe42db0e45362b3 Author: Yuta SATOH gmail com> AuthorDate: Sat Dec 9 22:15:54 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Dec 9 22:15:54 2017 + 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 000..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 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d31cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205 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 b3f4b7678ff196ee00e65961894b19ec58868c2e769bc573ab4cb0570febb7b5ca0b5f2e3534bc4582db872e4da4f49d9d98fc9d82c473a627194bd63c0b +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 000..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} == ** ]]; 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
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
commit: 577e2305cbb5ee32eb808b3728dd84b291f02db2 Author: Yuta SATOH gmail com> AuthorDate: Sat Dec 9 22:29:07 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Dec 9 22:29:07 2017 + 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 a35ca75490b453e4952b996b4c52ec10b75c7b7b11c0f7c7c8ae05638380885c9e678e37e093069f02bfe9947e4b976eb13c0b0e0b7d5b6943f91c3ed905 +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 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d31cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205 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 b3f4b7678ff196ee00e65961894b19ec58868c2e769bc573ab4cb0570febb7b5ca0b5f2e3534bc4582db872e4da4f49d9d98fc9d82c473a627194bd63c0b 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
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/specs/x86-fbsd/, scripts/mkstages/specs/amd64-fbsd/, ...
commit: 6aff4270e5ca402ec66a3010ea16dd95c389a938 Author: Yuta SATOH gmail com> AuthorDate: Sat Dec 9 22:05:29 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Dec 9 22:05:29 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6aff4270 updated sample specs for the catalyst. scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec | 11 +-- scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec | 11 +-- scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec | 11 +-- scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec | 11 +-- scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec | 9 - scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec | 9 - scripts/mkstages/specs/amd64-fbsd/stage1.spec | 10 +- scripts/mkstages/specs/amd64-fbsd/stage1_tmp.spec | 10 +- scripts/mkstages/specs/amd64-fbsd/stage2.spec | 10 +- scripts/mkstages/specs/amd64-fbsd/stage2_tmp.spec | 10 +- scripts/mkstages/specs/amd64-fbsd/stage3.spec | 8 scripts/mkstages/specs/amd64-fbsd/stage3_tmp.spec | 8 scripts/mkstages/specs/x86-fbsd/stage1.spec | 10 +- scripts/mkstages/specs/x86-fbsd/stage1_tmp.spec | 10 +- scripts/mkstages/specs/x86-fbsd/stage2.spec | 10 +- scripts/mkstages/specs/x86-fbsd/stage2_tmp.spec | 10 +- scripts/mkstages/specs/x86-fbsd/stage3.spec | 8 scripts/mkstages/specs/x86-fbsd/stage3_tmp.spec | 8 18 files changed, 84 insertions(+), 90 deletions(-) diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec index 2adc441..dc88e33 100644 --- a/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec @@ -1,9 +1,8 @@ -chost: x86_64-gentoo-freebsd10.1 -cxxflags: -stdlib=libc++ ${CFLAGS} +chost: x86_64-gentoo-freebsd11.1 target: stage1 -version_stamp: fbsd-10.1-20150712-cl -profile: default/bsd/fbsd/amd64/10.1/clang -snapshot: 20150712 -source_subpath: default/stage3-amd64-fbsd-10.1-20150712-clt +version_stamp: fbsd-11.1-20171201-cl +profile: default/bsd/fbsd/amd64/11.1/clang +snapshot: 20171201 +source_subpath: default/stage3-amd64-fbsd-11.1-20171201-clt subarch: amd64 rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec index c780435..8ef481a 100644 --- a/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec @@ -1,9 +1,8 @@ -chost: x86_64-gentoo-freebsd10.1 -cxxflags: -stdlib=libc++ ${CFLAGS} +chost: x86_64-gentoo-freebsd11.1 target: stage1 -version_stamp: fbsd-10.1-20150712-clt -profile: default/bsd/fbsd/amd64/10.1/clang -snapshot: 20150712 -source_subpath: default/stage3-amd64-fbsd-10.1-forcestage3-cl +version_stamp: fbsd-11.1-20171201-clt +profile: default/bsd/fbsd/amd64/11.1/clang +snapshot: 20171201 +source_subpath: default/stage3-amd64-fbsd-11.1-forcestage3-cl subarch: amd64 rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec index 1de9e13..34f140e 100644 --- a/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec @@ -1,9 +1,8 @@ -chost: x86_64-gentoo-freebsd10.1 -cxxflags: -stdlib=libc++ ${CFLAGS} +chost: x86_64-gentoo-freebsd11.1 target: stage2 -version_stamp: fbsd-10.1-20150712-cl -profile: default/bsd/fbsd/amd64/10.1/clang -snapshot: 20150712 -source_subpath: default/stage1-amd64-fbsd-10.1-20150712-cl +version_stamp: fbsd-11.1-20171201-cl +profile: default/bsd/fbsd/amd64/11.1/clang +snapshot: 20171201 +source_subpath: default/stage1-amd64-fbsd-11.1-20171201-cl subarch: amd64 rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec index 73ff50f..950f9b6 100644 --- a/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec @@ -1,9 +1,8 @@ -chost: x86_64-gentoo-freebsd10.1 -cxxflags: -stdlib=libc++ ${CFLAGS} +chost: x86_64-gentoo-freebsd11.1 target: stage2 -version_stamp: fbsd-10.1-20150712-clt -profile: default/bsd/fbsd/amd64/10.1/clang -snapshot: 20150712 -source_subpath: default/stage1-amd64-fbsd-10.1-20150712-clt +version_stamp: fbsd-11.1-20171201-clt +profile: default/bsd/fbsd/amd64/11.1/clang +snapshot: 20171201 +source_subpath: default/stage1-amd64-fbsd-11.1-20171201-clt subarch: amd64 rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec index d5e1fd8..7c2121b 100644 --- a/scripts/mkstages/specs/amd64-fbsd-clang/stage
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: b85ab4b4483a6ac0f55fcccb7f3c3c2cdef29242 Author: Yuta SATOH gmail com> AuthorDate: Thu Dec 7 13:24:28 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Thu Dec 7 13:24:28 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b85ab4b4 create_forcestage3.sh: updated. It targets 11.1. scripts/mkstages/create_forcestage3.sh | 56 ++ 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh old mode 100644 new mode 100755 index 516f95b..c34631e --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -1,22 +1,34 @@ #!/bin/bash set -eu -TARGETVER="${TARGETVER:-10.1}" +TARGETVER="${TARGETVER:-11.1}" TARGETARCH="${TARGETARCH:-amd64}" OLDSTAGE3="${OLDSTAGE3:-http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2}; WORKDIR="/${TARGETVER}-forcestage3/${TARGETARCH}" PORTDIR="${PORTDIR:-/usr/portage}" TMPFS=${TMPFS:-0} CLANG=${CLANG:-0} +SET_MAKEOPTS=${SET_MAKEOPTS:-1} +# DISTDIR will be set automatically if your environment have the emerge command. +# This setting exists for vanilla FreeBSD. +DISTDIR="${DISTDIR:-/usr/portage/distfiles}" + [[ ${CLANG} -ne 0 ]] && WORKDIR="${WORKDIR}_clang" prepare(){ - local distdir="$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 's:"::g')" + local distdir + + if type -P emerge &> /dev/null ; then + distdir="$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 's:"::g')" + else + distdir="${DISTDIR}" + fi + if [[ ! -d "${WORKDIR}" ]]; then mkdir -p "${WORKDIR}" else - echo "${WORKDIR} exists." - echo "Please remove the following steps." + echo "Error: ${WORKDIR} exists." + echo "Please remove the following steps:" echo "" echo "kill -9 $(ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs)" echo "umount $(mount | grep ${WORKDIR} | awk '{print $3}' | xargs)" @@ -27,10 +39,11 @@ prepare(){ if [[ "${OLDSTAGE3}" =~ ^http ]]; then if [[ ! -e /tmp/$(basename ${OLDSTAGE3}) ]]; then - wget -P /tmp "${OLDSTAGE3}" + cd /tmp + fetch "${OLDSTAGE3}" fi else - cp "${OLDSTAGE3}" /tmp + cp -a "${OLDSTAGE3}" /tmp fi tar xjpf /tmp/$(basename ${OLDSTAGE3}) -C "${WORKDIR}" @@ -40,6 +53,7 @@ prepare(){ mount -t devfs devfs "${WORKDIR}"/dev mount -t nullfs "${PORTDIR}" "${WORKDIR}"/usr/portage + if [[ ! "${distdir}" =~ ${PORTDIR}.* ]]; then echo "mount DISTDIR" if [[ ! -e "${WORKDIR}"/usr/portage/distfiles ]]; then @@ -51,8 +65,10 @@ prepare(){ echo "mount TMPFS" mount -t tmpfs tmpfs "${WORKDIR}"/var/tmp/portage fi - wget -P "${WORKDIR}" https://gitweb.gentoo.org/proj/gentoo-bsd.git/plain/scripts/automatic_updater.sh - cp /etc/resolv.conf "${WORKDIR}"/etc + + cd "${WORKDIR}" + fetch https://gitweb.gentoo.org/proj/gentoo-bsd.git/plain/scripts/automatic_updater.sh + cp -a /etc/resolv.conf "${WORKDIR}"/etc } chroot_update(){ @@ -62,15 +78,24 @@ chroot_update(){ local makeconf="${WORKDIR}"/etc/portage/make.conf fi - echo "MAKEOPTS=\"-j$(sysctl hw.ncpu | awk '{ print $2 + 1 }')"\" >> "${makeconf}" + case ${SET_MAKEOPTS} in + [1-9]|[1-9][0-9]) + echo "MAKEOPTS=\"-j${SET_MAKEOPTS}\"" >> "${makeconf}" + ;; + *) exit 1 ;; + esac + echo 'USE="${USE} -fortran -build-kernel"' >> "${makeconf}" export EMERGE_DEFAULT_OPTS="-q" + mkdir -p "${WORKDIR}"/etc/portage/patches/sys-apps + cp -a /etc/portage/patches/sys-apps/portage "${WORKDIR}"/etc/portage/patches/sys-apps chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} kernel chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} freebsd_userland if [[ -e "${WORKDIR}"/usr/bin/git ]]; then chroot &quo
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: a55cb5b680153dd98c0118b5e28a13dc81b7bbb9 Author: Yuta SATOH gmail com> AuthorDate: Thu Dec 7 13:33:34 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Thu Dec 7 13:33:34 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=a55cb5b6 stages_builder.sh: updated. It targets 11.1. scripts/mkstages/stages_builder.sh | 238 + 1 file changed, 84 insertions(+), 154 deletions(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 964e41e..4254c25 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -1,155 +1,95 @@ #!/bin/bash -export TARGETVER="${TARGETVER:-9.1}" -export MKSRC="${MKSRC:-NONE}" +set -eu + +PORTDIR="${PORTDIR:-/usr/portage}" +export TARGETVER="${TARGETVER:-11.1}" export WORKDATE="${WORKDATE:-local}" export WORKARCH="${WORKARCH:-$(uname -m)}" -export FORCESTAGE3="${FORCESTAGE3:-}" +export SOURCE_STAGE="${SOURCE_STAGE}" +export TARGETARCH="${TARGETARCH:-}" export EXTRAOVERLAY="${EXTRAOVERLAY:-}" -OLDVER="${OLDVER:-9.0}" -OVERLAY_SNAPSHOT="https://gitweb.gentoo.org/proj/gentoo-bsd.git/snapshot/gentoo-bsd-master.tar.gz; +export CLANG="${CLANG:-0}" prepare(){ - local MAJORVER=`echo ${TARGETVER} | awk -F \. '{ print $1 }'` - if [ -n "${STABLE}" ] ; then - export CHOSTVER="${MAJORVER}.0" - else - export CHOSTVER="${TARGETVER}" - fi - - if [ "$1" = "x86" ] || [ "${WORKARCH}" = "i386" ] ; then - export CATALYST_CHOST="i686-gentoo-freebsd${CHOSTVER}" + if [[ ${TARGETARCH} == x86 ]] || [[ ${WORKARCH} == i386 ]] ; then + export CATALYST_CHOST="i686-gentoo-freebsd${TARGETVER}" export TARGETARCH="x86" export TARGETSUBARCH="i686" else - export CATALYST_CHOST="x86_64-gentoo-freebsd${CHOSTVER}" + export CATALYST_CHOST="x86_64-gentoo-freebsd${TARGETVER}" export TARGETARCH="amd64" export TARGETSUBARCH="amd64" fi export WORKDIR="/tmp/mk_stages_${TARGETARCH}_${TARGETVER}" - [[ -n ${CLANG} ]] && WORKDIR="${WORKDIR}_clang" + [[ ${CLANG} -ne 0 ]] && WORKDIR="${WORKDIR}_clang" - if [ -e ${WORKDIR} ] ; then - echo "WORKDIR ${WORKDIR} is already exists." - echo "Please remove manually it." + if [[ -e "${WORKDIR}" ]] ; then + echo "WORKDIR ${WORKDIR} already exists." + echo "Please remove it:" echo "" echo "chflags -R noschg ${WORKDIR} && rm -rf ${WORKDIR}" exit 1 else - mkdir -p ${WORKDIR} + mkdir -p "${WORKDIR}" fi - if [ ! -e "/var/tmp/catalyst/builds/default" ] ; then - mkdir -p /var/tmp/catalyst/builds/default + if [[ ! -e "/var/tmp/catalyst/builds/default" ]] ; then + mkdir -p "/var/tmp/catalyst/builds/default" fi - if [ -z "${FORCESTAGE3}" ] ; then - if [ -z "${CLANG}" ] ; then - local oldstage3fn="stage3-${TARGETSUBARCH}-freebsd-${OLDVER}" - local oldstage3url="http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/${oldstage3fn}.tar.bz2; - else - local oldstage3fn="stage3-${TARGETSUBARCH}-clangfbsd-${OLDVER}" - local oldstage3url="http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/clang/${oldstage3fn}.tar.bz2; - fi - - if [ ! -e "/var/tmp/catalyst/builds/default/${oldstage3fn}.tar.bz2" ] ; then - echo "Downloading aballier's ${TARGETSUBARCH} stage3 file..." - wget -q -P /var/tmp/catalyst/builds/default "${oldstage3url}" - [[ $? -ne 0 ]] && exit 1 - fi - export FORCESTAGE3="${oldstage3fn}" - fi + cd "${WORKDIR}" - cd ${WORKDIR} - if [ -d "${HOME}/gentoo-bsd" ] ; then - echo "Copy from ${HOME}/gentoo-bsd to ${WORKDIR}/" - cp -a "${HOME}/gentoo-bsd" ${WORKDIR}/ - else - echo "Clone gentoo-bsd overlay snapshot..." - wget -q -O "${WORKDIR}"/gentoo-bsd.tar.gz &
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 53789eceebb7150f68090669635b9eedb7eeea60 Author: Yuta SATOH gmail com> AuthorDate: Thu Dec 7 13:35:06 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Thu Dec 7 13:35:06 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=53789ece remove old script. scripts/mkstages/chroot_prepare_upgrade.sh | 74 -- 1 file changed, 74 deletions(-) diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh b/scripts/mkstages/chroot_prepare_upgrade.sh deleted file mode 100755 index 298c7fb..000 --- a/scripts/mkstages/chroot_prepare_upgrade.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -if [ -e /etc/make.conf ] ; then - echo "MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> /etc/make.conf -fi -if [ -e /etc/portage/make.conf ] ; then - echo "MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> /etc/portage/make.conf -fi -if [ -e /tmp/catalystrc ] ; then - source /tmp/catalystrc -fi -# fixes bug #447810 -MAKEOPTS=-j1 emerge -q app-shells/bash || exit - -# fixes bug #412319 -emerge -q sys-devel/gcc-config || exit -gcc-config 1 - -# fixes bug #413865 -emerge -q app-arch/libarchive || exit - -# upgrade sys-freebsd packages -emerge -q sys-apps/portage || exit -emerge -q sys-devel/libtool || exit -# fixes bug 425530 -emerge -q app-admin/eselect || exit - -rm /etc/make.profile /etc/portage/make.profile -ln -s ../../usr/portage/profiles/default/bsd/fbsd/${TARGETARCH}/${TARGETVER} /etc/portage/make.profile - -emerge -1q sys-freebsd/freebsd-mk-defs -USE=build emerge -1q --nodeps sys-freebsd/freebsd-lib -emerge -Cq sys-freebsd/boot0 -USE=symlink emerge -1q freebsd-bin freebsd-cddl freebsd-contrib freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin || exit - -# sys-libs/zlib will request ${CHOST}-gcc. -# different ${CHOST}-gcc fails to install -CHOST=${CATALYST_CHOST} emerge -q sys-devel/gcc || exit - -# fixes bug 436560 -fixes436560(){ - local rootdir=$1 - - if [ -d "${rootdir}lib64" ] && [ -L "${rootdir}lib" ] ; then - rm "${rootdir}lib" - LD_LIBRARY_PATH="${rootdir}lib64" mv "${rootdir}lib64" "${rootdir}lib" - ln -s lib ${rootdir}lib64 - fi -} - -fixes436560 / -fixes436560 /usr/ -fixes436560 /usr/local/ - -emerge -q sys-apps/baselayout -emerge -q sys-apps/portage || exit - -# libtool has the old CHOST. Need to be updated -CHOST=${CATALYST_CHOST} emerge -q sys-devel/libtool || exit - -# fixes bug 425530 -emerge -q app-admin/eselect || exit - -if [ -e /etc/portage/profile ] ; then - rm -rf /etc/portage/profile - rm /etc/portage/package.keywords - rm /etc/portage/package.use - rm -rf /etc/portage/patches -fi - -rm -rf /usr/local/portage.bsd-overlay -gsed -i '/PORTDIR_OVERLAY=.*/d' /etc/make.conf -gsed -i '/PORTDIR_OVERLAY=.*/d' /etc/portage/make.conf -touch /tmp/prepare_done
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: b477cae6a1f05eb0f562c8f9294ec3db4c3d1be2 Author: Yuta SATOH gmail com> AuthorDate: Thu Dec 7 13:14:27 2017 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Thu Dec 7 13:14:27 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b477cae6 automatic_updater.sh: updated. It targets 11.1. scripts/automatic_updater.sh | 165 --- 1 file changed, 122 insertions(+), 43 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 3f1b639..2afa6f6 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -1,9 +1,13 @@ #/bin/bash set -eu REMOVEPERL=${REMOVEPERL:-0} +PORTDIR="/usr/portage" +DISTDIR="${PORTDIR}/distfiles" +PORTAGE_TMPDIR="/var/tmp" if [[ $# -ne 2 ]] ; then - echo "need 2 argument" + echo "Two arguments are required." + echo "" echo "arg 1: TARGETVER" echo "arg 2: TARGETMODE, Please set kernel, freebsd_userland, world." exit 1 @@ -13,9 +17,12 @@ else fi set_profile(){ - emerge --info | head -n 1 | grep clang && : + echo "Setting the ${TARGETVER} profile..." + + emerge --info | head -n 1 | grep clang &>/dev/null && : if [[ $? -eq 0 ]] ; then eselect profile set $(eselect profile list | grep "${TARGETVER}" | grep clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + export CXX="clang++ -stdlib=libc++" else eselect profile set $(eselect profile list | grep "${TARGETVER}" | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) fi @@ -24,25 +31,56 @@ set_profile(){ move_makeconf(){ [[ ! -e /etc/portage ]] && mkdir -p /etc/portage if [[ -e /etc/make.conf ]] && [[ ! -e /etc/portage/make.conf ]] ; then - mv /etc/make.conf /etc/portage/make.conf + echo "Moving the /etc/make.conf to /etc/portage..." + mv /etc/make.conf /etc/portage fi gsed -i '/LDFLAGS=/d' /etc/portage/make.conf + if [[ -e /etc/make.profile ]] && [[ ! -e /etc/portage/make.profile ]] ; then + echo "Creating the make.profile..." + ln -s ../..${PORTDIR}profiles/$(eselect profile list | grep '*' | awk '{print $2}') /etc/portage/make.profile + fi } update_portage(){ - local dl_portage_ver="2.2.20.1" + local dl_portage_ver="2.3.8" + + echo "Updating the sys-apps/portage with a manual method..." + cd /tmp - wget http://dev.gentoo.org/~dolsen/releases/portage/portage-${dl_portage_ver}.tar.bz2 - tar xjf portage-${dl_portage_ver}.tar.bz2 - PYTHON_TARGETS="python2_7" "portage-${dl_portage_ver}"/bin/emerge --nodeps dev-lang/python-exec + if [[ -e "${DISTDIR}"/portage-${dl_portage_ver}.tar.bz2 ]] ; then + cp -a "${DISTDIR}/portage-${dl_portage_ver}.tar.bz2" . + else + wget -q "http://dev.gentoo.org/~dolsen/releases/portage/portage-${dl_portage_ver}.tar.bz2; + fi + + tar xjf "portage-${dl_portage_ver}.tar.bz2" + + cd "/tmp/portage-${dl_portage_ver}" + PYTHON_TARGETS="python2_7" bin/emerge --nodeps dev-lang/python-exec eselect python set 1 - "portage-${dl_portage_ver}"/bin/emerge sys-apps/portage --exclude sys-freebsd/* - emerge dev-lang/python-exec --exclude sys-freebsd/* - emerge app-admin/eselect --exclude sys-freebsd/* + PYTHON_TARGETS="python2_7" bin/emerge --nodeps sys-apps/portage --exclude sys-freebsd/* + eselect python set 1 } +update_bmake(){ + echo "Updating the bmake..." + + [[ -e /usr/local/bin/make ]] && exit 1 + + cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) prepare + cd "${PORTAGE_TMPDIR}"/portage/sys-freebsd/freebsd-ubin-${TARGETVER}*/work/usr.bin/bmake + make + cp -a make /usr/local/bin/ + cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) clean +} + update_minimal(){ + echo "Updating the minimal packages to upgrade the Gentoo/FreeBSD..." + + emerge -u sys-devel/gcc-config --exclude sys-freebsd/* + update_bmake + emerge --nodeps sys-freebsd/freebsd-mk-defs emerge -u '> /etc/portage/profile/package.use.mask echo "sys-libs/libcxxrt abi_x86_32" >> /etc/portage/profile/package.use.mask - emerge -u
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/
commit: 08ac873b4a35c7e24ba3948c4a00d932b745b52e Author: Yuta SATOH gmail com> AuthorDate: Mon Oct 31 16:12:03 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Mon Oct 31 16:12:03 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=08ac873b dev-util/catalyst-: import from latest tree. dev-util/catalyst/catalyst-.ebuild | 63 ++ 1 file changed, 63 insertions(+) diff --git a/dev-util/catalyst/catalyst-.ebuild b/dev-util/catalyst/catalyst-.ebuild new file mode 100644 index 000..adc1244 --- /dev/null +++ b/dev-util/catalyst/catalyst-.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +if [[ ${PV} == ** ]]; 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{3_4,3_5} ) + +inherit distutils-r1 multilib ${SRC_ECLASS} + +DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" +HOMEPAGE="https://www.gentoo.org/proj/en/releng/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-[${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 ) +" + +python_prepare_all() { + echo VERSION="${PV}" "${PYTHON}" setup.py set_version + VERSION="${PV}" "${PYTHON}" setup.py set_version +} + +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 +}
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
commit: 5bedc2513a1f3bdc91e0e0793f451f55fca8d6cd Author: Yuta SATOH gmail com> AuthorDate: Mon Oct 31 16:16:43 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Mon Oct 31 16:16:43 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=5bedc251 dev-util/catalyst: added - patches. dev-util/catalyst/Manifest| 3 + dev-util/catalyst/catalyst-.ebuild| 10 +- dev-util/catalyst/files/catalyst--sed.patch | 302 ++ dev-util/catalyst/files/catalyst--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--sed.patch 12970 SHA256 279d0ba5b32bc7e921e9a6038a85981da2229773edc1b7519e144e05f34614c2 SHA512 f90d9e64079c88380508c42c5f408a106d7cc6fe07732d25722f92c94ddea84c9a592c61e403585b29e16612c2a8b59f1245e3259e7d7587aeb11881c6e84932 WHIRLPOOL 6e4db5701884eb976b2b893dbc3ec73297096ef30319ff7a2dbec43861403ad2444dc0af40fe5b03143f5694ccd7806b6e057a6ab7cc58d59c19aa245ae86eb1 +AUX catalyst--tmpfs.patch 1531 SHA256 23cdf7e169129343d7a55e62870a70f971b8746c721cf6acf8b19027d8f9cf6e SHA512 1ff41b0c994336ff73e69c54258f6d0aa75b235fbfe67ebc6c20322b9c27bf7554e6236b0f7376a06e115abdb80e6947b32afe94ff73755290f80b85a68d 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 WHI
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 03b1fb456466b0b3440996123486d5b8cd22b4a2 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 13:45:57 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 13:45:57 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=03b1fb45 freebsd.eclass: Always disable DEBUG_FILES= eclass/freebsd.eclass | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 5d4562a..8f6b204 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -80,7 +80,7 @@ if [[ ${MY_PV} != ** ]] && version_is_at_least 10.0 ${RV} ; then SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" fi -IUSE="debug profile" +IUSE="profile" #unalias -a alias install-info='/usr/bin/bsdinstall-info' @@ -230,7 +230,8 @@ freebsd_src_compile() { if ! use profile ; then mymakeopts="${mymakeopts} WITHOUT_PROFILE= " fi - use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " + # Disable debugging info, use FEATURES=splitdebug instead. + mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " # Test does not support yet. mymakeopts="${mymakeopts} WITHOUT_TESTS= " # Force set SRCTOP. @@ -305,7 +306,8 @@ freebsd_src_install() { if ! use profile ; then mymakeopts="${mymakeopts} WITHOUT_PROFILE= " fi - use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " + # Disable debugging info, use FEATURES=splitdebug instead. + mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " # Test does not support yet. mymakeopts="${mymakeopts} WITHOUT_TESTS= " # Force set SRCTOP.
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/
commit: a6a0fb0f387995833465f299d14998b92ccf9475 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:48:18 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:48:18 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=a6a0fb0f sys-freebsd/freebsd-sources: added LICENSE sys-freebsd/freebsd-sources/Manifest| 2 +- sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 09b4cb2..e43f572 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -35,5 +35,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-sources-11.0.ebuild 4806 SHA256 4a15f22daebab7a4527756f0cf348e8033ade8b6d141163cba90f6c8e14017b1 SHA512 9e717538e753c0ad09f5cddd80e4734b446d3026c8d35cdb7d82343ca77613b99e830ded9c57d20ba95cd555f5d411e8c18a16322094ac474efedb156258c4e9 WHIRLPOOL 0f77d4c783339c1f7b09f21c7e95bcdfcd76d015a80490141b6e10d90f08cff864c5c8f4466afa5c029df76680cf84570533bb47aadf440925df78f1aef01c8c +EBUILD freebsd-sources-11.0.ebuild 4823 SHA256 968c5d17553771f653e861cdfa78c7567049d6999dd436cc3189ada0e13707fa SHA512 ddefd5c3dca7b54c59d72e1d0ca83431b84de92be2274afaef6e77a9648f7fff82bbc500c0d225475476ebdfae04026f5d29577d5f36eb2fc407a4e258c6d72a WHIRLPOOL 6d18a50d484072a24d53d70824be5679bf6292658df83fd53ed5f8c1fd645e90bfa6f46415b1ed85b22d1451cc4a470535fc2493689a37423b4fefcdd617da99 MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild index 46e7942..aebc8cf 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild @@ -8,7 +8,7 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs DESCRIPTION="FreeBSD kernel sources" SLOT="0" -LICENSE="BSD zfs? ( CDDL )" +LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" IUSE="+build-kernel debug dtrace zfs"
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/, sys-freebsd/freebsd-cddl/
commit: 79c76f7a8c4f391e411b60660de6e8e0c0fc91db Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:41:22 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:41:22 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=79c76f7a sys-freebsd: update Manifest sys-freebsd/freebsd-cddl/Manifest| 2 +- sys-freebsd/freebsd-mk-defs/Manifest | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest index 3220295..55d9aa4 100644 --- a/sys-freebsd/freebsd-cddl/Manifest +++ b/sys-freebsd/freebsd-cddl/Manifest @@ -12,5 +12,5 @@ AUX zfs.initd 375 SHA256 4d87977d430ba846a0b1c8ef383838891d93b40480d4a2816c94902 AUX zvol.initd 845 SHA256 70f237d969b5e539ad1c83fa49b0e5e85d4e2f588e97c1f2e65161edc9c93484 SHA512 18b706cd611858299228a7b74314149fc9a30351f03695accea8a0afbae164acfd8b10df4018b8103273adea1b6e764ca52e0ee3cb07d8f3ff8952b16201edb0 WHIRLPOOL 430d429b43c7be432133859dcd12820362ea03ea4a28a3f335230d66873bcc1658dcbb62e779942de06e7e8a987be30fc968194f31d5431f3b0e3e609509e79a AUX zvol.initd-9.0 819 SHA256 42d8b9a3eed04273e1638e0e7f7aa1f3b939e925c068260ef11a760fc61b5afb SHA512 1d59d5001ecb0ab4416f4bea8e2f4ff2c7ca19891d23b2a24cd1f389ca66f7cbe3a12bf913633dd90c013b730301dd704c072b94e5d95f7724203d3810314c70 WHIRLPOOL bdb6f1da1c420a254fb12776c0af378619b98c030c0830bcb3fcf2ee6eabf3e89576079d1a31a797e311e9b98d45dfcdf0ea22bddfe7ebc0a1936016474a469b DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-cddl-11.0.ebuild 1704 SHA256 7a6e92ff6ec2dbb86f162ac9467653f4c3590e1442eaa3d960caf84276d6cead SHA512 a8cb91aa73872dbfdce2ecab214614a28df3b13c703e73d998346cec986cd98abc5a8532344d2422e0780494290cb39ca17e24c761ad17dd8b776d7ec432b933 WHIRLPOOL 32b02d13f2f2f691536f3e654bda0f2144ec07c6faba033926771bffc185ce1842d9a95b8e1f61957da805dc48b699a258d7733d137852e4f5012aea060c8b90 +EBUILD freebsd-cddl-11.0.ebuild 1708 SHA256 5639b9aa8083c825eb2e8df97f336dbfde36094072b820363af4f2d5d1bf6d9a SHA512 82579abdd555463b191143c210e57c3db4c179dfaa6365b07632f5f92e9db82ba01f6f7148ca369d4ce84a263293783219c67f7073a6d61166d054c6e8f49f04 WHIRLPOOL 549801fee4dc1270e854dd8029b17f5739670c9fbe716ce041da08e7232b1c9d390ec3ee2d3ee058999a9e7735dba364dc6991ec33c681653fd3ef4ddc73cfee MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index f775090..f74b1f5 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -2,6 +2,7 @@ AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023 AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7 AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 SHA256 4f592c92b88173156bb4688ccc2f26d79a37fa2c9905fc93286291fe80fb9533 SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168 WHIRLPOOL de041217c36baee221543ebfd6fd202bd8a7f753d27cb9118f8c38b4f94bdde6b6726db6967a007f6ed6aba4b65e39aa139ae374858b32e5a895cb7bd3335d33 AUX freebsd-mk-defs-11.0-gentoo.patch 12840 SHA256 30b491c6037f302f62c6d7d9cec93d32b0ded0dc4bf54dbd37b0394801c6 SHA512 1b070418a5cb5739c55dc8f3e146ccd1390031ec6c13283573900922cd547310e0ccc18093c81df8836c3f78d6ce4279c3b56d6ad059ecb1d09f2b55b781ff79 WHIRLPOOL 1e3d87efa5303586218e9719e9d7aa86b9168413638c7b98cb64ff670f30c84d024627c66e8f53f8227c62b945333a8d625160c9b7ce943718a8556c9736 +AUX freebsd-mk-defs-11.0-gnu.patch 1946 SHA256 37005860ec5ecb6fb916668af794f43bdc6fa64a79b01ab01e93cb1156ae1435 SHA512 bda6a5396c653b964426a3de80ed9c37205d30f3a863f7df231e0cc708ce3bca65ef46f2ca8bf63ea9a37309e2d3ac74ccbfe147688be686c998d940ded0 WHIRLPOOL f6d4a3cc293e87789827a81e8ddd1c81226dc1bb7f894c8a397b494ae418fdc5a75ac1055ff11ff70a3deec9dbc4fb971d580d9ed588f6de9f18a11f584b2109 AUX freebsd-mk-defs-11.0-libproc-libcxx.pat
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/
commit: 1f76ab179a504311fceb2790e2daf67cd341bf95 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:39:25 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:39:25 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=1f76ab17 sys-freebsd/freebsd-cddl: fix QA. sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild index 384ffc2..2efbb35 100644 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild +++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild @@ -56,9 +56,9 @@ src_prepare() { } src_compile() { - cd ${S}/lib || die + cd "${S}"/lib || die freebsd_src_compile - cd ${S} || die + cd "${S}" || die freebsd_src_compile }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/, sys-freebsd/freebsd-mk-defs/files/
commit: 601368e62b33789d987f8b0cc6f1a05a4be4ab86 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:40:39 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:40:39 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=601368e6 sys-freebsd/freebsd-mk-defs: added freebsd-mk-defs-11.0-gnu.patch .../files/freebsd-mk-defs-11.0-gnu.patch | 63 ++ .../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild| 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch new file mode 100644 index 000..97e882d --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch @@ -0,0 +1,63 @@ +diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk +index 92df111..88c75d9 100644 +--- a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk +@@ -184,7 +184,7 @@ _LIBS= lib${LIB_PRIVATE}${LIB}.a + lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS} + @${ECHO} building static ${LIB} library + @rm -f ${.TARGET} +- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} ++ ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} + .endif + +@@ -199,7 +199,7 @@ CLEANFILES+= ${POBJS} + lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS} + @${ECHO} building profiled ${LIB} library + @rm -f ${.TARGET} +- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${POBJS} | tsort -q` ${ARADD} ++ ${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} + .endif + +@@ -247,7 +247,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} + .endif + ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ + -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` ${LDADD} ++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} + .if ${MK_CTF} != "no" + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} + .endif +@@ -312,13 +312,6 @@ _EXTRADEPEND: + + .if !target(install) + +-.if defined(PRECIOUSLIB) +-.if !defined(NO_FSCHG) +-SHLINSTALLFLAGS+= -fschg +-.endif +-SHLINSTALLFLAGS+= -S +-.endif +- + _INSTALLFLAGS:= ${INSTALLFLAGS} + .for ie in ${INSTALLFLAGS_EDIT} + _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} +diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk +index 3b1ecf8..26ac9c5 100644 +--- a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk +@@ -196,13 +196,6 @@ _EXTRADEPEND: + + .if !target(install) + +-.if defined(PRECIOUSPROG) +-.if !defined(NO_FSCHG) +-INSTALLFLAGS+= -fschg +-.endif +-INSTALLFLAGS+= -S +-.endif +- + _INSTALLFLAGS:= ${INSTALLFLAGS} + .for ie in ${INSTALLFLAGS_EDIT} + _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild index d0f48cd..e1eb27a 100644 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild @@ -31,7 +31,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" + use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch" if [[ ${CHOST} != *-freebsd* ]]; then installdir="/usr/share/mk/freebsd"
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-ubin/, sys-freebsd/freebsd-usbin/, ...
commit: 9a9a9e3ea9416bf82b336c30ed50d84cb27caa18 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:06:41 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:06:41 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9a9a9e3e sys-freebsd: update Manifest sys-freebsd/freebsd-mk-defs/Manifest | 2 +- sys-freebsd/freebsd-ubin/Manifest| 2 +- sys-freebsd/freebsd-usbin/Manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 5879378..f775090 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -10,5 +10,5 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-mk-defs-11.0.ebuild 1149 SHA256 a8bb1967bbdbb85bcf60a4f03897f054b8cccf976d8dde5710d1ee0e67b9b062 SHA512 c87470787cd155c32432a2f3269562b5caad9ed8f6c0af934266d20a8c3e2d443dbdd2253b3b89074a103a434766dba95156b1b2b0e2484d6127b77a7b6c33c6 WHIRLPOOL 99fad21dad8365698ef626113fef87007dd70db849b74874eb2ab2685cbb45f14337722f6013fef290b4a1a4ec86861568deceeb6cda44c695b1af34559c78c1 +EBUILD freebsd-mk-defs-11.0.ebuild 1156 SHA256 7e3c368955511b55cde203a061736ef786b7e0e4689608c2ccceab11bffa84ea SHA512 74b5ae4decc354e1273a875067cd18bc221bcc63534410509442ddc17f6a223fa0a622cd6c27869ead7a06ebba70938b101bd25e76244047e355efbbf0f2dcc5 WHIRLPOOL 7d549450beeab0896da03c620f655a51b2a43c194f504c133e8fcdd44478ea627d86010d571231c44bc7df7f5bebf0dd6d31adc06f3d2ed7adbad6750657aca3 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest index 247f2b3..8992ddc 100644 --- a/sys-freebsd/freebsd-ubin/Manifest +++ b/sys-freebsd/freebsd-ubin/Manifest @@ -29,5 +29,5 @@ AUX passwd.pamd 247 SHA256 df5babb31578b5fd56629dac06656a981cffd2e1ef4987e075c0e AUX su.1.pamd 321 SHA256 18ed54492632b231ca9074fe08aa5343a5dd7049834a7eda3aa45d42d313c779 SHA512 fa27233d99c70c3b968b5aff430cdbd55a3d795a1a4430143f863d3dae7bf7b6b1564d58f82431fe2e8e4a2b1bcc2f12714abf7d48ff75c08c1a65f22cd74d6c WHIRLPOOL 7b82c775ec138873b2754c101fa14c09e87bf052f2497b0bba12fee2cfa80f970b27041febb7fd22c3291977f942363ab558d52a92833fcd4cfdf7ece829c713 AUX su.pamd 311 SHA256 5090fbcd2807019255062cacf3816e2e28088c0084c6e9f34a3cceda31e08e27 SHA512 d7c7eaf776aace61f2a534e5a8c2f65879fe27311859e6e8bd309f1425693e4effe8867a1a7ecc3f1d5a478989139f1731c1863c4509da49318c3cead5c8b0dd WHIRLPOOL 055d4b0b9f0645a4ee33170f3a69de0f8733dc972330bb3182400cdae54711f82f85536aa5b6b8ccbd66f1d2ab547780fa0198e2134466f6fa5782ff4b02a77d DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-ubin-11.0.ebuild 6132 SHA256 cee63ec9efe2b026a1a0f0defce4981af0d0072604cdcd82cdd6f7e2de6bb944 SHA512 dcc2f0d54a4eb5273920d526dac4c28ee23bde4249e51fdf5fd26d5c3d41f1040b0c296d2979a3746ae93cecdf5adef59263bc03fbd67a0009f6f0c76b71f0a5 WHIRLPOOL f37513a4720a48a6dad565b873eb351bd8edd46760c18c9a83d1bb9d6455d4b9e3ac9b6b95ee978e6d454f99d0885f06e952ac67ee5dcc203def9d9944d37ae2 +EBUILD freebsd-ubi
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-ubin/
commit: 82e64081848de143f544b7fd3ef31b671cdca8e8 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:04:35 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:04:35 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=82e64081 sys-freebsd/freebsd-ubin: drop unnecessary setting sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild index 157f6a8..537aad0 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild @@ -145,12 +145,12 @@ setup_multilib_vars() { src_compile() { # Preparing to build addr2line, elfcopy, m4 - local MULTIBUILD_VARIANTS="${DEFAULT_ABI}" for dir in libelftc libpe libopenbsd ; do cd "${WORKDIR}/lib/${dir}" || die - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1 + freebsd_src_compile -j1 done - MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/, sys-freebsd/freebsd-usbin/
commit: 25f37a70cab75e24f6116ab75bd3f96ad5f84223 Author: Yuta SATOH gmail com> AuthorDate: Tue Oct 11 12:05:28 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Oct 11 12:05:28 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=25f37a70 sys-freebsd: Add missing || die sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 2 +- sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild index 720012d..d0f48cd 100644 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild @@ -39,7 +39,7 @@ src_prepare() { installdir="/usr/share/mk" fi - sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile + sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die } src_compile() { :; } diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild index 6309b60..31ca603 100644 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild @@ -154,7 +154,7 @@ EOS rm -f "${D}"/etc/bluetooth/Makefile fi - cd "${S}"/ppp + cd "${S}"/ppp || die insinto /etc/ppp doins ppp.conf || die
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/
commit: d2edd1030e57563d62fbc53ed75e5601f1654598 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 09:27:55 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 09:27:55 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=d2edd103 sys-freebsd/freebsd-sources: change from zfs to dtrace sys-freebsd/freebsd-sources/Manifest| 2 +- sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 8ba517c..09b4cb2 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -35,5 +35,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-sources-11.0.ebuild 4748 SHA256 18178d8aaca24b9bec56396f9bee889d705668a6ce255b94a38c7b97b74e0e06 SHA512 b28b8c9b80e15a145796593afe084df6dd2d65afc37ed7e4a83da16ca9e5948e708038d9c2998e111ef84382a5929234642bf6cdbb399f2feb2834c614df52d2 WHIRLPOOL 5bb7d5640897dca5fb559fc5d7b449886d133157530725494ede82038f8fc85060371fb8972768251fd3cfe8bc116247fc42e3a29c2088b6e9637039f556a061 +EBUILD freebsd-sources-11.0.ebuild 4806 SHA256 4a15f22daebab7a4527756f0cf348e8033ade8b6d141163cba90f6c8e14017b1 SHA512 9e717538e753c0ad09f5cddd80e4734b446d3026c8d35cdb7d82343ca77613b99e830ded9c57d20ba95cd555f5d411e8c18a16322094ac474efedb156258c4e9 WHIRLPOOL 0f77d4c783339c1f7b09f21c7e95bcdfcd76d015a80490141b6e10d90f08cff864c5c8f4466afa5c029df76680cf84570533bb47aadf440925df78f1aef01c8c MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild index 9a442c6..46e7942 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild @@ -55,11 +55,12 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" pkg_setup() { # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " + use dtrace && EXTRACTONLY+="cddl/ " # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL=" + use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" + use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" } src_prepare() {
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 5fdebd5d0c9b22a9e046fba384ddbd4c06587830 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 09:15:50 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 09:15:50 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=5fdebd5d freebsd.eclass: freebsd 11.0 does not support NO_ variable. eclass/freebsd.eclass | 22 ++ 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 8bab9af..5d4562a 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -228,18 +228,21 @@ freebsd_src_compile() { use profile && filter-flags "-fomit-frame-pointer" if version_is_at_least 11.0 ${RV} ; then if ! use profile ; then - mymakeopts="${mymakeopts} MK_PROFILE=no " + mymakeopts="${mymakeopts} WITHOUT_PROFILE= " fi - use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " + use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " # Test does not support yet. - mymakeopts="${mymakeopts} MK_TESTS=no " + mymakeopts="${mymakeopts} WITHOUT_TESTS= " # Force set SRCTOP. mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + # Set common option. + mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " else use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " fi - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG=" + mymakeopts="${mymakeopts} NO_FSCHG=" # Make sure to use FreeBSD definitions while crosscompiling [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" @@ -300,18 +303,21 @@ freebsd_multilib_multibuild_wrapper() { freebsd_src_install() { if version_is_at_least 11.0 ${RV} ; then if ! use profile ; then - mymakeopts="${mymakeopts} MK_PROFILE=no " + mymakeopts="${mymakeopts} WITHOUT_PROFILE= " fi - use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " + use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " # Test does not support yet. - mymakeopts="${mymakeopts} MK_TESTS=no " + mymakeopts="${mymakeopts} WITHOUT_TESTS= " # Force set SRCTOP. mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + # Set common option. + mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " else use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " fi - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG=" + mymakeopts="${mymakeopts} NO_FSCHG=" [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-share/, sys-freebsd/freebsd-pf/, sys-freebsd/freebsd-lib/
commit: 7148d5124bbaa5c2b19bee120783296697d11216 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 09:06:35 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 09:06:35 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=7148d512 sys-freebsd: change NO_ to WITHOUT_ sys-freebsd/freebsd-lib/Manifest| 2 +- sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild | 2 +- sys-freebsd/freebsd-pf/Manifest | 2 +- sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 2 +- sys-freebsd/freebsd-share/Manifest | 2 +- sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index bd66ba4..25129fa 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -39,5 +39,5 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-lib-11.0.ebuild 19395 SHA256 97db9ccab5d9208304f8ce71bd70b371609320e708bc6327bb4a7ff9404ab1a0 SHA512 815439793e3ed8fa7600b1d4a099beea5fc9d8b98e8ec0d0f4713818402f8176af82460f6eb3a4caa46718fd8d91b3dbe06ab91ff66ae259e1f7925108c3eaf6 WHIRLPOOL d22669465c32b652a99ea82d20b36967cafa2d2c9595fa4385cca087e7fda215bc91bfb65f9816cc3fe112d6f26a0320750d8b7a4041be448978a03e0c41d9da +EBUILD freebsd-lib-11.0.ebuild 19400 SHA256 4695f889de60e8c782108a50835dbc3951613286898c671683ad37564ca3161b SHA512 909ed2a228d4af07abe8971f1ef16ec69a13ec6a78279ff59d4c5627d2b6ae2d01bf3f8aa9540aec58c878bf51b19a2d98b4845cfaf07b59b8590f0f48d08c7c WHIRLPOOL db6a0c89df20fc3621bfe11a64ead7612741692627353436caf892a1f559bc60404d564c2360d2ae44a8bb5a7735ae2d812e299004818c3ae174b2e2d157bc5e MISC metadata.xml 500 SHA256 82c704031ba7ec4dec7348c15d1188fad5e9df804c12f90c04afcb0a46eb5dd6 SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470 WHIRLPOOL 0837f442d3673e9bac470774a9868ad4992056a4edae8e07759248ec58830cb1a596cf39b347d04a3e33b16d88329084571df30f33bdc9c9e73073f32ca015ae diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild index 05ea4a9..5265af2 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild @@ -573,7 +573,7 @@ src_install() { # get tc-arch-kernel to return the right value, etc. export CHOST=${CTARGET} - mymakeopts="${mymakeopts} NO_MAN= \ + mymakeopts="${mymakeopts} WITHOUT_MAN= \ INCLUDEDIR=/usr/${CTARGET}/usr/include \ SHLIBDIR=/usr/${CTARGET}/usr/lib \ LIBDIR=/usr/${CTARGET}/usr/lib" diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest index 6b3fc9c..352118a 100644 --- a/sys-freebsd/freebsd-pf/Manifest +++ b/sys-freebsd/freebsd-pf/Manifest @@ -12,5 +12,5 @@ AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f767 AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc AUX pf.initd 810 SHA256 e2e592682e4c8e2b5de2a0be21c061e0f9adbe237d566ce8846dbda13fb56750 SHA512 7638cae25c51f8be6229992b6462ac65ad7fd53fd61aaaedd70e7f97ea3b3314278f5ed3336dde043cdd86f017f1b6d025a95931649257b596eba3
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-share/, sys-freebsd/freebsd-pf/
commit: 1b3d6db2432259424478925adff5c178d85169ed Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 09:18:33 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 09:18:33 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=1b3d6db2 sys-freebsd: remove duplicate items sys-freebsd/freebsd-pf/Manifest | 2 +- sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 1 - sys-freebsd/freebsd-share/Manifest | 2 +- sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest index 352118a..a360de1 100644 --- a/sys-freebsd/freebsd-pf/Manifest +++ b/sys-freebsd/freebsd-pf/Manifest @@ -12,5 +12,5 @@ AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f767 AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc AUX pf.initd 810 SHA256 e2e592682e4c8e2b5de2a0be21c061e0f9adbe237d566ce8846dbda13fb56750 SHA512 7638cae25c51f8be6229992b6462ac65ad7fd53fd61aaaedd70e7f97ea3b3314278f5ed3336dde043cdd86f017f1b6d025a95931649257b596eba3dbf2c64eff WHIRLPOOL 099108815854abb3e05f4f0100e1bef515570955677eb68d2b1f1d2301057adc12f319a7ef5805af466b3de4d10414e49df53d6119ebcc674410cafe968d9992 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-pf-11.0.ebuild 1570 SHA256 578ccc39384807fe5b330de80653b7f81d481858646ef0eceba8d186ae223e20 SHA512 def0d6db438f9f2faff16e3f3fadcf921ad3a3c7d8502cabd9e4e9d1b42eb878af7a470af62cfb512943216e65ab7a05a8e74823539fdb741d9a6c87e66433df WHIRLPOOL 86caf10232a85499b94d8deafbd1bbc1195d1f58eb0d6ad4eee9864cb5012ee870145d2e6ea791e627d96be4c1f20aa815e50a37ec29b37506a38d8a612f8dfc +EBUILD freebsd-pf-11.0.ebuild 1498 SHA256 56f9cb1cb83e1e72ea89a09d4dadafbac81fb2fd7aba5d00113e5680b89c4f21 SHA512 0f9e4054b4d758437e5ef0aec840fde5def23e2e17b1ecb21f8404a207dabba134126623d92a23f6778faca9ca22dc672bbd459e801b094458e93abf3df1f77e WHIRLPOOL 51d26a08d3a367d06b257c26fa17b2e814849b9487a2cb9a4242986734f33540e2b621e30bd06b4bca9f11edf20fcba5a4a6005d987af0a8f0be0212d6671fdf MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild index be88217..914cfe1 100644 --- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild +++ b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild @@ -35,7 +35,6 @@ SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy" pkg_setup() { enewgroup authpf 63 - mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " } src_prepare() { diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest index b2d6e47..d65d9d8 100644 --- a/sys-freebsd/freebsd-share/Manifest +++ b/sys-freebsd/freebsd-share/Manifest @@ -6,5 +6,5 @@ AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b2030
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-libexec/
commit: 38ac0ea49559eff8137a53b1efef3ed88a41fe2b Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 09:07:50 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 09:07:50 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=38ac0ea4 sys-freebsd/freebsd-libexec: change MK_ to WITHOUT_ sys-freebsd/freebsd-libexec/Manifest| 2 +- sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index e20a1e2..2d67c7a 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -11,5 +11,5 @@ AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-libexec-11.0.ebuild 4150 SHA256 9fd87de85c3c125e10a013b9f8f4dcc9718ee153af0d46cfa3be892d8ba7ab90 SHA512 a18b235bfe5fd08e581c220f35ac5483823ea0ae37f40034ce0a9faf8386edf2ed6830595a034efcef386d08469e36e7110da3f8aea28e3cfbd64c8e8990ac53 WHIRLPOOL f58d4f4867b8ead04b0733aa9f6571530e47deea2b768a4a86eaa7cfce94022b9cb8cdb7fb872779fcbe505a87b7fda8e4ea5d83f0dd12b1557875697190c2cd +EBUILD freebsd-libexec-11.0.ebuild 4156 SHA256 280c2f86164a03c6f29c9b1a97052a96e3440db3a5b7089f7bcc0e78f6b6a240 SHA512 2358f3abf07776f07bdf2b35d3115c2b9db3d9808970827e41574ece785cf2a9c8fd4179b896883d572717b9e1fade88239403d50898a1b3359cdb80fdcf130f WHIRLPOOL c71f337efb4120a4e28e7df79b63394e110bc5e583b68327c485f750028b4f872d789a98fba9e031c56262bd916617a17e3b3a97377280931b0faf5f7b236f30 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild index 57ac862..8aea14d 100644 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild @@ -94,7 +94,7 @@ src_prepare() { echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h - export mymakeopts="${mymakeopts} MK_SYMVER=no MK_BLACKLIST_SUPPORT=no " + export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= " fi }
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 04c0fbf399b92ca4713be304a14f63415b66e32d Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:19:59 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:19:59 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=04c0fbf3 eclass/bsdmk.eclass: Pass all of arguments to mkinstall. eclass/bsdmk.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass index 3ce3572..a92b4c0 100644 --- a/eclass/bsdmk.eclass +++ b/eclass/bsdmk.eclass @@ -79,5 +79,5 @@ bsdmk_src_compile() { # @DESCRIPTION: # The bsdmk src_install function, which is exported bsdmk_src_install() { - mkinstall || die "install failed" + mkinstall "$@" || die "install failed" }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/
commit: c6d4a07e548ed44b915e7289ff7606a03661319d Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:16:46 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:16:46 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=c6d4a07e sys-freebsd/freebsd-usbin: drop sed mtree/Makefile sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild index b7f4a4e..eb51009 100644 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild @@ -101,9 +101,6 @@ src_prepare() { else dummy_mk mount_smbfs fi - # Don't install mtree format manpage - # it's installed by libarchive. - sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile } src_compile() {
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 6894d04c327ef5aa3e951d565edf04722c52262a Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:18:40 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:18:40 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6894d04c freebsd.eclass: Pass all of arguments to bsdmk_src_install. eclass/freebsd.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index bedda33..8bab9af 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -315,5 +315,5 @@ freebsd_src_install() { [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" - bsdmk_src_install + bsdmk_src_install "$@" }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/, sys-freebsd/freebsd-pam-modules/, ...
commit: 2c14b57f9db537b6865e85917e63002dfe29fb28 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:28:04 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:28:04 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=2c14b57f sys-freebsd: change from mkinstall to freebsd_src_install sys-freebsd/boot0/Manifest | 2 +- sys-freebsd/boot0/boot0-11.0.ebuild | 2 +- sys-freebsd/freebsd-cddl/Manifest | 2 +- sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 2 +- sys-freebsd/freebsd-pam-modules/Manifest| 2 +- sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild | 2 +- sys-freebsd/freebsd-usbin/Manifest | 2 +- sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index 470b480..bda3b4c 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -9,5 +9,5 @@ AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1a AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD boot0-11.0.ebuild 1878 SHA256 3ce95c8f57d76659c63e4afe0eb07d083ddee0695bfc140e8b8fb2bc4fb4c171 SHA512 1f886907cdd3fd5ef36e4f2cafe73c3deb8013904c50d01c25b025fb479a185932d999e60a4d63fdeecc25e78ca02e51053e41ee712b57b13f2d783189c458d6 WHIRLPOOL c419f3f87a9fa95b65764c819e554f40e91b351b0c6cc8fd5472ba24eb54ac0a207bf9973f5e0384cc125faba3f2be1901d9f7d0b74dcaadd97cd6c5d0ee8c88 +EBUILD boot0-11.0.ebuild 1862 SHA256 3247b5ca4135f21acf4710536c85389f5a76738da24ded110711678aaa4364a4 SHA512 fdb37a29b7916ff1f8912bb544ddb3e40cd95395a7b42e830adac5c9c8df21b3a5577d3b8baf6ecd74482c53bebd63ecf3d7bbec47923ffe9f7ef96cd23b2558 WHIRLPOOL dc761ab66f1b874dfee3fb458cc97ce0e98a35589fc9f45520edc1449b1ccb42b5e130e634f741d2e164217e34bfd4de1556cf87ea3a32a8ce0bc6bcffe48111 MISC metadata.xml 385 SHA256 1b6dbb50d321102c9a48b5f6bce5825e88ce8dfcabd86892194b2fa10e540b11 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808 WHIRLPOOL f073e698718e05e55026bad3888ce2809d2a0a7f4d0e4090e5c1fb16be55846e0bbf81c09748b76ea960a77e74b96678031c52b8e4e259640d67386cc655 diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0.ebuild index 71b9564..d108508 100644 --- a/sys-freebsd/boot0/boot0-11.0.ebuild +++ b/sys-freebsd/boot0/boot0-11.0.ebuild @@ -71,7 +71,7 @@ src_compile() { src_install() { dodir /boot/defaults - mkinstall FILESDIR=/boot || die "mkinstall failed" + freebsd_src_install FILESDIR=/boot cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die insinto /boot diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest index 827823c..3220295 100644 --- a/sys-freebsd/freebsd-cddl/Manifest +++ b/sys-freebsd/freebsd-cddl/Manifest @@ -12,5 +12,5 @@ AUX zfs.initd 375 SHA256 4d87977d430ba846a0b1c8ef383838891d93b40480d4a2816c94902 AUX zvol.initd 845 SHA256 70f237d969b5e539ad1c83fa49b0e5e85d4e2f588e97c1f2e65161edc9c93484 SHA512 18b706cd611858299228a7b74314149fc9a30351f03695accea8a0afbae164acfd8b10df4018b8103273adea1b6e764ca52e0ee3cb07d8f3ff8952b16201edb0 WHIRLPOOL 430d429b43c7be432133859dcd12820362ea03ea4a28a3f335230d66873bcc1658dcbb62e779942de06e7e8a987be30fc968194f31d5431f3b0e3e609509e79a AUX zvol.initd-9.0 819 SHA256 42d8b9a3eed04273e1638e0e7f7aa1f3b939e925c068260ef11a760fc61b5afb SHA512 1d59d5001ecb0ab4416f4bea8e2f4ff2c7ca19891d23b2a24cd1f389ca66f7cbe3a12bf913633dd90c013b730301dd704c072b94e5d95f772
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/
commit: cc9a78e9d4b7c1b456503a43eced695307fc93c7 Author: Yuta SATOH gmail com> AuthorDate: Sat Oct 8 13:04:42 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Oct 8 13:04:42 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=cc9a78e9 sys-freebsd/freebsd-lib: add lib/libmp to EXTRA_INCLUDES. sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild index 9ca30a1..05ea4a9 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild @@ -630,7 +630,7 @@ install_includes() WITHOUT_GSSAPI= \ SRCTOP="${WORKDIR}"|| die "install_includes() failed" einfo "includes installed ok." - EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper" + EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper lib/libmp" for i in $EXTRA_INCLUDES; do einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." cd "${WORKDIR}/$i" || die
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/
commit: 67d64bb339ba9bf7e5dcf972ddb39d79df2c54b1 Author: Yuta SATOH gmail com> AuthorDate: Sat Oct 8 13:26:06 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Oct 8 13:26:06 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=67d64bb3 sys-freebsd/freebsd-sources: disable hyperv on x86-fbsd. sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 6 ++ 1 file changed, 6 insertions(+) diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild index c649b12..9a442c6 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild @@ -92,6 +92,12 @@ src_prepare() { use debug || echo 'nomakeoptions DEBUG' >> "${conf}" use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" + # hyperv fails to compile on x86-fbsd. + if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then + echo 'nodevice hyperv' >> "${conf}" + dummy_mk modules/hyperv + fi + # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-share/
commit: b91a10d066e810df07d52ba8f2b31d11df893f74 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:22:19 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:22:19 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b91a10d0 freebsd-share: change from mkmake to freebsd_src_install sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild index 8c64414..9085ed8 100644 --- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild +++ b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild @@ -110,5 +110,5 @@ src_compile() { } src_install() { - mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" + freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF} }
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 33612af8cae165e0549873ae64e6713d4de5e004 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:19:26 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:19:26 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=33612af8 eclass/bsdmk.eclass: import from latest tree eclass/bsdmk.eclass | 83 + 1 file changed, 83 insertions(+) diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass new file mode 100644 index 000..3ce3572 --- /dev/null +++ b/eclass/bsdmk.eclass @@ -0,0 +1,83 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# @ECLASS: bsdmk.eclass +# @MAINTAINER: +# maintainer-nee...@gentoo.org +# @BLURB: Some functions for BSDmake + +inherit toolchain-funcs portability flag-o-matic + +EXPORT_FUNCTIONS src_compile src_install + +RDEPEND="" +# this should actually be BDEPEND, but this works. +DEPEND="virtual/pmake" + +ESED="/usr/bin/sed" + +# @ECLASS-VARIABLE: mymakeopts +# @DESCRIPTION: +# Options for bsd-make + +# @FUNCTION: append-opt +# @USAGE: < options > +# @DESCRIPTION: +# append options to enable or disable features +append-opt() { + mymakeopts="${mymakeopts} $@" +} + +# @FUNCTION: mkmake +# @USAGE: [ options ] +# @DESCRIPTION: +# calls bsd-make command with the given options, passing ${mymakeopts} to +# enable ports to useflags bridge. +mkmake() { + [[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)" + + tc-export CC CXX LD RANLIB + + ${BMAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} NO_WERROR= STRIP= "$@" +} + +# @FUNCTION: mkinstall +# @USAGE: [ options ] +# @DESCRIPTION: +# Calls "bsd-make install" with the given options, passing ${mamakeopts} to +# enable ports to useflags bridge +mkinstall() { + [[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)" + + # STRIP= will replace the default value of -s, leaving to portage the + # task of stripping executables. + ${BMAKE} ${mymakeopts} NO_WERROR= STRIP= MANSUBDIR= DESTDIR="${D}" "$@" install +} + +# @FUNCTION: dummy_mk +# @USAGE: < dirnames > +# @DESCRIPTION: +# removes the specified subdirectories and creates a dummy makefile in them +# useful to remove the need for "minimal" patches +dummy_mk() { + for dir in $@; do + [ -d ${dir} ] || ewarn "dummy_mk called on a non-existing directory: $dir" + [ -f ${dir}/Makefile ] || ewarn "dummy_mk called on a directory without Makefile: $dir" + echo ".include " > ${dir}/Makefile + done +} + +# @FUNCTION: bsdmk_src_compile +# @DESCRIPTION: +# The bsdmk src_compile function, which is exported +bsdmk_src_compile() { + mkmake "$@" || die "make failed" +} + +# @FUNCTION: bsdmk_src_install +# @DESCRIPTION: +# The bsdmk src_install function, which is exported +bsdmk_src_install() { + mkinstall || die "install failed" +}
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-mk-defs/, ...
commit: b23b570eee616ec3ef80dac408d632f0709c3133 Author: Yuta SATOH gmail com> AuthorDate: Sun Oct 9 08:25:23 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sun Oct 9 08:25:23 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b23b570e sys-freebsd: update Manifest sys-freebsd/boot0/Manifest | 2 +- sys-freebsd/freebsd-bin/Manifest | 2 +- sys-freebsd/freebsd-cddl/Manifest| 2 +- sys-freebsd/freebsd-lib/Manifest | 4 ++-- sys-freebsd/freebsd-libexec/Manifest | 2 +- sys-freebsd/freebsd-mk-defs/Manifest | 2 +- sys-freebsd/freebsd-pam-modules/Manifest | 2 +- sys-freebsd/freebsd-pf/Manifest | 2 +- sys-freebsd/freebsd-rescue/Manifest | 2 +- sys-freebsd/freebsd-sbin/Manifest| 2 +- sys-freebsd/freebsd-share/Manifest | 4 ++-- sys-freebsd/freebsd-sources/Manifest | 5 +++-- sys-freebsd/freebsd-ubin/Manifest| 2 +- sys-freebsd/freebsd-usbin/Manifest | 4 ++-- 14 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index c4746b8..470b480 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -8,6 +8,6 @@ AUX boot0-11.0-uefi-support.patch 715 SHA256 ca983122c1a73575ce81cfad1c11378b60c AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4 AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe -DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 +DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 EBUILD boot0-11.0.ebuild 1878 SHA256 3ce95c8f57d76659c63e4afe0eb07d083ddee0695bfc140e8b8fb2bc4fb4c171 SHA512 1f886907cdd3fd5ef36e4f2cafe73c3deb8013904c50d01c25b025fb479a185932d999e60a4d63fdeecc25e78ca02e51053e41ee712b57b13f2d783189c458d6 WHIRLPOOL c419f3f87a9fa95b65764c819e554f40e91b351b0c6cc8fd5472ba24eb54ac0a207bf9973f5e0384cc125faba3f2be1901d9f7d0b74dcaadd97cd6c5d0ee8c88 MISC metadata.xml 385 SHA256 1b6dbb50d321102c9a48b5f6bce5825e88ce8dfcabd86892194b2fa10e540b11 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808 WHIRLPOOL f073e698718e05e55026bad3888ce2809d2a0a7f4d0e4090e5c1fb16be55846e0bbf81c09748b76ea960a77e74b96678031c52b8e4e259640d67386cc655 diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest index 44ba8a6..353f2b2 100644 --- a/sys-freebsd/freebsd-bin/Manifest +++ b/sys-freebsd/freebsd-bin/Manifest @@ -1,3 +1,3 @@ -DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 +DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHI
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/, sys-freebsd/freebsd-sources/files/
commit: 0d12610172a4b2aecb10165af751190da5c3cfe8 Author: Yuta SATOH gmail com> AuthorDate: Sat Oct 8 04:50:44 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Sat Oct 8 04:50:44 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=0d126101 sys-freebsd/freebsd-sources: add ${PN}-11.0-gentoo.patch .../files/freebsd-sources-11.0-gentoo.patch| 22 ++ .../freebsd-sources/freebsd-sources-11.0.ebuild| 1 + 2 files changed, 23 insertions(+) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch new file mode 100644 index 000..6acd6aa --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch @@ -0,0 +1,22 @@ +diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk +index e27ea93..615dbac 100644 +--- a/sys/conf/kern.mk b/sys/conf/kern.mk +@@ -5,7 +5,7 @@ + # + CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ + -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ +- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ ++ -Wundef -Wno-pointer-sign \ + -Wmissing-include-dirs -fdiagnostics-show-option \ + -Wno-unknown-pragmas \ + ${CWARNEXTRA} +@@ -86,7 +86,7 @@ FORMAT_EXTENSIONS= -fformat-extensions + # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 + # + .if ${MACHINE_CPUARCH} == "i386" +-CFLAGS.gcc+= -mno-align-long-strings -mpreferred-stack-boundary=2 ++CFLAGS.gcc+= -mpreferred-stack-boundary=2 + CFLAGS.clang+=-mno-aes -mno-avx + CFLAGS+= -mno-mmx -mno-sse -msoft-float + INLINE_LIMIT?=8000 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild index bf4781c..c649b12 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild @@ -49,6 +49,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" "${FILESDIR}/${PN}-7.1-includes.patch" "${FILESDIR}/${PN}-9.0-sysctluint.patch" + "${FILESDIR}/${PN}-11.0-gentoo.patch" "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" "${FILESDIR}/${PN}-10.1-gcc48.patch" )
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: d5112aae544505078691a9099ae33c0f6aaaec2f Author: Yuta SATOH gmail com> AuthorDate: Fri Oct 7 12:12:29 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Fri Oct 7 12:12:29 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=d5112aae freebsd.eclass: sync latest tree. eclass/freebsd.eclass | 14 ++ 1 file changed, 14 insertions(+) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 0e6ad01..bedda33 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -208,6 +208,20 @@ freebsd_src_unpack() { if version_is_at_least 11.0 ${RV} ; then export RSYMLINK=" -l s" fi + + # When CC=clang, force use clang-cpp #478810, #595878 + if [[ $(tc-getCC) == *clang* ]] ; then + if type -P clang-cpp > /dev/null ; then + export CPP=clang-cpp + else + mkdir "${WORKDIR}"/workaround_clang-cpp || die "Could not create ${WORKDIR}/workaround_clang-cpp" + ln -s "$(type -P clang)" "${WORKDIR}"/workaround_clang-cpp/clang-cpp || die "Could not create clang-cpp symlink." + export CPP="${WORKDIR}/workaround_clang-cpp/clang-cpp" + fi + fi + + # Add a special CFLAGS required for multilib support. + use amd64-fbsd && export CFLAGS_x86_fbsd="${CFLAGS_x86_fbsd} -DCOMPAT_32BIT -B/usr/lib32 -L/usr/lib32" } freebsd_src_compile() {
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/
commit: 798bb84ec8f28b215798df2b915fb92c8e90eb09 Author: Yuta SATOH gmail com> AuthorDate: Mon Oct 3 11:15:35 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Mon Oct 3 11:15:35 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=798bb84e sys-freebsd/freebsd-sources: add WITHOUT_FORMAT_EXTENSIONS=. sys-freebsd/freebsd-sources/Manifest| 2 +- sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 5dcfe24..4cf07fb 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -34,5 +34,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD freebsd-sources-11.0.ebuild 4519 SHA256 a29fce1572ae6c34ed54d974f07f4ef0331a3fe1eee450c17af17aba03dc SHA512 98dd91a352143754c44a6d8f302fd61ce0dd33a744c652983484405786af2edb0e43941cb8c8ea3b5a5b1710e7719055e8887e0d864ae487388af4714a4f813f WHIRLPOOL 13e62b88847320ede84ad38634a945913d3bcfdb4af71f771263ffcb4ea39da5f8fdd0ee942879b1f80eec52ffe9e2aac6e44d62416c7d1853996fd8f15f43d8 +EBUILD freebsd-sources-11.0.ebuild 4546 SHA256 200d3273335866df489e1318a929ba63ed98757f6787ac3a38fe2ebfd7f52073 SHA512 dcd43af2ec2d6d899adbfb2797852bb87a4f72b9e8477b2132cb4a29c60bdc61e8fb58b5e90a43c7d99664725b790db2f0274f01e9b6152ce149d02172e29bc6 WHIRLPOOL 981afa61b3c45f2164679aea8199e1a137c043d147661e1155492eb26041ac1722a4b0fd6cdff07262510214966467a1e0a6c0c368f3ee069ab59dd6f46ab8a5 MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild index a14f752..bf4781c 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild @@ -57,7 +57,7 @@ pkg_setup() { use zfs && EXTRACTONLY+="cddl/ " # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 - [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP=" + [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL=" }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/, eclass/
commit: 0821460d6a35dd331a721b8ffe9b2017f32598ca Author: Yuta SATOH gmail com> AuthorDate: Mon Oct 3 11:21:09 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Mon Oct 3 11:21:09 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=0821460d Drop unnecessary mk files, and put all of mk to /usr/share/mk/system for sys-freebsd/* eclass/freebsd.eclass | 10 +- sys-freebsd/freebsd-mk-defs/Manifest| 2 +- sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 15 +-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 1e141da..0e6ad01 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -102,7 +102,15 @@ doperiodic() { freebsd_get_bmake() { local bmake bmake=$(get_bmake) - [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" + if version_is_at_least 11.0 ${RV} ; then + if [[ ${CBUILD} == *-freebsd* ]] ; then + bmake="${bmake} -m /usr/share/mk/system" + else + bmake="${bmake} -m /usr/share/mk/freebsd/system" + fi + else + [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" + fi echo "${bmake}" } diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 798a003..a9c3535 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -10,5 +10,5 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1 DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD freebsd-mk-defs-11.0.ebuild 910 SHA256 2df2e883dba970a27f5fec499b8516f1b8a1126763cc2b590a5661a979a8b966 SHA512 1e2f8d4fac2c461a2fbf0127cb8bb27cdda9dad8d5d93513a28d77baf87bc5199fd781134e67fd5e2a31c03fec9b71f2e4732e700e3f2e3fdca759c27d89ac87 WHIRLPOOL b5c335c9bb20746a9a630226cf9601fc767476eb65ca3e1f8661172d392b60e6186b4a167ecc02962b935e11c987716f078674356f8027a816794a4b65a4d712 +EBUILD freebsd-mk-defs-11.0.ebuild 1149 SHA256 a8bb1967bbdbb85bcf60a4f03897f054b8cccf976d8dde5710d1ee0e67b9b062 SHA512 c87470787cd155c32432a2f3269562b5caad9ed8f6c0af934266d20a8c3e2d443dbdd2253b3b89074a103a434766dba95156b1b2b0e2484d6127b77a7b6c33c6 WHIRLPOOL 99fad21dad8365698ef626113fef87007dd70db849b74874eb2ab2685cbb45f14337722f6013fef290b4a1a4ec86861568deceeb6cda44c695b1af34559c78c1 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild index 0a7d87b..720012d 100644 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild @@ -25,20 +25,31 @@ RESTRICT="strip" S="${WORKDIR}/share/mk" src_prepare() { + local installdir + epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" + + if [[ ${CHOST} != *-freebsd* ]]; then + installdir="/usr/share/mk/fr
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
commit: 348d0cda29759191a1a77af2b34e3543a198a0a0 Author: Yuta SATOH gmail com> AuthorDate: Fri Sep 30 11:32:54 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Fri Sep 30 11:32:54 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=348d0cda sys-freebsd/freebsd-sources: remove ${PN}-11.0-gentoo.patch sys-freebsd/freebsd-sources/Manifest| 3 +-- .../freebsd-sources/files/freebsd-sources-11.0-gentoo.patch | 13 - sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index bfa922f..5dcfe24 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -2,7 +2,6 @@ AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc111 AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf AUX freebsd-sources-10.1-gcc48.patch 452 SHA256 26ad0753e59bd7e45f957cc98c8a11c8c1bcaf89ed55898b4efc6d95e3943671 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 WHIRLPOOL b6ed5ad4d7e444c79afcc0a14ce9fc85fddd5d1ae6b1d7dc8aa3e4949bb598e0da7a0d95025ba7e3981fc0af741c52e3c84fc81cba00bc79f59ab510afa85441 AUX freebsd-sources-11.0-gentoo-gcc.patch 430 SHA256 e8f031a81dc611c7368bbb4330f2e162a50b72af9b3cdce012c93d0130668b8f SHA512 9869ba13091cc0975a7fe1a1b18a279835d19f1f57204dd3463798d3695a250ba6c96f2c1f6a2352dfce0022d7365257b0f938032b55e7090f68e58c4455bffe WHIRLPOOL 01b61475aabca1647092a8d77c426ffd609ce66a508672eb85b87f2b25db37dbc6191a3f9bfaa24f5fe03a233c122a4f2b971c3a4f4fd9022acaad55c8ad3427 -AUX freebsd-sources-11.0-gentoo.patch 464 SHA256 b027a41e0ffb719e3692a167830f7efe56c3cd4cabd6196578ad1cb40f91532c SHA512 5177ddb7cb5db32ed479fb3201911a76f225f15de8eb422a0c00355c1e8769ca71a46f6dea14d4b5e0a55e2a3ac53939ee25032c5f4b7cb8d25a3cafde078836 WHIRLPOOL b1747199f6ff9b12f5c431bca78dc6f8d454fd4dd638b9d9091dc03577d0f78c6089462b923ab33b819ae1172b70e23b32cfaf1b88746f8252e21df25b781880 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512 @@ -35,5 +34,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dc
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/, sys-freebsd/boot0/files/, ...
commit: 0893d9fcb292ceef2bebe61005ee0e73c517344c Author: Yuta SATOH gmail com> AuthorDate: Fri Sep 30 11:31:17 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Fri Sep 30 11:31:17 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=0893d9fc sys-freebsd: boot0 can build with gcc. sys-freebsd/boot0/Manifest | 4 +++- sys-freebsd/boot0/boot0-11.0.ebuild | 9 - sys-freebsd/boot0/files/boot0-11.0-gcc46.patch | 14 ++ .../boot0/files/boot0-11.0-uefi-support.patch | 21 + sys-freebsd/freebsd-mk-defs/Manifest| 3 ++- ...freebsd-mk-defs-11.0-drop-unsupport-cflags.patch | 13 + .../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 1 + 7 files changed, 58 insertions(+), 7 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index f3da9d2..c4746b8 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -3,9 +3,11 @@ AUX boot0-10.1-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef3 AUX boot0-10.3-clang.patch 847 SHA256 6687fa92439ec0813a61221f5acfc6fe4588432c6660f9e6962437d2589f5a1c SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 WHIRLPOOL 3a299ffc554ad91a763a974268978755dc7819a6e4c21736efca6df1c0e5a95b07184103724634af3eb634fb2da77abb40d6bfb493cb6effb7463abe2c339905 AUX boot0-10.3-drop-unsupport-cflags.patch 971 SHA256 26a7aef66e0b436201698f0df262d8af50061da203f90e1bc8babd79815f62b9 SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 WHIRLPOOL 6ff2f96c33857433ed3160241a7137aef9375d15533f7fd3db979ac8294ee28f21fc9e1c292450fac6a3dd515e86f5969b7b517d36636712ef921af5956faa0f AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf00021ec7372829bec56d08ba4d83c SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a WHIRLPOOL cb83d397f0a1660b6ee0154b1c2d6e7807e2c6e61d92790e5be37233fa6f8bec3947f9c49d5046329486654a648e758f0e4d9f6d2ce7b2cf448c181059745281 +AUX boot0-11.0-gcc46.patch 481 SHA256 d05e22731b13b3eb12c75034c3f3d5ba74c1d842271ba1c81669698d0cfe1911 SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01 WHIRLPOOL a4a1620b892850f9affac443399901f52af2344539e251169d08d6b7db588a23db5ec3b4857992acda96b9893a7acde848a3171689eebf332fdbb1c9e18e858a +AUX boot0-11.0-uefi-support.patch 715 SHA256 ca983122c1a73575ce81cfad1c11378b60cdcb869dea4db4fafd387a38136086 SHA512 e6b4b48e5442ad4d948389aa4862484947fce5f15deedd6603cf5616054ccf9fa61a0c190443cdbe76502225a44da37675d1bccf49476ffedd633fe8128a2db6 WHIRLPOOL 0bf282dff86cd8cd59dbf42ad99aae10cf056260e356f4ac88392698107b4c26970c2028300c795ee28e91b8b5129b414e6c25d8f8587effac6cdf8ee56e6e65 AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4 AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD boot0-11.0.ebuild 1865 SHA256 c24408235abca82188344803e4ed8a1460180eb89116585f21e6b7c02de5fe81 SHA512 392bca15d3f3ac0852f35bd090b562ed13659ebaf764106dffc77f9df6f5f719a776f0bb3f0ac48ea5f6e207746451dcc3aadaf2e1c4909be061ebfbcac7 WHI
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
commit: 99ef1e8a9dcf50cb93a20827c223d319008d7c8a Author: Yuta SATOH gmail com> AuthorDate: Fri Sep 30 11:34:28 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Fri Sep 30 11:34:28 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=99ef1e8a sys-freebsd/freebsd-mk-defs: update ${PN}-11.0-gentoo.patch sys-freebsd/freebsd-mk-defs/Manifest | 2 +- .../files/freebsd-mk-defs-11.0-gentoo.patch| 40 +++--- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 239188f..798a003 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -1,7 +1,7 @@ AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023fb1799b81a458451f58ea2fe63e46a1 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e7972c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e WHIRLPOOL 1db20b2a7e39da3b86a4fb09c42980c6c028b1b46baac55c334abccea87f8c6c59f1c3aaa753bcbc2c08e9bad17d342410ca882a75e37edcf9bdfd26ac7ec1ba AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7 AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 SHA256 4f592c92b88173156bb4688ccc2f26d79a37fa2c9905fc93286291fe80fb9533 SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168 WHIRLPOOL de041217c36baee221543ebfd6fd202bd8a7f753d27cb9118f8c38b4f94bdde6b6726db6967a007f6ed6aba4b65e39aa139ae374858b32e5a895cb7bd3335d33 -AUX freebsd-mk-defs-11.0-gentoo.patch 12249 SHA256 43a1f6fbbb4c8290c0104a7363f9f66f54de0082487107fdd477205ef44c527f SHA512 992451114b971684c17e5a6eb849599763dc89f703885bda65d8aed67c5b45f939713c384a8eebdec9c68260495af68ec0bb41fa0ffd064d6e58fd18d49a2d3e WHIRLPOOL 1ac9559e8ce8f742f2fc5dff987038bf6af91d18b2cd16c347967671f24de5fee753b2a67d494353cc0ced4cc6bd098e8e902055bd24432c21e00fa5057bc17d +AUX freebsd-mk-defs-11.0-gentoo.patch 12840 SHA256 30b491c6037f302f62c6d7d9cec93d32b0ded0dc4bf54dbd37b0394801c6 SHA512 1b070418a5cb5739c55dc8f3e146ccd1390031ec6c13283573900922cd547310e0ccc18093c81df8836c3f78d6ce4279c3b56d6ad059ecb1d09f2b55b781ff79 WHIRLPOOL 1e3d87efa5303586218e9719e9d7aa86b9168413638c7b98cb64ff670f30c84d024627c66e8f53f8227c62b945333a8d625160c9b7ce943718a8556c9736 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 SHA256 dbefba73ba46a51a252fe17dbd0530df9fcf613ea990bdfa75689151e24d9ef8 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545 WHIRLPOOL 1a6df92d61ac0d72ce04c0989377e63a08f995990abb0d7c6fbe876594bf005c6fc277d2fc63b54e5f1dafbf7c1d1740da263a6441fede72d13eb617fae4713b AUX freebsd-mk-defs-11.0-rename-libs.patch 478 SHA256 a776bf656af7c328d2cd02c13e95e2c869240476459d8129e0227254e79a0847 SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2 WHIRLPOOL 5e175ca3eba51680ae1fdd54dfe92eff92f83de4d9b589d7067e0cdd4480991b264da01a28f2a3e237cfe781332ca26e5bbc12f61c5fc9f8e90646a438df0a87 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch index 3724f13..e87bdba 100644 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch @@ -1,5 +1,5 @@ diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk -index 9fc6d8f..8ec6e9e 100644 +index 9f4ea2c..0f666bf 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -144,10 +144,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ @@ -16,7 +16,7 @@ index 9fc6d8f..8ec6e9e 100644 ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/ .endfor diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk -index 04a0621..45c059e 100644 +index bc123e1..4707b84 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -63,6 +63,7 @@ stage_as.${file:T}: ${file} @@ -41,7 +41,7 @@ index 04a0621..45c059e 100644 -m ${${group}MODE} ${.
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-libexec/, sys-freebsd/freebsd-share/, ...
commit: cfafb8814dc513b489fae5e17279fc85deb0502c Author: Yuta SATOH gmail com> AuthorDate: Fri Sep 30 11:40:31 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Fri Sep 30 11:40:31 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=cfafb881 sys-freebsd: remove unnecessary dodir. sys-freebsd/freebsd-bin/Manifest| 2 +- sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild | 5 - sys-freebsd/freebsd-libexec/Manifest| 2 +- sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild | 1 - sys-freebsd/freebsd-share/Manifest | 2 +- sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild | 5 - sys-freebsd/freebsd-ubin/Manifest | 2 +- sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild | 7 --- 8 files changed, 4 insertions(+), 22 deletions(-) diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest index a6b679b..44ba8a6 100644 --- a/sys-freebsd/freebsd-bin/Manifest +++ b/sys-freebsd/freebsd-bin/Manifest @@ -1,3 +1,3 @@ DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD freebsd-bin-11.0.ebuild 856 SHA256 f8c44aed715c9c9b7c480e4caac2bc94a547871263ace54ef072fb97029a8bcd SHA512 2c95a552d6f34af59b77827d809918ed33ea09a21b64b346204998c8469ffc9edaaf6577e523f6da022b60ed016ab433c4ac242057f449443a371234133572c7 WHIRLPOOL fe42160ffd45d14c3a6f30082cd1070b66aa28a3cd6da4abd23ab1e01f44a26ed48a62a6b4cd270cd6c437735320218a58706a0a49e7c426a72ee7a98360b6fc +EBUILD freebsd-bin-11.0.ebuild 800 SHA256 ccc8ba3dce3c251ccf7fbc468b803d41414968012808a89baa85fdffdf374dbf SHA512 7a0e427a5621bf195544cfeed199bf93c2f5d42bce139d31c5477019c2ee9c8e9cd1bcea41cb5b3cb10f972db89f29f4868c5c7687062d85a3d51051f72fe5fb WHIRLPOOL 8f64ea4813d9db4b379a53a1eaea8d1ff43a49a961a64e844bb30768029aec2b953b7c8afbbedd35451070b25322ff04dc0019524a2bbb3ffb6ee766aa53 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild index de7d832..d4bf7e3 100644 --- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild +++ b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild @@ -40,8 +40,3 @@ REMOVE_SUBDIRS="csh rmail ed freebsd-version" pkg_setup() { mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " } - -src_install() { - dodir /usr/bin - freebsd_src_install -} diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index 2614f53..003e2b2 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -11,5 +11,5 @@ AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802 DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD freebsd-libexec-11.0.ebuild 4170 SHA256 b04c061597f914a71485f4db5924749a8b994ac92051e419fa7b548d198b33ee SHA512 e27ee84be8ae03d171d6108e140bf8b7978cf57b197110810cc84ac82f532ce44eb33e6cf34b73b84c662433e03bf4cb075c4b976f90bb0cbd462f8642d7bd4a WHIRLPOOL 83877185944bc41f0e34a4952c62d290532c2b05a165523a91f737f5e6b9dd07544f5d44d712b08c2cd02721a0d27f3d8052655408a15f91701c81
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/
commit: f543070dcbaaf5f528c977fbfc556d74bf00f723 Author: Yuta SATOH gmail com> AuthorDate: Wed Sep 28 13:21:53 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Sep 28 13:21:53 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=f543070d sys-freebsd/freebsd-sources: drop ${PN}-7.1-types.h-fix.patch sys-freebsd/freebsd-sources/Manifest| 2 +- sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 0b85989..bfa922f 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -35,5 +35,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD freebsd-sources-11.0.ebuild 4601 SHA256 af3edc90e63ee4b85bef4a0013a2ac6e79d0de7912e4d589e246cc81f027a9cf SHA512 6be3622c25ef5da94b9892b344feb73e0a0a0c0bb1572ad43aa6e9bb333214d7d1989d10ba8c42376360280c5b3e2463e2a2bc9aa21635ee9e57ea0761b0084f WHIRLPOOL 7df8178938ca5bdfdff303e1b9c7e9730042ab6d7d08394a296e7713f586d2d21bac38adce4e05117729e71369d196ed27a4cfd9327e010cc214450ec3da891c +EBUILD freebsd-sources-11.0.ebuild 4558 SHA256 0888e4513ee7dbb559c674a28e55dd6ab1b460c20d66ec1ef24af74559ea93a5 SHA512 984343d5c15d000e291c2e7e84bda9a601bc80c1922cc73b3107e39e05a42cd34fde4b9901f653e3576e04c109bd8aa4dedb5fe01d1db4515b2e133966cecdb0 WHIRLPOOL 4f2750b3b03ad1f35f9b7a77a080cd7b280ceec9be21db0057dc4f54ff3c30fca07be67c13c4bb158f0266e916e8d9fc95a359af89ebfdb9b2c31f84f3d1bab3 MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild index 92cc495..eb1120d 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild @@ -47,7 +47,6 @@ KERN_BUILD=GENTOO PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-11.0-gentoo.patch" "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - "${FILESDIR}/${PN}-7.1-types.h-fix.patch" "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" "${FILESDIR}/${PN}-7.1-includes.patch" "${FILESDIR}/${PN}-9.0-sysctluint.patch"
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sbin/, sys-freebsd/boot0/, sys-freebsd/freebsd-lib/, ...
commit: ba4d00da5578f91b8b0fe5c4ef798d227d8751d4 Author: Yuta SATOH gmail com> AuthorDate: Wed Sep 28 12:24:44 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Sep 28 12:24:44 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=ba4d00da sys-freebsd: update Manifest sys-freebsd/boot0/Manifest | 11 sys-freebsd/freebsd-bin/Manifest | 3 +++ sys-freebsd/freebsd-cddl/Manifest| 16 sys-freebsd/freebsd-lib/Manifest | 43 sys-freebsd/freebsd-libexec/Manifest | 15 +++ sys-freebsd/freebsd-mk-defs/Manifest | 13 ++ sys-freebsd/freebsd-pam-modules/Manifest | 6 + sys-freebsd/freebsd-pf/Manifest | 16 sys-freebsd/freebsd-rescue/Manifest | 12 + sys-freebsd/freebsd-sbin/Manifest| 17 + sys-freebsd/freebsd-share/Manifest | 10 sys-freebsd/freebsd-sources/Manifest | 39 + sys-freebsd/freebsd-ubin/Manifest| 33 sys-freebsd/freebsd-usbin/Manifest | 33 14 files changed, 267 insertions(+) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest new file mode 100644 index 000..f3da9d2 --- /dev/null +++ b/sys-freebsd/boot0/Manifest @@ -0,0 +1,11 @@ +AUX boot0-10.1-drop-unsupport-cflags.patch 893 SHA256 7d58c67b73ed6ae7326b03e7a4c1204d17808328de0ac904973604658bc1804c SHA512 c4d441c9538489585f27f292fa0acd921496cdd10e06a7de45f4db7f6a6300f41401a387c9e65bf909790e7755fb92001131d668c6246a2505756b8e9e10eeea WHIRLPOOL 9ce41efe802fc181fac9026eb310d3d48173df7db585f4ddb5424ced43f5e7081a8baefc12370588ba2979e0ef6234fa5718457e3e854f66c7d1309778d863f4 +AUX boot0-10.1-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8 +AUX boot0-10.3-clang.patch 847 SHA256 6687fa92439ec0813a61221f5acfc6fe4588432c6660f9e6962437d2589f5a1c SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 WHIRLPOOL 3a299ffc554ad91a763a974268978755dc7819a6e4c21736efca6df1c0e5a95b07184103724634af3eb634fb2da77abb40d6bfb493cb6effb7463abe2c339905 +AUX boot0-10.3-drop-unsupport-cflags.patch 971 SHA256 26a7aef66e0b436201698f0df262d8af50061da203f90e1bc8babd79815f62b9 SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 WHIRLPOOL 6ff2f96c33857433ed3160241a7137aef9375d15533f7fd3db979ac8294ee28f21fc9e1c292450fac6a3dd515e86f5969b7b517d36636712ef921af5956faa0f +AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf00021ec7372829bec56d08ba4d83c SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a WHIRLPOOL cb83d397f0a1660b6ee0154b1c2d6e7807e2c6e61d92790e5be37233fa6f8bec3947f9c49d5046329486654a648e758f0e4d9f6d2ce7b2cf448c181059745281 +AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4 +AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 +AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe +DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 +EBUILD boot0-11.0.ebuild 1865
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/, sys-freebsd/freebsd-ubin/files/, ...
commit: 6eafa0eea6cf020bdb7a44c4b7295eade87cf2c4 Author: Yuta SATOH gmail com> AuthorDate: Wed Sep 28 12:23:34 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Sep 28 12:23:34 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6eafa0ee sys-freebsd: initial version of 11.0 sys-freebsd/boot0/boot0-11.0.ebuild| 14 +- sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild| 5 + .../files/freebsd-cddl-11.0-add-libs.patch | 87 ++ .../files/freebsd-cddl-11.0-workaround.patch | 12 + sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 16 +- .../files/freebsd-lib-11.0-bsdxml2expat.patch | 39 +++ .../files/freebsd-lib-11.0-liblink.patch | 62 .../files/freebsd-lib-11.0-libproc-libcxx.patch| 13 + .../files/freebsd-lib-11.0-libsysdecode.patch | 22 ++ .../files/freebsd-lib-11.0-workaround.patch| 12 + sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild| 33 +-- .../freebsd-libexec/freebsd-libexec-11.0.ebuild| 24 +- .../files/freebsd-mk-defs-11.0-gentoo.patch| 327 + .../freebsd-mk-defs-11.0-libproc-libcxx.patch | 13 + .../files/freebsd-mk-defs-11.0-rename-libs.patch | 16 + .../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild| 5 +- .../freebsd-pam-modules-11.0.ebuild| 2 - .../files/freebsd-pf-11.0-libevent.patch | 13 + .../freebsd-pf/files/freebsd-pf-11.0-pflogd.patch | 13 + sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 11 +- .../files/freebsd-rescue-11.0-rename-libs.patch| 22 ++ .../freebsd-rescue/freebsd-rescue-11.0.ebuild | 7 +- sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild | 3 +- .../freebsd-share/freebsd-share-11.0.ebuild| 10 +- .../files/freebsd-sources-11.0-gentoo-gcc.patch| 13 + .../files/freebsd-sources-11.0-gentoo.patch| 13 + .../freebsd-sources/freebsd-sources-11.0.ebuild| 22 +- .../files/freebsd-ubin-11.0-setXid.patch | 147 + sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild | 44 +-- .../files/freebsd-usbin-11.0-workaround.patch | 13 + .../freebsd-usbin/freebsd-usbin-11.0.ebuild| 10 +- 31 files changed, 955 insertions(+), 88 deletions(-) diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0.ebuild index 49521d0..01d8eb7 100644 --- a/sys-freebsd/boot0/boot0-11.0.ebuild +++ b/sys-freebsd/boot0/boot0-11.0.ebuild @@ -23,15 +23,12 @@ EXTRACTONLY=" RDEPEND="" DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-lib-${RV}*" + =sys-freebsd/freebsd-lib-${RV}* + !sparc-fbsd? ( sys-devel/clang )" S="${WORKDIR}/sys/boot" -PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch" - "${FILESDIR}/${PN}-10.3-clang.patch" - "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch" - "${FILESDIR}/${PN}-10.3-uefi-support.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) +PATCHES=( "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) boot0_use_enable() { use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" @@ -46,12 +43,15 @@ pkg_setup() { } src_prepare() { + use sparc-fbsd || export CC=clang + sed -e '/-mno-align-long-strings/d' \ -i "${S}"/i386/boot2/Makefile \ -i "${S}"/i386/gptboot/Makefile \ -i "${S}"/i386/gptzfsboot/Makefile \ -i "${S}"/i386/zfsboot/Makefile || die + mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes" export MAKEOBJDIRPREFIX="${WORKDIR}/build" } @@ -63,7 +63,7 @@ src_compile() { freebsd_src_compile CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" - LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" + LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand" export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" cd "${S}" || die diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild index d4bf7e3..de7d832 100644 --- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild +++ b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild @@ -40,3 +40,8 @@ REMOVE_SUBDIRS="csh rmail ed freebsd-version" pkg_setup() { mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " } + +src_install() { + dodir /usr/bin + freebsd_src_install +} diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch new file mode 100644 index 000..46f2521 --- /dev/null +++ b/sys-freebsd/freebsd-cddl/files/freebs
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 71c6af1834ace305d5bdc7de9baea656151e93c5 Author: Yuta SATOH gmail com> AuthorDate: Wed Sep 28 12:03:36 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Sep 28 12:03:36 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=71c6af18 eclass/freebsd.eclass: add Gentoo/FreeBSD 11.0 support. eclass/freebsd.eclass | 35 +++ 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 57f9d45..1e141da 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -80,7 +80,7 @@ if [[ ${MY_PV} != ** ]] && version_is_at_least 10.0 ${RV} ; then SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" fi -IUSE="profile" +IUSE="debug profile" #unalias -a alias install-info='/usr/bin/bsdinstall-info' @@ -187,7 +187,9 @@ freebsd_src_unpack() { dummy_mk ${REMOVE_SUBDIRS} freebsd_do_patches - freebsd_rename_libraries + if ! version_is_at_least 11.0 ${RV} ; then + freebsd_rename_libraries + fi # Starting from FreeBSD 9.2, its install command supports the -l option and # they now use it. Emulate it if we are on a system that does not have it. @@ -195,11 +197,25 @@ freebsd_src_unpack() { export INSTALL_LINK="ln -f" export INSTALL_SYMLINK="ln -fs" fi + if version_is_at_least 11.0 ${RV} ; then + export RSYMLINK=" -l s" + fi } freebsd_src_compile() { use profile && filter-flags "-fomit-frame-pointer" - use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + if version_is_at_least 11.0 ${RV} ; then + if ! use profile ; then + mymakeopts="${mymakeopts} MK_PROFILE=no " + fi + use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " + # Test does not support yet. + mymakeopts="${mymakeopts} MK_TESTS=no " + # Force set SRCTOP. + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + else + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + fi mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG=" @@ -260,7 +276,18 @@ freebsd_multilib_multibuild_wrapper() { } freebsd_src_install() { - use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + if version_is_at_least 11.0 ${RV} ; then + if ! use profile ; then + mymakeopts="${mymakeopts} MK_PROFILE=no " + fi + use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " + # Test does not support yet. + mymakeopts="${mymakeopts} MK_TESTS=no " + # Force set SRCTOP. + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + else + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + fi mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 9c7da84db91d7a65a9904fdb251a17ea5d61724a Author: Yuta SATOH gmail com> AuthorDate: Wed Sep 28 11:59:38 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Sep 28 11:59:38 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9c7da84d eclass/freebsd.eclass: import from latest tree eclass/freebsd.eclass | 270 ++ 1 file changed, 270 insertions(+) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass new file mode 100644 index 000..57f9d45 --- /dev/null +++ b/eclass/freebsd.eclass @@ -0,0 +1,270 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# +# @MAINTAINER: +# maintainer-nee...@gentoo.org +# @AUTHOR: +# Diego Pettenò <flamee...@gentoo.org> + +inherit versionator eutils flag-o-matic bsdmk + +# Drop patch level from ${PV} +MY_PV=${PV/_p*} +PLEVEL=${PV##*_p} + +LICENSE="BSD" +HOMEPAGE="http://www.freebsd.org/; + +# Define global package names +LIB="freebsd-lib-${PV}" +BIN="freebsd-bin-${PV}" +CONTRIB="freebsd-contrib-${PV}" +SHARE="freebsd-share-${PV}" +UBIN="freebsd-ubin-${PV}" +USBIN="freebsd-usbin-${PV}" +CRYPTO="freebsd-crypto-${PV}" +LIBEXEC="freebsd-libexec-${PV}" +SBIN="freebsd-sbin-${PV}" +GNU="freebsd-gnu-${PV}" +ETC="freebsd-etc-${PV}" +SYS="freebsd-sys-${PV}" +INCLUDE="freebsd-include-${PV}" +RESCUE="freebsd-rescue-${PV}" +CDDL="freebsd-cddl-${PV}" +SECURE="freebsd-secure-${PV}" + +# Release version (5.3, 5.4, 6.0, etc) +RV="$(get_version_component_range 1-2 ${MY_PV})" + +# SVN ebuild support. +# 9.1.0. --> release/9.1.0 +# 9.1. --> releng/9.1 +# 9. --> stable/9 +# -->head +# +# svn revision can be specified by patch level: +# freebsd-lib-9._p247000 --> set svn -r 247000 + +if [[ ${MY_PV} == ** ]]; then + inherit subversion + + # Set SVN revision using patch level. + [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}" + + case ${MY_PV%.} in + *.*.*) BRANCH="release";; + *.*)BRANCH="releng" ;; + ) BRANCH="head" ;; + *) BRANCH="stable" ;; + esac + + if [[ ${BRANCH} == head ]] ; then + SVN_SUB_URI="${BRANCH}" + else + SVN_SUB_URI="${BRANCH}/${MY_PV%.}" + fi + + ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" + ESVN_PROJECT="freebsd-${BRANCH}" +fi + +# use the original source code. +if [[ ${MY_PV} != ** ]] && version_is_at_least 10.0 ${RV} ; then + DL_PV=${MY_PV/_rc/-RC} + DL_PV=${DL_PV/_beta/-BETA} + DL_PV=${DL_PV/_alpha/-ALPHA} + if [[ ${DL_PV} == ${MY_PV} ]]; then + DL_PV="${DL_PV}-RELEASE" + fi + SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" +fi + +IUSE="profile" + +#unalias -a +alias install-info='/usr/bin/bsdinstall-info' + +EXPORT_FUNCTIONS src_compile src_install src_unpack + +# doperiodic ... +doperiodic() { + local kind=$1 + shift + + ( # dont want to pollute calling env + insinto /etc/periodic/${kind} + insopts -m 0755 + doins "$@" + ) +} + +freebsd_get_bmake() { + local bmake + bmake=$(get_bmake) + [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" + + echo "${bmake}" +} + +# Generates a patch SRC_URI or DISTDIR of upstream. +freebsd_upstream_patches() { + local opt=$1 + [[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1 + for x in "${UPSTREAM_PATCHES[@]}" + do + local out=${PN}-${x/\//-} + out=${out/:/} + if [[ ${opt} == -s ]] ; then + echo "${DISTDIR}/${out}" + else + echo "https://security.freebsd.org/patches/${x} -> ${out}" + fi + done +} + +freebsd_do_patches() { + if [[ ${#PATCHES[@]} -gt 1 ]] ; then + for x in "${PATCHES[@]}"; do + epatch "${x}" + done + else + for x in ${PATCHES} ; do + epatch "${x}" + done + fi + [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch $(freebsd_upstream_patches -s) + epatch_user +} + +freebsd_rename_libraries() { + ebegin "Renaming libraries" + # We don't use libter
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 2c6a351bbbfcf1dc2fe2ec15fd6585fe5042d926 Author: Yuta SATOH gmail com> AuthorDate: Fri Aug 12 10:47:08 2016 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Fri Aug 12 10:47:08 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=2c6a351b automatic_updater.sh: fix bug 564168. scripts/automatic_updater.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index ae15942..3f1b639 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -46,6 +46,11 @@ update_minimal(){ emerge --nodeps sys-freebsd/freebsd-mk-defs emerge -u 'https://bugs.gentoo.org/564168 + USE="-*" emerge --nodeps sys-devel/gettext --exclude sys-freebsd/* + emerge sys-devel/gettext --exclude sys-freebsd/* + emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/* emerge sys-devel/libtool --exclude sys-freebsd/* if [[ -e /usr/lib/libc++.so ]] ; then
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/grub2-bhyve/
commit: e4b51765a5a7df70ceb1094cfff9941b28128a8a Author: Yuta SATOH gentoo gr jp> AuthorDate: Wed Oct 7 11:17:11 2015 + Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Oct 7 11:17:11 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=e4b51765 sys-freebsd/grub2-bhyve: version bump. sys-freebsd/grub2-bhyve/Manifest| 6 -- sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild | 2 +- .../{grub2-bhyve-0.30.ebuild => grub2-bhyve-0.40.ebuild}| 2 +- sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys-freebsd/grub2-bhyve/Manifest b/sys-freebsd/grub2-bhyve/Manifest index 2967516..4f7df96 100644 --- a/sys-freebsd/grub2-bhyve/Manifest +++ b/sys-freebsd/grub2-bhyve/Manifest @@ -1,4 +1,6 @@ DIST grub2-bhyve-0.30.tar.gz 8383110 SHA256 d854538b71ce1b964daf4aed141bfcb024c30a245b3bb88d0266420a0c34246d SHA512 8cf810e97d10a4ca494bc55acebd44c216dce5fafa2b83b263157517f354134472a811d6d381a583173e4f7192b30e93397c0f573fca3ad802945c5f4a4e WHIRLPOOL f77985b7ed28d8276c5e63979f5050d72b9f8eadee838e4ee077b45dbfdc3ea40fe05463b000a3e89304e9ccf743a8d05990e9920ce9aafbb316ff410ed1b7c9 -EBUILD grub2-bhyve-0.30.ebuild 1040 SHA256 08fb91e15a1e03eb45239afa6d443be5c507b99f3002e8f935a0ee4a32ccef25 SHA512 75a0b79bc67ef4b724503b7c11bfbb72008b051d7c8ce35f22cdebbd2f9d65731cb0b58f8610351cae4e34410137a86755778217bc8ba5c059731248e14c WHIRLPOOL e68104e7f4bf732bad311aa2eecac8328be1a0798e7f604c9a9bdeb77d5bec650b4e987e56779e11e2da2d5fa251e0bd1202ef278ff13ff31409e9500e32e5c6 -EBUILD grub2-bhyve-.ebuild 1040 SHA256 08fb91e15a1e03eb45239afa6d443be5c507b99f3002e8f935a0ee4a32ccef25 SHA512 75a0b79bc67ef4b724503b7c11bfbb72008b051d7c8ce35f22cdebbd2f9d65731cb0b58f8610351cae4e34410137a86755778217bc8ba5c059731248e14c WHIRLPOOL e68104e7f4bf732bad311aa2eecac8328be1a0798e7f604c9a9bdeb77d5bec650b4e987e56779e11e2da2d5fa251e0bd1202ef278ff13ff31409e9500e32e5c6 +DIST grub2-bhyve-0.40.tar.gz 8380492 SHA256 7cf3547d816e925f53b0790abd4633da72126d8271ae210d0f348ad63f4f6d34 SHA512 f176d1a8ccae535f037d6370345215a0b6decfdde913d58ff02b7dd85b0c5966d32ff87b4305bcbd3b8529c9df5e69b3c7d53cbb6480e166e7783a83009c0219 WHIRLPOOL 6bed4f2d5498efa66239a7eb8ff203d99e8fa47f2f52883abd73dc5d3547abe35bbcae1c71ba42343ae02104a0630310711a08f7e41feca871a1b2d59892d901 +EBUILD grub2-bhyve-0.30.ebuild 1034 SHA256 8dfa0fdb6f4d32f6ba52be2f7dd290f7447b2a82fc9acd967d6c86613aff297b SHA512 d15b5478216d2c3565d8c8e32bd02d2d958b56ada3d14bc92f63b67a8e30e29ec5a46fd7c767969b3454d83ab09150a5315a03b62d1d3d9bc6dc496b293bbd60 WHIRLPOOL f7634e90209890501bf2ffbf0e5e8423a5bf849c87a4196312a6341fe0c7030134e395b3a101972021d3775fe744507d511918f7509b6bdef99b54b57796c9d8 +EBUILD grub2-bhyve-0.40.ebuild 1034 SHA256 8dfa0fdb6f4d32f6ba52be2f7dd290f7447b2a82fc9acd967d6c86613aff297b SHA512 d15b5478216d2c3565d8c8e32bd02d2d958b56ada3d14bc92f63b67a8e30e29ec5a46fd7c767969b3454d83ab09150a5315a03b62d1d3d9bc6dc496b293bbd60 WHIRLPOOL f7634e90209890501bf2ffbf0e5e8423a5bf849c87a4196312a6341fe0c7030134e395b3a101972021d3775fe744507d511918f7509b6bdef99b54b57796c9d8 +EBUILD grub2-bhyve-.ebuild 1034 SHA256 8dfa0fdb6f4d32f6ba52be2f7dd290f7447b2a82fc9acd967d6c86613aff297b SHA512 d15b5478216d2c3565d8c8e32bd02d2d958b56ada3d14bc92f63b67a8e30e29ec5a46fd7c767969b3454d83ab09150a5315a03b62d1d3d9bc6dc496b293bbd60 WHIRLPOOL f7634e90209890501bf2ffbf0e5e8423a5bf849c87a4196312a6341fe0c7030134e395b3a101972021d3775fe744507d511918f7509b6bdef99b54b57796c9d8 MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild index 43dcd87..f3abd94 100644 --- a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild +++ b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.40.ebuild similarity index 98% copy from sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild copy to sys-freebsd/grub2-bhyve/grub2-bhyve-0.40.ebuild index 43dcd87..f3abd94 100644 --- a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild +++ b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.40.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" diff --git a/
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 88393869d5034e779bc3b9c8ca16d3f232cd42e1 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Aug 22 12:18:42 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Aug 22 12:18:42 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=88393869 automatic_updater.sh: support FreeBSD 10.2 amd64/clang environment. scripts/automatic_updater.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 4d620d6..3749286 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -94,15 +94,15 @@ update_freebsd_userland(){ fi emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd : - CC=gcc CXX=g++ emerge --nodeps sys-freebsd/freebsd-libexec - CC=gcc CXX=g++ USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib + CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe emerge --nodeps sys-freebsd/freebsd-libexec + CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib + CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe USE=build emerge --nodeps sys-freebsd/freebsd-share + [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask + + CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin if [[ -e /usr/lib/libc++.so ]] ; then emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* fi - USE=build emerge --nodeps sys-freebsd/freebsd-share - [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask - - emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin }
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 9fe2f7f34c896fad111c7f05ae29d7bd840f7176 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Aug 22 22:57:44 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Aug 22 22:57:44 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9fe2f7f3 automatic_updater.sh: Set the correct TARGETVER in set_profile. scripts/automatic_updater.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 3749286..0ab1f22 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -15,9 +15,9 @@ fi set_profile(){ emerge --info | head -n 1 | grep clang : if [[ $? -eq 0 ]] ; then - eselect profile set $(eselect profile list | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + eselect profile set $(eselect profile list | grep ${TARGETVER} | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) else - eselect profile set $(eselect profile list | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + eselect profile set $(eselect profile list | grep ${TARGETVER} | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) fi }
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 43bf434fa63c2519ef291163a9ee3144d0fe556d Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Fri Aug 21 12:43:22 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Fri Aug 21 12:43:22 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=43bf434f automatic_updater.sh: added MAKEOPTS=-j1 and force set gcc to CC,CXX. scripts/automatic_updater.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 258424c..4d620d6 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -94,8 +94,8 @@ update_freebsd_userland(){ fi emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd : - emerge --nodeps sys-freebsd/freebsd-libexec - USE=build emerge --nodeps sys-freebsd/freebsd-lib + CC=gcc CXX=g++ emerge --nodeps sys-freebsd/freebsd-libexec + CC=gcc CXX=g++ USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib if [[ -e /usr/lib/libc++.so ]] ; then emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* fi
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/, sys-freebsd/freebsd-cddl/, ...
commit: ef7257367ef7766dba0311ba02330896675206ee Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Aug 15 00:46:27 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Aug 15 00:46:27 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=ef725736 Replace Header. sys-freebsd/boot0/boot0-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-rescue/freebsd-rescue-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-sbin/freebsd-sbin-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-share/freebsd-share-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-sources/freebsd-sources-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-ubin/freebsd-ubin-10.2_beta1.ebuild | 2 +- sys-freebsd/freebsd-usbin/freebsd-usbin-10.2_beta1.ebuild | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys-freebsd/boot0/boot0-10.2_beta1.ebuild b/sys-freebsd/boot0/boot0-10.2_beta1.ebuild index f2e8018..ad1175e 100644 --- a/sys-freebsd/boot0/boot0-10.2_beta1.ebuild +++ b/sys-freebsd/boot0/boot0-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild index a2ef986..31f008b 100644 --- a/sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild index 493db51..9dcfe3c 100644 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild index a77f94c..4d91673 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild index bb8e70a..cf509b2 100644 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild index f8fdcb8..1dc6575 100644 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild index 75a4710..9b3f992 100644 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild index eb65961..237bb73 100644 --- a/sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild +++ b/sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: ac58cf04623d1dd665422cb150207af366c75f52 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Aug 15 00:46:58 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Aug 15 00:46:58 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=ac58cf04 automatic_updater.sh: added --nodeps scripts/automatic_updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh old mode 100644 new mode 100755 index c0663b2..258424c --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -46,7 +46,7 @@ update_portage(){ } update_minimal(){ - emerge sys-freebsd/freebsd-mk-defs + emerge --nodeps sys-freebsd/freebsd-mk-defs emerge -u sys-apps/findutils --exclude sys-freebsd/* emerge sys-devel/libtool --exclude sys-freebsd/* emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/
commit: 88f0bf68f07002749bedce5a79189014405949e6 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 26 00:05:18 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 26 00:05:18 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=88f0bf68 boot0-10.2_beta1: synced main tree. sys-freebsd/boot0/Manifest| 2 +- sys-freebsd/boot0/boot0-10.2_beta1.ebuild | 6 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index 8b4c919..281a50a 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -4,5 +4,5 @@ AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1a AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b -EBUILD boot0-10.2_beta1.ebuild 2147 SHA256 5833cf7f377c1c5c7ce5b98b31efe95366c6aa74af0a5515b7851ef90640f34e SHA512 45063fb49e2c77b40148c4c36e4b1d1685548a5bc826078e8594bc0e4d28e7c8d76412de0600967c8f8c227f5de656c76581ded45ded956c9cda4782128f3c32 WHIRLPOOL f9207d5dfd3d885a37d57444355a6a9af168e4080ed1ae0834638dc2a88cc04c2cf8466aea03f94bf314a2905875120a031826f11f51b30fedea3e980aa4f12b +EBUILD boot0-10.2_beta1.ebuild 2114 SHA256 b21f575403fa249f5aa173d5775b6cfcdd89676656e531f2be4ab96428a9dde2 SHA512 290d71d57e1e997f2594a9ba1caaa88d76d33cf7974b92a3dd6bc452b6350cdb0dccde65b399b80f90fab0b6f71376f1537b96dca4b522551b7ca32b3dc2 WHIRLPOOL 0fd915db36574bb05538e9f0aaf92df40eb1cbe5440ba35a63f830358790b895aaa4f25cdd1dc17681a8b3e6f4502fc6ab14e7d46e4105f06bd367fd0a3a25e6 MISC metadata.xml 295 SHA256 922f6d4e646895d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9 diff --git a/sys-freebsd/boot0/boot0-10.2_beta1.ebuild b/sys-freebsd/boot0/boot0-10.2_beta1.ebuild index e5d4302..f2e8018 100644 --- a/sys-freebsd/boot0/boot0-10.2_beta1.ebuild +++ b/sys-freebsd/boot0/boot0-10.2_beta1.ebuild @@ -62,10 +62,8 @@ src_compile() { freebsd_src_compile fi - if ! use sparc-fbsd; then - cd ${S}/libstand32 || die - freebsd_src_compile - fi + cd ${S}/libstand32 || die + freebsd_src_compile # bug542676 if [[ $(tc-getCC) == *clang* ]]; then
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 9dcce70dac259f3f85b3fe0ac1c7224eb70334db Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Jul 13 12:40:25 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Mon Jul 13 12:40:25 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9dcce70d automatic_updater.sh: libcxxrt -- libcxx scripts/automatic_updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 608b013..c0663b2 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -57,7 +57,7 @@ update_minimal(){ echo sys-libs/libcxx abi_x86_32 /etc/portage/profile/package.use.mask echo sys-libs/libcxxrt abi_x86_32 /etc/portage/profile/package.use.mask emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* - [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask + [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-libs\/libcxx abi_x86_32/d' /etc/portage/profile/package.use.mask [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask fi fi
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: e0c4ab39a29316aa8503673f8db4bb0a9b15dbd9 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Jul 13 12:36:53 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Mon Jul 13 12:36:53 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=e0c4ab39 automatic_updater.sh: fixed perl issue, amd64/clang profile support. scripts/automatic_updater.sh | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 358c168..608b013 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -40,7 +40,6 @@ update_portage(){ tar xjf portage-2.2.20.tar.bz2 PYTHON_TARGETS=python2_7 portage-2.2.20/bin/emerge --nodeps dev-lang/python-exec PYTHON_TARGETS=python2_7 portage-2.2.20/bin/emerge --nodeps sys-apps/portage - emerge -u sys-apps/portage --exclude sys-freebsd/* else emerge -u sys-apps/portage --exclude sys-freebsd/* fi @@ -53,7 +52,14 @@ update_minimal(){ emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/* emerge sys-devel/libtool --exclude sys-freebsd/* if [[ -e /usr/lib/libc++.so ]] ; then - emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + if [[ $(uname -p) == amd64 ]] [[ ! -e /usr/lib32/librt.so ]] ; then + [[ ! -e /etc/portage/profile ]] mkdir -p /etc/portage/profile + echo sys-libs/libcxx abi_x86_32 /etc/portage/profile/package.use.mask + echo sys-libs/libcxxrt abi_x86_32 /etc/portage/profile/package.use.mask + emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask + [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask + fi fi } @@ -90,6 +96,9 @@ update_freebsd_userland(){ emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd : emerge --nodeps sys-freebsd/freebsd-libexec USE=build emerge --nodeps sys-freebsd/freebsd-lib + if [[ -e /usr/lib/libc++.so ]] ; then + emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + fi USE=build emerge --nodeps sys-freebsd/freebsd-share [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask @@ -104,12 +113,14 @@ post_freebsd_userland(){ remove_perl(){ emerge -C dev-lang/perl - emerge -C perl-core/* virtual/perl* + emerge -C dev-perl/* perl-core/* virtual/perl* emerge dev-lang/perl + emerge dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth dev-perl/XML-Parser dev-perl/libintl-perl } emerge_world(){ emerge sys-devel/libtool + emerge -C dev-lang/python:3.2 : emerge -u dev-libs/libxml2 emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib emerge -e @world --exclude sys-apps/portage
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 3e4b2faf25edc29cd6194fbb202b5e1271d9e856 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Jul 13 12:38:31 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Mon Jul 13 12:38:31 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3e4b2faf create_forcestage3.sh: fixed some issues. tested amd64/10.1, amd64/10.1/clang, x86/10.1. scripts/mkstages/create_forcestage3.sh | 26 ++ 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh index 515aae2..e0aff8c 100644 --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -14,6 +14,15 @@ prepare(){ local distdir=$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 's:::g') if [[ ! -d ${WORKDIR} ]]; then mkdir -p ${WORKDIR} + else + echo ${WORKDIR} exists. + echo Please remove the following steps. + echo + echo kill -9 $(ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs) + echo umount $(mount | grep ${WORKDIR} | awk '{print $3}' | xargs) + echo umount $(mount | grep ${WORKDIR} | awk '{print $3}' | xargs) + echo chflags -R noschg \${WORKDIR}\ rm -rf \${WORKDIR}\ + exit 1 fi if [[ ${OLDSTAGE3} =~ ^http ]]; then @@ -56,6 +65,9 @@ chroot_update(){ export EMERGE_DEFAULT_OPTS=-q chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} kernel chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} freebsd_userland + if [[ -e ${WORKDIR}/usr/bin/git ]]; then + chroot ${WORKDIR} emerge -C dev-vcs/git + fi REMOVEPERL=1 chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} world unset EMERGE_DEFAULT_OPTS } @@ -74,8 +86,13 @@ check_ecompressdir() { } cleanup(){ + local distdir=$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 's:::g') + check_ecompressdir - umount ${WORKDIR}/usr/portage/distfiles + if [[ ! ${distdir} =~ ${PORTDIR}.* ]]; then + echo unmount DISTDIR + umount ${WORKDIR}/usr/portage/distfiles + fi umount ${WORKDIR}/usr/portage if [[ ${TMPFS} -ne 0 ]] ; then umount ${WORKDIR}/var/tmp/portage @@ -91,12 +108,13 @@ create_stage3(){ mkdir -p /var/tmp/catalyst/builds/default fi if [[ ${CLANG} -ne 0 ]]; then - tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3-cl + tarfile=stage3-${TARGETARCH}-fbsd-${TARGETVER}-forcestage3-cl else - tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3 + tarfile=stage3-${TARGETARCH}-fbsd-${TARGETVER}-forcestage3 fi - tar cjpf /var/tmp/catalyst/builds/default/${tarfile}.tar.bz2 . + echo Compress with tar. + LANG=en_US.UTF-8 tar cjpf /var/tmp/catalyst/builds/default/${tarfile}.tar.bz2 . echo Complete ! echo Set FORCESTAGE3=${tarfile}
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 3d0f050caab91226fe78eff4665c0b7c627e8dab Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 07:55:50 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 07:55:50 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3d0f050c create_forcestage3.sh: added /tmp. scripts/mkstages/create_forcestage3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh index e30be09..4edead8 100644 --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -17,7 +17,7 @@ prepare(){ fi if [[ ${OLDSTAGE3} =~ ^http ]]; then - if [[ ! -e $(basename ${OLDSTAGE3}) ]]; then + if [[ ! -e /tmp/$(basename ${OLDSTAGE3}) ]]; then wget -P /tmp ${OLDSTAGE3} fi else
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: c9569c32c6d042965fa18ac92eb2e03825136941 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 07:35:03 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 07:35:03 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=c9569c32 automatic_updater.sh: binutils rebuild with lastest gcc. scripts/automatic_updater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 9585af5..d6bcf60 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -70,6 +70,7 @@ update_gcc(){ env-update source /etc/profile emerge sys-devel/libtool --exclude sys-freebsd/* + emerge sys-devel/binutils --exclude sys-freebsd/* } update_kernel(){
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 6787623dbab83d53099569bdd0152e5ebf29755e Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 14:08:47 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 14:08:47 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6787623d automatic_updater.sh: remove all perl. scripts/automatic_updater.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 31c5528..ff13ceb 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -102,8 +102,9 @@ post_freebsd_userland(){ } emerge_world(){ - emerge -uD dev-lang/perl - perl-cleaner --all + emerge -C dev-lang/perl + emerge -C perl-core/* virtual/perl* + emerge dev-lang/perl emerge sys-devel/libtool emerge -u dev-libs/libxml2 emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 02f6bb63dd00fdd5181b885746f8bbf9e2abc7b5 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 07:49:47 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 07:49:47 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=02f6bb63 create_forcestage3.sh: added check OLDSTAGE3 file exists. scripts/mkstages/create_forcestage3.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh index 0d8954e..e30be09 100644 --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -17,7 +17,9 @@ prepare(){ fi if [[ ${OLDSTAGE3} =~ ^http ]]; then - wget -P /tmp ${OLDSTAGE3} + if [[ ! -e $(basename ${OLDSTAGE3}) ]]; then + wget -P /tmp ${OLDSTAGE3} + fi else cp ${OLDSTAGE3} /tmp fi
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: f61fe5bb3edcfd2855127dbed5a2b12bedd66f1b Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 12:09:01 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 12:09:01 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=f61fe5bb automatic_updater.sh: added -D option scripts/automatic_updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index de9ca0e..31c5528 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -102,7 +102,7 @@ post_freebsd_userland(){ } emerge_world(){ - emerge -u dev-lang/perl + emerge -uD dev-lang/perl perl-cleaner --all emerge sys-devel/libtool emerge -u dev-libs/libxml2
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/specs/x86-fbsd/, scripts/mkstages/specs/amd64-fbsd/, ...
commit: 9aa54a1de7d1aa0b1d16e92087d574204de77996 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 09:03:59 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 09:03:59 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9aa54a1d added catalyst sample specs. scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec | 9 + scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec | 9 + scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec | 9 + scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec | 9 + scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec | 8 scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec | 8 scripts/mkstages/specs/amd64-fbsd/stage1.spec | 8 scripts/mkstages/specs/amd64-fbsd/stage1_tmp.spec | 8 scripts/mkstages/specs/amd64-fbsd/stage2.spec | 8 scripts/mkstages/specs/amd64-fbsd/stage2_tmp.spec | 8 scripts/mkstages/specs/amd64-fbsd/stage3.spec | 7 +++ scripts/mkstages/specs/amd64-fbsd/stage3_tmp.spec | 7 +++ scripts/mkstages/specs/x86-fbsd/stage1.spec | 8 scripts/mkstages/specs/x86-fbsd/stage1_tmp.spec | 8 scripts/mkstages/specs/x86-fbsd/stage2.spec | 8 scripts/mkstages/specs/x86-fbsd/stage2_tmp.spec | 8 scripts/mkstages/specs/x86-fbsd/stage3.spec | 7 +++ scripts/mkstages/specs/x86-fbsd/stage3_tmp.spec | 7 +++ 18 files changed, 144 insertions(+) diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec new file mode 100644 index 000..2adc441 --- /dev/null +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec @@ -0,0 +1,9 @@ +chost: x86_64-gentoo-freebsd10.1 +cxxflags: -stdlib=libc++ ${CFLAGS} +target: stage1 +version_stamp: fbsd-10.1-20150712-cl +profile: default/bsd/fbsd/amd64/10.1/clang +snapshot: 20150712 +source_subpath: default/stage3-amd64-fbsd-10.1-20150712-clt +subarch: amd64 +rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec new file mode 100644 index 000..c780435 --- /dev/null +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec @@ -0,0 +1,9 @@ +chost: x86_64-gentoo-freebsd10.1 +cxxflags: -stdlib=libc++ ${CFLAGS} +target: stage1 +version_stamp: fbsd-10.1-20150712-clt +profile: default/bsd/fbsd/amd64/10.1/clang +snapshot: 20150712 +source_subpath: default/stage3-amd64-fbsd-10.1-forcestage3-cl +subarch: amd64 +rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec new file mode 100644 index 000..1de9e13 --- /dev/null +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec @@ -0,0 +1,9 @@ +chost: x86_64-gentoo-freebsd10.1 +cxxflags: -stdlib=libc++ ${CFLAGS} +target: stage2 +version_stamp: fbsd-10.1-20150712-cl +profile: default/bsd/fbsd/amd64/10.1/clang +snapshot: 20150712 +source_subpath: default/stage1-amd64-fbsd-10.1-20150712-cl +subarch: amd64 +rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec new file mode 100644 index 000..73ff50f --- /dev/null +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec @@ -0,0 +1,9 @@ +chost: x86_64-gentoo-freebsd10.1 +cxxflags: -stdlib=libc++ ${CFLAGS} +target: stage2 +version_stamp: fbsd-10.1-20150712-clt +profile: default/bsd/fbsd/amd64/10.1/clang +snapshot: 20150712 +source_subpath: default/stage1-amd64-fbsd-10.1-20150712-clt +subarch: amd64 +rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec new file mode 100644 index 000..d5e1fd8 --- /dev/null +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec @@ -0,0 +1,8 @@ +cxxflags: -stdlib=libc++ ${CFLAGS} +target: stage3 +version_stamp: fbsd-10.1-20150712-cl +profile: default/bsd/fbsd/amd64/10.1/clang +snapshot: 20150712 +source_subpath: default/stage2-amd64-fbsd-10.1-20150712-cl +subarch: amd64 +rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec b/scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec new file mode 100644 index 000..8550390 --- /dev/null +++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec @@ -0,0 +1,8 @@ +cxxflags: -stdlib=libc++ ${CFLAGS} +target: stage3 +version_stamp: fbsd-10.1-20150712-clt +profile: default/bsd/fbsd/amd64/10.1/clang +snapshot: 20150712 +source_subpath: default/stage2-amd64-fbsd-10.1-20150712-clt +subarch: amd64 +rel_type: default diff --git a/scripts/mkstages/specs/amd64-fbsd/stage1.spec b/scripts/mkstages/specs/amd64-fbsd/stage1.spec new file mode 100644 index 000..dcb7c22
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 15ec8adb0366f4200bdbe2281e159601d53a9a13 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 10:52:08 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 10:52:08 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=15ec8adb automatic_updater.sh: added perl-cleaner --all scripts/automatic_updater.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index d6bcf60..de9ca0e 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -102,6 +102,8 @@ post_freebsd_userland(){ } emerge_world(){ + emerge -u dev-lang/perl + perl-cleaner --all emerge sys-devel/libtool emerge -u dev-libs/libxml2 emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/, scripts/mkstages/
commit: 977ae16d2bd91209bf3193672aacdb69a26ef51f Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 14:41:38 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 14:41:38 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=977ae16d automatic_updater.sh, create_forcestage3.sh: added REMOVEPERL flag. scripts/automatic_updater.sh | 7 ++- scripts/mkstages/create_forcestage3.sh | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index ff13ceb..c9766ab 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -1,5 +1,6 @@ #/bin/bash set -eu +REMOVEPERL=${REMOVEPERL:-0} if [[ $# -ne 2 ]] ; then echo need 2 argument @@ -101,10 +102,13 @@ post_freebsd_userland(){ emerge sys-apps/portage } -emerge_world(){ +remove_perl(){ emerge -C dev-lang/perl emerge -C perl-core/* virtual/perl* emerge dev-lang/perl +} + +emerge_world(){ emerge sys-devel/libtool emerge -u dev-libs/libxml2 emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib @@ -132,6 +136,7 @@ case $TARGETMODE in post_freebsd_userland ;; world ) + [[ ${REMOVEPERL} -ne 0 ]] removeperl emerge_world cleanup ;; diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh index 4edead8..515aae2 100644 --- a/scripts/mkstages/create_forcestage3.sh +++ b/scripts/mkstages/create_forcestage3.sh @@ -53,16 +53,16 @@ chroot_update(){ echo MAKEOPTS=\-j$(sysctl hw.ncpu | awk '{ print $2 + 1 }')\ ${makeconf} echo 'USE=${USE} -fortran -build-kernel' ${makeconf} - export EMERGE_DEFAULT_OPTS=-q + export EMERGE_DEFAULT_OPTS=-q chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} kernel chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} freebsd_userland - chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} world + REMOVEPERL=1 chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} world unset EMERGE_DEFAULT_OPTS } check_ecompressdir() { # dirty solution - # /dev is still mounted; performing auto-bind-umount... + # /dev is still mounted; performing auto-bind-umount... local PID=$(ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs) if [[ -n ${PID} ]] ; then echo kill ecompressdir
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 765e6fa1f5ff636f78423f8968c7637ce8c5f7a5 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 15:58:22 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 15:58:22 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=765e6fa1 automatic_updater.sh: added _ scripts/automatic_updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index c9766ab..358c168 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -136,7 +136,7 @@ case $TARGETMODE in post_freebsd_userland ;; world ) - [[ ${REMOVEPERL} -ne 0 ]] removeperl + [[ ${REMOVEPERL} -ne 0 ]] remove_perl emerge_world cleanup ;;
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: e88134b0d8b010d1d268c477a4bc504fb785eefb Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Jul 11 11:17:17 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Jul 11 11:17:17 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=e88134b0 added sample script to automatic update. scripts/automatic_updater.sh | 136 +++ 1 file changed, 136 insertions(+) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh new file mode 100644 index 000..0fd381b --- /dev/null +++ b/scripts/automatic_updater.sh @@ -0,0 +1,136 @@ +#/bin/bash +set -eu + +if [[ $# -ne 2 ]] ; then + echo need 2 argument + echo arg 1: TARGETVER + echo arg 2: TARGETMODE, Please set kernel, freebsd_userland, world. + exit 1 +else + TARGETVER=$1 + TARGETMODE=$2 +fi + +set_profile(){ + emerge --info | head -n 1 | grep clang : + if [[ $? -eq 0 ]] ; then + eselect profile set $(eselect profile list | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + else + eselect profile set $(eselect profile list | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + fi +} + +move_makeconf(){ + [[ ! -e /etc/portage ]] mkdir -p /etc/portage + if [[ -e /etc/make.conf ]] [[ ! -e /etc/portage/make.conf ]] ; then + mv /etc/make.conf /etc/portage/make.conf + fi + gsed -i '/LDFLAGS=/d' /etc/portage/make.conf +} + +update_portage(){ + emerge -p --nodeps dev-lang/python-exec : + if [[ $? -eq 0 ]] ; then + emerge --nodeps dev-lang/python-exec + fi + if [[ ! -e /usr/lib/python-exec ]] ; then + cd /tmp + wget http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.20.tar.bz2 + tar xjf portage-2.2.20.tar.bz2 + PYTHON_TARGETS=python2_7 portage-2.2.20/bin/emerge --nodeps dev-lang/python-exec + PYTHON_TARGETS=python2_7 portage-2.2.20/bin/emerge --nodeps sys-apps/portage + emerge -u sys-apps/portage --exclude sys-freebsd/* + else + emerge -u sys-apps/portage --exclude sys-freebsd/* + fi +} + +update_minimal(){ + emerge sys-freebsd/freebsd-mk-defs + emerge -u sys-apps/findutils --exclude sys-freebsd/* + emerge sys-devel/libtool --exclude sys-freebsd/* + emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/* + emerge sys-devel/libtool --exclude sys-freebsd/* + if [[ -e /usr/lib/libc++.so ]] ; then + emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + fi +} + +update_gcc(){ + if [[ $(uname -p) == amd64 ]] ; then + gsed -i s:CHOST=.*:CHOST=\x86_64-gentoo-freebsd${TARGETVER}\:g /etc/portage/make.conf + else + gsed -i s:CHOST=.*:CHOST=\i686-gentoo-freebsd${TARGETVER}\:g /etc/portage/make.conf + fi + emerge -u sys-devel/binutils --exclude sys-freebsd/* + emerge -u sys-devel/gcc-config --exclude sys-freebsd/* + emerge -u sys-devel/gcc --exclude sys-freebsd/* +# gcc-config $(gcc-config -l | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + emerge -C \$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') : + env-update + source /etc/profile + emerge sys-devel/libtool --exclude sys-freebsd/* +} + +update_kernel(){ + emerge -C freebsd-sources sys-freebsd/virtio-kmod sys-fs/fuse4bsd : + emerge --nodeps freebsd-sources + echo Don't have a problem? Now we restart. + echo shutdown -r now +} + +update_freebsd_userland(){ + 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 + + emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd : + emerge --nodeps sys-freebsd/freebsd-libexec + USE=build emerge --nodeps sys-freebsd/freebsd-lib + USE=build emerge --nodeps sys-freebsd/freebsd-share + [[ -e /etc/portage/profile/package.use.mask ]] gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask + + emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin + emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin +} + +post_freebsd_userland(){ + emerge sys-devel/libtool app-admin
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 2f12a22761fa221e2380be13916b5b23939367b8 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 00:09:43 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 00:09:43 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=2f12a227 automatic_updater.sh : added kernelonly. scripts/automatic_updater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 0fd381b..c84a60e 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -120,6 +120,7 @@ case $TARGETMODE in update_gcc update_kernel ;; + kernelonly ) update_kernel ;; freebsd_userland ) update_freebsd_userland post_freebsd_userland
[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
commit: 43de81a212155fdaba9d1534adc1d98e3faaf76b Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Jul 11 23:09:02 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Jul 11 23:09:02 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=43de81a2 remove freebsd.eclass eclass/freebsd.eclass | 229 -- 1 file changed, 229 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass deleted file mode 100644 index aaeeba9..000 --- a/eclass/freebsd.eclass +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -# -# Diego Pettenò flamee...@gentoo.org - -inherit versionator eutils flag-o-matic bsdmk - -# Drop patch level from ${PV} -MY_PV=${PV/_p*} -PLEVEL=${PV##*_p} - -LICENSE=BSD -HOMEPAGE=http://www.freebsd.org/; - -# Define global package names -LIB=freebsd-lib-${PV} -BIN=freebsd-bin-${PV} -CONTRIB=freebsd-contrib-${PV} -SHARE=freebsd-share-${PV} -UBIN=freebsd-ubin-${PV} -USBIN=freebsd-usbin-${PV} -CRYPTO=freebsd-crypto-${PV} -LIBEXEC=freebsd-libexec-${PV} -SBIN=freebsd-sbin-${PV} -GNU=freebsd-gnu-${PV} -ETC=freebsd-etc-${PV} -SYS=freebsd-sys-${PV} -INCLUDE=freebsd-include-${PV} -RESCUE=freebsd-rescue-${PV} -CDDL=freebsd-cddl-${PV} -SECURE=freebsd-secure-${PV} - -# Release version (5.3, 5.4, 6.0, etc) -RV=$(get_version_component_range 1-2 ${MY_PV}) - -# SVN ebuild support. -# 9.1.0. -- release/9.1.0 -# 9.1. -- releng/9.1 -# 9. -- stable/9 -# --head -# -# svn revision can be specified by patch level: -# freebsd-lib-9._p247000 -- set svn -r 247000 - -if [[ ${MY_PV} == ** ]]; then - inherit subversion - - # Set SVN revision using patch level. - [[ ${PV} == *_p* ]] ESVN_REVISION=${PLEVEL} - - case ${MY_PV%.} in - *.*.*) BRANCH=release;; - *.*)BRANCH=releng ;; - ) BRANCH=head ;; - *) BRANCH=stable ;; - esac - - if [[ ${BRANCH} == head ]] ; then - SVN_SUB_URI=${BRANCH} - else - SVN_SUB_URI=${BRANCH}/${MY_PV%.} - fi - - ESVN_REPO_URI=svn://svn.freebsd.org/base/${SVN_SUB_URI} - ESVN_PROJECT=freebsd-${BRANCH} -fi - -if [[ ${PN} != freebsd-share ]] [[ ${PN} != freebsd-sources ]]; then - IUSE=profile -fi - -#unalias -a -alias install-info='/usr/bin/bsdinstall-info' - -EXPORT_FUNCTIONS src_compile src_install src_unpack - -# doperiodic kind file ... -doperiodic() { - local kind=$1 - shift - - ( # dont want to pollute calling env - insinto /etc/periodic/${kind} - insopts -m 0755 - doins $@ - ) -} - -freebsd_get_bmake() { - local bmake - bmake=$(get_bmake) - [[ ${CBUILD} == *-freebsd* ]] || bmake=${bmake} -m /usr/share/mk/freebsd - - echo ${bmake} -} - -freebsd_do_patches() { - if [[ ${#PATCHES[@]} -gt 1 ]] ; then - for x in ${PATCHES[@]}; do - epatch ${x} - done - else - for x in ${PATCHES} ; do - epatch ${x} - done - fi - epatch_user -} - -freebsd_rename_libraries() { - ebegin Renaming libraries - # We don't use libtermcap, we use libncurses - find ${S} -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g' - # flex provides libfl, not libl - find ${S} -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g' - # ncurses provides libncursesw not libcursesw - find ${S} -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-lcursesw:-lncursesw:g' - # we use expat instead of bsdxml - find ${S} -name Makefile -print0 | xargs -0 \ - sed -i -e 's:-lbsdxml:-lexpat:g' - - eend $? -} - -freebsd_src_unpack() { - if [[ ${MY_PV} == ** ]]; then - S=${WORKDIR} subversion_src_unpack - - # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0. - # Removed ${WORKDIR}/share/mk/*.mk, use to force /usr/share/mk. - if [[ ${PN} != freebsd-mk-defs ]] ; then - [[ -e ${WORKDIR}/share/mk ]] rm -rf ${WORKDIR}/share/mk/*.mk - fi - else - unpack ${A} - fi - cd ${S} - - dummy_mk ${REMOVE_SUBDIRS} - - freebsd_do_patches - freebsd_rename_libraries - - # Starting from FreeBSD 9.2, its install command supports the -l option and - # they now use it. Emulate it if we are on a system that does not have it. - version_compare ${RV} 9.1 - if [[ $? -eq 3
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-rescue/, sys-freebsd/freebsd-share/, sys-freebsd/freebsd-pf/, ...
commit: 1792008f3aaadcba079808cc7771cb7f67524e2a Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Jul 11 23:25:54 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Jul 11 23:25:54 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=1792008f sys-freebsd: rename *10.1*ebuild to 10.2_beta1.ebuild sys-freebsd/boot0/{boot0-10.1.ebuild = boot0-10.2_beta1.ebuild} | 0 .../{freebsd-bin-10.1.ebuild = freebsd-bin-10.2_beta1.ebuild}| 0 .../{freebsd-cddl-10.1.ebuild = freebsd-cddl-10.2_beta1.ebuild} | 0 .../{freebsd-lib-10.1-r1.ebuild = freebsd-lib-10.2_beta1.ebuild} | 0 .../{freebsd-libexec-10.1.ebuild = freebsd-libexec-10.2_beta1.ebuild}| 0 .../{freebsd-mk-defs-10.1.ebuild = freebsd-mk-defs-10.2_beta1.ebuild}| 0 ...ebsd-pam-modules-10.1.ebuild = freebsd-pam-modules-10.2_beta1.ebuild} | 0 .../freebsd-pf/{freebsd-pf-10.1.ebuild = freebsd-pf-10.2_beta1.ebuild} | 0 .../{freebsd-rescue-10.1.ebuild = freebsd-rescue-10.2_beta1.ebuild} | 0 .../{freebsd-sbin-10.1.ebuild = freebsd-sbin-10.2_beta1.ebuild} | 0 .../{freebsd-share-10.1.ebuild = freebsd-share-10.2_beta1.ebuild}| 0 .../{freebsd-sources-10.1-r4.ebuild = freebsd-sources-10.2_beta1.ebuild} | 0 .../{freebsd-ubin-10.1.ebuild = freebsd-ubin-10.2_beta1.ebuild} | 0 .../{freebsd-usbin-10.1.ebuild = freebsd-usbin-10.2_beta1.ebuild}| 0 14 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/boot0/boot0-10.1.ebuild rename to sys-freebsd/boot0/boot0-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild rename to sys-freebsd/freebsd-bin/freebsd-bin-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild rename to sys-freebsd/freebsd-cddl/freebsd-cddl-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild rename to sys-freebsd/freebsd-lib/freebsd-lib-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild rename to sys-freebsd/freebsd-libexec/freebsd-libexec-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild rename to sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild rename to sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild rename to sys-freebsd/freebsd-pf/freebsd-pf-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild rename to sys-freebsd/freebsd-rescue/freebsd-rescue-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild rename to sys-freebsd/freebsd-sbin/freebsd-sbin-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild rename to sys-freebsd/freebsd-share/freebsd-share-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2_beta1.ebuild similarity index 100% rename from sys-freebsd/freebsd-sources/freebsd-sources-10.1-r4.ebuild rename to sys-freebsd/freebsd-sources/freebsd-sources-10.2_beta1.ebuild diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.2_beta1.ebuild
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: b54c1fed2e973a321f5292b654e7a1934fee8770 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Jul 11 23:07:55 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Jul 11 23:07:55 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b54c1fed stages_builder.sh: some issue fix. scripts/mkstages/stages_builder.sh | 76 ++ 1 file changed, 11 insertions(+), 65 deletions(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 3317cc7..3414edb 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -6,7 +6,7 @@ export WORKARCH=${WORKARCH:-$(uname -m)} export FORCESTAGE3=${FORCESTAGE3:-} export EXTRAOVERLAY=${EXTRAOVERLAY:-} OLDVER=${OLDVER:-9.0} -OVERLAY_SNAPSHOT=http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=snapshot;h=HEAD;sf=tgz; +OVERLAY_SNAPSHOT=https://gitweb.gentoo.org/proj/gentoo-bsd.git/snapshot/gentoo-bsd-master.tar.gz; prepare(){ local MAJORVER=`echo ${TARGETVER} | awk -F \. '{ print $1 }'` @@ -68,7 +68,7 @@ prepare(){ echo Clone gentoo-bsd overlay snapshot... type -P git [[ $? -ne 0 ]] emerge git - git clone git://git.overlays.gentoo.org/proj/gentoo-bsd.git + git clone git://anongit.gentoo.org/proj/gentoo-bsd.git [[ $? -ne 0 ]] exit 1 fi if [ -n ${EXTRAOVERLAY} ] ; then @@ -87,11 +87,8 @@ prepare(){ fi echo emerging catalyst... - PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools app-text/build-docbook-catalog dev-util/catalyst::gentoo-bsd || exit 1 - grep ^export MAKEOPTS /etc/catalyst/catalystrc /dev/null 21 - if [ $? -ne 0 ] ; then - echo export MAKEOPTS=\-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`\ /etc/catalyst/catalystrc - fi + PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools app-text/build-docbook-catalog || exit 1 + PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -q dev-util/catalyst::gentoo-bsd || exit 1 if [ ! -e /usr/portage/profiles/releases/freebsd-${TARGETVER} ] ; then echo prepare new ${TARGETVER} profiles @@ -107,35 +104,6 @@ prepare(){ _EOF_ fi - if [ ${MKSRC} != NONE ] ; then - if [ ${MKSRC} = release ] ; then - MY_MKSRC= - else - MY_MKSRC=_${MKSRC} - fi - local DISTDIR=`emerge --info | grep DISTDIR | awk -F= '{print $2}' | sed 's:\::g'` - if [[ ${MAJORVER} -ge 10 ]]; then - local TAREXT=xz - else - local TAREXT=bz2 - fi - if [ ! -e ${DISTDIR}/freebsd-lib-${TARGETVER}${MY_MKSRC}.tar.${TAREXT} ] ; then - echo create src tarball - mkdir ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src - cd ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src - ${WORKDIR}/gentoo-bsd/scripts/extract-9.0.sh ${TARGETVER}${MY_MKSRC} - mkdir -p ${DISTDIR} - mv *${TARGETVER}${MY_MKSRC}*${TAREXT} ${DISTDIR}/ - fi - - ls -1 /usr/portage/sys-freebsd/freebsd-lib/freebsd-lib-${TARGETVER}*.ebuild /dev/null 21 - if [ $? -eq 0 ] ; then - create_manifest /usr/portage/sys-freebsd - export WORKDATE=local - fi - create_manifest ${WORKDIR}/gentoo-bsd/sys-freebsd - fi - if [ ${WORKDATE} = remote ] ; then wget -q -O ${WORKDIR}/snapshot_list.html http://distfiles.gentoo.org/snapshots/ export WORKDATE=`grep -e 'portage-[0-9]\+.*bz2' ${WORKDIR}/snapshot_list.html | tail -n 1 | gsed 's:.*portage-\([0-9]\+\).*:\1:g'` @@ -153,8 +121,10 @@ prepare(){ else export WORKDATE=`date +%Y%m%d` fi - else + elif [ ${WORKDATE} = local ] ; then export WORKDATE=`date +%Y%m%d` + else + export WORKDATE=${WORKDATE} fi if [ -n ${STABLE} ] ; then @@ -170,34 +140,6 @@ prepare(){ fi } -create_manifest(){ - local rootdir=$1 - - if [ -d ${rootdir} ] ; then - cd ${rootdir} - echo re-create Manifest - for dir in `ls -1 | grep freebsd-` boot0; - do - cd ${dir} - ls -1 *${TARGETVER}*.ebuild /dev/null 21 - if [ $? -eq 0 ] ; then - EBUILDFILE=`ls -1 *${TARGETVER}*.ebuild | tail -n 1` - echo copy
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/
commit: 3db30f5ccdd6872765caea3870042a4f81ee41aa Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 04:23:49 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 04:23:49 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3db30f5c automatic_updater.sh: Updates run required before emerge -e @world. scripts/automatic_updater.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index c84a60e..9585af5 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -102,6 +102,8 @@ post_freebsd_userland(){ emerge_world(){ emerge sys-devel/libtool + emerge -u dev-libs/libxml2 + emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib emerge -e @world --exclude sys-apps/portage emerge sys-apps/portage }
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 988ba7cc9b1f74d8657a1248524af4fabeafdc7c Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 04:43:16 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 04:43:16 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=988ba7cc create_forcestage3.sh: added sample script. scripts/mkstages/create_forcestage3.sh | 107 + 1 file changed, 107 insertions(+) diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh new file mode 100644 index 000..0d8954e --- /dev/null +++ b/scripts/mkstages/create_forcestage3.sh @@ -0,0 +1,107 @@ +#!/bin/bash +set -eu + +TARGETVER=${TARGETVER:-10.1} +TARGETARCH=${TARGETARCH:-amd64} +OLDSTAGE3=${OLDSTAGE3:-http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2}; +WORKDIR=/${TARGETVER}-forcestage3/${TARGETARCH} +PORTDIR=${PORTDIR:-/usr/portage} +TMPFS=${TMPFS:-0} +CLANG=${CLANG:-0} +[[ ${CLANG} -ne 0 ]] WORKDIR=${WORKDIR}_clang + +prepare(){ + local distdir=$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 's:::g') + if [[ ! -d ${WORKDIR} ]]; then + mkdir -p ${WORKDIR} + fi + + if [[ ${OLDSTAGE3} =~ ^http ]]; then + wget -P /tmp ${OLDSTAGE3} + else + cp ${OLDSTAGE3} /tmp + fi + + tar xjpf /tmp/$(basename ${OLDSTAGE3}) -C ${WORKDIR} + + mkdir -p ${WORKDIR}/usr/portage/distfiles + mkdir -p ${WORKDIR}/var/tmp/portage + + mount -t devfs devfs ${WORKDIR}/dev + mount -t nullfs ${PORTDIR} ${WORKDIR}/usr/portage + if [[ ! ${distdir} =~ ${PORTDIR}.* ]]; then + echo mount DISTDIR + mount -t nullfs ${WORKDIR}/usr/portage/distfiles + fi + if [[ ${TMPFS} -ne 0 ]] ; then + echo mount TMPFS + mount -t tmpfs tmpfs ${WORKDIR}/var/tmp/portage + fi + wget -P ${WORKDIR} https://gitweb.gentoo.org/proj/gentoo-bsd.git/plain/scripts/automatic_updater.sh + cp /etc/resolv.conf ${WORKDIR}/etc +} + +chroot_update(){ + if [[ -e ${WORKDIR}/etc/make.conf ]]; then + local makeconf=${WORKDIR}/etc/make.conf + else + local makeconf=${WORKDIR}/etc/portage/make.conf + fi + + echo MAKEOPTS=\-j$(sysctl hw.ncpu | awk '{ print $2 + 1 }')\ ${makeconf} + echo 'USE=${USE} -fortran -build-kernel' ${makeconf} + + export EMERGE_DEFAULT_OPTS=-q + chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} kernel + chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} freebsd_userland + chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} world + unset EMERGE_DEFAULT_OPTS +} + +check_ecompressdir() { + # dirty solution + # /dev is still mounted; performing auto-bind-umount... + local PID=$(ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs) + if [[ -n ${PID} ]] ; then + echo kill ecompressdir + kill -9 ${PID} : + return 0 + else + return 0 + fi +} + +cleanup(){ + check_ecompressdir + umount ${WORKDIR}/usr/portage/distfiles + umount ${WORKDIR}/usr/portage + if [[ ${TMPFS} -ne 0 ]] ; then + umount ${WORKDIR}/var/tmp/portage + fi + umount ${WORKDIR}/dev +} + +create_stage3(){ + local tarfile + + cd ${WORKDIR} + if [[ ! -e /var/tmp/catalyst/builds/default ]] ; then + mkdir -p /var/tmp/catalyst/builds/default + fi + if [[ ${CLANG} -ne 0 ]]; then + tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3-cl + else + tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3 + fi + + tar cjpf /var/tmp/catalyst/builds/default/${tarfile}.tar.bz2 . + + echo Complete ! + echo Set FORCESTAGE3=${tarfile} +} + +prepare +chroot_update +cleanup +create_stage3 +
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 6bb2b0d6c1f288c71cf95941e06efc4d75031563 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Jul 12 03:56:36 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun Jul 12 03:56:36 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6bb2b0d6 stages_builder.sh: When it contains forcestage3 in FORCESTAGE3, disables update_seed. scripts/mkstages/stages_builder.sh | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 3414edb..f8e4a79 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -66,10 +66,10 @@ prepare(){ cp -a ${HOME}/gentoo-bsd ${WORKDIR}/ else echo Clone gentoo-bsd overlay snapshot... - type -P git - [[ $? -ne 0 ]] emerge git - git clone git://anongit.gentoo.org/proj/gentoo-bsd.git + wget -q -O ${WORKDIR}/gentoo-bsd.tar.gz ${OVERLAY_SNAPSHOT} [[ $? -ne 0 ]] exit 1 + mkdir -p ${WORKDIR}/gentoo-bsd + tar xzf ${WORKDIR}/gentoo-bsd.tar.gz --strip-components=1 -C ${WORKDIR}/gentoo-bsd fi if [ -n ${EXTRAOVERLAY} ] ; then if [[ ${EXTRAOVERLAY} =~ ^http ]]; then @@ -142,7 +142,7 @@ prepare(){ check_ecompressdir() { # dirty solution - # /dev is still mounted; performing auto-bind-umount... + # /dev is still mounted; performing auto-bind-umount... local PID=`ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs` if [ -n ${PID} ] ; then echo kill ecompressdir @@ -164,7 +164,7 @@ run_catalyst() { local specfile=${WORKDIR}/${C_TARGET}.spec [[ -e ${specfile} ]] rm ${specfile} - if [ ${C_TARGET} = stage1 ] [ ${C_SOURCE} != stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ]; then + if [ ${C_TARGET} = stage1 ] [ ${C_SOURCE} != stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ] [[ ! ${C_SOURCE} =~ .*forcestage3.* ]]; then echo update_seed: yes ${specfile} fi if [ ${C_TARGET} != stage3 ] ; then @@ -190,9 +190,12 @@ run_catalyst() { source_subpath: default/${C_SOURCE} subarch: ${TARGETSUBARCH} rel_type: default - portage_overlay: ${WORKDIR}/gentoo-bsd _EOF_ + if [ ! -n ${NOOVERLAY} ] ; then + echo portage_overlay: ${WORKDIR}/gentoo-bsd ${specfile} + fi + catalyst -f ${specfile} if [ $? -ne 0 ] ; then
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/grub2-bhyve/
commit: 8b231049d0f951f672b9aeb1071fe5deb6359d3e Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun May 31 02:47:19 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sun May 31 02:47:19 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=8b231049 grub2-bhyve: QA fix. sys-freebsd/grub2-bhyve/Manifest| 4 ++-- sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild | 5 +++-- sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys-freebsd/grub2-bhyve/Manifest b/sys-freebsd/grub2-bhyve/Manifest index 12ffcf4..2967516 100644 --- a/sys-freebsd/grub2-bhyve/Manifest +++ b/sys-freebsd/grub2-bhyve/Manifest @@ -1,4 +1,4 @@ DIST grub2-bhyve-0.30.tar.gz 8383110 SHA256 d854538b71ce1b964daf4aed141bfcb024c30a245b3bb88d0266420a0c34246d SHA512 8cf810e97d10a4ca494bc55acebd44c216dce5fafa2b83b263157517f354134472a811d6d381a583173e4f7192b30e93397c0f573fca3ad802945c5f4a4e WHIRLPOOL f77985b7ed28d8276c5e63979f5050d72b9f8eadee838e4ee077b45dbfdc3ea40fe05463b000a3e89304e9ccf743a8d05990e9920ce9aafbb316ff410ed1b7c9 -EBUILD grub2-bhyve-0.30.ebuild 996 SHA256 f84d2ea9bcdc20175d08387d508f056687c09a5bb0ebc43e76db86c19afc3f74 SHA512 57983d518c61b51e936c34a16e214b85958400a5d50f16cdd3de48b67e6036082fd4afb716ffbb3439c5634ef1d40a6f0cf87fe1a993aa9ff243409de8ec70fc WHIRLPOOL 261d652ad27b6e364cad39aba43675493166a59b500c729c87fd62a0ad1005767b7ac00bdc09844c8b5b2c506f84215439f4f812f95367682c95851f899415ff -EBUILD grub2-bhyve-.ebuild 996 SHA256 f84d2ea9bcdc20175d08387d508f056687c09a5bb0ebc43e76db86c19afc3f74 SHA512 57983d518c61b51e936c34a16e214b85958400a5d50f16cdd3de48b67e6036082fd4afb716ffbb3439c5634ef1d40a6f0cf87fe1a993aa9ff243409de8ec70fc WHIRLPOOL 261d652ad27b6e364cad39aba43675493166a59b500c729c87fd62a0ad1005767b7ac00bdc09844c8b5b2c506f84215439f4f812f95367682c95851f899415ff +EBUILD grub2-bhyve-0.30.ebuild 1040 SHA256 08fb91e15a1e03eb45239afa6d443be5c507b99f3002e8f935a0ee4a32ccef25 SHA512 75a0b79bc67ef4b724503b7c11bfbb72008b051d7c8ce35f22cdebbd2f9d65731cb0b58f8610351cae4e34410137a86755778217bc8ba5c059731248e14c WHIRLPOOL e68104e7f4bf732bad311aa2eecac8328be1a0798e7f604c9a9bdeb77d5bec650b4e987e56779e11e2da2d5fa251e0bd1202ef278ff13ff31409e9500e32e5c6 +EBUILD grub2-bhyve-.ebuild 1040 SHA256 08fb91e15a1e03eb45239afa6d443be5c507b99f3002e8f935a0ee4a32ccef25 SHA512 75a0b79bc67ef4b724503b7c11bfbb72008b051d7c8ce35f22cdebbd2f9d65731cb0b58f8610351cae4e34410137a86755778217bc8ba5c059731248e14c WHIRLPOOL e68104e7f4bf732bad311aa2eecac8328be1a0798e7f604c9a9bdeb77d5bec650b4e987e56779e11e2da2d5fa251e0bd1202ef278ff13ff31409e9500e32e5c6 MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild index 385669a..43dcd87 100644 --- a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild +++ b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild @@ -36,15 +36,16 @@ DEPEND=${RDEPEND} src_configure() { local myeconfargs=( --disable-werror + --disable-nls --with-platform=emu --enable-grub-mount=no --enable-grub-mkfont=no --enable-grub-emu-sdl=no + $(use_enable zfs libzfs) ) autotools-utils_src_configure } src_install() { - newbin ${BUILD_DIR}/grub-core/grub-emu grub-bhyve + newbin ${BUILD_DIR}/grub-core/grub-emu grub-bhyve } - diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild index 385669a..43dcd87 100644 --- a/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild +++ b/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild @@ -36,15 +36,16 @@ DEPEND=${RDEPEND} src_configure() { local myeconfargs=( --disable-werror + --disable-nls --with-platform=emu --enable-grub-mount=no --enable-grub-mkfont=no --enable-grub-emu-sdl=no + $(use_enable zfs libzfs) ) autotools-utils_src_configure } src_install() { - newbin ${BUILD_DIR}/grub-core/grub-emu grub-bhyve + newbin ${BUILD_DIR}/grub-core/grub-emu grub-bhyve } -
[gentoo-commits] proj/gentoo-bsd:master commit in: profiles/default/bsd/fbsd/x86/10.1/, profiles/default/bsd/fbsd/amd64/10.1/, ...
commit: eb15ec4fac5a7ce8f567e9b0ba68ac9a7704d203 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Jul 4 13:33:17 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Jul 4 13:33:17 2015 + URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=eb15ec4f Clean up profiles. profiles/arch/amd64-fbsd/clang/ChangeLog | 43 profiles/arch/amd64-fbsd/clang/make.defaults | 8 --- profiles/arch/amd64-fbsd/clang/package.use.force | 17 - profiles/arch/amd64-fbsd/clang/package.use.mask| 16 - profiles/arch/amd64-fbsd/clang/packages| 10 --- profiles/arch/amd64-fbsd/clang/packages.build | 7 -- profiles/arch/amd64-fbsd/clang/parent | 1 - profiles/arch/amd64-fbsd/clang/profile.bashrc | 12 profiles/default/bsd/fbsd/amd64/10.1/clang/parent | 2 - profiles/default/bsd/fbsd/amd64/10.1/make.defaults | 11 --- .../default/bsd/fbsd/amd64/10.1/package.use.force | 4 -- profiles/default/bsd/fbsd/amd64/10.1/parent| 2 - profiles/default/bsd/fbsd/x86/10.1/make.defaults | 9 --- profiles/default/bsd/fbsd/x86/10.1/parent | 2 - profiles/default/bsd/profile.bashrc| 82 -- profiles/releases/freebsd-10.1/package.mask| 53 -- profiles/releases/freebsd-10.1/package.use.force | 6 -- profiles/releases/freebsd-10.1/packages| 10 --- profiles/releases/freebsd-10.1/packages.build | 7 -- profiles/releases/freebsd-10.1/parent | 1 - profiles/releases/freebsd-10.1/profile.bashrc | 35 - 21 files changed, 338 deletions(-) diff --git a/profiles/arch/amd64-fbsd/clang/ChangeLog b/profiles/arch/amd64-fbsd/clang/ChangeLog deleted file mode 100644 index b6446cd..000 --- a/profiles/arch/amd64-fbsd/clang/ChangeLog +++ /dev/null @@ -1,43 +0,0 @@ -# ChangeLog for profile directory -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/ChangeLog,v 1.2 2013/08/10 02:33:31 aballier Exp $ - - 10 Aug 2013; Alexis Ballier aball...@gentoo.org package.use.force: - force clang useflag on llvm - - 27 Jul 2013; Alexis Ballier aball...@gentoo.org package.use.force: - build libcxx multilib, patch by Yuta SATOH in bug #475294 - - 19 Jun 2013; Alexis Ballier aball...@gentoo.org +make.defaults: - add default cflags, esp. CXXFLAGS=-stdlib=libc++ ... - - 19 Jun 2013; Alexis Ballier aball...@gentoo.org package.use.force, - package.use.mask: - force curl[ssl,curl_ssl_openssl] and mask the others: curl is in @system for - this profile so better have it with sane defaults. - - 19 Jun 2013; Alexis Ballier aball...@gentoo.org -package.unmask: - no need to unmask clang 3.3 now that it is unmasked globally - - 17 Jun 2013; Alexis Ballier aball...@gentoo.org +package.unmask: - Unmask llvm/clang 3.3_rc since llvm 3.2 does not build with clang++ - -stdlib=libc++ - - 01 Jun 2013; Alexis Ballier aball...@gentoo.org package.use.force, - package.use.mask: - Build libcxxrt over libgcc_s since that is what clang defaults to. - - 31 May 2013; Alexis Ballier aball...@gentoo.org package.use.mask: - libunwind is rather core for our C++ stack. Better not have it link to - liblzma for smaller debug info. - - 31 May 2013; Alexis Ballier aball...@gentoo.org package.use.force: - Force building libc++ over libcxxrt - - 31 May 2013; Alexis Ballier aball...@gentoo.org +package.use.force: - Force static libs on the C++ stack so that static linking has a chance to - work - - 30 May 2013; Alexis Ballier aball...@gentoo.org +package.use.mask: - Mask binutils[cxx], bug #427344 (and add a ChangeLog here) - diff --git a/profiles/arch/amd64-fbsd/clang/make.defaults b/profiles/arch/amd64-fbsd/clang/make.defaults deleted file mode 100644 index 693bf18..000 --- a/profiles/arch/amd64-fbsd/clang/make.defaults +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -CFLAGS=-O2 -pipe -CXXFLAGS=-stdlib=libc++ ${CFLAGS} -FFLAGS=${CFLAGS} -FCFLAGS=${CFLAGS} diff --git a/profiles/arch/amd64-fbsd/clang/package.use.force b/profiles/arch/amd64-fbsd/clang/package.use.force deleted file mode 100644 index 3d54a7b..000 --- a/profiles/arch/amd64-fbsd/clang/package.use.force +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# Force building libc++ over libcxxrt. -sys-libs/libcxx libcxxrt - -# Force static libs and multilib on the C++ stack. -sys-libs/libcxxrt static-libs abi_x86_32 -sys-libs/libcxx static-libs abi_x86_32 - -# Force openssl on curl since cmakes needs it and is in @system because of -# libcxx on this profile. Mask the other ssl providers. -net-misc/curl ssl curl_ssl_openssl - -# We
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/, sys-freebsd/freebsd-sources/files/
commit: 8bf57aa52a012990cc0b2fb1686d0cf69b676abd Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Feb 28 23:32:41 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Sat Feb 28 23:32:41 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8bf57aa5 freebsd-sources-10.1.0.-r2: security fix CVE-2015-1414 --- sys-freebsd/freebsd-sources/Manifest | 3 ++- .../files/freebsd-sources-10.1-cve-2015-1414.patch| 15 +++ ...99-r1.ebuild = freebsd-sources-10.1.0.-r2.ebuild} | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 0742fde..b595b90 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -5,6 +5,7 @@ AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea2 AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf AUX freebsd-sources-10.1-cve-2014-8612.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69 AUX freebsd-sources-10.1-cve-2014-8613.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe +AUX freebsd-sources-10.1-cve-2015-1414.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512 @@ -24,5 +25,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4da9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/
commit: 3d5bf94481beb6294209874d33deb80af5290917 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Feb 23 12:46:23 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Mon Feb 23 12:46:23 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=3d5bf944 freebsd-sources-10.1.0.-r1.ebuild: QA fix, remove tab. --- sys-freebsd/freebsd-sources/Manifest | 2 +- sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.-r1.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index b5d9df2..0742fde 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -24,5 +24,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4da9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d -EBUILD freebsd-sources-10.1.0.-r1.ebuild 3906 SHA256 ab19bc3a80568fa08a0f155bb044d9c2e8376c47d46348beb7da74d65be71a73 SHA512 7c8dc6d0892210598e65718e59c46b43b1d37a85c3c1cc11188b8eee5220f5394caa965a02c439cd0051ce94f1525c61573bb896c207966bd112ec6f705331e8 WHIRLPOOL d9f4b5f989a9ee44b899cb129d0c3eb1dee5fc796f732a9125e7e751d4933c8068f1d45a1ffbfda71ffb5729e31888231e17333eae248b01a8b412a21d252510 +EBUILD freebsd-sources-10.1.0.-r1.ebuild 3905 SHA256 ed67bd4830ae5025d242c8d9648c533073278f3ef29e5d09a59cb6a570e3d638 SHA512 90bc1ef547ef4564b75ec8bcb391d9a2f75b24588939f3f35811eb26ca3b7abd04e40a4cb32b9211652fffdc2adfa9bb5050461af4b0a6806ed422a0cf1d60be WHIRLPOOL 08256f4b8badad44b6a8e48a47e80b878f8653528a8bc962f1da9bd8218c92eb82bb5364a1d25fe58e2def929120c89e210dcb6374d77a57cf5dbb306499e3ed MISC metadata.xml 410 SHA256 f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512 d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f WHIRLPOOL ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.-r1.ebuild index fce83da..a139b6d 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.-r1.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -77,7 +77,7 @@ src_prepare() { cp -f ${FILESDIR}/config-GENTOO ${conf} || die use debug || echo 'nomakeoptions DEBUG' ${conf} use dtrace || echo 'nomakeoptions WITH_CTF' ${conf} - + # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL }
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/
commit: 5cd06325403f72dc7827e1fe4208f2f059d565ca Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Feb 23 12:23:04 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Mon Feb 23 12:23:04 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5cd06325 freebsd-lib-10.1.0.-r1.ebuild: QA fix. added --- sys-freebsd/freebsd-lib/Manifest | 2 +- sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 47dfe0f..344fad4 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -28,4 +28,4 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 -EBUILD freebsd-lib-10.1.0.-r1.ebuild 19162 SHA256 95a48547fcad32d73a02a30878beca25b26be530d66a63467410c12a1f367f8c SHA512 9f48c02861a6838515d472a38d7ffb522b092a73e5ed6cdebd75f9b11bc4efcfffa18118a65dd4ec038721cdf6040ff674f2670acf7137e6dae26320c372a3cd WHIRLPOOL d05a92958363bd102d6b4af18a7eaf3af21ac724a59e6ee5ccea83c2a01d5220598722f1161498580da833a1de6ea5a564720264800c964a2fbfc8b7a2630448 +EBUILD freebsd-lib-10.1.0.-r1.ebuild 19164 SHA256 f3b1271d7f2f93e7c231040bffd375e737d880ff6aaf4f0e93b994e5bc565afc SHA512 8957e68211b6591280c019f3603fe9bf9aa1fcf25a3d3edb5dcf4e43987fa70eaa914126a53438012f9cd5d8aa27cbc21b14bf75a19d0921cf72708347a931bd WHIRLPOOL 5abc6a28d96239d86bd3fe085b3bf01192b4fc99a64dd134bf64f097113fe6e868bc54ecbf3835fd3460c3e4e3f2edfdbf85a2f929431d68b916026844a2bd60 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.-r1.ebuild index d1ac74b..2697cb8 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.-r1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.-r1.ebuild @@ -493,7 +493,7 @@ do_install() { # Install a libusb.pc for better compat with Linux's libusb if use usb ; then dodir /usr/$(get_libdir)/pkgconfig - sed -i.bkp s:^libdir=.*:libdir=/usr/$(get_libdir):g ${S}/libusb/libusb-*.pc + sed -i.bkp s:^libdir=.*:libdir=/usr/$(get_libdir):g ${S}/libusb/libusb-*.pc fi for i in $(get_subdirs) ; do
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 29986d119cb7fa2a16b06649ac0e1e4e20281b9b Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Fri Feb 13 11:27:44 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Fri Feb 13 11:27:44 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=29986d11 stages_builder.sh, Change to the method of using catalyst spec, fixed CXXFLAGS of CLANG stages --- scripts/mkstages/stages_builder.sh | 36 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 58af37e..3317cc7 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -99,8 +99,12 @@ prepare(){ cp -a ${WORKDIR}/gentoo-bsd/profiles/default/bsd/fbsd/amd64/${TARGETVER} /usr/portage/profiles/default/bsd/fbsd/amd64/ cp -a ${WORKDIR}/gentoo-bsd/profiles/default/bsd/fbsd/x86/${TARGETVER} /usr/portage/profiles/default/bsd/fbsd/x86/ cp -a ${WORKDIR}/gentoo-bsd/profiles/releases/freebsd-${TARGETVER} /usr/portage/profiles/releases/ - echo amd64-fbsd default/bsd/fbsd/amd64/${TARGETVER} dev /usr/portage/profiles/profiles.desc - echo x86-fbsd default/bsd/fbsd/x86/${TARGETVER} dev /usr/portage/profiles/profiles.desc + + cat - _EOF_ /usr/portage/profiles/profiles.desc + amd64-fbsd default/bsd/fbsd/amd64/${TARGETVER} dev + amd64-fbsd default/bsd/fbsd/amd64/${TARGETVER}/clang dev + x86-fbsd default/bsd/fbsd/x86/${TARGETVER} dev + _EOF_ fi if [ ${MKSRC} != NONE ] ; then @@ -215,23 +219,39 @@ run_catalyst() { local C_APPEND_OPT= if [ ! -e /var/tmp/catalyst/builds/default/${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}.tar.bz2 ] ; then + local specfile=${WORKDIR}/${C_TARGET}.spec + [[ -e ${specfile} ]] rm ${specfile} + if [ ${C_TARGET} = stage1 ] [ ${C_SOURCE} != stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ]; then - C_APPEND_OPT=${C_APPEND_OPT} update_seed=yes + echo update_seed: yes ${specfile} fi if [ ${C_TARGET} != stage3 ] ; then - C_APPEND_OPT=${C_APPEND_OPT} chost=${CATALYST_CHOST} + echo chost: ${CATALYST_CHOST} ${specfile} fi if [ -n ${STABLE} ] ; then - C_APPEND_OPT=${C_APPEND_OPT} portage_confdir=${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage + echo portage_confdir: ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage ${specfile} else if [ -e ${WORKDIR}/gentoo-bsd/etc/portage ] ; then - C_APPEND_OPT=${C_APPEND_OPT} portage_confdir=${WORKDIR}/gentoo-bsd/etc/portage + echo portage_confdir: ${WORKDIR}/gentoo-bsd/etc/portage ${specfile} fi fi if [ -n ${CLANG} ] ; then C_APPEND_PROFILE=/clang + echo 'cxxflags: -stdlib=libc++ ${CFLAGS}' ${specfile} fi - catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/gentoo-bsd ${C_APPEND_OPT} + + cat - _EOF_ ${specfile} + target: ${C_TARGET} + version_stamp: fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} + profile: default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} + snapshot: ${WORKDATE} + source_subpath: default/${C_SOURCE} + subarch: ${TARGETSUBARCH} + rel_type: default + portage_overlay: ${WORKDIR}/gentoo-bsd + _EOF_ + + catalyst -f ${specfile} if [ $? -ne 0 ] ; then check_ecompressdir ${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}/usr/local/portage @@ -239,7 +259,7 @@ run_catalyst() { if [ ${C_TARGET} = stage1 ] [ ${C_SOURCE} != stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ]; then C_APPEND_OPT=${C_APPEND_OPT} update_seed=no fi - catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/files/
commit: acc53371016060ea87dcd3cea27552a295d56e6a Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Thu Feb 12 14:56:46 2015 + Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp CommitDate: Thu Feb 12 14:56:46 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=acc53371 added files/freebsd-lib-10.1-cve-2014-8611.patch --- .../files/freebsd-lib-10.1-cve-2014-8611.patch | 22 ++ 1 file changed, 22 insertions(+) diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch new file mode 100644 index 000..e225042 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch @@ -0,0 +1,22 @@ +Index: lib/libc/stdio/fflush.c +=== +--- lib/libc/stdio/fflush.c.orig lib/libc/stdio/fflush.c +@@ -124,11 +124,13 @@ + t = _swrite(fp, (char *)p, n); + if (t = 0) { + /* Reset _p and _w. */ +- if (p fp-_p) /* Some was written. */ ++ if (p fp-_p) { ++ /* Some was written. */ + memmove(fp-_p, p, n); +- fp-_p += n; +- if ((fp-_flags (__SLBF | __SNBF)) == 0) +- fp-_w -= n; ++ fp-_p += n; ++ if ((fp-_flags (__SLBF | __SNBF)) == 0) ++ fp-_w -= n; ++ } + fp-_flags |= __SERR; + return (EOF); + }
[gentoo-commits] proj/gentoo-bsd:master commit in: profiles/default/bsd/fbsd/amd64/9.3/, profiles/default/bsd/fbsd/amd64/10.0/, ...
commit: 09509967d2b3ae9bb91f864e7f1113b57608b845 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Tue Feb 3 13:47:29 2015 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Tue Feb 3 13:47:29 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=09509967 Remove 9.3 and 10.0 profiles. --- profiles/default/bsd/fbsd/amd64/10.0/clang/parent | 2 - profiles/default/bsd/fbsd/amd64/10.0/make.defaults | 11 - .../default/bsd/fbsd/amd64/10.0/package.use.force | 4 -- profiles/default/bsd/fbsd/amd64/10.0/parent| 2 - profiles/default/bsd/fbsd/amd64/9.3/clang/parent | 2 - profiles/default/bsd/fbsd/amd64/9.3/make.defaults | 11 - profiles/default/bsd/fbsd/amd64/9.3/parent | 2 - profiles/default/bsd/fbsd/x86/10.0/make.defaults | 9 profiles/default/bsd/fbsd/x86/10.0/parent | 2 - profiles/default/bsd/fbsd/x86/9.3/make.defaults| 9 profiles/default/bsd/fbsd/x86/9.3/parent | 2 - profiles/releases/freebsd-10.0/package.mask| 53 -- profiles/releases/freebsd-10.0/package.use.force | 6 --- profiles/releases/freebsd-10.0/packages| 10 profiles/releases/freebsd-10.0/packages.build | 7 --- profiles/releases/freebsd-10.0/parent | 1 - profiles/releases/freebsd-10.0/profile.bashrc | 35 -- profiles/releases/freebsd-9.3/eapi | 1 - profiles/releases/freebsd-9.3/package.mask | 53 -- profiles/releases/freebsd-9.3/packages | 6 --- profiles/releases/freebsd-9.3/parent | 1 - 21 files changed, 229 deletions(-) diff --git a/profiles/default/bsd/fbsd/amd64/10.0/clang/parent b/profiles/default/bsd/fbsd/amd64/10.0/clang/parent deleted file mode 100644 index 7dbda40..000 --- a/profiles/default/bsd/fbsd/amd64/10.0/clang/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../arch/amd64-fbsd/clang diff --git a/profiles/default/bsd/fbsd/amd64/10.0/make.defaults b/profiles/default/bsd/fbsd/amd64/10.0/make.defaults deleted file mode 100644 index d297dce..000 --- a/profiles/default/bsd/fbsd/amd64/10.0/make.defaults +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -CHOST=x86_64-gentoo-freebsd10.0 -CHOST_amd64_fbsd=x86_64-gentoo-freebsd10.0 -CHOST_x86_fbsd=i686-gentoo-freebsd10.0 - -# Diego Pettenò flamee...@gentoo.org (2 Dec 2006) -# Turn this on by default as we don't have Java 1.4 and 1.5 at all -USE=java6 diff --git a/profiles/default/bsd/fbsd/amd64/10.0/package.use.force b/profiles/default/bsd/fbsd/amd64/10.0/package.use.force deleted file mode 100644 index 4229a8f..000 --- a/profiles/default/bsd/fbsd/amd64/10.0/package.use.force +++ /dev/null @@ -1,4 +0,0 @@ -# =dev-lang/python-3.2 requires threads, #494744 -=dev-lang/python-3.2* threads -=dev-lang/python-3.3* threads - diff --git a/profiles/default/bsd/fbsd/amd64/10.0/parent b/profiles/default/bsd/fbsd/amd64/10.0/parent deleted file mode 100644 index 88743e3..000 --- a/profiles/default/bsd/fbsd/amd64/10.0/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../releases/freebsd-10.0 diff --git a/profiles/default/bsd/fbsd/amd64/9.3/clang/parent b/profiles/default/bsd/fbsd/amd64/9.3/clang/parent deleted file mode 100644 index 7dbda40..000 --- a/profiles/default/bsd/fbsd/amd64/9.3/clang/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../arch/amd64-fbsd/clang diff --git a/profiles/default/bsd/fbsd/amd64/9.3/make.defaults b/profiles/default/bsd/fbsd/amd64/9.3/make.defaults deleted file mode 100644 index e268b87..000 --- a/profiles/default/bsd/fbsd/amd64/9.3/make.defaults +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -CHOST=x86_64-gentoo-freebsd9.3 -CHOST_amd64_fbsd=x86_64-gentoo-freebsd9.3 -CHOST_x86_fbsd=i686-gentoo-freebsd9.3 - -# Diego Pettenò flamee...@gentoo.org (2 Dec 2006) -# Turn this on by default as we don't have Java 1.4 and 1.5 at all -USE=java6 diff --git a/profiles/default/bsd/fbsd/amd64/9.3/parent b/profiles/default/bsd/fbsd/amd64/9.3/parent deleted file mode 100644 index b97f8c7..000 --- a/profiles/default/bsd/fbsd/amd64/9.3/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../releases/freebsd-9.3 diff --git a/profiles/default/bsd/fbsd/x86/10.0/make.defaults b/profiles/default/bsd/fbsd/x86/10.0/make.defaults deleted file mode 100644 index a821487..000 --- a/profiles/default/bsd/fbsd/x86/10.0/make.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -CHOST=i486-gentoo-freebsd10.0 - -# Diego Pettenò flamee...@gentoo.org (2 Dec 2006) -# Turn this on by default as we don't
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/, sys-freebsd/freebsd-sources/files/
commit: eb758f6a55fff9cc369b15c431540bb99e56c10b Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Jan 31 09:56:03 2015 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sat Jan 31 09:56:03 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=eb758f6a freebsd-sources-10.1.0.-r1: security fix CVE-2014-8612, CVE-2014-8613 --- sys-freebsd/freebsd-sources/Manifest | 4 +- .../files/freebsd-sources-10.1-cve-2014-8612.patch | 45 .../files/freebsd-sources-10.1-cve-2014-8613.patch | 119 + ...build = freebsd-sources-10.1.0.-r1.ebuild} | 4 +- 4 files changed, 170 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 4d7802d..ff1ec0e 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -3,6 +3,8 @@ AUX freebsd-sources-10.0-EN-1407-pmap.patch 520 SHA256 64f3fc5765449538fecd6a911 AUX freebsd-sources-10.0-SA-1417-kmem.patch 10626 SHA256 217fed19e36d6febc973f2eff141e9d10ff5700122126b9097c36f9642b168e7 SHA512 0706bef96076723a92664316573c2a877e090213ea50fdde2418d8ea7d98acc76fd45832bb9b66a5af45b6fc97e9d6ab11e7aa561514a4c59ed3afce516d3581 WHIRLPOOL f06b189d12ee4dd7ccec1d84b68297d2b3e33c832440f01c94c07cf5e051e9fa8ef782c28d01f976a017941f832da0be88700575f1092498aaffb7eb931821ac AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea27f4974884cdf850f54f3c61541bf9617d2 SHA512 63403f328a2c394aefc66a6230e5c7699ca59d809780686055152f53ce5f7b86b7f2b083951e5e51d0a34ed20561f2473a22c3af8919f0336bf6f10a9db03113 WHIRLPOOL 5d0779ea5f5609f629d9751e365997ac39c2eaab3c0b8f2153b0ed17bf08896b581f3c109a51634be820f0e40b3cc18c6072b1540a1a270099263c63adfb3d67 AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf +AUX freebsd-sources-10.1-cve-2014-8612.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69 +AUX freebsd-sources-10.1-cve-2014-8613.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512 @@ -23,6 +25,6 @@ AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/grub2-bhyve/
commit: 0e5046543bc3eb2a051c0d8c52af9cff0b687a39 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Thu Jan 1 11:57:18 2015 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Thu Jan 1 11:57:18 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0e504654 grub2-bhyve-0.30: version bump --- sys-freebsd/grub2-bhyve/Manifest| 6 +++--- .../{grub2-bhyve-0.24.ebuild = grub2-bhyve-0.30.ebuild}| 2 +- sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-freebsd/grub2-bhyve/Manifest b/sys-freebsd/grub2-bhyve/Manifest index c8e8fae..12ffcf4 100644 --- a/sys-freebsd/grub2-bhyve/Manifest +++ b/sys-freebsd/grub2-bhyve/Manifest @@ -1,4 +1,4 @@ -DIST grub2-bhyve-0.24.tar.gz 8380188 SHA256 42228c161550edb037a1e6f0ed2cdd1bd547344184fb43af955b9f588c753ea3 SHA512 3ec2484cb2791318b034e12f6098ce43f11dee949af60cb410ef153008c8e03809e2e956a787fb59d0f333c8f516f911ea747466458566fb9ecea9277857158b WHIRLPOOL e55e87ffd7950913281701e428330ca7a3ba3340112860e4afd8001cc019413642e31c120801b22c88f9ac7b4b5d285046fb9475278f7ee696a8812b40cad412 -EBUILD grub2-bhyve-0.24.ebuild 996 SHA256 b1e78404d33c394b81fdbbbde98d241715d50a94400fab273226e9082c0e56e1 SHA512 1af28631d55cf04d859dad718d8ec8c0fa672bb7ae7272c3749b4748bc724cf25d372c182a0badf3b10bc9b829ca01b3939dbeca4f77e9ae1e478e7965601404 WHIRLPOOL 18c94f6761861d8fcd17fb8c88b46ddd3431b0362e5193b3dabc66d0920c8b87f57df036bdba65d0bfd17af08f77d73c32695fed5ee34343e7d36737a923bd32 -EBUILD grub2-bhyve-.ebuild 996 SHA256 b1e78404d33c394b81fdbbbde98d241715d50a94400fab273226e9082c0e56e1 SHA512 1af28631d55cf04d859dad718d8ec8c0fa672bb7ae7272c3749b4748bc724cf25d372c182a0badf3b10bc9b829ca01b3939dbeca4f77e9ae1e478e7965601404 WHIRLPOOL 18c94f6761861d8fcd17fb8c88b46ddd3431b0362e5193b3dabc66d0920c8b87f57df036bdba65d0bfd17af08f77d73c32695fed5ee34343e7d36737a923bd32 +DIST grub2-bhyve-0.30.tar.gz 8383110 SHA256 d854538b71ce1b964daf4aed141bfcb024c30a245b3bb88d0266420a0c34246d SHA512 8cf810e97d10a4ca494bc55acebd44c216dce5fafa2b83b263157517f354134472a811d6d381a583173e4f7192b30e93397c0f573fca3ad802945c5f4a4e WHIRLPOOL f77985b7ed28d8276c5e63979f5050d72b9f8eadee838e4ee077b45dbfdc3ea40fe05463b000a3e89304e9ccf743a8d05990e9920ce9aafbb316ff410ed1b7c9 +EBUILD grub2-bhyve-0.30.ebuild 996 SHA256 f84d2ea9bcdc20175d08387d508f056687c09a5bb0ebc43e76db86c19afc3f74 SHA512 57983d518c61b51e936c34a16e214b85958400a5d50f16cdd3de48b67e6036082fd4afb716ffbb3439c5634ef1d40a6f0cf87fe1a993aa9ff243409de8ec70fc WHIRLPOOL 261d652ad27b6e364cad39aba43675493166a59b500c729c87fd62a0ad1005767b7ac00bdc09844c8b5b2c506f84215439f4f812f95367682c95851f899415ff +EBUILD grub2-bhyve-.ebuild 996 SHA256 f84d2ea9bcdc20175d08387d508f056687c09a5bb0ebc43e76db86c19afc3f74 SHA512 57983d518c61b51e936c34a16e214b85958400a5d50f16cdd3de48b67e6036082fd4afb716ffbb3439c5634ef1d40a6f0cf87fe1a993aa9ff243409de8ec70fc WHIRLPOOL 261d652ad27b6e364cad39aba43675493166a59b500c729c87fd62a0ad1005767b7ac00bdc09844c8b5b2c506f84215439f4f812f95367682c95851f899415ff MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.24.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild similarity index 95% rename from sys-freebsd/grub2-bhyve/grub2-bhyve-0.24.ebuild rename to sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild index f0fdfd1..385669a 100644 --- a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.24.ebuild +++ b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild index f0fdfd1..385669a 100644 --- a/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild +++ b/sys-freebsd/grub2-bhyve/grub2-bhyve-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/
commit: f662068716cfa82ea5961c2d57c6839bc04cf295 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Fri Dec 12 14:14:10 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Fri Dec 12 14:14:10 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=f6620687 freebsd-lib-10.1.0.-r1: security fix CVE-2014-8611 --- sys-freebsd/freebsd-lib/Manifest | 3 ++- ...reebsd-lib-10.1.0..ebuild = freebsd-lib-10.1.0.-r1.ebuild} | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index fab3aeb..cd13f06 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -5,6 +5,7 @@ AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370 +AUX freebsd-lib-10.1-cve-2014-8611.patch 605 SHA256 f8e3556e82a9d256bd42be796dd1a8672b84259087369087ecf8fb2ddcdbdbd7 SHA512 9462e5e4a8a04999b0d434e47bd6891e638281d13f2aba1ff7e2fd6f2b3a698f1339aac2b257404eb52498b14bcdb7b512b82ea203b176a0cb42891da292e691 WHIRLPOOL 942287e5fe27452d1c5c046d00d1e33cf57052ad3429a81ef5da2b4eb93d96aad734d31f0e1c196278a9ab232ec6efc4217c2ff28b271ed63878c6677f4753dc AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0 AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d80675f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f @@ -28,5 +29,5 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 EBUILD freebsd-lib-10.0.0.-r1.ebuild 19247 SHA256 6a9490c5a8e10db356353328efdc0cf4f9fe8c436212a63345fb2eaa22cc667c SHA512 70942c24c349d843636b21e84e2812598cc77266a1f9e137b177838ae556d1d7abbf7d78a2dd80769fe2d9f8b100f51edd5444e487fd9867ab9e7e42c425af50 WHIRLPOOL 11e0c03af096b567b66cdfc8edf0a3ba65d0faa894815b9b26324fe8650c842d918da971c297853760c07465ba6cecfbe0281ca3c09845e16a5bd132a44cf94f -EBUILD freebsd-lib-10.1.0..ebuild 19116 SHA256
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sbin/
commit: 0c1bf1d9d4b16d375f0377454a8e03511c3dd0e9 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Nov 17 10:17:07 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Mon Nov 17 10:17:07 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0c1bf1d9 freebsd-sbin: remove idmapd.initd --- sys-freebsd/freebsd-sbin/Manifest| 6 +++--- sys-freebsd/freebsd-sbin/freebsd-sbin-10.0.0..ebuild | 3 --- sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.0..ebuild | 3 --- sys-freebsd/freebsd-sbin/freebsd-sbin-9.3.0..ebuild | 3 --- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest index 319b4d0..db2f2db 100644 --- a/sys-freebsd/freebsd-sbin/Manifest +++ b/sys-freebsd/freebsd-sbin/Manifest @@ -6,6 +6,6 @@ AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4 AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512 d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a WHIRLPOOL eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16 -EBUILD freebsd-sbin-10.0.0..ebuild 2754 SHA256 389dd4e1757a8073330bd823b3fd156802dae51c6906e64aec577b4a51429f5d SHA512 0b3419140e8cc27a57eed7c06e63ea45152f03fe80d27af485ddd6e741834bde3c123bfeebb36bcc70f3781bb9a0beaa7c73b5e332553e6b0ddec7732aaa560e WHIRLPOOL 2581caae4b9fac7152281b1ac7aa396f88abf73832ce87f47900fea7925bce33c2b94dc0920a02a2da20a5d63f292ffb9b6aecbad0a0445e503c42dc60443776 -EBUILD freebsd-sbin-10.1.0..ebuild 2754 SHA256 389dd4e1757a8073330bd823b3fd156802dae51c6906e64aec577b4a51429f5d SHA512 0b3419140e8cc27a57eed7c06e63ea45152f03fe80d27af485ddd6e741834bde3c123bfeebb36bcc70f3781bb9a0beaa7c73b5e332553e6b0ddec7732aaa560e WHIRLPOOL 2581caae4b9fac7152281b1ac7aa396f88abf73832ce87f47900fea7925bce33c2b94dc0920a02a2da20a5d63f292ffb9b6aecbad0a0445e503c42dc60443776 -EBUILD freebsd-sbin-9.3.0..ebuild 2760 SHA256 4874f0acd14cd1735316806710a27e63a9e5bf6436e8f2ebe9494b9b08601a56 SHA512 13808a37b195ae768ceb73ff2f8a7cc12d343cf84b0f2ac24f8a6c2aa282072e2ce4dbde2a7bed5279e2bf2d9bf6e0422679f19eea5bcc1e836e156b3280a388 WHIRLPOOL 50849f9d28ee674a4b54f2c8de87f785e0441e5c70e2e0f98a89e40282159bf14842b307f407ae97dda0620c8b9e13c2555735c3597547005c584c0bc7a7737d +EBUILD freebsd-sbin-10.0.0..ebuild 2682 SHA256 0089b62a44f816b015aae62867f54c085c6ed531359b9c4b4562747de67d777f SHA512 1d848b4463e9ce046f227966c9b0499f864e8644c3bad9779f00fc1fc1f941ff78ac130fd968cb954e83869e20473e36fc99106fdc4728e8c0bb05574bd14650 WHIRLPOOL 7174b3132e112288cb99f493e7b3982f4f01b63b67962f2a81516404bb131f00c9aca4316f2eda31d232b53c0343f98722d3f5882a37f4e4ded92b9d584c8741 +EBUILD freebsd-sbin-10.1.0..ebuild 2682 SHA256 0089b62a44f816b015aae62867f54c085c6ed531359b9c4b4562747de67d777f SHA512 1d848b4463e9ce046f227966c9b0499f864e8644c3bad9779f00fc1fc1f941ff78ac130fd968cb954e83869e20473e36fc99106fdc4728e8c0bb05574bd14650 WHIRLPOOL 7174b3132e112288cb99f493e7b3982f4f01b63b67962f2a81516404bb131f00c9aca4316f2eda31d232b53c0343f98722d3f5882a37f4e4ded92b9d584c8741 +EBUILD freebsd-sbin-9.3.0..ebuild 2688 SHA256 58c6d302fbd9574a6a297fca5e82155de57c5e481e6a11bee5641affd19fbb9c SHA512 d68d282ccb4b9b62848f50cd16fd5dc733a69ec7fea6b917958d920767f9a654422d221d27f3066ab80ab9d719ddfbb25940eecc34a0e14209877dd2c9ef38e6 WHIRLPOOL 73952d98c0b8ecc4e6dab9e57f841d75b2976285daf0062121c98450567483a68ea6a931c77a80c77e0823f1132b90ca511eaebfca38572378b8829a5093cc38 diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.0.0..ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.0.0..ebuild index 0b33874..36ef6d8 100644 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.0.0..ebuild +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.0.0..ebuild @@ -76,9 +76,6 @@ src_install() { insinto /etc doins minfree sysctl.conf regdomain.xml || die - # initd script for idmapd - newinitd ${FILESDIR}/idmapd.initd idmapd
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/grub2-bhyve/
commit: 75afdd46473a2fec68ad6c4792a75f2b93ec0afa Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Mon Nov 17 10:37:44 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Mon Nov 17 10:37:44 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=75afdd46 grub2-bhyve-0.24: version bump --- sys-freebsd/grub2-bhyve/Manifest | 4 ++-- .../grub2-bhyve/{grub2-bhyve-0.23.ebuild = grub2-bhyve-0.24.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/grub2-bhyve/Manifest b/sys-freebsd/grub2-bhyve/Manifest index 087dd68..c8e8fae 100644 --- a/sys-freebsd/grub2-bhyve/Manifest +++ b/sys-freebsd/grub2-bhyve/Manifest @@ -1,4 +1,4 @@ -DIST grub2-bhyve-0.23.tar.gz 8390695 SHA256 2bbae9a291e5458b70141d0be1fcc82d0cfa989df2f3983fb64b7e307e81602e SHA512 9b365acf754c61abd7f9bbf4889bd005be6467ef6d6118df6805187460fc79e759d6402b9d95816d865a00f16d72c9a091a46ef0909500396af65eca2a61ee7f WHIRLPOOL 5d8a69ea801a77d2a01cadd52b24a423c9cee3f59aa096f39fda8b28948a0dd6acddb4259648fdf60e8070716c0c3b69952a2c25f1ef2101fa59f69b3d22665c -EBUILD grub2-bhyve-0.23.ebuild 996 SHA256 b1e78404d33c394b81fdbbbde98d241715d50a94400fab273226e9082c0e56e1 SHA512 1af28631d55cf04d859dad718d8ec8c0fa672bb7ae7272c3749b4748bc724cf25d372c182a0badf3b10bc9b829ca01b3939dbeca4f77e9ae1e478e7965601404 WHIRLPOOL 18c94f6761861d8fcd17fb8c88b46ddd3431b0362e5193b3dabc66d0920c8b87f57df036bdba65d0bfd17af08f77d73c32695fed5ee34343e7d36737a923bd32 +DIST grub2-bhyve-0.24.tar.gz 8380188 SHA256 42228c161550edb037a1e6f0ed2cdd1bd547344184fb43af955b9f588c753ea3 SHA512 3ec2484cb2791318b034e12f6098ce43f11dee949af60cb410ef153008c8e03809e2e956a787fb59d0f333c8f516f911ea747466458566fb9ecea9277857158b WHIRLPOOL e55e87ffd7950913281701e428330ca7a3ba3340112860e4afd8001cc019413642e31c120801b22c88f9ac7b4b5d285046fb9475278f7ee696a8812b40cad412 +EBUILD grub2-bhyve-0.24.ebuild 996 SHA256 b1e78404d33c394b81fdbbbde98d241715d50a94400fab273226e9082c0e56e1 SHA512 1af28631d55cf04d859dad718d8ec8c0fa672bb7ae7272c3749b4748bc724cf25d372c182a0badf3b10bc9b829ca01b3939dbeca4f77e9ae1e478e7965601404 WHIRLPOOL 18c94f6761861d8fcd17fb8c88b46ddd3431b0362e5193b3dabc66d0920c8b87f57df036bdba65d0bfd17af08f77d73c32695fed5ee34343e7d36737a923bd32 EBUILD grub2-bhyve-.ebuild 996 SHA256 b1e78404d33c394b81fdbbbde98d241715d50a94400fab273226e9082c0e56e1 SHA512 1af28631d55cf04d859dad718d8ec8c0fa672bb7ae7272c3749b4748bc724cf25d372c182a0badf3b10bc9b829ca01b3939dbeca4f77e9ae1e478e7965601404 WHIRLPOOL 18c94f6761861d8fcd17fb8c88b46ddd3431b0362e5193b3dabc66d0920c8b87f57df036bdba65d0bfd17af08f77d73c32695fed5ee34343e7d36737a923bd32 MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de diff --git a/sys-freebsd/grub2-bhyve/grub2-bhyve-0.23.ebuild b/sys-freebsd/grub2-bhyve/grub2-bhyve-0.24.ebuild similarity index 100% rename from sys-freebsd/grub2-bhyve/grub2-bhyve-0.23.ebuild rename to sys-freebsd/grub2-bhyve/grub2-bhyve-0.24.ebuild
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: bd1e7006c588ac340805cf09736b33e8a12a7395 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Nov 15 12:07:34 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sat Nov 15 12:07:34 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=bd1e7006 stages_builder.sh: added URL support, EXTRAOVERLAY --- scripts/mkstages/stages_builder.sh | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 09055d0..a4eeff0 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -61,8 +61,18 @@ prepare(){ [[ $? -ne 0 ]] exit 1 fi if [ -n ${EXTRAOVERLAY} ] ; then - echo Copy from ${EXTRAOVERLAY} to ${WORKDIR}/gentoo-bsd - cp -a ${EXTRAOVERLAY}/* ${WORKDIR}/gentoo-bsd/ + if [[ ${EXTRAOVERLAY} =~ ^http ]]; then + echo Downloading extra overlay. + wget -q -O ${WORKDIR}/extraoverlay.tar.bz2 ${EXTRAOVERLAY} + [[ $? -ne 0 ]] exit 1 + echo Copy from ${WORKDIR}/extraoverlay to ${WORKDIR}/gentoo-bsd + mkdir ${WORKDIR}/extraoverlay + tar xjf ${WORKDIR}/extraoverlay.tar.bz2 --strip-components=1 -C ${WORKDIR}/extraoverlay + cp -a ${WORKDIR}/extraoverlay/* ${WORKDIR}/gentoo-bsd/ + else + echo Copy from ${EXTRAOVERLAY} to ${WORKDIR}/gentoo-bsd + cp -a ${EXTRAOVERLAY}/* ${WORKDIR}/gentoo-bsd/ + fi fi echo emerging catalyst...
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-libexec/
commit: d91f3a958c2485d99f33ff0c5b633b87efa0a186 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Nov 15 16:28:09 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sat Nov 15 16:28:09 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=d91f3a95 freebsd-libexec-10.1.0..ebuild: remove lukemftpd from REMOVE_SUBDIRS --- sys-freebsd/freebsd-libexec/Manifest | 2 +- sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0..ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index 01eeb53..bbd1e51 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -8,5 +8,5 @@ AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802 EBUILD freebsd-libexec-10.0.0..ebuild 2519 SHA256 9c2a8ea10adc7a7015a0a1be1a35556a07bc3329c81391416a3792efe88b2362 SHA512 959e6027da56dd075f2eab63905d972621746b4b59cfadfd9c3a28112011d4e6bf8d0524fec14992bf56f7ce1e8acc7874c50719cd3eb54d59391f5c8a856908 WHIRLPOOL 8c24bc3198ddf9a947feea6f9aa1bbf74272fdcf2a202dc759428e1b242416c3632c2b2dae6a2c64a894fff5003b2276e19036dfb81f8b3befc22db8d48b -EBUILD freebsd-libexec-10.1.0..ebuild 3208 SHA256 30f996c3e5cd728dec66641e6693321aa34ad593b2593b20edad887453de07d0 SHA512 a9536066f4e27b1ceb38bc93e528dbe00de884e9ea0884263b17682bca8c7caa1c088ad6867edbbfd7c5033412cf6445fc80e762ae11c222a422ea17435f8d65 WHIRLPOOL 7754e0d3d93cf1a86b33c93d9fc2700c2bad37946f88a50875b4164740736aac0ae50c8e83c882087ec6d18fda57a186b51237b93e97b4c769ab570f05300bf2 +EBUILD freebsd-libexec-10.1.0..ebuild 3198 SHA256 b9833d0d661363258bbd3ba68bef66bfe5e0b120140ace4ef2f6b59b8754f66f SHA512 15d631126cb462cc63b456da4963952829fb9ed5f7b97492a162f831ef4b493c798573f0a900c64a631efabeb3ec825c35ab6e258f033c6ecfaac74b8210ce1f WHIRLPOOL 348beffbd76065a94e440629bfd12eef8610bc6a7e15bfa4b779acac0bf443825b8ba3a95a90dcb29b81956098f5ab166c1f73eb3c93e1f7ff06e677325593f6 EBUILD freebsd-libexec-9.3.0..ebuild 2484 SHA256 3ce34ec17af06590dda720857a64bfb75a5a7f85fd0c38d7f10b72ab0d65af5f SHA512 1d0badf22482005a70ce2428c7b23c5730f7c19684b37bec0cb00b30a2ca9c4dec6eae2f4f77ad3da7324e1e62f00d33d30ea0da8c5300db863a7150f045c524 WHIRLPOOL 07c1464cd7a9e779e288d592d695c2b0aff9c5573ceff108fda196932419251a4cbeabecc2612255aeb12882354d4c8e77d1b17b872d3835e605a56db31e7975 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0..ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0..ebuild index f4f3ff8..5a2d7bc 100644 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0..ebuild +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0..ebuild @@ -32,7 +32,7 @@ RDEPEND=${RDEPEND} S=${WORKDIR}/libexec # Remove sendmail, tcp_wrapper and other useless stuff -REMOVE_SUBDIRS=smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd +REMOVE_SUBDIRS=smrsh mail.local tcpd telnetd rshd rlogind ftpd IUSE=pam ssl kerberos ipv6 nis xinetd
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 093a6ac384d993ca66e78607bfce91923d57395c Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Nov 15 16:24:53 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sat Nov 15 16:24:53 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=093a6ac3 stages_builder.sh: Add the code to download clang stage3. --- scripts/mkstages/stages_builder.sh | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index a4eeff0..d95eb85 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -43,10 +43,21 @@ prepare(){ mkdir -p /var/tmp/catalyst/builds/default fi - if [ ! -e /var/tmp/catalyst/builds/default/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2 ] [ -z ${FORCESTAGE3} ]; then - echo Downloading aballier's ${TARGETSUBARCH} stage3 file... - wget -q -P /var/tmp/catalyst/builds/default http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2 - [[ $? -ne 0 ]] exit 1 + if [ -z ${FORCESTAGE3} ] ; then + if [ -z ${CLANG} ] ; then + local oldstage3fn=stage3-${TARGETSUBARCH}-freebsd-${OLDVER} + local oldstage3url=http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/${oldstage3fn}.tar.bz2; + else + local oldstage3fn=stage3-${TARGETSUBARCH}-clangfbsd-${OLDVER} + local oldstage3url=http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/clang/${oldstage3fn}.tar.bz2; + fi + + if [ ! -e /var/tmp/catalyst/builds/default/${oldstage3fn}.tar.bz2 ] ; then + echo Downloading aballier's ${TARGETSUBARCH} stage3 file... + wget -q -P /var/tmp/catalyst/builds/default ${oldstage3url} + [[ $? -ne 0 ]] exit 1 + export FORCESTAGE3=${oldstage3fn} + fi fi cd ${WORKDIR}
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/
commit: 7bc8fa65855a3510033cb39830c6494f332d096c Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Nov 15 16:25:24 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sat Nov 15 16:25:24 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=7bc8fa65 added catalyst-2.0.17.ebuild --- dev-util/catalyst/catalyst-2.0.17.ebuild | 115 +++ 1 file changed, 115 insertions(+) diff --git a/dev-util/catalyst/catalyst-2.0.17.ebuild b/dev-util/catalyst/catalyst-2.0.17.ebuild new file mode 100644 index 000..90e2475 --- /dev/null +++ b/dev-util/catalyst/catalyst-2.0.17.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +if [[ ${PV} == ** ]]; then + SRC_ECLASS=git-2 + EGIT_REPO_URI=git://git.overlays.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 +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=http://www.gentoo.org/proj/en/releng/catalyst/; + +LICENSE=GPL-2 +SLOT=0 +IUSE=ccache kernel_linux + +DEPEND= + app-text/asciidoc + ${PYTHON_DEPS} + +RDEPEND= + app-crypt/shash + 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-arch/lbzip2 app-misc/zisofs-tools =sys-fs/squashfs-tools-2.1 ) + ${PYTHON_DEPS} + + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +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 ${FILESDIR}/${PN}-2.0.14-fbsd.patch + epatch ${FILESDIR}/${PN}-2.0.15-fbsd-extra.patch +} + +src_install() { + insinto /usr/$(get_libdir)/${PN} + exeinto /usr/$(get_libdir)/${PN} + doexe catalyst || die copying catalyst + + if [[ ${PV} == 3.* ]]; 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 http://www.gentoo.org/proj/en/releng/catalyst/index.xml; +}
[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/, sys-freebsd/freebsd-libexec/, ...
commit: 4a3a95d17f8555c198ff419b8ee6471bde4fb0d3 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sat Nov 15 12:06:43 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sat Nov 15 12:06:43 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=4a3a95d1 sys-freebsd/*-10.1.0.: bump 10.1-RELEASE. --- sys-freebsd/boot0/Manifest | 2 +- .../boot0/{boot0-10.1._p273437.ebuild = boot0-10.1.0..ebuild} | 0 sys-freebsd/freebsd-bin/Manifest| 2 +- ...ebsd-bin-10.1._p273437.ebuild = freebsd-bin-10.1.0..ebuild} | 0 sys-freebsd/freebsd-cddl/Manifest | 2 +- ...sd-cddl-10.1._p273437.ebuild = freebsd-cddl-10.1.0..ebuild} | 0 sys-freebsd/freebsd-lib/Manifest| 2 +- ...ebsd-lib-10.1._p273437.ebuild = freebsd-lib-10.1.0..ebuild} | 0 sys-freebsd/freebsd-libexec/Manifest| 2 +- ...exec-10.1._p273437.ebuild = freebsd-libexec-10.1.0..ebuild} | 0 sys-freebsd/freebsd-mk-defs/Manifest| 2 +- ...defs-10.1._p273437.ebuild = freebsd-mk-defs-10.1.0..ebuild} | 0 sys-freebsd/freebsd-pam-modules/Manifest| 2 +- ...-10.1._p273437.ebuild = freebsd-pam-modules-10.1.0..ebuild} | 0 sys-freebsd/freebsd-pf/Manifest | 2 +- ...reebsd-pf-10.1._p273437.ebuild = freebsd-pf-10.1.0..ebuild} | 0 sys-freebsd/freebsd-rescue/Manifest | 2 +- ...escue-10.1._p273437.ebuild = freebsd-rescue-10.1.0..ebuild} | 0 sys-freebsd/freebsd-sbin/Manifest | 2 +- ...sd-sbin-10.1._p273437.ebuild = freebsd-sbin-10.1.0..ebuild} | 0 sys-freebsd/freebsd-share/Manifest | 2 +- ...-share-10.1._p273437.ebuild = freebsd-share-10.1.0..ebuild} | 0 sys-freebsd/freebsd-sources/Manifest| 2 +- ...rces-10.1._p273437.ebuild = freebsd-sources-10.1.0..ebuild} | 0 sys-freebsd/freebsd-ubin/Manifest | 2 +- ...sd-ubin-10.1._p273437.ebuild = freebsd-ubin-10.1.0..ebuild} | 0 sys-freebsd/freebsd-usbin/Manifest | 2 +- ...-usbin-10.1._p273437.ebuild = freebsd-usbin-10.1.0..ebuild} | 0 28 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index face644..e430e86 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -3,5 +3,5 @@ AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242 AUX boot0-9.3-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe EBUILD boot0-10.0.0..ebuild 1816 SHA256 687ff6d157bfed3c8cacb5ef8651cb1a10bec0596821a6f91efc34e31cc5be42 SHA512 6fe2922b9366b841e7f3645ca71b8c0597c35e73c56af51971fb6a2a95724048cccb7e2fbe8b1aef1b4962c60a0b7135e983289b7b47fd86545ed4100b5df3f0 WHIRLPOOL 9708d1b5564ff343c1b684a24883ccdc77106b076bcd393961691cdfe34596e4b3e8e8e688740b5f9ebe82ef7dc6a9eb7bf07d632db14decda323336ad5a1552 -EBUILD boot0-10.1._p273437.ebuild 2071 SHA256 5ffcfadd17923a607a3608c1eb66b9e59a03e86ec2aefaaf1dd643326540b14d SHA512 f302d65a701b7be93b8168282dd78127e9907af9739fe616f1bf372136b25a963164552efda873d18742926f9c121f839dfc1e06cfee90cc9d59fb946e5581fd WHIRLPOOL 1d89621e63ef51832f26aa2c7d3c0e9fd0aaaf7d02e9e340d57bcb13974da528adf254ca56c3ece0449fe20b741c6bd3f501cdd4866712ecc1a5b7bd8da20d3b +EBUILD boot0-10.1.0..ebuild 2071 SHA256 5ffcfadd17923a607a3608c1eb66b9e59a03e86ec2aefaaf1dd643326540b14d SHA512 f302d65a701b7be93b8168282dd78127e9907af9739fe616f1bf372136b25a963164552efda873d18742926f9c121f839dfc1e06cfee90cc9d59fb946e5581fd WHIRLPOOL 1d89621e63ef51832f26aa2c7d3c0e9fd0aaaf7d02e9e340d57bcb13974da528adf254ca56c3ece0449fe20b741c6bd3f501cdd4866712ecc1a5b7bd8da20d3b EBUILD boot0-9.3.0..ebuild 1731 SHA256 23526e967e810ef69b61c89d2b76e289ff3d564483c2c9c3be0574b7ef5b9489 SHA512
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/, dev-util/catalyst/files/
commit: 069c9360d560db4669175991c7ffe790846c68ac Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Nov 16 07:42:46 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sun Nov 16 07:42:46 2014 + 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 +- .../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
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 982c5145b50d15e755f9ff09f8f24d1aac59 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Sun Nov 16 07:31:59 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Sun Nov 16 07:31:59 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=982c5145 stages_builder.sh: When check_ecompressdir fails, set update_seed=no --- scripts/mkstages/stages_builder.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index d95eb85..856742a 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -236,6 +236,9 @@ run_catalyst() { if [ $? -ne 0 ] ; then check_ecompressdir ${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}/usr/local/portage if [ $? -ne 0 ] ; then + if [ ${C_TARGET} = stage1 ] [ ${C_SOURCE} != stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ]; then +C_APPEND_OPT=${C_APPEND_OPT} update_seed=no + fi catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/gentoo-bsd ${C_APPEND_OPT} || exit 1 fi fi
[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/files/, dev-util/catalyst/
commit: 12078ea6233fad9ae13bb1295daa73848edb3806 Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Wed Oct 29 12:13:44 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Wed Oct 29 12:13:44 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=12078ea6 catalyst-2.0.15-fbsd-extra.patch: added x86-fbsd 9.0 stage3 and amd64-fbsd/clang 9.1 stage3 support. --- dev-util/catalyst/Manifest | 2 +- dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch | 12 +--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 522dc45..27df8a8 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 3631 SHA256 9ff22dbe1e9a2289dd800fae9d61df391ba8b099f51988d6eb6946aeac3b4f7c SHA512 81757926891d27b3e78fa92ac1c26fa7b69dca488e4e7504ee83458a41cce72df93fb3a9443a27408c1388e4a40d03f03f0bb49291b0d70986b229ee21b7b534 WHIRLPOOL d97927a3eb264ed2c44758ad82092cbaa0126d71aff66dcabaf7594019ad9b4f33b813701b59e5a58142b96def2eab152562639f849750268279958b9491d56a +AUX catalyst-2.0.15-fbsd-extra.patch 3972 SHA256 0f66298139b65fc46aaa198afe5bee6d2a7eb1c3e50a5b9d003967fe5467a9fe SHA512 7d5346fe10f24a10ddc4a933e523268300df5dfa5471df9e3ed4fbd68488d304f08631a5259b744f424a281b69020e7138311c057748740a033bfb205f94a0d4 WHIRLPOOL 4cdd3eb20a151ea8010047ce76ace4ca496ec62f8f9689d7495712d3034fb96ec9ccdd850a6a5d1473eb0b5bd71efb7036c1101266a53766e0662b1fb4eb05c0 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 596ce5f..87a7401 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,19 +1,24 @@ 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 +index ed83f38..1f7137e --- 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 +@@ -21,17 +21,48 @@ 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 ++ 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 ++[[ 4 -eq $(cat /usr/portage/profiles/eapi) ]] find /usr/portage/profiles -name eapi -exec bash -c 'echo 5 {}' \; # Update stage3 if [ -n ${clst_update_seed} ]; then @@ -34,6 +39,7 @@ index ed83f38..0819b2e + [[ -e /etc/portage
[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/
commit: 86c82e0b35fba3367729496d2b028e43ba26307a Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp AuthorDate: Wed Oct 29 12:14:47 2014 + Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com CommitDate: Wed Oct 29 12:14:47 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=86c82e0b stages_builder.sh: ebuild-helpers/ecompressdir path update. --- scripts/mkstages/stages_builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index f3021ca..09055d0 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -176,7 +176,7 @@ create_manifest(){ check_ecompressdir() { # dirty solution # /dev is still mounted; performing auto-bind-umount... - local PID=`ps auxw | grep portage/bin/ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs` + local PID=`ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs` if [ -n ${PID} ] ; then echo kill ecompressdir kill -9 ${PID}