| 1 |
commit: 6a0bfb7ed650a81cee7051471ad309b143ac2928 |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Thu Nov 22 14:32:18 2012 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Thu Nov 22 14:32:18 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=6a0bfb7e |
| 7 |
|
| 8 |
gfbsd stages builder, some fix to the success of build stages |
| 9 |
|
| 10 |
--- |
| 11 |
scripts/mkstages/chroot_prepare_upgrade.sh | 1 + |
| 12 |
scripts/mkstages/minimal-fbsd-list | 1 + |
| 13 |
scripts/mkstages/stages_builder.sh | 2 ++ |
| 14 |
3 files changed, 4 insertions(+), 0 deletions(-) |
| 15 |
|
| 16 |
diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh b/scripts/mkstages/chroot_prepare_upgrade.sh |
| 17 |
index dee7991..fe44c0b 100755 |
| 18 |
--- a/scripts/mkstages/chroot_prepare_upgrade.sh |
| 19 |
+++ b/scripts/mkstages/chroot_prepare_upgrade.sh |
| 20 |
@@ -61,6 +61,7 @@ emerge -q app-admin/eselect || exit |
| 21 |
if [ -e /etc/portage/profile ] ; then |
| 22 |
rm -rf /etc/portage/profile |
| 23 |
rm /etc/portage/package.keywords |
| 24 |
+ rm /etc/portage/package.use |
| 25 |
fi |
| 26 |
|
| 27 |
rm -rf /usr/local/portage.bsd-overlay |
| 28 |
|
| 29 |
diff --git a/scripts/mkstages/minimal-fbsd-list b/scripts/mkstages/minimal-fbsd-list |
| 30 |
index 7ca109f..2787328 100644 |
| 31 |
--- a/scripts/mkstages/minimal-fbsd-list |
| 32 |
+++ b/scripts/mkstages/minimal-fbsd-list |
| 33 |
@@ -3,6 +3,7 @@ app-arch/libarchive ~x86-fbsd |
| 34 |
dev-libs/libedit ~x86-fbsd |
| 35 |
dev-libs/libelf ~x86-fbsd |
| 36 |
dev-libs/libiconv ~x86-fbsd |
| 37 |
+net-misc/openssh ~x86-fbsd |
| 38 |
sys-apps/baselayout ~x86-fbsd |
| 39 |
sys-apps/more ~x86-fbsd |
| 40 |
sys-auth/openpam ~x86-fbsd |
| 41 |
|
| 42 |
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh |
| 43 |
index 6a8a86f..edf4410 100755 |
| 44 |
--- a/scripts/mkstages/stages_builder.sh |
| 45 |
+++ b/scripts/mkstages/stages_builder.sh |
| 46 |
@@ -102,6 +102,8 @@ prepare(){ |
| 47 |
mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile |
| 48 |
cp -a ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/minimal-fbsd-list ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/package.keywords |
| 49 |
echo "ACCEPT_KEYWORDS=\"-${TARGETARCH}-fbsd -~${TARGETARCH}-fbsd ${TARGETARCH}\"" > ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults |
| 50 |
+ echo "FEATURES=\"preserve-libs\"" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults |
| 51 |
+ echo "sys-apps/portage python3" > ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/package.use |
| 52 |
fi |
| 53 |
} |
Archives