From bed5f0ab57664ed54d43d18afeaf92145a3417b1 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Sat, 11 Jul 2009 23:10:08 -0400 Subject: [PATCH] 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 --- configs/debxo-awesome/hooks | 8 +++----- configs/debxo-awesome/packages | 5 +++-- configs/debxo-awesome/variables | 3 ++- configs/debxo-gnome/hooks | 12 ++++-------- configs/debxo-gnome/packages | 5 +++-- configs/debxo-gnome/variables | 3 ++- configs/debxo-kde/hooks | 12 ++++-------- configs/debxo-kde/packages | 5 +++-- configs/debxo-kde/variables | 3 ++- configs/debxo-lxde/hooks | 8 +++----- configs/debxo-lxde/packages | 5 +++-- configs/debxo-lxde/variables | 3 ++- configs/debxo-sugar/hooks | 8 +++----- configs/debxo-sugar/packages | 5 +++-- configs/debxo-sugar/variables | 3 ++- configs/debxo-xfce/hooks | 8 +++----- configs/debxo-xfce/packages | 5 +++-- configs/debxo-xfce/variables | 3 ++- release.sh | 3 ++- 19 files changed, 52 insertions(+), 55 deletions(-) diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks index 1a4f297..d1cc47e 100644 --- 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 674ade2..ec02a7b 100644 --- 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 40e1313..d10ede7 100644 --- 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 a3365db..58ac437 100644 --- 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 7cf341a..2e71a87 100644 --- 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 40e1313..d10ede7 100644 --- 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 e1b2c6d..a3b46cb 100644 --- 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 a630fc7..42f27ae 100644 --- 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 40e1313..d10ede7 100644 --- 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 1a4f297..d1cc47e 100644 --- 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 d22850b..ca1b80a 100644 --- 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 40e1313..d10ede7 100644 --- 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 a29584e..1daad43 100644 --- 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 7d70521..8238ff2 100644 --- 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 40e1313..d10ede7 100644 --- 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 1408491..259119a 100644 --- 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 d887c27..0bd3527 100644 --- 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 40e1313..d10ede7 100644 --- 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 4f104b6..681e298 100755 --- 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} \ -- 2.39.5