CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into toutatis

Browse source
This commit is contained in:
Rubén Rodríguez 2012-10-15 08:46:24 +02:00
commit d057cfb453
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
makepackage
View file

@ -132,7 +132,7 @@ EOF
[ $UPSTREAM != hardy -a $UPSTREAM != lucid -a $UPSTREAM != maverick ] && echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/02apt-speedup [ $UPSTREAM != hardy -a $UPSTREAM != lucid -a $UPSTREAM != maverick ] && echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/02apt-speedup
$C apt-get update $C apt-get update
[ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata [ $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 disablescripts
$C apt-get --force-yes -y dist-upgrade $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 $C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache
@ -146,6 +146,7 @@ EOF
then then
for BIN in /bin/uname /usr/bin/arch for BIN in /bin/uname /usr/bin/arch
do do
[ -f $CHROOT/$BIN ] || continue
mv $CHROOT/$BIN $CHROOT/$BIN.orig mv $CHROOT/$BIN $CHROOT/$BIN.orig
cat << EOF > $CHROOT/$BIN cat << EOF > $CHROOT/$BIN
#!/bin/sh #!/bin/sh

6
makepending
View file

@ -120,8 +120,10 @@ then
continue continue
fi fi
$TEST git --git-dir=$WD/.git checkout $DISTRO cd $WD
$TEST git --git-dir=$WD/.git merge master $TEST git checkout $DISTRO
$TEST git merge master
cd $TMP
echo Upgrading $current at $DISTRO with ${UPSTREAM}_$upstream 1>&2 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
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log 1>&2 echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log 1>&2