Commit d472ac67 authored by Ruben Rodriguez's avatar Ruben Rodriguez

Merge branch 'master' into dagda

parents f4ec475d ac10a85a
#!/bin/sh
#!/bin/bash
#
# Copyright (C) 2011 Ruben Rodriguez <ruben@trisquel.info>
#
......@@ -147,7 +147,7 @@ EOF
[ -f $CHROOT/$BIN ] || continue
mv $CHROOT/$BIN $CHROOT/$BIN.orig
cat << EOF > $CHROOT/$BIN
#!/bin/sh
#!/bin/bash
if [ \$# -eq 0 ]
then
......@@ -175,10 +175,11 @@ do
mv \$i \$i.real
cp /bin/true \$i
done
export DEBIAN_FRONTEND=noninteractive
apt-get --force-yes -y dist-upgrade
umount /proc
EOF
chroot jails/$UPSTREAM-$ARCH sh /tmp/update
chroot jails/$UPSTREAM-$ARCH bash /tmp/update
if [ -f jails/$UPSTREAM-$ARCH/CurrentlyBuilding ]
then
echo The $UPSTREAM-$ARCH jail appears to be running $(cat jails/$UPSTREAM-$ARCH/CurrentlyBuilding |grep Package: |sed 's/Package:\ //'), aborting.
......@@ -188,7 +189,7 @@ fi
}
tmpumount(){
grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return
grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return 0
umount jails/$UPSTREAM-$ARCH/tmp && return
echo ERROR: could not umount tmpfs at jails/$UPSTREAM-$ARCH/tmp
exit 1
......@@ -206,7 +207,7 @@ tmpmount
cp -a helpers/ jails/$UPSTREAM-$ARCH/$WORKDIR/
cat << EOF > jails/$UPSTREAM-$ARCH/usr/local/sbin/makepackage-handler
#!/bin/sh
#!/bin/bash
WORKDIR=$WORKDIR
PACKAGE=$PACKAGE
cd $WORKDIR
......@@ -214,7 +215,7 @@ cd $WORKDIR
[ -d PACKAGES ] || mkdir PACKAGES
export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
export PATH="/usr/lib/ccache:${PATH}"
sh -e make-$PACKAGE 2>&1 || exit 1
bash -e make-$PACKAGE 2>&1 || exit 1
EOF
cat << EOF > jails/$UPSTREAM-$ARCH/etc/pkgbinarymangler/striptranslations.conf
......
......@@ -108,6 +108,7 @@ then
# echo Upstream version in $UPSTREAM: $upstream 1>&2
[ $package = "grub2" -a $UPSTREAM = natty ] && continue
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
[ $package = "grub2" -a $UPSTREAM = precise ] && continue
[ $package = "yelp" -a $UPSTREAM = natty ] && continue
echo Current version in $DISTRO: $current
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment