[Debian-live-changes] r2081 - in dists/trunk/live-helper: data/debian-cd helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Thu Jun 14 12:11:37 UTC 2007
Author: daniel
Date: 2007-06-14 12:11:37 +0000 (Thu, 14 Jun 2007)
New Revision: 2081
Added:
dists/trunk/live-helper/data/debian-cd/exclude-udebs
dists/trunk/live-helper/data/debian-cd/exclude-udebs-i386
dists/trunk/live-helper/data/debian-cd/i386_businesscard_udeb_include
dists/trunk/live-helper/data/debian-cd/i386_netinst_udeb_include
dists/trunk/live-helper/data/debian-cd/i386_udeb_include
Modified:
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_binary_linux-image
dists/trunk/live-helper/helpers/lh_binary_memtest
Log:
Added: dists/trunk/live-helper/data/debian-cd/exclude-udebs
===================================================================
--- dists/trunk/live-helper/data/debian-cd/exclude-udebs (rev 0)
+++ dists/trunk/live-helper/data/debian-cd/exclude-udebs 2007-06-14 12:11:37 UTC (rev 2081)
@@ -0,0 +1,118 @@
+# These udebs build the d-i cdrom initrd. As such, there is no reason
+# to keep another copy of them on the CD in udeb form.
+#
+# This duplicates data found in the file build/pkg-lists/kernel, in d-i svn
+kernel-image-*
+# build/pkg-lists/base in d-i svn
+rootskel
+main-menu
+cdebconf-udeb
+udpkg
+anna
+di-utils-shell
+di-utils-reboot
+lowmemcheck
+# build/pkg-lists/cdrom/common, in d-i svn (also included in the
+# root+cd-drivers floppies)
+busybox-udeb
+installation-locale
+localechooser
+iso-3166-udeb
+hw-detect
+cdrom-detect
+cdrom-retriever
+load-cdrom
+cdrom-checker
+bogl-bterm-udeb
+di-utils-terminfo
+cdebconf-priority
+cdebconf-newt-udeb
+usb-discover
+preseed-common
+initrd-preseed
+file-preseed
+nano-udeb
+floppy-retriever
+libfribidi0-udeb
+# Already on the initrd, thanks to library reduction.
+libdebconfclient0-udeb
+libdebian-installer-extra4-udeb
+# These udebs are only useful in building the boot floppy image.
+busybox-floppy-udeb
+rootskel-bootfloppy
+# gtk stuff
+cdebconf-gtk-udeb
+fontconfig-udeb
+libatk1.0-udeb
+libcairo-directfb2-udeb
+libdirectfb-0.9-22-udeb
+libdirectfb-0.9-25-udeb
+libexpat1-udeb
+libfreetype6-udeb
+libglib2.0-udeb
+libgtk-directfb-2.0-0-udeb
+libgtk2-engines-udeb
+libpango1.0-udeb
+libpng12-0-udeb
+libsdl1.2debian-udeb
+mouse-modules-*
+ttf-*
+fbset-udeb
+# We're currently using busybox's own shell, and do not need this one.
+dash-udeb
+# Not currently used
+cdebootstrap-udeb
+hdparm-udeb
+laptop-detect-udeb
+# These dhcp clients are not the currently preferred one.
+dhcp3-client-udeb
+# This package is only useful in the d-i-demo.
+di-utils-exit-installer
+# No need for these loaders.
+download-installer
+load-floppy
+# Only useful in the hd-media initrd.
+iso-scan
+load-iso
+# We're using busybox's modutils these days.
+modutils-basic
+modutils-full
+# Nothing currently depends on this, and it seems not useful on its own.
+reiserfsprogs-udeb
+# reiser4 is not in the Debian kernel.
+mkreiser4-udeb
+reiser4progs-udeb
+# No longer used by parted.
+libreiserfs0.3-udeb
+# These are not really needed, the regular netcfg subsumes them.
+netcfg-static
+# skolelinux stuff, not for the stock CDs
+debian-edu-install-udeb
+debian-edu-profile-udeb
+debian-edu-archive-keyring-udeb
+ltsp-client-builder
+autopartkit
+lvm10-udeb
+# If needed, will be on the initrd already.
+modutils-full
+module-init-tools-udeb
+env-preseed
+rescue-check
+rootskel-gtk
+cdebconf-text-udeb
+brltty-udeb
+klibc-utils-udeb
+libklibc-udeb
+udev-udeb
+ai-choosers
+auto-install
+# Obsolete
+libslang1-utf8-udeb
+discover-udeb
+discover-data-udeb
+discover1-udeb
+discover1-data-udeb
+libdiscover1-udeb
+# Eh?
+gnumach-udeb
+# Exclude apt-setup components; they will be included
Added: dists/trunk/live-helper/data/debian-cd/exclude-udebs-i386
===================================================================
--- dists/trunk/live-helper/data/debian-cd/exclude-udebs-i386 (rev 0)
+++ dists/trunk/live-helper/data/debian-cd/exclude-udebs-i386 2007-06-14 12:11:37 UTC (rev 2081)
@@ -0,0 +1,28 @@
+# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies.
+# As such, there is no reason to keep another copy of them on the CD
+# in udeb form.
+isa-pnp-modules-*
+socket-modules-*
+console-keymaps-at
+console-keymaps-usb
+floppy-modules-*
+cdrom-core-modules-*
+cdrom-modules-*
+ide-modules-*
+ide-core-modules-*
+input-modules-*
+fb-modules-*
+kbd-chooser
+usb-modules-*
+usb-storage-modules-*
+scsi-core-modules-*
+# Not needed with the 2.4 kernel on i386.
+userdevfs
+# The speakup kernel modules are not useful unless the access images are
+# provided.
+*-speakup-di
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
Added: dists/trunk/live-helper/data/debian-cd/i386_businesscard_udeb_include
===================================================================
--- dists/trunk/live-helper/data/debian-cd/i386_businesscard_udeb_include (rev 0)
+++ dists/trunk/live-helper/data/debian-cd/i386_businesscard_udeb_include 2007-06-14 12:11:37 UTC (rev 2081)
@@ -0,0 +1,6 @@
+choose-mirror
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
Added: dists/trunk/live-helper/data/debian-cd/i386_netinst_udeb_include
===================================================================
--- dists/trunk/live-helper/data/debian-cd/i386_netinst_udeb_include (rev 0)
+++ dists/trunk/live-helper/data/debian-cd/i386_netinst_udeb_include 2007-06-14 12:11:37 UTC (rev 2081)
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
Added: dists/trunk/live-helper/data/debian-cd/i386_udeb_include
===================================================================
--- dists/trunk/live-helper/data/debian-cd/i386_udeb_include (rev 0)
+++ dists/trunk/live-helper/data/debian-cd/i386_udeb_include 2007-06-14 12:11:37 UTC (rev 2081)
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-14 09:21:33 UTC (rev 2080)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-14 12:11:37 UTC (rev 2081)
@@ -172,7 +172,7 @@
done
fi
-# Generating indices
+# Generating deb indices
mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
cd binary
@@ -201,7 +201,7 @@
#Architecture: source
#EOF
-# Downloading udebs
+# Downloading udebs indices
mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
@@ -212,6 +212,16 @@
DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
+# Excluding udebs
+EXCLUDE_UDEBS="`grep -v '^#' ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/exclude-udebs`"
+EXCLUDE_UDEBS_i386="`grep -v '^#' ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/exclude-udebs-i386`"
+
+for EXCLUDE in ${EXCLUDE_UDEBS}
+do
+ UDEBS="`grep -v ${EXCLUDE} ${UDEBS}`"
+done
+
+# Downloading udebs
for UDEB in ${UDEBS}
do
mkdir -p binary/`dirname ${UDEB}`
@@ -239,6 +249,8 @@
ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
done
+ln -s . binary/debian
+
# Creating disk info
mkdir binary/.disk
echo "main" > binary/.disk/base_components
Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-14 09:21:33 UTC (rev 2080)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-14 12:11:37 UTC (rev 2081)
@@ -60,17 +60,12 @@
;;
tar|usb-hdd)
+ DESTDIR="binary/live"
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/live"
- fi
- else
- DESTDIR="binary/live"
+ DESTDIR="binary"
fi
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-14 09:21:33 UTC (rev 2080)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-14 12:11:37 UTC (rev 2081)
@@ -82,17 +82,15 @@
;;
tar|usb-hdd)
+ DESTDIR="binary/live"
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
DESTDIR="binary"
- else
- DESTDIR="binary/live"
fi
- else
- DESTDIR="binary/live"
fi
;;
esac
More information about the Debian-live-changes
mailing list