From 554b72536dc9fbd145868518d122695b3f7b56b5 Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Mon, 12 Nov 2012 18:56:18 +0100
Subject: WIP: basic armel no-squashfs build

---
 README        | 1 +
 auto/config   | 3 ++-
 config/binary | 8 ++++----
 config/chroot | 4 ++--
 config/common | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README b/README
index bcdfe95..b6e1da8 100644
--- a/README
+++ b/README
@@ -14,6 +14,7 @@ Install live-build and qemu:
 You need a recent version of live-build because of a secring.gpg-related error
 (see http://lists.debian.org/debian-live/2012/07/msg00122.html); download the
 sid package (from http://packages.debian.org/sid/live-build) and install:
+(or, from http://live.debian.net/debian/ ?)
 
     sudo dpkg -i live-build_3.0~a67-1_all.deb
 
diff --git a/auto/config b/auto/config
index 18c6034..1245b65 100755
--- a/auto/config
+++ b/auto/config
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 lb config noauto \
-    --architecture armel \
+    --architectures armel \
     --linux-flavours kirkwood \
     --apt-secure true \
     --binary-images hdd \
@@ -12,6 +12,7 @@ lb config noauto \
     --distribution wheezy \
     --parent-distribution wheezy \
     --binary-filesystem ext3 \
+    --chroot-filesystem none \
     --security true \
     --debian-installer-gui false \
     --bootstrap-qemu-arch armel \
diff --git a/config/binary b/config/binary
index 97f09d2..d8f2969 100644
--- a/config/binary
+++ b/config/binary
@@ -78,16 +78,16 @@ LB_HDD_SIZE="10000"
 LB_ISO_APPLICATION="Debian Live"
 
 # $LB_ISO_PREPARER: set iso preparer
-# (Default: live-build $VERSION; http://packages.qa.debian.org/live-build)
-LB_ISO_PREPARER="live-build $VERSION; http://packages.qa.debian.org/live-build"
+# (Default: live-build 3.0~a67-1; http://packages.qa.debian.org/live-build)
+LB_ISO_PREPARER="live-build 3.0~a67-1; http://packages.qa.debian.org/live-build"
 
 # $LB_ISO_PUBLISHER: set iso publisher
 # (Default: Debian Live project; http://live.debian.net/; debian-live@lists.debian.org)
 LB_ISO_PUBLISHER="Debian Live project; http://live.debian.net/; debian-live@lists.debian.org"
 
 # $LB_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian wheezy $(date +%Y%m%d-%H:%M))
-LB_ISO_VOLUME="Debian wheezy $(date +%Y%m%d-%H:%M)"
+# (Default: Debian wheezy 20121112-18:54)
+LB_ISO_VOLUME="Debian wheezy 20121112-18:54"
 
 # $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
 # (Default: unset)
diff --git a/config/chroot b/config/chroot
index cb3036d..46c5a45 100644
--- a/config/chroot
+++ b/config/chroot
@@ -1,8 +1,8 @@
 # config/chroot - options for live-build(7), chroot stage
 
 # $LB_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: squashfs)
-LB_CHROOT_FILESYSTEM="squashfs"
+# (Default: none)
+LB_CHROOT_FILESYSTEM="none"
 
 # $LB_UNION_FILESYSTEM: set union filesystem
 # (Default: aufs)
diff --git a/config/common b/config/common
index 3ba9d46..00ee8f0 100644
--- a/config/common
+++ b/config/common
@@ -134,5 +134,5 @@ APT_OPTIONS="--yes"
 APTITUDE_OPTIONS="--assume-yes"
 DEBOOTSTRAP_OPTIONS=""
 CDEBOOTSTRAP_OPTIONS=""
-GZIP_OPTIONS="-6 --rsyncable"
+GZIP_OPTIONS="-6  --rsyncable"
 ISOHYBRID_OPTIONS=""
-- 
cgit v1.2.3