summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2013-02-01 09:14:09 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2013-02-01 09:14:09 +0200
commit40c11d8ebb8467f9b3e788f3da15745708044479 (patch)
treef58235f811c8ed52266059026392ffd63ce155d6
parent8318be9330b098146f1f5daf56c83cf4894e80c5 (diff)
precise-armhf-ubuntu-desktop: update config to live-build 3.0~a69 syntax
-rwxr-xr-xprecise-armhf-ubuntu-desktop/Makefile4
-rwxr-xr-xprecise-armhf-ubuntu-desktop/configure3
2 files changed, 4 insertions, 3 deletions
diff --git a/precise-armhf-ubuntu-desktop/Makefile b/precise-armhf-ubuntu-desktop/Makefile
index fb94bc7..f1154bd 100755
--- a/precise-armhf-ubuntu-desktop/Makefile
+++ b/precise-armhf-ubuntu-desktop/Makefile
@@ -10,7 +10,7 @@
IMAGEPREFIX=linaro-precise-ubuntu-desktop-`date +%Y%m%d`-$(BUILD_NUMBER)
LOGFILE=$(IMAGEPREFIX).build-log.txt
CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
-LISTFILE=$(IMAGEPREFIX).list
+LISTFILE=$(IMAGEPREFIX).contents
PKGSFILE=$(IMAGEPREFIX).packages
TARGZFILE=$(IMAGEPREFIX).tar.gz
MD5SUMSFILE=$(IMAGEPREFIX).md5sums.txt
@@ -20,7 +20,7 @@ all:
set -e; sudo lb build 2>&1 | tee $(LOGFILE)
if [ -f binary-tar.tar.gz ]; then \
tar -jcf $(CONFIGFILE) auto/ config/ configure; \
- sudo mv binary.list $(LISTFILE); \
+ sudo mv binary.contents $(LISTFILE); \
sudo mv binary.packages $(PKGSFILE); \
sudo mv binary-tar.tar.gz $(TARGZFILE); \
md5sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(TARGZFILE) > $(MD5SUMSFILE); \
diff --git a/precise-armhf-ubuntu-desktop/configure b/precise-armhf-ubuntu-desktop/configure
index e3e2298..b56274d 100755
--- a/precise-armhf-ubuntu-desktop/configure
+++ b/precise-armhf-ubuntu-desktop/configure
@@ -23,6 +23,7 @@ lb config \
--bootstrap-qemu-static /usr/bin/qemu-arm-static \
--cache false \
--chroot-filesystem none \
+ --compression gzip \
--distribution precise \
--gzip-options '-9 --rsyncable' \
--iso-publisher 'Linaro; http://www.linaro.org/; linaro-dev@lists.linaro.org' \
@@ -33,7 +34,7 @@ lb config \
--mode ubuntu \
--security false \
--system normal \
- --volatile false
+ --updates false
echo "I: copy customization"
cp -rf customization/* config/