debxo: use initramfs-tools and xserver-xorg-video-geode from backports

This switches over to using backports.org for initramfs-tools and
xserver-xorg-video-geode.  Slowly, the other packages will make
their way to backports.org as well (until we no longer need
that annoying archive hack).

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>

diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks
index 1a4f2976c4124977340bdd0fed51e5a3da0f5d02..d1cc47ef60f67a541a69eb97f288e57275373da7 100644 (file)
--- a/configs/debxo-awesome/hooks
+++ b/configs/debxo-awesome/hooks
@@ -45,7 +45,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -69,10 +70,8 @@ msr
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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 
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
        mkdir -p cache
        for i in $k; do
@@ -86,7 +85,6 @@ EOF
        done
 
        # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
        echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
        # No longer a need for xorg.conf

diff --git a/configs/debxo-awesome/packages b/configs/debxo-awesome/packages
index 674ade2e77bd184faddf4e43a0139c9818277c81..ec02a7bc427bfeda35aa154a74382b7056808cee 100644 (file)
--- a/configs/debxo-awesome/packages
+++ b/configs/debxo-awesome/packages
@@ -6,7 +6,8 @@
 
 # the backend stuff
 libertas-firmware
-initramfs-tools
+olpc-xo1-hw/lenny-backports
+initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
@@ -28,7 +29,7 @@ xserver-xorg-core
 xserver-xorg-input-kbd
 xserver-xorg-input-mouse
 xserver-xorg-input-evdev
-xserver-xorg-video-geode
+xserver-xorg-video-geode/lenny-backports
 xfonts-100dpi
 xfonts-scalable
 xfonts-base

diff --git a/configs/debxo-awesome/variables b/configs/debxo-awesome/variables
index 40e131326042cef1dd6ded59de5fb8c38a4c7c5f..d10ede77f0cadd94c07f0bd1b7d0a27bc36ba03f 100644 (file)
--- a/configs/debxo-awesome/variables
+++ b/configs/debxo-awesome/variables
@@ -15,7 +15,8 @@ IMG_ARCH=i386
 # during the image creation process, a different mirror (ie, a local cache)
 # can be used by supplying --local-apt-mirror.
 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"
+deb http://security.debian.org/ lenny/updates main contrib non-free
+deb http://www.backports.org/debian lenny-backports main contrib non-free"
 
 # The default locale
 IMG_LOCALE="en_US.UTF-8 UTF-8"

diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index a3365dba20e71b6cbf6c0ee1564803f2df4c83c2..58ac437c18259b5889a9c84b37811dcb5c1bf85a 100644 (file)
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -46,7 +46,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -70,10 +71,8 @@ msr
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb"
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb"
        mkdir -p cache
        for i in $k; do
                pkg=$(basename ${i})
@@ -85,9 +84,6 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
-
        # No longer a need for xorg.conf
        rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 

diff --git a/configs/debxo-gnome/packages b/configs/debxo-gnome/packages
index 7cf341aff2c4c4c8654a3404d0f892c69511df0d..2e71a878e0dc5260e5958f44986caddd904ad709 100644 (file)
--- a/configs/debxo-gnome/packages
+++ b/configs/debxo-gnome/packages
@@ -6,7 +6,8 @@
 
 # the backend stuff
 libertas-firmware
-initramfs-tools
+olpc-xo1-hw/lenny-backports
+initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
@@ -28,7 +29,7 @@ xserver-xorg-core
 xserver-xorg-input-kbd
 xserver-xorg-input-mouse
 xserver-xorg-input-evdev
-xserver-xorg-video-geode
+xserver-xorg-video-geode/lenny-backports
 xfonts-100dpi
 xfonts-scalable
 xfonts-base

diff --git a/configs/debxo-gnome/variables b/configs/debxo-gnome/variables
index 40e131326042cef1dd6ded59de5fb8c38a4c7c5f..d10ede77f0cadd94c07f0bd1b7d0a27bc36ba03f 100644 (file)
--- a/configs/debxo-gnome/variables
+++ b/configs/debxo-gnome/variables
@@ -15,7 +15,8 @@ IMG_ARCH=i386
 # during the image creation process, a different mirror (ie, a local cache)
 # can be used by supplying --local-apt-mirror.
 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"
+deb http://security.debian.org/ lenny/updates main contrib non-free
+deb http://www.backports.org/debian lenny-backports main contrib non-free"
 
 # The default locale
 IMG_LOCALE="en_US.UTF-8 UTF-8"

diff --git a/configs/debxo-kde/hooks b/configs/debxo-kde/hooks
index e1b2c6dd5ff88ec3e618e883211b3fb73b070c38..a3b46cb63e0c4c5302eae7a589d5151d722aef9f 100644 (file)
--- a/configs/debxo-kde/hooks
+++ b/configs/debxo-kde/hooks
@@ -45,7 +45,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -69,10 +70,8 @@ msr
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb"
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb"
        mkdir -p cache
        for i in $k; do
                pkg=$(basename ${i})
@@ -84,9 +83,6 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
-
        # No longer a need for xorg.conf
        rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 

diff --git a/configs/debxo-kde/packages b/configs/debxo-kde/packages
index a630fc76e0b4f6f847361dc561f5683a7729a743..42f27aeb40b815c463372025d765a4fc4a55dfb7 100644 (file)
--- a/configs/debxo-kde/packages
+++ b/configs/debxo-kde/packages
@@ -6,7 +6,8 @@
 
 # the backend stuff
 libertas-firmware
-initramfs-tools
+olpc-xo1-hw/lenny-backports
+initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
@@ -28,7 +29,7 @@ xserver-xorg-core
 xserver-xorg-input-kbd
 xserver-xorg-input-mouse
 xserver-xorg-input-evdev
-xserver-xorg-video-geode
+xserver-xorg-video-geode/lenny-backports
 xfonts-100dpi
 xfonts-scalable
 xfonts-base

diff --git a/configs/debxo-kde/variables b/configs/debxo-kde/variables
index 40e131326042cef1dd6ded59de5fb8c38a4c7c5f..d10ede77f0cadd94c07f0bd1b7d0a27bc36ba03f 100644 (file)
--- a/configs/debxo-kde/variables
+++ b/configs/debxo-kde/variables
@@ -15,7 +15,8 @@ IMG_ARCH=i386
 # during the image creation process, a different mirror (ie, a local cache)
 # can be used by supplying --local-apt-mirror.
 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"
+deb http://security.debian.org/ lenny/updates main contrib non-free
+deb http://www.backports.org/debian lenny-backports main contrib non-free"
 
 # The default locale
 IMG_LOCALE="en_US.UTF-8 UTF-8"

diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index 1a4f2976c4124977340bdd0fed51e5a3da0f5d02..d1cc47ef60f67a541a69eb97f288e57275373da7 100644 (file)
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -45,7 +45,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -69,10 +70,8 @@ msr
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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 
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
        mkdir -p cache
        for i in $k; do
@@ -86,7 +85,6 @@ EOF
        done
 
        # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
        echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
        # No longer a need for xorg.conf

diff --git a/configs/debxo-lxde/packages b/configs/debxo-lxde/packages
index d22850b150540e5620890d1cdeed4618c55dd882..ca1b80a05cc27228ad2b663ad59d714c4d4b9ce9 100644 (file)
--- a/configs/debxo-lxde/packages
+++ b/configs/debxo-lxde/packages
@@ -6,7 +6,8 @@
 
 # the backend stuff
 libertas-firmware
-initramfs-tools
+olpc-xo1-hw/lenny-backports
+initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
@@ -28,7 +29,7 @@ xserver-xorg-core
 xserver-xorg-input-kbd
 xserver-xorg-input-mouse
 xserver-xorg-input-evdev
-xserver-xorg-video-geode
+xserver-xorg-video-geode/lenny-backports
 xfonts-100dpi
 xfonts-scalable
 xfonts-base

diff --git a/configs/debxo-lxde/variables b/configs/debxo-lxde/variables
index 40e131326042cef1dd6ded59de5fb8c38a4c7c5f..d10ede77f0cadd94c07f0bd1b7d0a27bc36ba03f 100644 (file)
--- a/configs/debxo-lxde/variables
+++ b/configs/debxo-lxde/variables
@@ -15,7 +15,8 @@ IMG_ARCH=i386
 # during the image creation process, a different mirror (ie, a local cache)
 # can be used by supplying --local-apt-mirror.
 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"
+deb http://security.debian.org/ lenny/updates main contrib non-free
+deb http://www.backports.org/debian lenny-backports main contrib non-free"
 
 # The default locale
 IMG_LOCALE="en_US.UTF-8 UTF-8"

diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index a29584ef2532a21a356bad49ebac5995d6a6c5e9..1daad432a89d0d490f0745f278c2695ce55c70a0 100644 (file)
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/hooks
@@ -45,7 +45,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -69,10 +70,8 @@ msr
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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 
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
        mkdir -p cache
        for i in $k; do
@@ -86,7 +85,6 @@ EOF
        done
 
        # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
        echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
        # No longer a need for xorg.conf

diff --git a/configs/debxo-sugar/packages b/configs/debxo-sugar/packages
index 7d7052191a6330330e9774fe7154e09a38bf5a14..8238ff2e969b9f3960f03efd07eb7e17ea2774ee 100644 (file)
--- a/configs/debxo-sugar/packages
+++ b/configs/debxo-sugar/packages
@@ -6,7 +6,8 @@
 
 # the backend stuff
 libertas-firmware
-initramfs-tools
+olpc-xo1-hw/lenny-backports
+initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
@@ -29,7 +30,7 @@ xserver-xorg-core
 xserver-xorg-input-kbd
 xserver-xorg-input-mouse
 xserver-xorg-input-evdev
-xserver-xorg-video-geode
+xserver-xorg-video-geode/lenny-backports
 xfonts-100dpi
 xfonts-scalable
 xfonts-base

diff --git a/configs/debxo-sugar/variables b/configs/debxo-sugar/variables
index 40e131326042cef1dd6ded59de5fb8c38a4c7c5f..d10ede77f0cadd94c07f0bd1b7d0a27bc36ba03f 100644 (file)
--- a/configs/debxo-sugar/variables
+++ b/configs/debxo-sugar/variables
@@ -15,7 +15,8 @@ IMG_ARCH=i386
 # during the image creation process, a different mirror (ie, a local cache)
 # can be used by supplying --local-apt-mirror.
 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"
+deb http://security.debian.org/ lenny/updates main contrib non-free
+deb http://www.backports.org/debian lenny-backports main contrib non-free"
 
 # The default locale
 IMG_LOCALE="en_US.UTF-8 UTF-8"

diff --git a/configs/debxo-xfce/hooks b/configs/debxo-xfce/hooks
index 140849187e22e65e2260f6dac4f2708c808f40ae..259119af85b77ee4e51da58d5211e3990d2a50a6 100644 (file)
--- a/configs/debxo-xfce/hooks
+++ b/configs/debxo-xfce/hooks
@@ -45,7 +45,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -69,10 +70,8 @@ msr
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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 
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
        mkdir -p cache
        for i in $k; do
@@ -86,7 +85,6 @@ EOF
        done
 
        # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
        echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
        # No longer a need for xorg.conf

diff --git a/configs/debxo-xfce/packages b/configs/debxo-xfce/packages
index d887c27d98cf40d5a5300bd4bf736b2b228d6d94..0bd35273f1e16a0fd18119aa95144fe76c625142 100644 (file)
--- a/configs/debxo-xfce/packages
+++ b/configs/debxo-xfce/packages
@@ -6,7 +6,8 @@
 
 # the backend stuff
 libertas-firmware
-initramfs-tools
+olpc-xo1-hw/lenny-backports
+initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
@@ -28,7 +29,7 @@ xserver-xorg-core
 xserver-xorg-input-kbd
 xserver-xorg-input-mouse
 xserver-xorg-input-evdev
-xserver-xorg-video-geode
+xserver-xorg-video-geode/lenny-backports
 xfonts-100dpi
 xfonts-scalable
 xfonts-base

diff --git a/configs/debxo-xfce/variables b/configs/debxo-xfce/variables
index 40e131326042cef1dd6ded59de5fb8c38a4c7c5f..d10ede77f0cadd94c07f0bd1b7d0a27bc36ba03f 100644 (file)
--- a/configs/debxo-xfce/variables
+++ b/configs/debxo-xfce/variables
@@ -15,7 +15,8 @@ IMG_ARCH=i386
 # during the image creation process, a different mirror (ie, a local cache)
 # can be used by supplying --local-apt-mirror.
 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"
+deb http://security.debian.org/ lenny/updates main contrib non-free
+deb http://www.backports.org/debian lenny-backports main contrib non-free"
 
 # The default locale
 IMG_LOCALE="en_US.UTF-8 UTF-8"

diff --git a/release.sh b/release.sh
index 4f104b6b9477c9d0e59e2671b2e9fe34b1cc92d2..681e2981e252fa1a335f24ca12d188f4f538a410 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -5,7 +5,8 @@ for f in configs/debxo-*; do
        desktop=$(basename $f | sed 's/debxo-//')
        ./mkchroot.sh --config-type debxo-${desktop} \
                        --local-apt-mirror "deb http://localhost:9999/debian lenny main contrib non-free
-deb http://localhost:9999/security lenny/updates main contrib non-free" \
+deb http://localhost:9999/security lenny/updates main contrib non-free
+deb http://localhost:9999/backports lenny-backports main contrib non-free" \
                        debxo-${desktop}
        ./mkjffs2.sh --config-type debxo-${desktop} debxo-${desktop} ${desktop}.img
        ./mkext3.sh --config-type debxo-${desktop} debxo-${desktop} \