From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0D5C71381FA for ; Sat, 29 Dec 2012 09:17:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A880221C093; Sat, 29 Dec 2012 09:16:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AD8B21C093 for ; Sat, 29 Dec 2012 09:16:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8602733C3B4 for ; Sat, 29 Dec 2012 09:16:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E96BCE543D for ; Sat, 29 Dec 2012 09:16:43 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1356772590.6a5e666e45eb900b6dd230ad650871269d6470c7.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: scripts/mkstages/chroot_prepare_upgrade.sh scripts/mkstages/stages_builder.sh X-VCS-Directories: scripts/mkstages/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 6a5e666e45eb900b6dd230ad650871269d6470c7 X-VCS-Branch: master Date: Sat, 29 Dec 2012 09:16:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9f591d25-2fae-4214-822c-64f212a53664 X-Archives-Hash: 891e18804d4af5daea3a953e459cccd8 commit: 6a5e666e45eb900b6dd230ad650871269d6470c7 Author: Yuta SATOH gentoo gr jp> AuthorDate: Sat Dec 29 09:16:30 2012 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Sat Dec 29 09:16:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=6a5e666e gfbsd stages builder, fixed bug 447808, 447810. --- scripts/mkstages/chroot_prepare_upgrade.sh | 4 ++++ scripts/mkstages/stages_builder.sh | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh b/scripts/mkstages/chroot_prepare_upgrade.sh index fe44c0b..298c7fb 100755 --- a/scripts/mkstages/chroot_prepare_upgrade.sh +++ b/scripts/mkstages/chroot_prepare_upgrade.sh @@ -9,6 +9,9 @@ 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 @@ -62,6 +65,7 @@ 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 diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 93251d6..e6285cd 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -96,6 +96,7 @@ prepare(){ mkdir ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src cd ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src ${WORKDIR}/portage.bsd-overlay/scripts/extract-9.0.sh ${TARGETVER}${MY_MKSRC} + mkdir -p /usr/portage/distfiles mv *${TARGETVER}${MY_MKSRC}*bz2 /usr/portage/distfiles/ fi @@ -128,6 +129,12 @@ prepare(){ export WORKDATE="`date +%Y%m%d`" fi + #fixes bug 447808 + grep "python_targets_python2_7" /usr/portage/profiles/default/bsd/fbsd/make.defaults > /dev/null 2>&1 + if [ $? -ne 0 ] ; then + gsed -i 's:BOOTSTRAP_USE="\(.*\)":BOOTSTRAP_USE="\1 python_targets_python2_7":g' /usr/portage/profiles/default/bsd/fbsd/make.defaults + fi + if [ -n "${STABLE}" ] ; then echo "create stages, mixed stable ${TARGETARCH} and minimal ${TARGETARCH}-fbsd flag on" mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile @@ -142,6 +149,9 @@ prepare(){ if [ $? -ne 0 ] ; then echo "*app-editors/nano" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/packages fi + #fixes bug 447810 + mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/patches/app-shells/bash + 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" fi } @@ -155,12 +165,13 @@ create_manifest(){ do cd ${dir} ls -1 *${TARGETVER}*.ebuild > /dev/null 2>&1 - if [[ "${MKSRC}" = "release" || $? -ne 0 ]] ; then + if [ $? -eq 0 ] ; then gsed -i "/${TARGETVER}/d" Manifest ls -1 *${TARGETVER}${MY_MKSRC}*.ebuild > /dev/null 2>&1 - if [ $? -ne 0 ] ; then + if [[ "${MKSRC}" = "release" || $? -ne 0 ]] ; then EBUILDFILE=`ls -1 *${TARGETVER}*.ebuild | tail -n 1` echo "copy ${EBUILDFILE} to ${TARGETVER}${MY_MKSRC}.ebuild" + gsed -i '/cve-2012-4576.patch/d' ${EBUILDFILE} cp ${EBUILDFILE} ${dir}-${TARGETVER}${MY_MKSRC}.ebuild fi @@ -206,7 +217,7 @@ upgrade_src_stage3(){ echo "nameserver 8.8.8.8" > ${WORKDIR}/stage3tmp/etc/resolv.conf fi chroot ${WORKDIR}/stage3tmp /tmp/chroot_prepare_upgrade.sh - umount ${WORKDIR}/stage3tmp/usr/portage/distfiles || exit 1 + umount ${WORKDIR}/stage3tmp/usr/portage/distfiles umount ${WORKDIR}/stage3tmp/usr/portage || exit 1 umount ${WORKDIR}/stage3tmp/dev || exit 1 if [ ! -e ${WORKDIR}/stage3tmp/tmp/prepare_done ] ; then