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

Simplify eatmydata loading for compiling

Browse source
This commit is contained in:
Rubén Rodríguez 2014-11-23 18:10:21 +01:00
parent 0c3e4ee2ed
commit a2fb7885d7
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
makepackage
View file

@ -19,6 +19,7 @@
set -e set -e
export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
MEM=$(cat /proc/meminfo |grep MemTotal| awk '{print $2}') MEM=$(cat /proc/meminfo |grep MemTotal| awk '{print $2}')
GPGKEY=8D8AEBF1 GPGKEY=8D8AEBF1
@ -132,7 +133,6 @@ 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 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
@ -216,7 +216,6 @@ PACKAGE=$PACKAGE
cd $WORKDIR cd $WORKDIR
[ -d LOGS ] || mkdir LOGS [ -d LOGS ] || mkdir LOGS
[ -d PACKAGES ] || mkdir PACKAGES [ -d PACKAGES ] || mkdir PACKAGES
export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
export PATH="/usr/lib/ccache:${PATH}" export PATH="/usr/lib/ccache:${PATH}"
bash -e make-$PACKAGE 2>&1 || exit 1 bash -e make-$PACKAGE 2>&1 || exit 1
EOF EOF