Commit b07ce8a0 authored by Ruben Rodriguez's avatar Ruben Rodriguez

Merge branch 'master' into dwyn

parents 7eff37eb fb2f60fd
......@@ -44,10 +44,9 @@ UPSTREAM=$(grep 'export UPSTREAM=' helpers/config |sed 's/.*=//')
WORKDIR=tmp/makepackage
REPOSITORY=$PWD/repos/$CODENAME
HELPERS=$PWD/helpers
if ! [ -d repos/ ]
then
for REPO in $(git branch|sed 's/.* //;/master/d')
do
[ -d $REPOSITORY ] && continue
mkdir -p repos/$REPO/conf repos/$REPO/incoming
cat << EOF > repos/$REPO/conf/distributions
Origin: Trisquel
......@@ -74,7 +73,6 @@ cd repos/$REPO
reprepro -v export
cd ../..
done
fi
disablescripts(){
# Disable service starter scripts
......@@ -132,7 +130,7 @@ EOF
[ $UPSTREAM != hardy -a $UPSTREAM != lucid -a $UPSTREAM != maverick ] && echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/02apt-speedup
$C apt-get update
[ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata
$C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
[ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
disablescripts
$C apt-get --force-yes -y dist-upgrade
$C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache
......@@ -146,6 +144,7 @@ EOF
then
for BIN in /bin/uname /usr/bin/arch
do
[ -f $CHROOT/$BIN ] || continue
mv $CHROOT/$BIN $CHROOT/$BIN.orig
cat << EOF > $CHROOT/$BIN
#!/bin/sh
......
......@@ -120,8 +120,10 @@ then
continue
fi
$TEST git --git-dir=$WD/.git checkout $DISTRO
$TEST git --git-dir=$WD/.git merge master
cd $WD
$TEST git checkout $DISTRO
$TEST git merge master
cd $TMP
echo Upgrading $current at $DISTRO with ${UPSTREAM}_$upstream 1>&2
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log 1>&2
......
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