diff options
| author |   Yuta SATOH <nigoro@gentoo.gr.jp> | 2012-12-29 18:16:30 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro@gentoo.gr.jp> | 2012-12-29 18:16:30 +0900 |
| commit | 6a5e666e45eb900b6dd230ad650871269d6470c7 (patch) | |
| tree | 524fef301c5a6877766cc3bae65b8ebb9a003d29 /scripts | |
| parent | sys-freebsd/*/files: removed old patches (diff) | |
| download | gentoo-bsd-6a5e666e45eb900b6dd230ad650871269d6470c7.tar.gz gentoo-bsd-6a5e666e45eb900b6dd230ad650871269d6470c7.tar.bz2 gentoo-bsd-6a5e666e45eb900b6dd230ad650871269d6470c7.zip | |
gfbsd stages builder, fixed bug 447808, 447810.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkstages/chroot_prepare_upgrade.sh | 4 | ||||
| -rwxr-xr-x | 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 |