| 1 |
commit: 6a5e666e45eb900b6dd230ad650871269d6470c7 |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Sat Dec 29 09:16:30 2012 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Sat Dec 29 09:16:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=6a5e666e |
| 7 |
|
| 8 |
gfbsd stages builder, fixed bug 447808, 447810. |
| 9 |
|
| 10 |
--- |
| 11 |
scripts/mkstages/chroot_prepare_upgrade.sh | 4 ++++ |
| 12 |
scripts/mkstages/stages_builder.sh | 17 ++++++++++++++--- |
| 13 |
2 files changed, 18 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh b/scripts/mkstages/chroot_prepare_upgrade.sh |
| 16 |
index fe44c0b..298c7fb 100755 |
| 17 |
--- a/scripts/mkstages/chroot_prepare_upgrade.sh |
| 18 |
+++ b/scripts/mkstages/chroot_prepare_upgrade.sh |
| 19 |
@@ -9,6 +9,9 @@ fi |
| 20 |
if [ -e /tmp/catalystrc ] ; then |
| 21 |
source /tmp/catalystrc |
| 22 |
fi |
| 23 |
+# fixes bug #447810 |
| 24 |
+MAKEOPTS=-j1 emerge -q app-shells/bash || exit |
| 25 |
+ |
| 26 |
# fixes bug #412319 |
| 27 |
emerge -q sys-devel/gcc-config || exit |
| 28 |
gcc-config 1 |
| 29 |
@@ -62,6 +65,7 @@ if [ -e /etc/portage/profile ] ; then |
| 30 |
rm -rf /etc/portage/profile |
| 31 |
rm /etc/portage/package.keywords |
| 32 |
rm /etc/portage/package.use |
| 33 |
+ rm -rf /etc/portage/patches |
| 34 |
fi |
| 35 |
|
| 36 |
rm -rf /usr/local/portage.bsd-overlay |
| 37 |
|
| 38 |
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh |
| 39 |
index 93251d6..e6285cd 100755 |
| 40 |
--- a/scripts/mkstages/stages_builder.sh |
| 41 |
+++ b/scripts/mkstages/stages_builder.sh |
| 42 |
@@ -96,6 +96,7 @@ prepare(){ |
| 43 |
mkdir ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src |
| 44 |
cd ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src |
| 45 |
${WORKDIR}/portage.bsd-overlay/scripts/extract-9.0.sh ${TARGETVER}${MY_MKSRC} |
| 46 |
+ mkdir -p /usr/portage/distfiles |
| 47 |
mv *${TARGETVER}${MY_MKSRC}*bz2 /usr/portage/distfiles/ |
| 48 |
fi |
| 49 |
|
| 50 |
@@ -128,6 +129,12 @@ prepare(){ |
| 51 |
export WORKDATE="`date +%Y%m%d`" |
| 52 |
fi |
| 53 |
|
| 54 |
+ #fixes bug 447808 |
| 55 |
+ grep "python_targets_python2_7" /usr/portage/profiles/default/bsd/fbsd/make.defaults > /dev/null 2>&1 |
| 56 |
+ if [ $? -ne 0 ] ; then |
| 57 |
+ gsed -i 's:BOOTSTRAP_USE="\(.*\)":BOOTSTRAP_USE="\1 python_targets_python2_7":g' /usr/portage/profiles/default/bsd/fbsd/make.defaults |
| 58 |
+ fi |
| 59 |
+ |
| 60 |
if [ -n "${STABLE}" ] ; then |
| 61 |
echo "create stages, mixed stable ${TARGETARCH} and minimal ${TARGETARCH}-fbsd flag on" |
| 62 |
mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile |
| 63 |
@@ -142,6 +149,9 @@ prepare(){ |
| 64 |
if [ $? -ne 0 ] ; then |
| 65 |
echo "*app-editors/nano" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/packages |
| 66 |
fi |
| 67 |
+ #fixes bug 447810 |
| 68 |
+ mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/patches/app-shells/bash |
| 69 |
+ wget -q -O ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/patches/app-shells/bash/bash-4.2-redir-fbsd.patch "https://447810.bugs.gentoo.org/attachment.cgi?id=333210" |
| 70 |
fi |
| 71 |
} |
| 72 |
|
| 73 |
@@ -155,12 +165,13 @@ create_manifest(){ |
| 74 |
do |
| 75 |
cd ${dir} |
| 76 |
ls -1 *${TARGETVER}*.ebuild > /dev/null 2>&1 |
| 77 |
- if [[ "${MKSRC}" = "release" || $? -ne 0 ]] ; then |
| 78 |
+ if [ $? -eq 0 ] ; then |
| 79 |
gsed -i "/${TARGETVER}/d" Manifest |
| 80 |
ls -1 *${TARGETVER}${MY_MKSRC}*.ebuild > /dev/null 2>&1 |
| 81 |
- if [ $? -ne 0 ] ; then |
| 82 |
+ if [[ "${MKSRC}" = "release" || $? -ne 0 ]] ; then |
| 83 |
EBUILDFILE=`ls -1 *${TARGETVER}*.ebuild | tail -n 1` |
| 84 |
echo "copy ${EBUILDFILE} to ${TARGETVER}${MY_MKSRC}.ebuild" |
| 85 |
+ gsed -i '/cve-2012-4576.patch/d' ${EBUILDFILE} |
| 86 |
cp ${EBUILDFILE} ${dir}-${TARGETVER}${MY_MKSRC}.ebuild |
| 87 |
fi |
| 88 |
|
| 89 |
@@ -206,7 +217,7 @@ upgrade_src_stage3(){ |
| 90 |
echo "nameserver 8.8.8.8" > ${WORKDIR}/stage3tmp/etc/resolv.conf |
| 91 |
fi |
| 92 |
chroot ${WORKDIR}/stage3tmp /tmp/chroot_prepare_upgrade.sh |
| 93 |
- umount ${WORKDIR}/stage3tmp/usr/portage/distfiles || exit 1 |
| 94 |
+ umount ${WORKDIR}/stage3tmp/usr/portage/distfiles |
| 95 |
umount ${WORKDIR}/stage3tmp/usr/portage || exit 1 |
| 96 |
umount ${WORKDIR}/stage3tmp/dev || exit 1 |
| 97 |
if [ ! -e ${WORKDIR}/stage3tmp/tmp/prepare_done ] ; then |
Archives