merge lunge

diff --git a/README.approx b/README.approx
index 7b67cf4da7e3efd03ec9de8e50bfe1c04d8c229e..80ef97ccffb52a38664e4df1f011615e21ae9035 100644 (file)
--- a/README.approx
+++ b/README.approx
@@ -17,8 +17,11 @@ security        http://security.debian.org/
        % sudo /etc/init.d/approx restart
 
 4.  follow README, but during the creation of the root filesystem, add
-the --mirror option, like this:
+the --local-apt-mirror option, like this:
 
         sudo ./initchroot.sh \
             --package-list kde.packages \
-            --mirror http://localhost:9999/debian kde.root
+            --local-apt-mirror \
+"deb http://localhost:9999/debian lenny main contrib non-free
+deb http://localhost:9999/security lenny/updates main contrib non-free" \
+            kde.root

diff --git a/initchroot.sh b/initchroot.sh
index 18c6e6505561cba8afb933aea19c33ea81fc94e8..706414a6b277ac6781b6c66d489361b9b35e1316 100755 (executable)
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -16,11 +16,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-DIST=lenny
 DEFUSER=olpc
 PLIST=gnome.packages
-MIRROR=http://http.us.debian.org/debian/
-OTHERMIRROR=
+APT_SOURCES="deb http://http.us.debian.org/debian/ lenny main contrib non-free
+deb http://security.debian.org/ lenny/updates main contrib non-free"
+LOCAL_APT_MIRROR=
 
 . functions.sh
 
@@ -30,11 +30,10 @@ usage()
        echo "Usage: $0 [<options>] <root directory>" 1>&2
        echo "" 1>&2
        echo "Options:" 1>&2
-       echo "  --distribution <name>     Which distribution to use" 1>&2
        echo "  --user <user>             Username for default user" 1>&2
        echo "  --package-list <list>     File containing package list" 1>&2
-       echo "  --mirror <url>            Main Mirror URL prefix" 1>&2
-       echo "  --othermirror <line>      An additional sources.list line" 1>&2
+       echo "  --apt-sources <srcs>      Contents of /etc/apt/sources.list" 1>&2
+       echo "  --local-apt-mirror <srcs> sources.list for local mirror" 1>&2
        echo "" 1>&2
        exit 1
 }
@@ -42,13 +41,6 @@ usage()
 while test $# != 0
 do
        case $1 in
-       --distribution)
-               DIST=$2
-               shift
-               if [ -z "${OTHERMIRROR}" ]; then
-                   OTHERMIRROR="deb http://security.debian.org/ ${DIST}/updates main contrib non-free"
-               fi
-               ;;
        --user)
                DEFUSER=$2
                shift
@@ -61,12 +53,12 @@ do
                }
                shift
                ;;
-       --mirror)
-               MIRROR=$2
+       --apt-sources)
+               APT_SOURCES="$2"
                shift
                ;;
-       --othermirror)
-               OTHERMIRROR=$2
+       --local-apt-mirror)
+               LOCAL_APT_MIRROR="$2"
                shift
                ;;
        *)
@@ -95,10 +87,14 @@ fi
 
 check_for_cmds debootstrap || exit 1
 
-if [ -z "${OTHERMIRROR}" ]; then
-    OTHERMIRROR="deb http://security.debian.org/ ${DIST}/updates main contrib non-free"
+if [ -z "${LOCAL_APT_MIRROR}" ]; then
+    LOCAL_APT_MIRROR="${APT_SOURCES}"
 fi
 
+# parse apt mirror
+MIRROR=$(printf "${LOCAL_APT_MIRROR}\n" | awk '/deb /{print $2}' | head -n1)
+DIST=$(printf "${LOCAL_APT_MIRROR}\n" | awk '/deb /{print $3}' | head -n1)
+
 # create chroot
 debootstrap --arch i386 ${DIST} ${ROOT_DIR} ${MIRROR}
 mkdir ${ROOT_DIR}/ofw
@@ -114,6 +110,21 @@ echo "Warning: Fake start-stop-daemon called, doing nothing"
 EOF
 chmod 755 ${ROOT_DIR}/sbin/start-stop-daemon
 
+# set up hostname stuff
+echo "debxo" > ${ROOT_DIR}/etc/hostname
+cat >${ROOT_DIR}/etc/hosts<<EOF
+127.0.0.1 localhost.localdomain localhost
+127.0.0.1 debxo
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+EOF
+
 # set up apt (working around #314334)
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_PRIORITY=critical
@@ -127,10 +138,7 @@ Dir {
        };
 };
 EOF
-cat >${ROOT_DIR}/etc/apt/sources.list<<EOF
-deb ${MIRROR} ${DIST} main contrib non-free
-${OTHERMIRROR}
-EOF
+printf "${LOCAL_APT_MIRROR}\n" >${ROOT_DIR}/etc/apt/sources.list
 (chroot ${ROOT_DIR} aptitude update)
 
 # set up base system and base packages
@@ -139,13 +147,15 @@ echo "en_US.UTF-8 UTF-8" >${ROOT_DIR}/etc/locale.gen
 
 k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.3/linux-2.6.25.15_2.6.25.15-146_i386.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.3/linux-2.6.25.15_2.6.25.15-147_i386.deb"
 mkdir -p cache
 for i in $k; do
        pkg=$(basename ${i})
        wget --continue -O cache/${pkg} ${i}
        cp cache/${pkg} ${ROOT_DIR}/${pkg} 
        (chroot ${ROOT_DIR} dpkg -i /${pkg})
+       pkgbase=$(echo $pkg | cut -d_ -f1)
+       echo $pkgbase hold | (chroot ${ROOT_DIR} dpkg --set-selections)
        rm -f ${ROOT_DIR}/${pkg}
 done
 
@@ -158,20 +168,6 @@ scx200_acb
 i8042
 EOF
 
-echo "debxo" > ${ROOT_DIR}/etc/hostname
-cat >${ROOT_DIR}/etc/hosts<<EOF
-127.0.0.1 localhost.localdomain localhost
-127.0.0.1 debxo
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-
 # install packages
 (chroot ${ROOT_DIR} aptitude install -y `cat ${PLIST}`)
 
@@ -248,6 +244,10 @@ sugar
 EOF
 fi
 
+# override sources.list with shipping version
+printf "${APT_SOURCES}\n" >${ROOT_DIR}/etc/apt/sources.list
+(chroot ${ROOT_DIR} aptitude update)
+
 # done, clean up
 mv ${ROOT_DIR}/sbin/start-stop-daemon.REAL ${ROOT_DIR}/sbin/start-stop-daemon
 (chroot ${ROOT_DIR} aptitude clean)

diff --git a/release.sh b/release.sh
new file mode 100755 (executable)
index 0000000..8cca167
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# prepare a release
+for f in *.packages; do
+       desktop=$(echo $f | sed 's/\.packages//')
+       ./initchroot.sh --package-list ${f} \
+                       --local-apt-mirror "deb http://localhost:9999/debian lenny main contrib non-free
+deb http://localhost:9999/security lenny/updates main contrib non-free" \
+                       debxo-${desktop}
+       ./mkjffs2.sh debxo-${desktop} ${desktop}.img
+       ./mkext3.sh debxo-${desktop} debxo-${desktop}.ext3.img
+       gzip debxo-${desktop}.ext3.img
+
+       mkdir -p ext3 jffs2
+       mv debxo-${desktop}.ext3.img.gz ext3
+       mv ${desktop}.img ${desktop}.dat jffs2
+done