diff --git a/sarge/CONF.sh b/sarge/CONF.sh index 5a9afc61..8053f736 100644 --- a/sarge/CONF.sh +++ b/sarge/CONF.sh @@ -23,14 +23,15 @@ unset EXCLUDE || true unset SRCEXCLUDE || true unset NORECOMMENDS || true unset NOSUGGESTS || true -unset DOJIGDO || true +#unset DOJIGDO || true +unset JIGDOCMD || true unset JIGDOTEMPLATEURL || true -unset JIGDOFALLBACKURLS || true +#unset JIGDOFALLBACKURLS || true unset JIGDOINCLUDEURLS || true unset JIGDOSCRIPT || true unset JIGDO_OPTS || true -unset DEFBINSIZE || true -unset DEFSRCSIZE || true +#unset DEFBINSIZE || true +#unset DEFSRCSIZE || true unset FASTSUMS || true unset PUBLISH_URL || true unset PUBLISH_NONUS_URL || true @@ -39,43 +40,38 @@ unset UDEB_INCLUDE || true unset UDEB_EXCLUDE || true unset BASE_INCLUDE || true unset BASE_EXCLUDE || true -unset INSTALLER_CD || true -unset MAXCDS || true -unset SPLASHPNG || true -unset OMIT_MANUAL || true -unset OMIT_RELEASE_NOTES || true +#unset INSTALLER_CD || true + # The debian-cd dir # Where I am (hoping I'm in the debian-cd dir) export BASEDIR=`pwd` -# Building etch cd set ... -export CODENAME=etch +export DI=sarge + +# Building sarge cd set ... +export CODENAME=sarge -# By default use Debian installer packages from $CODENAME if [ ! "$DI_CODENAME" ] then export DI_CODENAME=$CODENAME fi -# If set, controls where the d-i components are downloaded from. -# This may be an url, or "default", which will make it use the default url -# for the daily d-i builds. If not set, uses the official d-i images from -# the Debian mirror. -#export DI_WWW_HOME=default - # Version number, "2.2 r0", "2.2 r1" etc. -export DEBVERSION="3.1" +export DEBVERSION="3.1 r8" # Official or non-official set. # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE # ON THE OFFICIAL DEBIAN CD WEBSITE http://cdimage.debian.org -export OFFICIAL="Unofficial" -#export OFFICIAL="Official" +#export OFFICIAL="Unofficial" +export OFFICIAL="Official" #export OFFICIAL="Official Beta" # ... for arch -export ARCH=`dpkg --print-architecture` +if [ ! "$ARCH" ] +then + export ARCH=`dpkg --print-installation-architecture` +fi # IMPORTANT : The 4 following paths must be on the same partition/device. # If they aren't then you must set COPYLINK below to 1. This @@ -83,7 +79,12 @@ export ARCH=`dpkg --print-architecture` # images, however. Also, if you are using an NFS partition for # some part of this, you must use this option. # Paths to the mirrors -export MIRROR=/ftp/debian +if [ "$MIRROR"x = ""x ] ; then + export MIRROR=/org/cdbuilder.debian.org/src/ftp/debian +fi +if [ "$ARCH" = "amd64" ] ; then + export MIRROR=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian-amd64 +fi # Comment the following line if you don't have/want non-US #export NONUS=/ftp/debian-non-US @@ -94,14 +95,16 @@ export MIRROR=/ftp/debian #export FORCENONUSONCD1=1 # Path of the temporary directory -export TDIR=/ftp/tmp +export TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/"$INSTALLER_CD""$DI""$ARCH" # Path where the images will be written -export OUT=/rack/debian-cd +if [ "$OUT"x = ""x ] ; then + export OUT=/org/cdbuilder.debian.org/dst/deb-cd/tmp/"$INSTALLER_CD""$DI""$ARCH" +fi # Where we keep the temporary apt stuff. # This cannot reside on an NFS mount. -export APTTMP=/ftp/tmp/apt +export APTTMP=$TDIR/apt # Do I want to have NONFREE merged in the CD set # export NONFREE=1 @@ -144,7 +147,7 @@ export CONTRIB=1 # export COPYLINK=1 # Options -# export MKISOFS=mkisofs +export MKISOFS="$BASEDIR/../mkisofs/usr/bin/mkisofs" # export MKISOFS_OPTS="-r" #For normal users # export MKISOFS_OPTS="-r -F ." #For symlink farmers @@ -152,7 +155,7 @@ export CONTRIB=1 export ISOLINUX=1 # uncomment this to if you want to see more of what the Makefile is doing -#export VERBOSE_MAKE=1 +export VERBOSE_MAKE=1 # uncoment this to make build_all.sh try to build a simple CD image if # the proper official CD run does not work @@ -161,18 +164,18 @@ export ISOLINUX=1 # Set your disk size here in MB. Used in calculating package and # source file layouts in build.sh and build_all.sh. Defaults are for # CD-R, try ~4600 for DVD-R. -export DEFBINSIZE=630 -export DEFSRCSIZE=635 +if [ ! "$DEFBINSIZE" ] ; then export DEFBINSIZE=639 ; fi +if [ ! "$DEFSRCSIZE" ] ; then export DEFSRCSIZE=639 ; fi # We don't want certain packages to take up space on CD1... -export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME +export EXCLUDE="$BASEDIR"/tasks/exclude-sarge # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x) -export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-$CODENAME +export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-sarge # Any packages listed in EXCLUDE but not in any UNEXCLUDE will be # excluded completely. # We also exclude some source packages -#export SRCEXCLUDE="$BASEDIR"/tasks/exclude-src-$CODENAME +#export SRCEXCLUDE="$BASEDIR"/tasks/exclude-src-potato # Set this if the recommended packages should be skipped when adding # package on the CD. The default is 'false'. @@ -191,18 +194,20 @@ export NORECOMMENDS=1 # since they need the actual .iso to make it bootable. For these archs, # the temp-iso will be generated, but deleted again immediately after the # jigdo stuff is made; needs temporary space as big as the biggest image. -#export DOJIGDO=2 +if [ ! "$DOJIGDO" ];then export DOJIGDO=1;fi # # jigdo-file command & options # Note: building the cache takes hours, so keep it around for the next run -#export JIGDOCMD="/usr/local/bin/jigdo-file --cache=$HOME/jigdo-cache.db" -# +#export JIGDOCMD="$BASEDIR/../jigdo/usr/bin/jigdo-file --cache=$TDIR/jigdo-cache.db" +#export JIGDOCMD="/usr/bin/jigdo-file --cache=$TDIR/jigdo-cache.db" + # HTTP/FTP URL for directory where you intend to make the templates # available. You should not need to change this; the default value "" # means "template in same dir as the .jigdo file", which is usually # correct. If it is non-empty, it needs a trailing slash. "%ARCH%" # will be substituted by the current architecture. #export JIGDOTEMPLATEURL="" +#export JIGDOTEMPLATEURL="jigdotemplates/" # # Name of a directory on disc to create data for a fallback server in. # Should later be made available by you at the URL given in @@ -211,12 +216,13 @@ export NORECOMMENDS=1 # files in your FTP archive. Because of the hard links, the dir must # be on the same partition as the FTP archive! If unset, no fallback # data is created, which may cause problems - see README. -#export JIGDOFALLBACKPATH="$(OUT)/snapshot/" +#export JIGDOFALLBACKPATH="$OUT/snapshot/" # # Space-separated list of label->URL mappings for "jigdo fallback # server(s)" to add to .jigdo file. If unset, no fallback URL is # added, which may cause problems - see README. -#export JIGDOFALLBACKURLS="Debian=http://myserver/snapshot/Debian/ Non-US=http://myserver/snapshot/Non-US/" +if [ ! "$JIGDOFALLBACKURLS" ];then export JIGDOFALLBACKURLS="Debian=http://gluck.debian.org/cdimage/snapshot/cd/$ARCH/Debian/";fi +#Non-US=http://gluck.debian.org/cdimage/testing/jigdo-area/$ARCH/snapshot/Non-US/";fi # # Space-separated list of "include URLs" to add to the .jigdo file. # The included files are used to provide an up-to-date list of Debian @@ -233,14 +239,14 @@ export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigd # If set, use the md5sums from the main archive, rather than calculating # them locally -#export FASTSUMS=1 +export FASTSUMS=1 # A couple of things used only by publish_cds, so it can tweak the # jigdo files, and knows where to put the results. # You need to run publish_cds manually, it is not run by the Makefile. -export PUBLISH_URL="http://cdimage.debian.org/jigdo-area" -export PUBLISH_NONUS_URL="http://non-US.cdimage.debian.org/jigdo-area" -export PUBLISH_PATH="/home/jigdo-area/" +#export PUBLISH_URL="http://cdimage.debian.org/jigdo-area" +#export PUBLISH_NONUS_URL="http://non-US.cdimage.debian.org/jigdo-area" +#export PUBLISH_PATH="/home/jigdo-area/" # Specify files and directories to *exclude* from jigdo processing. These # files on each CD are expected to be different to those on the mirror, or @@ -248,11 +254,6 @@ export PUBLISH_PATH="/home/jigdo-area/" # simply be placed straight into the template file. export JIGDO_EXCLUDE="'README*' /doc/ /md5sum.txt /.disk/ /pics/ 'Release*' 'Packages*' 'Sources*'" -# Specify files that MUST match entries in the externally-supplied -# md5-list. If they do not, the CD build process will fail; something -# must have been corrupted. Replaces the old mirrorcheck code. -export JIGDO_INCLUDE="/pool/" - # Specify the minimum file size to consider for jigdo processing. Any files # smaller than this will simply be placed straight into the template file. export JIGDO_OPTS="-jigdo-min-file-size 0" @@ -262,10 +263,8 @@ do JIGDO_OPTS="$JIGDO_OPTS -jigdo-exclude $EXCL" done -for INCL in $JIGDO_INCLUDE -do - JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL" -done +export DEBOOTSTRAP_DIR="$BASEDIR"/../debootstrap/usr/lib/debootstrap/ +export IGNORE_MISSING_BOOT_SCRIPT=1 # Where to find the boot disks #export BOOTDISKS=$TOPDIR/ftp/skolelinux/boot-floppies @@ -291,32 +290,19 @@ done # Only put the installer onto the cd (set NORECOMMENDS,... as well). # INSTALLER_CD=0: nothing special (default) -# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME) -# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME) +# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer) +# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel) #export INSTALLER_CD=0 -# Parameters to pass to kernel when the CD boots. Not currently supported -# for all architectures. -#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical" - -# If set, limits the number of binary CDs to produce. -#export MAXCDS=1 - -# If set, overrides the boot picture used. -#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png" - -# Used by build.sh to determine what to build, this is the name of a target -# in the Makefile. Use bin-official_images to build only binary CDs. The -# default, official_images, builds everything. -#IMAGETARGET=official_images - -# Set to 1 to save space by omitting the installation manual. -# If so the README will link to the manual on the web site. -#export OMIT_MANUAL=1 +# Jeroen: not needed +#export DELOROOT="$BASEDIR"/../delo # Set to 1 to save space by omitting the release notes # If so we will link to them on the web site. -export OMIT_RELEASE_NOTES=0 +#export OMIT_RELEASE_NOTES=0 # Set this to override the defaul location #export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME" +if [ "$ARCH" = "amd64" ];then + export RELEASE_NOTES_LOCATION="http://amd64.debian.net/docs/release-notes/" +fi diff --git a/sarge/Makefile b/sarge/Makefile index c84a1ab0..551cfdcb 100755 --- a/sarge/Makefile +++ b/sarge/Makefile @@ -440,6 +440,7 @@ $(BDIR)/CD1/.disk/info: num=$${i%%.packages}; num=$${num##$(BDIR)/}; \ dir=$(BDIR)/CD$$num; \ echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \ + echo -n $(BINDISKINFOND) | sed 's/_NONUS//g' > $(BDIR)/$$num.diskinfo; \ echo '#define DISKNAME ' $(BINDISKINFOND) | sed 's/_NONUS//g' \ > $$dir/README.diskdefines; \ echo '#define TYPE binary' \ @@ -471,6 +472,7 @@ $(SDIR)/CD1/.disk/info: num=$${i%%.sources}; num=$${num##$(SDIR)/}; \ dir=$(SDIR)/CD$$num; \ echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \ + echo -n $(SRCDISKINFOND) | sed 's/_NONUS//g' > $(SDIR)/$$num.diskinfo; \ echo '#define DISKNAME ' $(SRCDISKINFOND) | sed 's/_NONUS//g' \ > $$dir/README.diskdefines; \ echo '#define TYPE source' \ @@ -875,10 +877,10 @@ images: bin-images src-images # 2 jigdo, cleanup_jigdo # bin-images: ok bin-md5list $(OUT) - $(make_image) $(BDIR) $(ARCH) $(OUT) $(DOJIGDO) $(DEBVERSION) $(MIRROR) $(MKISOFS) $(MKISOFS_OPTS) $(JIGDO_OPTS) $(JIGDO_CLEANUP) + $(make_image) "$(BDIR)" "$(ARCH)" "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)" src-images: ok src-md5list $(OUT) - $(make_image) $(SDIR) source $(OUT) $(DOJIGDO) $(DEBVERSION) $(MIRROR) $(MKISOFS) $(MKISOFS_OPTS) $(JIGDO_OPTS) $(JIGDO_CLEANUP) + $(make_image) "$(SDIR)" "source" "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)" check-number-given: @test -n "$(CD)" || (echo "Give me a CD= parameter !" && false) @@ -890,21 +892,7 @@ src-image: check-number-given src-images #Calculate the md5sums for the images (if available), or get from templates imagesums: - $(Q)cd $(OUT); :> MD5SUMS; for file in `find * -name \*.raw`; do \ - $(md5sum) $$file >>MD5SUMS; \ - done; \ - for file in `find * -name \*.template`; do \ - if [ "`tail --bytes=33 "$$file" | head --bytes=1 | od -tx1 -An | sed -e 's/ //g'`" != 05 ]; then \ - echo "Possibly invalid template $$file"; exit 1; \ - fi; \ - grep -q " $${file%%.template}.raw"'$$' MD5SUMS \ - || echo "`tail --bytes=26 "$$file" | head --bytes=16 | od -tx1 -An | sed -e 's/ //g'` $${file%%.template}.raw" >>MD5SUMS; \ - done - -# Likewise, the file size can be extracted from the .template with: -# tail --bytes=32 $$file | head --bytes=6 | od -tx1 -An \ -# | tr ' abcdef' '\nABCDEF' | tac | tr '\n' ' ' \ -# | sed -e 's/ //g; s/^.*$/ibase=16 & /' | tr ' ' '\n' | bc + $(Q)$(BASEDIR)/tools/imagesums $(OUT) ## MISC TARGETS ## @@ -919,23 +907,23 @@ conf: mirrorcheck-binary: ok rm -f $(BDIR)/md5-check - $(Q)$(grab_md5) $(MIRROR) $(ARCH) $(CODENAME) $(BDIR)/md5-check + $(Q)$(grab_md5) $(MIRROR) $(ARCH) $(CODENAME) $(CODENAME) $(BDIR)/md5-check if [ -n "$(NONUS)" ]; then \ - $(grab_md5) $(NONUS) $(ARCH) $(CODENAME) $(BDIR)/md5-check; \ + $(grab_md5) $(NONUS) $(ARCH) $(CODENAME) $(CODENAME) $(BDIR)/md5-check; \ fi $(Q)if [ -e $(BASEDIR)/data/$(CODENAME)/$(ARCH)/extra-sources ]; then \ echo "Extra dedicated source added; need to grab source MD5 info too"; \ - $(Q)$(grab_md5) $(MIRROR) source $(CODENAME) $(BDIR)/md5-check; \ + $(Q)$(grab_md5) $(MIRROR) source $(CODENAME) $(CODENAME) $(BDIR)/md5-check; \ if [ -n "$(NONUS)" ]; then \ - $(grab_md5) $(NONUS) source $(CODENAME) $(BDIR)/md5-check; \ + $(grab_md5) $(NONUS) source $(CODENAME) $(CODENAME) $(BDIR)/md5-check; \ fi; \ fi mirrorcheck-source: ok rm -f $(SDIR)/md5-check - $(Q)$(grab_md5) $(MIRROR) source $(CODENAME) $(SDIR)/md5-check + $(Q)$(grab_md5) $(MIRROR) source $(CODENAME) $(CODENAME) $(SDIR)/md5-check if [ -n "$(NONUS)" ]; then \ - $(grab_md5) $(NONUS) source $(CODENAME) $(SDIR)/md5-check; \ + $(grab_md5) $(NONUS) source $(CODENAME) $(CODENAME) $(SDIR)/md5-check; \ fi update-popcon: diff --git a/sarge/data/sarge/README.html.in b/sarge/data/sarge/README.html.in index c5164b67..f0c33dbb 100644 --- a/sarge/data/sarge/README.html.in +++ b/sarge/data/sarge/README.html.in @@ -12,7 +12,7 @@ - + #if 0 If you read THIS, you're viewing the actual source file ;-) #endif @@ -159,15 +159,6 @@ CONTENTS:
  • #endif -#ifndef UNOFFEXTRAS -Last-Minute Notes -

    - -#if OUTPUTtext -

  • -#endif -#endif - #if TYPEbinary Using CDs with apt

    @@ -305,23 +296,6 @@ The programs on the Binary CDs are ordered by popularity. The Binary-1 CD contains the most popular programs and the installation tools; it is possible to install and run Debian with only the Binary-1 CD. The other CDs, up to Binary-TOTALNUM, contain mostly special-interest programs. -

    -#if OMIT_RELEASE_NOTES -The Release Notes for "sarge" are available on the Debian web -site. -#else -#if DISKNUM == 1 -The Release Notes for Debian GNU/Linux "sarge" are included on this CD -in /doc/release-notes/, in -several languages. Additional translations and updated versions for -the Release Notes may be available from the Debian web -site. -#else -See the first CD in this set for the "sarge" Release Notes. -#endif -#endif #endif #if TYPEsource the source code of programs in the Debian OS. @@ -418,42 +392,6 @@ Installing See the README on that CD for more info. #endif -#ifndef UNOFFEXTRAS -#if OUTPUTtext -

     

    -#endif -#if OUTPUThtml -

    -#endif -Last-Minute Notes -#if OUTPUTtext -
    -================= -#endif -

    - -

    -

      - -
    • -You should keep in mind that this is an unofficial CD of the current -development version of the Debian system. This means that all sorts of -bugs may be present anywhere in the system. - -
        -
      • - -#if 0 --------- This can't be an official image, so also no official notes. -
    • -Last-minutes notes for this CD may be available on -http://www.debian.org/CD/releases/ -
      • -#endif - -
    -#endif - #if TYPEbinary #if OUTPUTtext

     

    diff --git a/sarge/tasks/debian-installer+kernel-sarge b/sarge/tasks/debian-installer+kernel-sarge index 6ca97668..70acf0a6 100644 --- a/sarge/tasks/debian-installer+kernel-sarge +++ b/sarge/tasks/debian-installer+kernel-sarge @@ -7,7 +7,7 @@ * * DO NOT EDIT THIS FILE, edit the above script * - * Last update: Fri May 27 23:28:27 CEST 2005 + * Last update: Sun Apr 13 22:25:15 CEST 2008 */ #include @@ -38,67 +38,31 @@ discover discover1 grub lilo -kernel-image-2.4.27-2-386 -kernel-pcmcia-modules-2.4.27-2-386 -kernel-image-2.6.8-2-386 #endif #ifdef ARCH_amd64 discover discover1 grub lilo -kernel-image-2.6.8-11-amd64-generic +kernel-image-2.6.8-12-amd64-generic #endif #ifdef ARCH_alpha aboot aboot-base discover1 -kernel-image-2.4-generic -kernel-image-2.4-smp -kernel-image-2.4.27-2-generic -kernel-image-2.4.27-2-smp -kernel-image-2.6-generic -kernel-image-2.6-smp -kernel-image-2.6.8-2-generic -kernel-image-2.6.8-2-smp -kernel-image-netbootable #endif #ifdef ARCH_hppa discover1 -kernel-image-2.6.8-2-32 -kernel-image-2.6.8-2-32-smp -kernel-image-2.6.8-2-64 -kernel-image-2.6.8-2-64-smp #endif #ifdef ARCH_ia64 discover1 initrd-tools -kernel-image-2.4.27-2-itanium -kernel-image-2.4.27-2-itanium-smp -kernel-image-2.4.27-2-mckinley -kernel-image-2.4.27-2-mckinley-smp -kernel-image-2.4-itanium -kernel-image-2.4-itanium-smp -kernel-image-2.4-mckinley -kernel-image-2.4-mckinley-smp -kernel-image-2.6.8-2-itanium -kernel-image-2.6.8-2-itanium-smp -kernel-image-2.6.8-2-mckinley -kernel-image-2.6.8-2-mckinley-smp -kernel-image-2.6-itanium -kernel-image-2.6-itanium-smp -kernel-image-2.6-mckinley -kernel-image-2.6-mckinley-smp #endif #ifdef ARCH_mips arcboot -kernel-image-2.4.27-r4k-ip22 -kernel-image-2.4.27-r5k-ip22 #endif #ifdef ARCH_mipsel delo -kernel-image-2.4.27-r3k-kn02 -kernel-image-2.4.27-r4k-kn04 #endif #ifdef ARCH_powerpc discover1 @@ -107,44 +71,14 @@ yaboot mkvmlinuz module-init-tools initrd-tools -kernel-image-2.6.8-powerpc -kernel-image-2.6.8-power3 -kernel-image-2.6.8-power4 -kernel-image-2.4.27-apus #endif #ifdef ARCH_sparc discover1 initrd-tools -kernel-image-2.4-sparc32 -kernel-image-2.4-sparc32-smp -kernel-image-2.4-sparc64 -kernel-image-2.4-sparc64-smp -kernel-image-2.4.27-2-sparc32 -kernel-image-2.4.27-2-sparc32-smp -kernel-image-2.4.27-2-sparc64 -kernel-image-2.4.27-2-sparc64-smp -kernel-image-2.6-sparc32 -kernel-image-2.6-sparc64 -kernel-image-2.6-sparc64-smp -kernel-image-2.6.8-2-sparc32 -kernel-image-2.6.8-2-sparc64 -kernel-image-2.6.8-2-sparc64-smp #endif #ifdef ARCH_m68k fileutils -kernel-image-2.2.25-mac -kernel-image-2.4.27-amiga -kernel-image-2.4.27-atari -kernel-image-2.4.27-bvme6000 -kernel-image-2.4.27-mvme147 -kernel-image-2.4.27-mvme16x -kernel-image-2.4.27-q40 #endif #ifdef ARCH_arm discover1 -kernel-image-2.4.27-bast -kernel-image-2.4.27-lart -kernel-image-2.4.27-netwinder -kernel-image-2.4.27-riscpc -kernel-image-2.4.27-riscstation #endif diff --git a/sarge/tasks/debian-installer-sarge b/sarge/tasks/debian-installer-sarge index fb5e8035..34aee9fc 100644 --- a/sarge/tasks/debian-installer-sarge +++ b/sarge/tasks/debian-installer-sarge @@ -5,388 +5,15 @@ * * DO NOT EDIT THIS FILE, edit the above script * - * Last update: Fri May 27 23:28:25 CEST 2005 + * Last update: Sun Apr 13 22:25:15 CEST 2008 */ -#ifdef ARCH_alpha -aboot-installer +#ifdef ARCH_amd64 +acpi-modules-2.6.8-11-amd64-generic-di +acpi-modules-2.6.8-12-amd64-generic-di archdetect autopartkit base-installer baseconfig-udeb -brltty-modules-2.4.27-2-generic-di -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.4.27-2-generic-di -cdrom-modules-2.4.27-2-generic-di -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -ext3-modules-2.4.27-2-generic-di -fat-modules-2.4.27-2-generic-di -fb-modules-2.4.27-2-generic-di -fbset-udeb -fdisk-udeb -hdparm-udeb -hw-detect-full -ide-core-modules-2.4.27-2-generic-di -ide-modules-2.4.27-2-generic-di -ipv6-modules-2.4.27-2-generic-di -isa-pnp-modules-2.4.27-2-generic-di -jfs-modules-2.4.27-2-generic-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6.1-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-2-generic-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-extra-modules-2.4.27-2-generic-di -nic-modules-2.4.27-2-generic-di -nic-shared-modules-2.4.27-2-generic-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -parport-modules-2.4.27-2-generic-di -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -plip-modules-2.4.27-2-generic-di -ppp-modules-2.4.27-2-generic-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -reiserfs-modules-2.4.27-2-generic-di -scsi-common-modules-2.4.27-2-generic-di -scsi-core-modules-2.4.27-2-generic-di -scsi-extra-modules-2.4.27-2-generic-di -scsi-modules-2.4.27-2-generic-di -serial-modules-2.4.27-2-generic-di -socket-modules-2.4.27-2-generic-di -srm-modules-2.4.27-2-generic-di -srm-reader -usb-modules-2.4.27-2-generic-di -usb-storage-modules-2.4.27-2-generic-di -userdevfs -wireless-tools-udeb -xfs-modules-2.4.27-2-generic-di -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_alpha */ -#ifdef ARCH_arm -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.4.27-bast-di -cdrom-core-modules-2.4.27-netwinder-di -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -fat-modules-2.4.27-netwinder-di -fat-modules-2.4.27-riscpc-di -fat-modules-2.4.27-riscstation-di -fbset-udeb -fdisk-udeb -hdparm-udeb -hw-detect-full -isa-pnp-modules-2.4.27-netwinder-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.4.27-bast-di -loop-modules-2.4.27-netwinder-di -loop-modules-2.4.27-riscpc-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-netwinder-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-extra-modules-2.4.27-netwinder-di -nic-modules-2.4.27-netwinder-di -nic-shared-modules-2.4.27-netwinder-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext2r0 -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -ppp-udeb -prebaseconfig -reiser4progs-udeb -scsi-common-modules-2.4.27-netwinder-di -scsi-core-modules-2.4.27-netwinder-di -scsi-extra-modules-2.4.27-netwinder-di -scsi-modules-2.4.27-netwinder-di -socket-modules-2.4.27-bast-di -socket-modules-2.4.27-lart-di -socket-modules-2.4.27-netwinder-di -socket-modules-2.4.27-riscpc-di -socket-modules-2.4.27-riscstation-di -usb-modules-2.4.27-netwinder-di -userdevfs -wireless-tools-udeb -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_arm */ -#ifdef ARCH_hppa -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.6.8-2-32-di -cdrom-core-modules-2.6.8-2-64-di -cdrom-modules-2.6.8-2-32-di -cdrom-modules-2.6.8-2-64-di -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -ext3-modules-2.6.8-2-32-di -ext3-modules-2.6.8-2-64-di -fbset-udeb -fdisk-udeb -firewire-core-modules-2.6.8-2-32-di -firewire-core-modules-2.6.8-2-64-di -hdparm-udeb -hw-detect-full -ide-modules-2.6.8-2-32-di -ide-modules-2.6.8-2-64-di -input-modules-2.6.8-2-32-di -input-modules-2.6.8-2-64-di -ipv6-modules-2.6.8-2-32-di -ipv6-modules-2.6.8-2-64-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.6.8-2-32-di -loop-modules-2.6.8-2-64-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.6.8-2-32-di -md-modules-2.6.8-2-64-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-modules-2.6.8-2-32-di -nic-modules-2.6.8-2-64-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -palo-installer -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-palo -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -ppp-modules-2.6.8-2-32-di -ppp-modules-2.6.8-2-64-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -sata-modules-2.6.8-2-32-di -sata-modules-2.6.8-2-64-di -scsi-modules-2.6.8-2-32-di -scsi-modules-2.6.8-2-64-di -socket-modules-2.6.8-2-32-di -socket-modules-2.6.8-2-64-di -usb-modules-2.6.8-2-32-di -usb-modules-2.6.8-2-64-di -usb-storage-modules-2.6.8-2-32-di -usb-storage-modules-2.6.8-2-64-di -userdevfs -wireless-tools-udeb -xfs-modules-2.6.8-2-32-di -xfs-modules-2.6.8-2-64-di -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_hppa */ -#ifdef ARCH_i386 -acpi-modules-2.6.8-2-386-di -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-modules-2.4.27-2-386-di brltty-udeb bterm-unifont bugreporter-udeb @@ -409,25 +36,26 @@ e2fsprogs-udeb eject-udeb ethdetect evms-udeb -ext3-modules-2.4.27-2-386-di -ext3-modules-2.6.8-2-386-di -fat-modules-2.4.27-2-386-di -fat-modules-2.6.8-2-386-di +ext3-modules-2.6.8-11-amd64-generic-di +ext3-modules-2.6.8-12-amd64-generic-di fbset-udeb fdisk-udeb -firewire-core-modules-2.4.27-2-386-di -firewire-core-modules-2.6.8-2-386-di -firmware-modules-2.4.27-2-386-di -firmware-modules-2.6.8-2-386-di +firewire-core-modules-2.6.8-11-amd64-generic-di +firewire-core-modules-2.6.8-12-amd64-generic-di +firmware-modules-2.6.8-11-amd64-generic-di +firmware-modules-2.6.8-12-amd64-generic-di +floppy-modules-2.6.8-11-amd64-generic-di +floppy-modules-2.6.8-12-amd64-generic-di +gpgv-udeb grub-installer hdparm-udeb hw-detect-full -ipv6-modules-2.4.27-2-386-di -ipv6-modules-2.6.8-2-386-di -irda-modules-2.4.27-2-386-di -irda-modules-2.6.8-2-386-di -jfs-modules-2.4.27-2-386-di -jfs-modules-2.6.8-2-386-di +ipv6-modules-2.6.8-11-amd64-generic-di +ipv6-modules-2.6.8-12-amd64-generic-di +irda-modules-2.6.8-11-amd64-generic-di +irda-modules-2.6.8-12-amd64-generic-di +jfs-modules-2.6.8-11-amd64-generic-di +jfs-modules-2.6.8-12-amd64-generic-di jfsutils-udeb libblkid1-udeb libc6-udeb @@ -442,15 +70,15 @@ libnss-files-udeb libparted1.6-udeb libuuid1-udeb lilo-installer -loop-modules-2.4.27-2-386-di -loop-modules-2.6.8-2-386-di +loop-modules-2.6.8-11-amd64-generic-di +loop-modules-2.6.8-12-amd64-generic-di lowmem lvm10-udeb lvm2-udeb lvmcfg lvmcfg-utils -md-modules-2.4.27-2-386-di -md-modules-2.6.8-2-386-di +md-modules-2.6.8-11-amd64-generic-di +md-modules-2.6.8-12-amd64-generic-di mdadm-udeb mdcfg mdcfg-utils @@ -461,25 +89,25 @@ net-retriever netcfg network-console network-preseed -nic-extra-modules-2.4.27-2-386-di -nic-extra-modules-2.6.8-2-386-di -nic-modules-2.4.27-2-386-di -nic-modules-2.6.8-2-386-di -nic-pcmcia-modules-2.4.27-2-386-di -nic-pcmcia-modules-2.6.8-2-386-di -nic-shared-modules-2.4.27-2-386-di -nic-shared-modules-2.6.8-2-386-di -nic-usb-modules-2.4.27-2-386-di -nic-usb-modules-2.6.8-2-386-di +nic-extra-modules-2.6.8-11-amd64-generic-di +nic-extra-modules-2.6.8-12-amd64-generic-di +nic-modules-2.6.8-11-amd64-generic-di +nic-modules-2.6.8-12-amd64-generic-di +nic-pcmcia-modules-2.6.8-11-amd64-generic-di +nic-pcmcia-modules-2.6.8-12-amd64-generic-di +nic-shared-modules-2.6.8-11-amd64-generic-di +nic-shared-modules-2.6.8-12-amd64-generic-di +nic-usb-modules-2.6.8-11-amd64-generic-di +nic-usb-modules-2.6.8-12-amd64-generic-di nobootloader -ntfs-modules-2.4.27-2-386-di -ntfs-modules-2.6.8-2-386-di +ntfs-modules-2.6.8-11-amd64-generic-di +ntfs-modules-2.6.8-12-amd64-generic-di ntfstools-udeb openssh-client-udeb openssh-server-udeb os-prober -parport-modules-2.4.27-2-386-di -parport-modules-2.6.8-2-386-di +parport-modules-2.6.8-11-amd64-generic-di +parport-modules-2.6.8-12-amd64-generic-di partconf-find-partitions partconf-mkfstab parted-udeb @@ -496,1060 +124,34 @@ partman-reiserfs partman-target partman-xfs pcmcia-cs-udeb -pcmcia-modules-2.4.27-2-386-di -pcmcia-modules-2.6.8-2-386-di -pcmcia-storage-modules-2.4.27-2-386-di -pcmcia-storage-modules-2.6.8-2-386-di -plip-modules-2.4.27-2-386-di -plip-modules-2.6.8-2-386-di -ppp-modules-2.4.27-2-386-di -ppp-modules-2.6.8-2-386-di +pcmcia-modules-2.6.8-11-amd64-generic-di +pcmcia-modules-2.6.8-12-amd64-generic-di +pcmcia-storage-modules-2.6.8-11-amd64-generic-di +pcmcia-storage-modules-2.6.8-12-amd64-generic-di +plip-modules-2.6.8-11-amd64-generic-di +plip-modules-2.6.8-12-amd64-generic-di +ppp-modules-2.6.8-11-amd64-generic-di +ppp-modules-2.6.8-12-amd64-generic-di ppp-udeb prebaseconfig reiser4progs-udeb -reiserfs-modules-2.4.27-2-386-di -reiserfs-modules-2.6.8-2-386-di -sata-modules-2.4.27-2-386-di -sata-modules-2.6.8-2-386-di -scsi-common-modules-2.4.27-2-386-di -scsi-common-modules-2.6.8-2-386-di -scsi-extra-modules-2.4.27-2-386-di -scsi-extra-modules-2.6.8-2-386-di -scsi-modules-2.4.27-2-386-di -scsi-modules-2.6.8-2-386-di -serial-modules-2.4.27-2-386-di -serial-modules-2.6.8-2-386-di -ufs-modules-2.4.27-2-386-di -ufs-modules-2.6.8-2-386-di +reiserfs-modules-2.6.8-11-amd64-generic-di +reiserfs-modules-2.6.8-12-amd64-generic-di +sata-modules-2.6.8-11-amd64-generic-di +sata-modules-2.6.8-12-amd64-generic-di +scsi-common-modules-2.6.8-11-amd64-generic-di +scsi-common-modules-2.6.8-12-amd64-generic-di +scsi-extra-modules-2.6.8-11-amd64-generic-di +scsi-extra-modules-2.6.8-12-amd64-generic-di +scsi-modules-2.6.8-11-amd64-generic-di +scsi-modules-2.6.8-12-amd64-generic-di +serial-modules-2.6.8-11-amd64-generic-di +serial-modules-2.6.8-12-amd64-generic-di +ufs-modules-2.6.8-11-amd64-generic-di +ufs-modules-2.6.8-12-amd64-generic-di wireless-tools-udeb -xfs-modules-2.4.27-2-386-di -xfs-modules-2.6.8-2-386-di +xfs-modules-2.6.8-11-amd64-generic-di +xfs-modules-2.6.8-12-amd64-generic-di xfsprogs-udeb zlib1g-udeb -#endif /* ARCH_i386 */ -#ifdef ARCH_ia64 -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-modules-2.4.27-2-itanium-smp-di -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.4.27-2-itanium-smp-di -cdrom-core-modules-2.6.8-2-itanium-smp-di -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmidecode-udeb -dmsetup-udeb -e2fsprogs-udeb -efi-reader -eject-udeb -elilo-installer -ethdetect -evms-udeb -ext3-modules-2.4.27-2-itanium-smp-di -ext3-modules-2.6.8-2-itanium-smp-di -fat-modules-2.4.27-2-itanium-smp-di -fat-modules-2.6.8-2-itanium-smp-di -fb-modules-2.4.27-2-itanium-smp-di -fb-modules-2.6.8-2-itanium-smp-di -fbset-udeb -fdisk-udeb -firewire-core-modules-2.4.27-2-itanium-smp-di -firewire-core-modules-2.6.8-2-itanium-smp-di -firmware-modules-2.4.27-2-itanium-smp-di -firmware-modules-2.6.8-2-itanium-smp-di -hdparm-udeb -hw-detect-full -ide-core-modules-2.4.27-2-itanium-smp-di -ide-core-modules-2.6.8-2-itanium-smp-di -ide-modules-2.4.27-2-itanium-smp-di -ide-modules-2.6.8-2-itanium-smp-di -input-modules-2.4.27-2-itanium-smp-di -input-modules-2.6.8-2-itanium-smp-di -ipv6-modules-2.4.27-2-itanium-smp-di -ipv6-modules-2.6.8-2-itanium-smp-di -irda-modules-2.6.8-2-itanium-smp-di -jfs-modules-2.6.8-2-itanium-smp-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6.1-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.4.27-2-itanium-smp-di -loop-modules-2.6.8-2-itanium-smp-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-2-itanium-smp-di -md-modules-2.6.8-2-itanium-smp-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-modules-2.4.27-2-itanium-smp-di -nic-modules-2.6.8-2-itanium-smp-di -nic-shared-modules-2.6.8-2-itanium-smp-di -nic-usb-modules-2.6.8-2-itanium-smp-di -nobootloader -ntfs-modules-2.6.8-2-itanium-smp-di -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -parport-modules-2.4.27-2-itanium-smp-di -parport-modules-2.6.8-2-itanium-smp-di -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-efi -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -pcmcia-modules-2.6.8-2-itanium-smp-di -plip-modules-2.4.27-2-itanium-smp-di -plip-modules-2.6.8-2-itanium-smp-di -ppp-modules-2.4.27-2-itanium-smp-di -ppp-modules-2.6.8-2-itanium-smp-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -reiserfs-modules-2.4.27-2-itanium-smp-di -reiserfs-modules-2.6.8-2-itanium-smp-di -sata-modules-2.6.8-2-itanium-smp-di -scsi-core-modules-2.6.8-2-itanium-smp-di -scsi-modules-2.4.27-2-itanium-smp-di -scsi-modules-2.6.8-2-itanium-smp-di -serial-modules-2.4.27-2-itanium-smp-di -serial-modules-2.6.8-2-itanium-smp-di -ufs-modules-2.6.8-2-itanium-smp-di -usb-modules-2.4.27-2-itanium-smp-di -usb-modules-2.6.8-2-itanium-smp-di -usb-storage-modules-2.4.27-2-itanium-smp-di -usb-storage-modules-2.6.8-2-itanium-smp-di -userdevfs -wireless-tools-udeb -xfs-modules-2.4.27-2-itanium-smp-di -xfs-modules-2.6.8-2-itanium-smp-di -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_ia64 */ -#ifdef ARCH_m68k -archdetect -atari-fdisk-udeb -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -fat-modules-2.2.25-atari-di -fat-modules-2.2.25-bvme6000-di -fat-modules-2.2.25-mac-di -fat-modules-2.2.25-mvme147-di -fat-modules-2.2.25-mvme16x-di -fat-modules-2.4.27-amiga-di -fat-modules-2.4.27-atari-di -fat-modules-2.4.27-bvme6000-di -fat-modules-2.4.27-mvme147-di -fat-modules-2.4.27-mvme16x-di -fat-modules-2.4.27-q40-di -fbset-udeb -hdparm-udeb -hw-detect-full -jfs-modules-2.4.27-amiga-di -jfs-modules-2.4.27-atari-di -jfs-modules-2.4.27-bvme6000-di -jfs-modules-2.4.27-mvme147-di -jfs-modules-2.4.27-mvme16x-di -jfs-modules-2.4.27-q40-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -mac-fdisk-udeb -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-shared-modules-2.2.25-atari-di -nic-shared-modules-2.2.25-bvme6000-di -nic-shared-modules-2.2.25-mac-di -nic-shared-modules-2.2.25-mvme147-di -nic-shared-modules-2.2.25-mvme16x-di -nic-shared-modules-2.4.27-amiga-di -nic-shared-modules-2.4.27-atari-di -nic-shared-modules-2.4.27-bvme6000-di -nic-shared-modules-2.4.27-mvme147-di -nic-shared-modules-2.4.27-mvme16x-di -nic-shared-modules-2.4.27-q40-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -partconf -partconf-find-partitions -partconf-mkfstab -parted-udeb -partitioner -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -ppp-modules-2.2.25-atari-di -ppp-modules-2.2.25-bvme6000-di -ppp-modules-2.2.25-mac-di -ppp-modules-2.2.25-mvme147-di -ppp-modules-2.2.25-mvme16x-di -ppp-modules-2.4.27-amiga-di -ppp-modules-2.4.27-atari-di -ppp-modules-2.4.27-bvme6000-di -ppp-modules-2.4.27-mvme147-di -ppp-modules-2.4.27-mvme16x-di -ppp-modules-2.4.27-q40-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -reiserfs-modules-2.4.27-amiga-di -reiserfs-modules-2.4.27-atari-di -reiserfs-modules-2.4.27-bvme6000-di -reiserfs-modules-2.4.27-mvme147-di -reiserfs-modules-2.4.27-mvme16x-di -reiserfs-modules-2.4.27-q40-di -scsi-modules-2.2.25-atari-di -scsi-modules-2.2.25-bvme6000-di -scsi-modules-2.2.25-mac-di -scsi-modules-2.2.25-mvme147-di -scsi-modules-2.2.25-mvme16x-di -scsi-modules-2.4.27-amiga-di -scsi-modules-2.4.27-atari-di -scsi-modules-2.4.27-bvme6000-di -scsi-modules-2.4.27-mvme147-di -scsi-modules-2.4.27-mvme16x-di -scsi-modules-2.4.27-q40-di -userdevfs -vmelilo-installer -wireless-tools-udeb -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_m68k */ -#ifdef ARCH_mips -arcboot-installer -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.4.27-sb1-swarm-bn-di -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -fat-modules-2.4.27-sb1-swarm-bn-di -fb-modules-2.4.27-sb1-swarm-bn-di -fbset-udeb -fdisk-udeb -hdparm-udeb -hw-detect-full -input-modules-2.4.27-sb1-swarm-bn-di -ipv6-modules-2.4.27-r4k-ip22-di -ipv6-modules-2.4.27-r5k-ip22-di -ipv6-modules-2.4.27-sb1-swarm-bn-di -jfs-modules-2.4.27-r4k-ip22-di -jfs-modules-2.4.27-r5k-ip22-di -jfs-modules-2.4.27-sb1-swarm-bn-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.4.27-r4k-ip22-di -loop-modules-2.4.27-r5k-ip22-di -loop-modules-2.4.27-sb1-swarm-bn-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-r4k-ip22-di -md-modules-2.4.27-r5k-ip22-di -md-modules-2.4.27-sb1-swarm-bn-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -partconf -partconf-find-partitions -partconf-mkfstab -parted-udeb -partitioner -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -pcmcia-storage-modules-2.4.27-sb1-swarm-bn-di -ppp-modules-2.4.27-r4k-ip22-di -ppp-modules-2.4.27-r5k-ip22-di -ppp-modules-2.4.27-sb1-swarm-bn-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -reiserfs-modules-2.4.27-r4k-ip22-di -reiserfs-modules-2.4.27-r5k-ip22-di -reiserfs-modules-2.4.27-sb1-swarm-bn-di -sata-modules-2.4.27-sb1-swarm-bn-di -scsi-common-modules-2.4.27-sb1-swarm-bn-di -scsi-core-modules-2.4.27-sb1-swarm-bn-di -scsi-modules-2.4.27-sb1-swarm-bn-di -sibyl-installer -usb-modules-2.4.27-sb1-swarm-bn-di -usb-storage-modules-2.4.27-sb1-swarm-bn-di -userdevfs -wireless-tools-udeb -xfs-modules-2.4.27-r4k-ip22-di -xfs-modules-2.4.27-r5k-ip22-di -xfs-modules-2.4.27-sb1-swarm-bn-di -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_mips */ -#ifdef ARCH_mipsel -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.4.27-r5k-cobalt-di -cdrom-core-modules-2.4.27-sb1-swarm-bn-di -choose-mirror -cobalt-scripts -colo-installer -colo-udeb -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -delo-installer -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -fat-modules-2.4.27-r5k-cobalt-di -fat-modules-2.4.27-sb1-swarm-bn-di -fb-modules-2.4.27-sb1-swarm-bn-di -fbset-udeb -fdisk-udeb -hdparm-udeb -hw-detect-full -input-modules-2.4.27-sb1-swarm-bn-di -ipv6-modules-2.4.27-r3k-kn02-di -ipv6-modules-2.4.27-r4k-kn04-di -ipv6-modules-2.4.27-r5k-cobalt-di -ipv6-modules-2.4.27-sb1-swarm-bn-di -jfs-modules-2.4.27-r5k-cobalt-di -jfs-modules-2.4.27-sb1-swarm-bn-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.4.27-r5k-cobalt-di -loop-modules-2.4.27-sb1-swarm-bn-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-r3k-kn02-di -md-modules-2.4.27-r4k-kn04-di -md-modules-2.4.27-r5k-cobalt-di -md-modules-2.4.27-sb1-swarm-bn-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext2r0 -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -pcmcia-storage-modules-2.4.27-sb1-swarm-bn-di -ppp-modules-2.4.27-r5k-cobalt-di -ppp-modules-2.4.27-sb1-swarm-bn-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -reiserfs-modules-2.4.27-r3k-kn02-di -reiserfs-modules-2.4.27-r4k-kn04-di -reiserfs-modules-2.4.27-r5k-cobalt-di -reiserfs-modules-2.4.27-sb1-swarm-bn-di -sata-modules-2.4.27-sb1-swarm-bn-di -scsi-common-modules-2.4.27-sb1-swarm-bn-di -scsi-core-modules-2.4.27-sb1-swarm-bn-di -scsi-modules-2.4.27-sb1-swarm-bn-di -sibyl-installer -usb-modules-2.4.27-sb1-swarm-bn-di -usb-storage-modules-2.4.27-sb1-swarm-bn-di -userdevfs -wireless-tools-udeb -xfs-modules-2.4.27-r5k-cobalt-di -xfs-modules-2.4.27-sb1-swarm-bn-di -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_mipsel */ -#ifdef ARCH_powerpc -affs-modules-2.4.27-powerpc-di -affs-modules-2.4.27-powerpc-small-di -affs-modules-2.6.8-power3-di -affs-modules-2.6.8-power4-di -affs-modules-2.6.8-powerpc-di -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-modules-2.4.27-powerpc-di -brltty-modules-2.4.27-powerpc-small-di -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -dmsetup-udeb -e2fsprogs-udeb -ethdetect -evms-udeb -ext2-modules-2.6.8-power3-di -ext2-modules-2.6.8-power4-di -ext2-modules-2.6.8-powerpc-di -ext3-modules-2.4.27-powerpc-small-di -ext3-modules-2.6.8-power3-di -ext3-modules-2.6.8-power4-di -ext3-modules-2.6.8-powerpc-di -fat-modules-2.6.8-power3-di -fat-modules-2.6.8-power4-di -fat-modules-2.6.8-powerpc-di -fb-modules-2.4.27-powerpc-di -fb-modules-2.4.27-powerpc-small-di -fb-modules-2.6.8-power3-di -fb-modules-2.6.8-power4-di -fb-modules-2.6.8-powerpc-di -fbset-udeb -fdisk-udeb -firmware-modules-2.6.8-power3-di -firmware-modules-2.6.8-power4-di -firmware-modules-2.6.8-powerpc-di -floppy-modules-2.4.27-powerpc-di -floppy-modules-2.4.27-powerpc-small-di -floppy-modules-2.6.8-power3-di -floppy-modules-2.6.8-power4-di -floppy-modules-2.6.8-powerpc-di -hdparm-udeb -hfs-modules-2.4.27-powerpc-di -hfs-modules-2.4.27-powerpc-small-di -hfs-modules-2.6.8-power3-di -hfs-modules-2.6.8-power4-di -hfs-modules-2.6.8-powerpc-di -hw-detect-full -ipv6-modules-2.4.27-powerpc-di -ipv6-modules-2.4.27-powerpc-small-di -ipv6-modules-2.6.8-power3-di -ipv6-modules-2.6.8-power4-di -ipv6-modules-2.6.8-powerpc-di -irda-modules-2.4.27-powerpc-di -irda-modules-2.4.27-powerpc-small-di -irda-modules-2.6.8-power3-di -irda-modules-2.6.8-power4-di -irda-modules-2.6.8-powerpc-di -isa-pnp-modules-2.4.27-powerpc-di -isa-pnp-modules-2.4.27-powerpc-small-di -jfs-modules-2.4.27-apus-di -jfs-modules-2.4.27-powerpc-small-di -jfs-modules-2.6.8-power3-di -jfs-modules-2.6.8-power4-di -jfs-modules-2.6.8-powerpc-di -jfsutils-udeb -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.4.27-powerpc-di -loop-modules-2.4.27-powerpc-small-di -loop-modules-2.6.8-power3-di -loop-modules-2.6.8-power4-di -loop-modules-2.6.8-powerpc-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -mac-fdisk-udeb -md-modules-2.4.27-apus-di -md-modules-2.4.27-powerpc-di -md-modules-2.4.27-powerpc-small-di -md-modules-2.6.8-power3-di -md-modules-2.6.8-power4-di -md-modules-2.6.8-powerpc-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-extra-modules-2.4.27-powerpc-di -nic-extra-modules-2.4.27-powerpc-small-di -nic-extra-modules-2.6.8-power3-di -nic-extra-modules-2.6.8-power4-di -nic-extra-modules-2.6.8-powerpc-di -nic-modules-2.4.27-apus-di -nic-modules-2.4.27-powerpc-di -nic-modules-2.4.27-powerpc-small-di -nic-modules-2.6.8-power3-di -nic-modules-2.6.8-power4-di -nic-modules-2.6.8-powerpc-di -nic-pcmcia-modules-2.4.27-powerpc-di -nic-pcmcia-modules-2.4.27-powerpc-small-di -nic-pcmcia-modules-2.6.8-power3-di -nic-pcmcia-modules-2.6.8-power4-di -nic-pcmcia-modules-2.6.8-powerpc-di -nic-shared-modules-2.4.27-powerpc-di -nic-shared-modules-2.4.27-powerpc-small-di -nic-shared-modules-2.6.8-power3-di -nic-shared-modules-2.6.8-power4-di -nic-shared-modules-2.6.8-powerpc-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -parport-modules-2.4.27-apus-di -parport-modules-2.4.27-powerpc-small-di -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-newworld -partman-partitioning -partman-prep -partman-reiserfs -partman-target -partman-xfs -plip-modules-2.4.27-apus-di -plip-modules-2.4.27-powerpc-di -plip-modules-2.4.27-powerpc-small-di -pmac-fdisk-udeb -ppp-modules-2.4.27-powerpc-di -ppp-modules-2.4.27-powerpc-small-di -ppp-modules-2.6.8-power3-di -ppp-modules-2.6.8-power4-di -ppp-modules-2.6.8-powerpc-di -ppp-udeb -prebaseconfig -quik-installer -reiser4progs-udeb -reiserfs-modules-2.4.27-powerpc-small-di -reiserfs-modules-2.6.8-power3-di -reiserfs-modules-2.6.8-power4-di -reiserfs-modules-2.6.8-powerpc-di -sata-modules-2.6.8-power3-di -sata-modules-2.6.8-power4-di -sata-modules-2.6.8-powerpc-di -scsi-extra-modules-2.4.27-powerpc-small-di -scsi-extra-modules-2.6.8-power3-di -scsi-extra-modules-2.6.8-power4-di -scsi-extra-modules-2.6.8-powerpc-di -serial-modules-2.4.27-powerpc-di -serial-modules-2.4.27-powerpc-small-di -serial-modules-2.6.8-power3-di -serial-modules-2.6.8-power4-di -serial-modules-2.6.8-powerpc-di -ufs-modules-2.4.27-powerpc-di -ufs-modules-2.4.27-powerpc-small-di -ufs-modules-2.6.8-power3-di -ufs-modules-2.6.8-power4-di -ufs-modules-2.6.8-powerpc-di -wireless-tools-udeb -xfs-modules-2.4.27-powerpc-small-di -xfs-modules-2.6.8-power3-di -xfs-modules-2.6.8-power4-di -xfs-modules-2.6.8-powerpc-di -xfsprogs-udeb -yaboot-installer -zlib1g-udeb -#endif /* ARCH_powerpc */ -#ifdef ARCH_s390 -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -fbset-udeb -hdparm-udeb -hw-detect-full -jfsutils-udeb -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-2-s390-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -network-console -network-preseed -nic-modules-2.4.27-2-s390-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -partconf -partconf-find-partitions -partconf-mkfstab -parted-udeb -partitioner -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -ppp-udeb -prebaseconfig -reiser4progs-udeb -s390-dasd -s390-netdevice -s390-tools-udeb -scsi-core-modules-2.4.27-2-s390-di -scsi-modules-2.4.27-2-s390-di -userdevfs -wireless-tools-udeb -xfs-modules-2.4.27-2-s390-di -xfsprogs-udeb -zipl-installer -zlib1g-udeb -#endif /* ARCH_s390 */ -#ifdef ARCH_sparc -archdetect -autopartkit -base-installer -baseconfig-udeb -brltty-udeb -bterm-unifont -bugreporter-udeb -cdebconf-text-udeb -cdebootstrap-udeb -cdrom-core-modules-2.4.27-2-sparc32-di -cdrom-core-modules-2.4.27-2-sparc64-di -cdrom-core-modules-2.6.8-2-sparc32-di -cdrom-core-modules-2.6.8-2-sparc64-di -choose-mirror -console-keymaps-acorn -console-keymaps-amiga -console-keymaps-at -console-keymaps-atari -console-keymaps-dec -console-keymaps-mac -console-keymaps-sun -console-keymaps-usb -debootstrap-udeb -dhcp-client-udeb -di-utils -di-utils-mapdevfs -discover-data-udeb -discover-udeb -discover1-data-udeb -discover1-udeb -dmsetup-udeb -e2fsprogs-udeb -eject-udeb -ethdetect -evms-udeb -ext3-modules-2.4.27-2-sparc32-di -ext3-modules-2.4.27-2-sparc64-di -ext3-modules-2.6.8-2-sparc32-di -ext3-modules-2.6.8-2-sparc64-di -fat-modules-2.6.8-2-sparc32-di -fat-modules-2.6.8-2-sparc64-di -fbset-udeb -fdisk-udeb -firewire-core-modules-2.4.27-2-sparc64-di -firmware-modules-2.4.27-2-sparc64-di -hdparm-udeb -hw-detect-full -ide-modules-2.4.27-2-sparc64-di -ide-modules-2.6.8-2-sparc64-di -ipv6-modules-2.4.27-2-sparc32-di -ipv6-modules-2.4.27-2-sparc64-di -ipv6-modules-2.6.8-2-sparc32-di -ipv6-modules-2.6.8-2-sparc64-di -jfsutils-udeb -kbd-chooser -libblkid1-udeb -libc6-udeb -libcrypto0.9.7-udeb -libdebian-installer-extra4-udeb -libdebian-installer4-udeb -libdevmapper1.01-udeb -libdirectfb-0.9-20-udeb -libiw27-udeb -libnss-dns-udeb -libnss-files-udeb -libparted1.6-udeb -libuuid1-udeb -loop-modules-2.4.27-2-sparc32-di -loop-modules-2.4.27-2-sparc64-di -lowmem -lvm10-udeb -lvm2-udeb -lvmcfg -lvmcfg-utils -md-modules-2.4.27-2-sparc32-di -md-modules-2.4.27-2-sparc64-di -md-modules-2.6.8-2-sparc32-di -md-modules-2.6.8-2-sparc64-di -mdadm-udeb -mdcfg -mdcfg-utils -mii-diag-udeb -mkreiser4-udeb -mkreiserfs-udeb -net-retriever -netcfg -network-console -network-preseed -nic-modules-2.4.27-2-sparc32-di -nic-modules-2.4.27-2-sparc64-di -nic-modules-2.6.8-2-sparc32-di -nic-modules-2.6.8-2-sparc64-di -nobootloader -ntfstools-udeb -openssh-client-udeb -openssh-server-udeb -os-prober -partconf-find-partitions -partconf-mkfstab -parted-udeb -partman -partman-auto -partman-basicfilesystems -partman-basicmethods -partman-ext3 -partman-jfs -partman-lvm -partman-md -partman-partitioning -partman-reiserfs -partman-target -partman-xfs -pcmcia-cs-udeb -plip-modules-2.6.8-2-sparc32-di -plip-modules-2.6.8-2-sparc64-di -ppp-modules-2.4.27-2-sparc32-di -ppp-modules-2.4.27-2-sparc64-di -ppp-modules-2.6.8-2-sparc32-di -ppp-modules-2.6.8-2-sparc64-di -ppp-udeb -prebaseconfig -reiser4progs-udeb -reiserfs-modules-2.4.27-2-sparc32-di -reiserfs-modules-2.4.27-2-sparc64-di -reiserfs-modules-2.6.8-2-sparc32-di -reiserfs-modules-2.6.8-2-sparc64-di -scsi-common-modules-2.6.8-2-sparc32-di -scsi-common-modules-2.6.8-2-sparc64-di -scsi-core-modules-2.4.27-2-sparc32-di -scsi-core-modules-2.4.27-2-sparc64-di -scsi-core-modules-2.6.8-2-sparc32-di -scsi-core-modules-2.6.8-2-sparc64-di -scsi-modules-2.4.27-2-sparc32-di -scsi-modules-2.4.27-2-sparc64-di -silo-installer -usb-modules-2.4.27-2-sparc64-di -usb-modules-2.6.8-2-sparc64-di -userdevfs -wireless-tools-udeb -xfs-modules-2.4.27-2-sparc32-di -xfs-modules-2.4.27-2-sparc64-di -xfs-modules-2.6.8-2-sparc32-di -xfs-modules-2.6.8-2-sparc64-di -xfsprogs-udeb -zlib1g-udeb -#endif /* ARCH_sparc */ +#endif /* ARCH_amd64 */ diff --git a/sarge/tasks/exclude-sarge b/sarge/tasks/exclude-sarge index 20480c20..70eee1fc 100644 --- a/sarge/tasks/exclude-sarge +++ b/sarge/tasks/exclude-sarge @@ -1,3 +1,4 @@ +flight-of-the-amazon-queen acorn-fdisk aspell-bg aspell-br @@ -17,155 +18,10 @@ kernel-image-2.4-686-smp kernel-image-2.4-k6 kernel-image-2.4-k7 kernel-image-2.4-k7-smp -kernel-image-2.4.21-5-386 -kernel-image-2.4.21-5-586tsc -kernel-image-2.4.21-5-686 -kernel-image-2.4.21-5-686-smp -kernel-image-2.4.21-5-k6 -kernel-image-2.4.21-5-k7 -kernel-image-2.4.21-5-k7-smp -kernel-image-2.4.24-1-386 -kernel-image-2.4.24-1-586tsc -kernel-image-2.4.24-1-686 -kernel-image-2.4.24-1-686-smp -kernel-image-2.4.24-1-k6 -kernel-image-2.4.24-1-k7 -kernel-image-2.4.24-1-k7-smp -kernel-image-2.4.24-speakup -kernel-image-2.4.25-1-386 -kernel-image-2.4.25-1-586tsc -kernel-image-2.4.25-1-686 -kernel-image-2.4.25-1-686-smp -kernel-image-2.4.25-1-k6 -kernel-image-2.4.25-1-k7 -kernel-image-2.4.25-1-k7-smp -kernel-image-2.4.26-speakup -kernel-image-2.4.26-1-386 -kernel-image-2.4.26-1-586tsc -kernel-image-2.4.26-1-686 -kernel-image-2.4.26-1-686-smp -kernel-image-2.4.26-1-k6 -kernel-image-2.4.26-1-k7 -kernel-image-2.4.26-1-k7-smp -kernel-image-2.4.27-1-586tsc -kernel-image-2.4.27-1-k6 -kernel-image-2.4.27-1-k7 -kernel-image-2.4.27-1-k7-smp -kernel-image-2.4.27-2-586tsc -kernel-image-2.4.27-2-k6 -kernel-image-2.4.27-2-k7 -kernel-image-2.4.27-2-k7-smp -kernel-image-2.6-386 -kernel-image-2.6-686 -kernel-image-2.6-686-smp -kernel-image-2.6-k7 -kernel-image-2.6-k7-smp -kernel-image-2.6-amd64-generic -kernel-image-2.6-amd64-k8 -kernel-image-2.6-amd64-k8-smp -kernel-image-2.6-em64t-p4 -kernel-image-2.6-em64t-p4-smp -kernel-image-2.6.3-1-386 -kernel-image-2.6.3-1-686 -kernel-image-2.6.3-1-686-smp -kernel-image-2.6.3-1-k7 -kernel-image-2.6.3-1-k7-smp -kernel-image-2.6.5-1-386 -kernel-image-2.6.5-1-686 -kernel-image-2.6.5-1-686-smp -kernel-image-2.6.5-1-k7 -kernel-image-2.6.5-1-k7-smp -kernel-image-2.6.6-1-386 -kernel-image-2.6.6-1-686 -kernel-image-2.6.6-1-686-smp -kernel-image-2.6.6-1-k7 -kernel-image-2.6.6-1-k7-smp -kernel-image-2.6.7-1-386 -kernel-image-2.6.7-1-686 -kernel-image-2.6.7-1-686-smp -kernel-image-2.6.7-1-k7 -kernel-image-2.6.7-1-k7-smp -kernel-image-2.6.8-1-k7 -kernel-image-2.6.8-1-k7-smp -kernel-image-2.6.8-2-k7 -kernel-image-2.6.8-2-k7-smp -kernel-image-2.6.8-9-amd64-k8-smp -kernel-image-2.6.8-9-amd64-k8 -kernel-image-2.6.8-9-amd64-generic -kernel-image-2.6.8-9-em64t-p4-smp -kernel-image-2.6.8-9-em64t-p4 -#ifndef ARCH_amd64 -kernel-image-2.6.8-10-em64t-p4 -kernel-image-2.6.8-10-em64t-p4-smp -kernel-image-2.6.8-10-amd64-k8 -kernel-image-2.6.8-10-amd64-k8-smp -kernel-image-2.6.8-10-amd64-generic -kernel-image-2.6.8-11-em64t-p4 -kernel-image-2.6.8-11-em64t-p4-smp -kernel-image-2.6.8-11-amd64-k8 -kernel-image-2.6.8-11-amd64-k8-smp -kernel-image-2.6.8-11-amd64-generic -#endif -kernel-image-2.6.9-1-386 -kernel-image-2.6.9-1-686 -kernel-image-2.6.9-1-686-smp -kernel-image-2.6.9-1-k7 -kernel-image-2.6.9-1-k7-smp -kernel-image-2.6.9-1-k7 -kernel-image-2.6.9-1-k7-smp -kernel-image-2.6.9-1-amd64-k8-smp -kernel-image-2.6.9-1-amd64-k8 -kernel-image-2.6.9-1-amd64-generic -kernel-image-2.6.9-1-em64t-p4-smp -kernel-image-2.6.9-1-em64t-p4 -kernel-image-2.6.10-1-386 -kernel-image-2.6.10-1-686 -kernel-image-2.6.10-1-686-smp -kernel-image-2.6.10-1-k7 -kernel-image-2.6.10-1-k7-smp -kernel-image-2.6.10-1-k7 -kernel-image-2.6.10-1-k7-smp -kernel-image-2.6.10-1-amd64-k8-smp -kernel-image-2.6.10-1-amd64-k8 -kernel-image-2.6.10-1-amd64-generic -kernel-image-2.6.10-1-em64t-p4-smp -kernel-image-2.6.10-1-em64t-p4 -kernel-image-2.6.11-1-386 -kernel-image-2.6.11-1-686 -kernel-image-2.6.11-1-686-smp -kernel-image-2.6.11-1-k7 -kernel-image-2.6.11-1-k7-smp -kernel-image-2.6.11-1-k7 -kernel-image-2.6.11-1-k7-smp -kernel-image-2.6.11-1-amd64-k8-smp -kernel-image-2.6.11-1-amd64-k8 -kernel-image-2.6.11-1-amd64-generic -kernel-image-2.6.11-1-em64t-p4-smp -kernel-image-2.6.11-1-em64t-p4 -kernel-image-2.6.12-1-386 -kernel-image-2.6.12-1-686 -kernel-image-2.6.12-1-686-smp -kernel-image-2.6.12-1-k7 -kernel-image-2.6.12-1-k7-smp -kernel-image-2.6.12-1-k7 -kernel-image-2.6.12-1-k7-smp -kernel-image-2.6.12-1-amd64-k8-smp -kernel-image-2.6.12-1-amd64-k8 -kernel-image-2.6.12-1-amd64-generic -kernel-image-2.6.12-1-em64t-p4-smp -kernel-image-2.6.12-1-em64t-p4 -kernel-image-2.6.13-1-386 -kernel-image-2.6.13-1-686 -kernel-image-2.6.13-1-686-smp -kernel-image-2.6.13-1-k7 -kernel-image-2.6.13-1-k7-smp -kernel-image-2.6.13-1-k7 -kernel-image-2.6.13-1-k7-smp -kernel-image-2.6.13-1-amd64-k8-smp -kernel-image-2.6.13-1-amd64-k8 -kernel-image-2.6.13-1-amd64-generic -kernel-image-2.6.13-1-em64t-p4-smp -kernel-image-2.6.13-1-em64t-p4 +kernel-image-2.4.27-3-586tsc +kernel-image-2.4.27-3-k6 +kernel-image-2.4.27-3-k7 +kernel-image-2.4.27-3-k7-smp kernel-pcmcia-modules-2.4-386 kernel-pcmcia-modules-2.4-586tsc kernel-pcmcia-modules-2.4-686 @@ -173,39 +29,40 @@ kernel-pcmcia-modules-2.4-686-smp kernel-pcmcia-modules-2.4-k6 kernel-pcmcia-modules-2.4-k7 kernel-pcmcia-modules-2.4-k7-smp -kernel-pcmcia-modules-2.4.24-1-386 -kernel-pcmcia-modules-2.4.24-1-586tsc -kernel-pcmcia-modules-2.4.24-1-686 -kernel-pcmcia-modules-2.4.24-1-686-smp -kernel-pcmcia-modules-2.4.24-1-k6 -kernel-pcmcia-modules-2.4.24-1-k7 -kernel-pcmcia-modules-2.4.24-1-k7-smp -kernel-pcmcia-modules-2.4.25-1-386 -kernel-pcmcia-modules-2.4.25-1-586tsc -kernel-pcmcia-modules-2.4.25-1-686 -kernel-pcmcia-modules-2.4.25-1-686-smp -kernel-pcmcia-modules-2.4.25-1-k6 -kernel-pcmcia-modules-2.4.25-1-k7 -kernel-pcmcia-modules-2.4.25-1-k7-smp -kernel-pcmcia-modules-2.4.26-1-386 -kernel-pcmcia-modules-2.4.26-1-586tsc -kernel-pcmcia-modules-2.4.26-1-686 -kernel-pcmcia-modules-2.4.26-1-686-smp -kernel-pcmcia-modules-2.4.26-1-k6 -kernel-pcmcia-modules-2.4.26-1-k7 -kernel-pcmcia-modules-2.4.26-1-k7-smp -kernel-pcmcia-modules-2.4.27-1-586tsc -kernel-pcmcia-modules-2.4.27-1-k6 -kernel-pcmcia-modules-2.4.27-1-k7 -kernel-pcmcia-modules-2.4.27-1-k7-smp -kernel-pcmcia-modules-2.4.27-2-586tsc -kernel-pcmcia-modules-2.4.27-2-k6 -kernel-pcmcia-modules-2.4.27-2-k7 -kernel-pcmcia-modules-2.4.27-2-k7-smp -kernel-pcmcia-modules-2.4.28-1-586tsc -kernel-pcmcia-modules-2.4.28-1-k6 -kernel-pcmcia-modules-2.4.28-1-k7 -kernel-pcmcia-modules-2.4.28-1-k7-smp +kernel-pcmcia-modules-2.4.27-3-586tsc +kernel-pcmcia-modules-2.4.27-3-k6 +kernel-pcmcia-modules-2.4.27-3-k7 +kernel-pcmcia-modules-2.4.27-3-k7-smp +kernel-headers-2.4-386 +kernel-headers-2.4-586tsc +kernel-headers-2.4-686 +kernel-headers-2.4-686-smp +kernel-headers-2.4-k6 +kernel-headers-2.4-k7 +kernel-headers-2.4-k7-smp +kernel-headers-2.4.27-3-586tsc +kernel-headers-2.4.27-3-k6 +kernel-headers-2.4.27-3-k7 +kernel-headers-2.4.27-3-k7-smp +kernel-image-2.6-386 +kernel-image-2.6-686 +kernel-image-2.6-686-smp +kernel-image-2.6-k7 +kernel-image-2.6-k7-smp +kernel-image-2.6.8-4-k7 +kernel-image-2.6.8-4-k7-smp +kernel-image-2.6-amd64-generic +kernel-image-2.6-amd64-k8 +kernel-image-2.6-amd64-k8-smp +kernel-image-2.6-em64t-p4 +kernel-image-2.6-em64t-p4-smp +#ifndef ARCH_amd64 +kernel-image-2.6.8-13-amd64-k8-smp +kernel-image-2.6.8-13-amd64-k8 +kernel-image-2.6.8-13-amd64-generic +kernel-image-2.6.8-13-em64t-p4-smp +kernel-image-2.6.8-13-em64t-p4 +#endif python2.1 smail tcl8.0 diff --git a/sarge/tasks/exclude-sarge.pre-r7 b/sarge/tasks/exclude-sarge.pre-r7 new file mode 100644 index 00000000..e8f02630 --- /dev/null +++ b/sarge/tasks/exclude-sarge.pre-r7 @@ -0,0 +1,237 @@ +flight-of-the-amazon-queen +acorn-fdisk +aspell-bg +aspell-br +aspell-cy +aspell-da +aspell-de +aspell-el +aspell-es +aspell-fr +aspell-pt +cfdisk-utf8 +gcc272 +kernel-image-2.4-386 +kernel-image-2.4-586tsc +kernel-image-2.4-686 +kernel-image-2.4-686-smp +kernel-image-2.4-k6 +kernel-image-2.4-k7 +kernel-image-2.4-k7-smp +kernel-image-2.4.21-5-386 +kernel-image-2.4.21-5-586tsc +kernel-image-2.4.21-5-686 +kernel-image-2.4.21-5-686-smp +kernel-image-2.4.21-5-k6 +kernel-image-2.4.21-5-k7 +kernel-image-2.4.21-5-k7-smp +kernel-image-2.4.24-1-386 +kernel-image-2.4.24-1-586tsc +kernel-image-2.4.24-1-686 +kernel-image-2.4.24-1-686-smp +kernel-image-2.4.24-1-k6 +kernel-image-2.4.24-1-k7 +kernel-image-2.4.24-1-k7-smp +kernel-image-2.4.24-speakup +kernel-image-2.4.25-1-386 +kernel-image-2.4.25-1-586tsc +kernel-image-2.4.25-1-686 +kernel-image-2.4.25-1-686-smp +kernel-image-2.4.25-1-k6 +kernel-image-2.4.25-1-k7 +kernel-image-2.4.25-1-k7-smp +kernel-image-2.4.26-speakup +kernel-image-2.4.26-1-386 +kernel-image-2.4.26-1-586tsc +kernel-image-2.4.26-1-686 +kernel-image-2.4.26-1-686-smp +kernel-image-2.4.26-1-k6 +kernel-image-2.4.26-1-k7 +kernel-image-2.4.26-1-k7-smp +kernel-image-2.4.27-1-586tsc +kernel-image-2.4.27-1-k6 +kernel-image-2.4.27-1-k7 +kernel-image-2.4.27-1-k7-smp +kernel-image-2.4.27-2-586tsc +kernel-image-2.4.27-2-k6 +kernel-image-2.4.27-2-k7 +kernel-image-2.4.27-2-k7-smp +kernel-image-2.6-386 +kernel-image-2.6-686 +kernel-image-2.6-686-smp +kernel-image-2.6-k7 +kernel-image-2.6-k7-smp +kernel-image-2.6-amd64-generic +kernel-image-2.6-amd64-k8 +kernel-image-2.6-amd64-k8-smp +kernel-image-2.6-em64t-p4 +kernel-image-2.6-em64t-p4-smp +kernel-image-2.6.3-1-386 +kernel-image-2.6.3-1-686 +kernel-image-2.6.3-1-686-smp +kernel-image-2.6.3-1-k7 +kernel-image-2.6.3-1-k7-smp +kernel-image-2.6.5-1-386 +kernel-image-2.6.5-1-686 +kernel-image-2.6.5-1-686-smp +kernel-image-2.6.5-1-k7 +kernel-image-2.6.5-1-k7-smp +kernel-image-2.6.6-1-386 +kernel-image-2.6.6-1-686 +kernel-image-2.6.6-1-686-smp +kernel-image-2.6.6-1-k7 +kernel-image-2.6.6-1-k7-smp +kernel-image-2.6.7-1-386 +kernel-image-2.6.7-1-686 +kernel-image-2.6.7-1-686-smp +kernel-image-2.6.7-1-k7 +kernel-image-2.6.7-1-k7-smp +kernel-image-2.6.8-1-k7 +kernel-image-2.6.8-1-k7-smp +kernel-image-2.6.8-2-k7 +kernel-image-2.6.8-2-k7-smp +kernel-image-2.6.8-9-amd64-k8-smp +kernel-image-2.6.8-9-amd64-k8 +kernel-image-2.6.8-9-amd64-generic +kernel-image-2.6.8-9-em64t-p4-smp +kernel-image-2.6.8-9-em64t-p4 +#ifndef ARCH_amd64 +kernel-image-2.6.8-10-em64t-p4 +kernel-image-2.6.8-10-em64t-p4-smp +kernel-image-2.6.8-10-amd64-k8 +kernel-image-2.6.8-10-amd64-k8-smp +kernel-image-2.6.8-10-amd64-generic +kernel-image-2.6.8-11-em64t-p4 +kernel-image-2.6.8-11-em64t-p4-smp +kernel-image-2.6.8-11-amd64-k8 +kernel-image-2.6.8-11-amd64-k8-smp +kernel-image-2.6.8-11-amd64-generic +#endif +kernel-image-2.6.9-1-386 +kernel-image-2.6.9-1-686 +kernel-image-2.6.9-1-686-smp +kernel-image-2.6.9-1-k7 +kernel-image-2.6.9-1-k7-smp +kernel-image-2.6.9-1-k7 +kernel-image-2.6.9-1-k7-smp +kernel-image-2.6.9-1-amd64-k8-smp +kernel-image-2.6.9-1-amd64-k8 +kernel-image-2.6.9-1-amd64-generic +kernel-image-2.6.9-1-em64t-p4-smp +kernel-image-2.6.9-1-em64t-p4 +kernel-image-2.6.10-1-386 +kernel-image-2.6.10-1-686 +kernel-image-2.6.10-1-686-smp +kernel-image-2.6.10-1-k7 +kernel-image-2.6.10-1-k7-smp +kernel-image-2.6.10-1-k7 +kernel-image-2.6.10-1-k7-smp +kernel-image-2.6.10-1-amd64-k8-smp +kernel-image-2.6.10-1-amd64-k8 +kernel-image-2.6.10-1-amd64-generic +kernel-image-2.6.10-1-em64t-p4-smp +kernel-image-2.6.10-1-em64t-p4 +kernel-image-2.6.11-1-386 +kernel-image-2.6.11-1-686 +kernel-image-2.6.11-1-686-smp +kernel-image-2.6.11-1-k7 +kernel-image-2.6.11-1-k7-smp +kernel-image-2.6.11-1-k7 +kernel-image-2.6.11-1-k7-smp +kernel-image-2.6.11-1-amd64-k8-smp +kernel-image-2.6.11-1-amd64-k8 +kernel-image-2.6.11-1-amd64-generic +kernel-image-2.6.11-1-em64t-p4-smp +kernel-image-2.6.11-1-em64t-p4 +kernel-image-2.6.12-1-386 +kernel-image-2.6.12-1-686 +kernel-image-2.6.12-1-686-smp +kernel-image-2.6.12-1-k7 +kernel-image-2.6.12-1-k7-smp +kernel-image-2.6.12-1-k7 +kernel-image-2.6.12-1-k7-smp +kernel-image-2.6.12-1-amd64-k8-smp +kernel-image-2.6.12-1-amd64-k8 +kernel-image-2.6.12-1-amd64-generic +kernel-image-2.6.12-1-em64t-p4-smp +kernel-image-2.6.12-1-em64t-p4 +kernel-image-2.6.13-1-386 +kernel-image-2.6.13-1-686 +kernel-image-2.6.13-1-686-smp +kernel-image-2.6.13-1-k7 +kernel-image-2.6.13-1-k7-smp +kernel-image-2.6.13-1-k7 +kernel-image-2.6.13-1-k7-smp +kernel-image-2.6.13-1-amd64-k8-smp +kernel-image-2.6.13-1-amd64-k8 +kernel-image-2.6.13-1-amd64-generic +kernel-image-2.6.13-1-em64t-p4-smp +kernel-image-2.6.13-1-em64t-p4 +kernel-pcmcia-modules-2.4-386 +kernel-pcmcia-modules-2.4-586tsc +kernel-pcmcia-modules-2.4-686 +kernel-pcmcia-modules-2.4-686-smp +kernel-pcmcia-modules-2.4-k6 +kernel-pcmcia-modules-2.4-k7 +kernel-pcmcia-modules-2.4-k7-smp +kernel-pcmcia-modules-2.4.24-1-386 +kernel-pcmcia-modules-2.4.24-1-586tsc +kernel-pcmcia-modules-2.4.24-1-686 +kernel-pcmcia-modules-2.4.24-1-686-smp +kernel-pcmcia-modules-2.4.24-1-k6 +kernel-pcmcia-modules-2.4.24-1-k7 +kernel-pcmcia-modules-2.4.24-1-k7-smp +kernel-pcmcia-modules-2.4.25-1-386 +kernel-pcmcia-modules-2.4.25-1-586tsc +kernel-pcmcia-modules-2.4.25-1-686 +kernel-pcmcia-modules-2.4.25-1-686-smp +kernel-pcmcia-modules-2.4.25-1-k6 +kernel-pcmcia-modules-2.4.25-1-k7 +kernel-pcmcia-modules-2.4.25-1-k7-smp +kernel-pcmcia-modules-2.4.26-1-386 +kernel-pcmcia-modules-2.4.26-1-586tsc +kernel-pcmcia-modules-2.4.26-1-686 +kernel-pcmcia-modules-2.4.26-1-686-smp +kernel-pcmcia-modules-2.4.26-1-k6 +kernel-pcmcia-modules-2.4.26-1-k7 +kernel-pcmcia-modules-2.4.26-1-k7-smp +kernel-pcmcia-modules-2.4.27-1-586tsc +kernel-pcmcia-modules-2.4.27-1-k6 +kernel-pcmcia-modules-2.4.27-1-k7 +kernel-pcmcia-modules-2.4.27-1-k7-smp +kernel-pcmcia-modules-2.4.27-2-586tsc +kernel-pcmcia-modules-2.4.27-2-k6 +kernel-pcmcia-modules-2.4.27-2-k7 +kernel-pcmcia-modules-2.4.27-2-k7-smp +kernel-pcmcia-modules-2.4.28-1-586tsc +kernel-pcmcia-modules-2.4.28-1-k6 +kernel-pcmcia-modules-2.4.28-1-k7 +kernel-pcmcia-modules-2.4.28-1-k7-smp +kernel-headers-2.4.27-1-k7 +kernel-headers-2.4.27-1-k6 +kernel-headers-2.4.27-1-586tsc +kernel-headers-2.4.27-1-k7-smp +kernel-headers-2.4.27-2-686-smp +kernel-headers-2.4.27-2-k6 +kernel-headers-2.4.27-2-686 +kernel-headers-2.4.27-2 +kernel-headers-2.4.27-2-586tsc +kernel-headers-2.4.27-2-k7 +kernel-headers-2.4.27-2-k7-smp +kernel-headers-2.4.27-2-386 +kernel-headers-2.4-686 +kernel-headers-2.4-k7 +kernel-headers-2.4-k6 +kernel-headers-2.4-586tsc +kernel-headers-2.4-386 +kernel-headers-2.4.27-2-686-smp +kernel-headers-2.4-k7-smp +kernel-headers-2.4-686-smp +python2.1 +smail +tcl8.0 +tk8.0 +exim +xserver-xfree86-dbg +zmailer +xmail diff --git a/sarge/tasks/unexclude-CD2-sarge b/sarge/tasks/unexclude-CD2-sarge index 82f8efc2..70eee1fc 100644 --- a/sarge/tasks/unexclude-CD2-sarge +++ b/sarge/tasks/unexclude-CD2-sarge @@ -1,3 +1,4 @@ +flight-of-the-amazon-queen acorn-fdisk aspell-bg aspell-br @@ -17,153 +18,10 @@ kernel-image-2.4-686-smp kernel-image-2.4-k6 kernel-image-2.4-k7 kernel-image-2.4-k7-smp -kernel-image-2.4.21-5-386 -kernel-image-2.4.21-5-586tsc -kernel-image-2.4.21-5-686 -kernel-image-2.4.21-5-686-smp -kernel-image-2.4.21-5-k6 -kernel-image-2.4.21-5-k7 -kernel-image-2.4.21-5-k7-smp -kernel-image-2.4.24-1-386 -kernel-image-2.4.24-1-586tsc -kernel-image-2.4.24-1-686 -kernel-image-2.4.24-1-686-smp -kernel-image-2.4.24-1-k6 -kernel-image-2.4.24-1-k7 -kernel-image-2.4.24-1-k7-smp -kernel-image-2.4.24-speakup -kernel-image-2.4.25-1-386 -kernel-image-2.4.25-1-586tsc -kernel-image-2.4.25-1-686 -kernel-image-2.4.25-1-686-smp -kernel-image-2.4.25-1-k6 -kernel-image-2.4.25-1-k7 -kernel-image-2.4.25-1-k7-smp -kernel-image-2.4.26-speakup -kernel-image-2.4.26-1-386 -kernel-image-2.4.26-1-586tsc -kernel-image-2.4.26-1-686 -kernel-image-2.4.26-1-686-smp -kernel-image-2.4.26-1-k6 -kernel-image-2.4.26-1-k7 -kernel-image-2.4.26-1-k7-smp -kernel-image-2.4.27-1-586tsc -kernel-image-2.4.27-1-k6 -kernel-image-2.4.27-1-k7 -kernel-image-2.4.27-1-k7-smp -kernel-image-2.4.27-2-586tsc -kernel-image-2.4.27-2-k6 -kernel-image-2.4.27-2-k7 -kernel-image-2.4.27-2-k7-smp -kernel-image-2.6-386 -kernel-image-2.6-686 -kernel-image-2.6-686-smp -kernel-image-2.6-k7 -kernel-image-2.6-k7-smp -kernel-image-2.6-amd64-generic -kernel-image-2.6-amd64-k8 -kernel-image-2.6-amd64-k8-smp -kernel-image-2.6-em64t-p4 -kernel-image-2.6-em64t-p4-smp -kernel-image-2.6.3-1-386 -kernel-image-2.6.3-1-686 -kernel-image-2.6.3-1-686-smp -kernel-image-2.6.3-1-k7 -kernel-image-2.6.3-1-k7-smp -kernel-image-2.6.5-1-386 -kernel-image-2.6.5-1-686 -kernel-image-2.6.5-1-686-smp -kernel-image-2.6.5-1-k7 -kernel-image-2.6.5-1-k7-smp -kernel-image-2.6.6-1-386 -kernel-image-2.6.6-1-686 -kernel-image-2.6.6-1-686-smp -kernel-image-2.6.6-1-k7 -kernel-image-2.6.6-1-k7-smp -kernel-image-2.6.7-1-386 -kernel-image-2.6.7-1-686 -kernel-image-2.6.7-1-686-smp -kernel-image-2.6.7-1-k7 -kernel-image-2.6.7-1-k7-smp -kernel-image-2.6.8-1-k7 -kernel-image-2.6.8-1-k7-smp -kernel-image-2.6.8-2-k7 -kernel-image-2.6.8-2-k7-smp -kernel-image-2.6.8-9-amd64-k8-smp -kernel-image-2.6.8-9-amd64-k8 -kernel-image-2.6.8-9-amd64-generic -kernel-image-2.6.8-9-em64t-p4-smp -kernel-image-2.6.8-9-em64t-p4 -kernel-image-2.6.8-10-em64t-p4 -kernel-image-2.6.8-10-em64t-p4-smp -kernel-image-2.6.8-10-amd64-k8 -kernel-image-2.6.8-10-amd64-k8-smp -kernel-image-2.6.8-10-amd64-generic -kernel-image-2.6.8-11-em64t-p4 -kernel-image-2.6.8-11-em64t-p4-smp -kernel-image-2.6.8-11-amd64-k8 -kernel-image-2.6.8-11-amd64-k8-smp -kernel-image-2.6.8-11-amd64-generic -kernel-image-2.6.9-1-386 -kernel-image-2.6.9-1-686 -kernel-image-2.6.9-1-686-smp -kernel-image-2.6.9-1-k7 -kernel-image-2.6.9-1-k7-smp -kernel-image-2.6.9-1-k7 -kernel-image-2.6.9-1-k7-smp -kernel-image-2.6.9-1-amd64-k8-smp -kernel-image-2.6.9-1-amd64-k8 -kernel-image-2.6.9-1-amd64-generic -kernel-image-2.6.9-1-em64t-p4-smp -kernel-image-2.6.9-1-em64t-p4 -kernel-image-2.6.10-1-386 -kernel-image-2.6.10-1-686 -kernel-image-2.6.10-1-686-smp -kernel-image-2.6.10-1-k7 -kernel-image-2.6.10-1-k7-smp -kernel-image-2.6.10-1-k7 -kernel-image-2.6.10-1-k7-smp -kernel-image-2.6.10-1-amd64-k8-smp -kernel-image-2.6.10-1-amd64-k8 -kernel-image-2.6.10-1-amd64-generic -kernel-image-2.6.10-1-em64t-p4-smp -kernel-image-2.6.10-1-em64t-p4 -kernel-image-2.6.11-1-386 -kernel-image-2.6.11-1-686 -kernel-image-2.6.11-1-686-smp -kernel-image-2.6.11-1-k7 -kernel-image-2.6.11-1-k7-smp -kernel-image-2.6.11-1-k7 -kernel-image-2.6.11-1-k7-smp -kernel-image-2.6.11-1-amd64-k8-smp -kernel-image-2.6.11-1-amd64-k8 -kernel-image-2.6.11-1-amd64-generic -kernel-image-2.6.11-1-em64t-p4-smp -kernel-image-2.6.11-1-em64t-p4 -kernel-image-2.6.12-1-386 -kernel-image-2.6.12-1-686 -kernel-image-2.6.12-1-686-smp -kernel-image-2.6.12-1-k7 -kernel-image-2.6.12-1-k7-smp -kernel-image-2.6.12-1-k7 -kernel-image-2.6.12-1-k7-smp -kernel-image-2.6.12-1-amd64-k8-smp -kernel-image-2.6.12-1-amd64-k8 -kernel-image-2.6.12-1-amd64-generic -kernel-image-2.6.12-1-em64t-p4-smp -kernel-image-2.6.12-1-em64t-p4 -kernel-image-2.6.13-1-386 -kernel-image-2.6.13-1-686 -kernel-image-2.6.13-1-686-smp -kernel-image-2.6.13-1-k7 -kernel-image-2.6.13-1-k7-smp -kernel-image-2.6.13-1-k7 -kernel-image-2.6.13-1-k7-smp -kernel-image-2.6.13-1-amd64-k8-smp -kernel-image-2.6.13-1-amd64-k8 -kernel-image-2.6.13-1-amd64-generic -kernel-image-2.6.13-1-em64t-p4-smp -kernel-image-2.6.13-1-em64t-p4 +kernel-image-2.4.27-3-586tsc +kernel-image-2.4.27-3-k6 +kernel-image-2.4.27-3-k7 +kernel-image-2.4.27-3-k7-smp kernel-pcmcia-modules-2.4-386 kernel-pcmcia-modules-2.4-586tsc kernel-pcmcia-modules-2.4-686 @@ -171,59 +29,40 @@ kernel-pcmcia-modules-2.4-686-smp kernel-pcmcia-modules-2.4-k6 kernel-pcmcia-modules-2.4-k7 kernel-pcmcia-modules-2.4-k7-smp -kernel-pcmcia-modules-2.4.24-1-386 -kernel-pcmcia-modules-2.4.24-1-586tsc -kernel-pcmcia-modules-2.4.24-1-686 -kernel-pcmcia-modules-2.4.24-1-686-smp -kernel-pcmcia-modules-2.4.24-1-k6 -kernel-pcmcia-modules-2.4.24-1-k7 -kernel-pcmcia-modules-2.4.24-1-k7-smp -kernel-pcmcia-modules-2.4.25-1-386 -kernel-pcmcia-modules-2.4.25-1-586tsc -kernel-pcmcia-modules-2.4.25-1-686 -kernel-pcmcia-modules-2.4.25-1-686-smp -kernel-pcmcia-modules-2.4.25-1-k6 -kernel-pcmcia-modules-2.4.25-1-k7 -kernel-pcmcia-modules-2.4.25-1-k7-smp -kernel-pcmcia-modules-2.4.26-1-386 -kernel-pcmcia-modules-2.4.26-1-586tsc -kernel-pcmcia-modules-2.4.26-1-686 -kernel-pcmcia-modules-2.4.26-1-686-smp -kernel-pcmcia-modules-2.4.26-1-k6 -kernel-pcmcia-modules-2.4.26-1-k7 -kernel-pcmcia-modules-2.4.26-1-k7-smp -kernel-pcmcia-modules-2.4.27-1-586tsc -kernel-pcmcia-modules-2.4.27-1-k6 -kernel-pcmcia-modules-2.4.27-1-k7 -kernel-pcmcia-modules-2.4.27-1-k7-smp -kernel-pcmcia-modules-2.4.27-2-586tsc -kernel-pcmcia-modules-2.4.27-2-k6 -kernel-pcmcia-modules-2.4.27-2-k7 -kernel-pcmcia-modules-2.4.27-2-k7-smp -kernel-pcmcia-modules-2.4.28-1-586tsc -kernel-pcmcia-modules-2.4.28-1-k6 -kernel-pcmcia-modules-2.4.28-1-k7 -kernel-pcmcia-modules-2.4.28-1-k7-smp -kernel-headers-2.4.27-1-k7 -kernel-headers-2.4.27-1-k6 -kernel-headers-2.4.27-1-586tsc -kernel-headers-2.4.27-1-k7-smp -kernel-headers-2.4.27-2-686-smp -kernel-headers-2.4.27-2-k6 -kernel-headers-2.4.27-2-686 -kernel-headers-2.4.27-2 -kernel-headers-2.4.27-2-586tsc -kernel-headers-2.4.27-2-k7 -kernel-headers-2.4.27-2-k7-smp -kernel-headers-2.4.27-2-386 -kernel-headers-2.4-686 -kernel-headers-2.4-k7 -kernel-headers-2.4-k6 -kernel-headers-2.4-586tsc +kernel-pcmcia-modules-2.4.27-3-586tsc +kernel-pcmcia-modules-2.4.27-3-k6 +kernel-pcmcia-modules-2.4.27-3-k7 +kernel-pcmcia-modules-2.4.27-3-k7-smp kernel-headers-2.4-386 -kernel-headers-2.4.27-2-686-smp -kernel-headers-2.4-k7-smp +kernel-headers-2.4-586tsc +kernel-headers-2.4-686 kernel-headers-2.4-686-smp +kernel-headers-2.4-k6 +kernel-headers-2.4-k7 +kernel-headers-2.4-k7-smp +kernel-headers-2.4.27-3-586tsc +kernel-headers-2.4.27-3-k6 +kernel-headers-2.4.27-3-k7 +kernel-headers-2.4.27-3-k7-smp +kernel-image-2.6-386 +kernel-image-2.6-686 +kernel-image-2.6-686-smp +kernel-image-2.6-k7 +kernel-image-2.6-k7-smp +kernel-image-2.6.8-4-k7 +kernel-image-2.6.8-4-k7-smp +kernel-image-2.6-amd64-generic +kernel-image-2.6-amd64-k8 +kernel-image-2.6-amd64-k8-smp +kernel-image-2.6-em64t-p4 +kernel-image-2.6-em64t-p4-smp +#ifndef ARCH_amd64 +kernel-image-2.6.8-13-amd64-k8-smp +kernel-image-2.6.8-13-amd64-k8 +kernel-image-2.6.8-13-amd64-generic +kernel-image-2.6.8-13-em64t-p4-smp +kernel-image-2.6.8-13-em64t-p4 +#endif python2.1 smail tcl8.0 diff --git a/sarge/tasks/unexclude-CD2-sarge.pre-r7 b/sarge/tasks/unexclude-CD2-sarge.pre-r7 new file mode 100644 index 00000000..82f8efc2 --- /dev/null +++ b/sarge/tasks/unexclude-CD2-sarge.pre-r7 @@ -0,0 +1,234 @@ +acorn-fdisk +aspell-bg +aspell-br +aspell-cy +aspell-da +aspell-de +aspell-el +aspell-es +aspell-fr +aspell-pt +cfdisk-utf8 +gcc272 +kernel-image-2.4-386 +kernel-image-2.4-586tsc +kernel-image-2.4-686 +kernel-image-2.4-686-smp +kernel-image-2.4-k6 +kernel-image-2.4-k7 +kernel-image-2.4-k7-smp +kernel-image-2.4.21-5-386 +kernel-image-2.4.21-5-586tsc +kernel-image-2.4.21-5-686 +kernel-image-2.4.21-5-686-smp +kernel-image-2.4.21-5-k6 +kernel-image-2.4.21-5-k7 +kernel-image-2.4.21-5-k7-smp +kernel-image-2.4.24-1-386 +kernel-image-2.4.24-1-586tsc +kernel-image-2.4.24-1-686 +kernel-image-2.4.24-1-686-smp +kernel-image-2.4.24-1-k6 +kernel-image-2.4.24-1-k7 +kernel-image-2.4.24-1-k7-smp +kernel-image-2.4.24-speakup +kernel-image-2.4.25-1-386 +kernel-image-2.4.25-1-586tsc +kernel-image-2.4.25-1-686 +kernel-image-2.4.25-1-686-smp +kernel-image-2.4.25-1-k6 +kernel-image-2.4.25-1-k7 +kernel-image-2.4.25-1-k7-smp +kernel-image-2.4.26-speakup +kernel-image-2.4.26-1-386 +kernel-image-2.4.26-1-586tsc +kernel-image-2.4.26-1-686 +kernel-image-2.4.26-1-686-smp +kernel-image-2.4.26-1-k6 +kernel-image-2.4.26-1-k7 +kernel-image-2.4.26-1-k7-smp +kernel-image-2.4.27-1-586tsc +kernel-image-2.4.27-1-k6 +kernel-image-2.4.27-1-k7 +kernel-image-2.4.27-1-k7-smp +kernel-image-2.4.27-2-586tsc +kernel-image-2.4.27-2-k6 +kernel-image-2.4.27-2-k7 +kernel-image-2.4.27-2-k7-smp +kernel-image-2.6-386 +kernel-image-2.6-686 +kernel-image-2.6-686-smp +kernel-image-2.6-k7 +kernel-image-2.6-k7-smp +kernel-image-2.6-amd64-generic +kernel-image-2.6-amd64-k8 +kernel-image-2.6-amd64-k8-smp +kernel-image-2.6-em64t-p4 +kernel-image-2.6-em64t-p4-smp +kernel-image-2.6.3-1-386 +kernel-image-2.6.3-1-686 +kernel-image-2.6.3-1-686-smp +kernel-image-2.6.3-1-k7 +kernel-image-2.6.3-1-k7-smp +kernel-image-2.6.5-1-386 +kernel-image-2.6.5-1-686 +kernel-image-2.6.5-1-686-smp +kernel-image-2.6.5-1-k7 +kernel-image-2.6.5-1-k7-smp +kernel-image-2.6.6-1-386 +kernel-image-2.6.6-1-686 +kernel-image-2.6.6-1-686-smp +kernel-image-2.6.6-1-k7 +kernel-image-2.6.6-1-k7-smp +kernel-image-2.6.7-1-386 +kernel-image-2.6.7-1-686 +kernel-image-2.6.7-1-686-smp +kernel-image-2.6.7-1-k7 +kernel-image-2.6.7-1-k7-smp +kernel-image-2.6.8-1-k7 +kernel-image-2.6.8-1-k7-smp +kernel-image-2.6.8-2-k7 +kernel-image-2.6.8-2-k7-smp +kernel-image-2.6.8-9-amd64-k8-smp +kernel-image-2.6.8-9-amd64-k8 +kernel-image-2.6.8-9-amd64-generic +kernel-image-2.6.8-9-em64t-p4-smp +kernel-image-2.6.8-9-em64t-p4 +kernel-image-2.6.8-10-em64t-p4 +kernel-image-2.6.8-10-em64t-p4-smp +kernel-image-2.6.8-10-amd64-k8 +kernel-image-2.6.8-10-amd64-k8-smp +kernel-image-2.6.8-10-amd64-generic +kernel-image-2.6.8-11-em64t-p4 +kernel-image-2.6.8-11-em64t-p4-smp +kernel-image-2.6.8-11-amd64-k8 +kernel-image-2.6.8-11-amd64-k8-smp +kernel-image-2.6.8-11-amd64-generic +kernel-image-2.6.9-1-386 +kernel-image-2.6.9-1-686 +kernel-image-2.6.9-1-686-smp +kernel-image-2.6.9-1-k7 +kernel-image-2.6.9-1-k7-smp +kernel-image-2.6.9-1-k7 +kernel-image-2.6.9-1-k7-smp +kernel-image-2.6.9-1-amd64-k8-smp +kernel-image-2.6.9-1-amd64-k8 +kernel-image-2.6.9-1-amd64-generic +kernel-image-2.6.9-1-em64t-p4-smp +kernel-image-2.6.9-1-em64t-p4 +kernel-image-2.6.10-1-386 +kernel-image-2.6.10-1-686 +kernel-image-2.6.10-1-686-smp +kernel-image-2.6.10-1-k7 +kernel-image-2.6.10-1-k7-smp +kernel-image-2.6.10-1-k7 +kernel-image-2.6.10-1-k7-smp +kernel-image-2.6.10-1-amd64-k8-smp +kernel-image-2.6.10-1-amd64-k8 +kernel-image-2.6.10-1-amd64-generic +kernel-image-2.6.10-1-em64t-p4-smp +kernel-image-2.6.10-1-em64t-p4 +kernel-image-2.6.11-1-386 +kernel-image-2.6.11-1-686 +kernel-image-2.6.11-1-686-smp +kernel-image-2.6.11-1-k7 +kernel-image-2.6.11-1-k7-smp +kernel-image-2.6.11-1-k7 +kernel-image-2.6.11-1-k7-smp +kernel-image-2.6.11-1-amd64-k8-smp +kernel-image-2.6.11-1-amd64-k8 +kernel-image-2.6.11-1-amd64-generic +kernel-image-2.6.11-1-em64t-p4-smp +kernel-image-2.6.11-1-em64t-p4 +kernel-image-2.6.12-1-386 +kernel-image-2.6.12-1-686 +kernel-image-2.6.12-1-686-smp +kernel-image-2.6.12-1-k7 +kernel-image-2.6.12-1-k7-smp +kernel-image-2.6.12-1-k7 +kernel-image-2.6.12-1-k7-smp +kernel-image-2.6.12-1-amd64-k8-smp +kernel-image-2.6.12-1-amd64-k8 +kernel-image-2.6.12-1-amd64-generic +kernel-image-2.6.12-1-em64t-p4-smp +kernel-image-2.6.12-1-em64t-p4 +kernel-image-2.6.13-1-386 +kernel-image-2.6.13-1-686 +kernel-image-2.6.13-1-686-smp +kernel-image-2.6.13-1-k7 +kernel-image-2.6.13-1-k7-smp +kernel-image-2.6.13-1-k7 +kernel-image-2.6.13-1-k7-smp +kernel-image-2.6.13-1-amd64-k8-smp +kernel-image-2.6.13-1-amd64-k8 +kernel-image-2.6.13-1-amd64-generic +kernel-image-2.6.13-1-em64t-p4-smp +kernel-image-2.6.13-1-em64t-p4 +kernel-pcmcia-modules-2.4-386 +kernel-pcmcia-modules-2.4-586tsc +kernel-pcmcia-modules-2.4-686 +kernel-pcmcia-modules-2.4-686-smp +kernel-pcmcia-modules-2.4-k6 +kernel-pcmcia-modules-2.4-k7 +kernel-pcmcia-modules-2.4-k7-smp +kernel-pcmcia-modules-2.4.24-1-386 +kernel-pcmcia-modules-2.4.24-1-586tsc +kernel-pcmcia-modules-2.4.24-1-686 +kernel-pcmcia-modules-2.4.24-1-686-smp +kernel-pcmcia-modules-2.4.24-1-k6 +kernel-pcmcia-modules-2.4.24-1-k7 +kernel-pcmcia-modules-2.4.24-1-k7-smp +kernel-pcmcia-modules-2.4.25-1-386 +kernel-pcmcia-modules-2.4.25-1-586tsc +kernel-pcmcia-modules-2.4.25-1-686 +kernel-pcmcia-modules-2.4.25-1-686-smp +kernel-pcmcia-modules-2.4.25-1-k6 +kernel-pcmcia-modules-2.4.25-1-k7 +kernel-pcmcia-modules-2.4.25-1-k7-smp +kernel-pcmcia-modules-2.4.26-1-386 +kernel-pcmcia-modules-2.4.26-1-586tsc +kernel-pcmcia-modules-2.4.26-1-686 +kernel-pcmcia-modules-2.4.26-1-686-smp +kernel-pcmcia-modules-2.4.26-1-k6 +kernel-pcmcia-modules-2.4.26-1-k7 +kernel-pcmcia-modules-2.4.26-1-k7-smp +kernel-pcmcia-modules-2.4.27-1-586tsc +kernel-pcmcia-modules-2.4.27-1-k6 +kernel-pcmcia-modules-2.4.27-1-k7 +kernel-pcmcia-modules-2.4.27-1-k7-smp +kernel-pcmcia-modules-2.4.27-2-586tsc +kernel-pcmcia-modules-2.4.27-2-k6 +kernel-pcmcia-modules-2.4.27-2-k7 +kernel-pcmcia-modules-2.4.27-2-k7-smp +kernel-pcmcia-modules-2.4.28-1-586tsc +kernel-pcmcia-modules-2.4.28-1-k6 +kernel-pcmcia-modules-2.4.28-1-k7 +kernel-pcmcia-modules-2.4.28-1-k7-smp +kernel-headers-2.4.27-1-k7 +kernel-headers-2.4.27-1-k6 +kernel-headers-2.4.27-1-586tsc +kernel-headers-2.4.27-1-k7-smp +kernel-headers-2.4.27-2-686-smp +kernel-headers-2.4.27-2-k6 +kernel-headers-2.4.27-2-686 +kernel-headers-2.4.27-2 +kernel-headers-2.4.27-2-586tsc +kernel-headers-2.4.27-2-k7 +kernel-headers-2.4.27-2-k7-smp +kernel-headers-2.4.27-2-386 +kernel-headers-2.4-686 +kernel-headers-2.4-k7 +kernel-headers-2.4-k6 +kernel-headers-2.4-586tsc +kernel-headers-2.4-386 +kernel-headers-2.4.27-2-686-smp +kernel-headers-2.4-k7-smp +kernel-headers-2.4-686-smp +python2.1 +smail +tcl8.0 +tk8.0 +exim +xserver-xfree86-dbg +zmailer +xmail diff --git a/sarge/tools/add_dirs b/sarge/tools/add_dirs index 0df15853..a3e31dec 100755 --- a/sarge/tools/add_dirs +++ b/sarge/tools/add_dirs @@ -18,7 +18,7 @@ fi if [ ! -d dists/$CODENAME ] ; then mkdir -p dists/$CODENAME - for name in stable unstable frozen testing; do + for name in stable unstable oldstable frozen testing; do ln -sf $CODENAME dists/$name done fi diff --git a/sarge/tools/add_packages b/sarge/tools/add_packages index ff0e77d4..3190fd3e 100755 --- a/sarge/tools/add_packages +++ b/sarge/tools/add_packages @@ -38,31 +38,31 @@ while (defined($_ = )) { # a symbolic link in binary-$ARCH or if arch=all and filename is a # symbolic link we suppose that the link points to # .../binary-all/... and we reproduce a similar setup on the CD - if ($arch eq "all" and (-l "$source/$file" or - $file =~ m#/binary-all/#)) { - $file =~ s#/binary-all/#/binary-$ENV{'ARCH'}/#g; - - # Check that the directory where the link will be created does - # exist - my $pdir = "$dir/$file"; - $pdir =~ s#[^/]+$##g; - if (! -d $pdir) - { - system("mkdir -p $pdir"); - } - - # Create the symlink from binary-$arch to binary-all - if ($section =~ /non-US/ || $file =~ /updates/ ) { - $file =~ m#/([^/]+)$# and $name = $1; - symlink ("../binary-all/$name", "$dir/$file") || - die "Can't symlink $dir/$file to ../binary-all/$name: $!"; - } else { - $file =~ m#/([^/]+/[^/]+)$# and $name = $1; - symlink ("../../binary-all/$name", "$dir/$file") || - die "Can't symlink $dir/$file to ../../binary-all/$name: $!"; - } - $file =~ s#/binary-$ENV{'ARCH'}/#/binary-all/#g; - } +# if ($arch eq "all" and (-l "$source/$file" or +# $file =~ m#/binary-all/#)) { +# $file =~ s#/binary-all/#/binary-$ENV{'ARCH'}/#g; +# +# # Check that the directory where the link will be created does +# # exist +# my $pdir = "$dir/$file"; +# $pdir =~ s#[^/]+$##g; +# if (! -d $pdir) +# { +# system("mkdir -p $pdir"); +# } +# +# # Create the symlink from binary-$arch to binary-all +# if ($section =~ /non-US/ || $file =~ /updates/ ) { +# $file =~ m#/([^/]+)$# and $name = $1; +# symlink ("../binary-all/$name", "$dir/$file") || +# die "Can't symlink $dir/$file to ../binary-all/$name: $!"; +# } else { +# $file =~ m#/([^/]+/[^/]+)$# and $name = $1; +# symlink ("../../binary-all/$name", "$dir/$file") || +# die "Can't symlink $dir/$file to ../../binary-all/$name: $!"; +# } +# $file =~ s#/binary-$ENV{'ARCH'}/#/binary-all/#g; +# } # And we put the file in the CD tree (with a (hard) link) $realfile = real_file ("$source/$file"); diff --git a/sarge/tools/boot/sarge/boot-alpha.calc b/sarge/tools/boot/sarge/boot-alpha.calc index 09ceec93..43d0071b 100644 --- a/sarge/tools/boot/sarge/boot-alpha.calc +++ b/sarge/tools/boot/sarge/boot-alpha.calc @@ -1,8 +1,9 @@ -BOOT_SIZE_1=11 +BOOT_SIZE_1=28 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 BOOT_SIZE_13=2 +BOOT_SIZE_14=2 BOOT_SIZE_2=2 BOOT_SIZE_3=2 BOOT_SIZE_4=2 diff --git a/sarge/tools/boot/sarge/boot-amd64.calc b/sarge/tools/boot/sarge/boot-amd64.calc new file mode 100644 index 00000000..77b7af6b --- /dev/null +++ b/sarge/tools/boot/sarge/boot-amd64.calc @@ -0,0 +1,13 @@ +BOOT_SIZE_1=9 +BOOT_SIZE_10=2 +BOOT_SIZE_11=2 +BOOT_SIZE_12=2 +BOOT_SIZE_13=2 +BOOT_SIZE_2=2 +BOOT_SIZE_3=2 +BOOT_SIZE_4=2 +BOOT_SIZE_5=2 +BOOT_SIZE_6=2 +BOOT_SIZE_7=2 +BOOT_SIZE_8=2 +BOOT_SIZE_9=2 diff --git a/sarge/tools/boot/sarge/boot-arm.calc b/sarge/tools/boot/sarge/boot-arm.calc index 211d6845..495779ab 100644 --- a/sarge/tools/boot/sarge/boot-arm.calc +++ b/sarge/tools/boot/sarge/boot-arm.calc @@ -1,7 +1,8 @@ -BOOT_SIZE_1=17 +BOOT_SIZE_1=33 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 +BOOT_SIZE_13=2 BOOT_SIZE_2=2 BOOT_SIZE_3=2 BOOT_SIZE_4=2 diff --git a/sarge/tools/boot/sarge/boot-hppa.calc b/sarge/tools/boot/sarge/boot-hppa.calc index c0276833..baebfd1a 100644 --- a/sarge/tools/boot/sarge/boot-hppa.calc +++ b/sarge/tools/boot/sarge/boot-hppa.calc @@ -1,8 +1,9 @@ -BOOT_SIZE_1=18 +BOOT_SIZE_1=40 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 BOOT_SIZE_13=2 +BOOT_SIZE_14=2 BOOT_SIZE_2=2 BOOT_SIZE_3=2 BOOT_SIZE_4=2 diff --git a/sarge/tools/boot/sarge/boot-i386.calc b/sarge/tools/boot/sarge/boot-i386.calc index f33ae8fa..ae53a3a0 100644 --- a/sarge/tools/boot/sarge/boot-i386.calc +++ b/sarge/tools/boot/sarge/boot-i386.calc @@ -1,14 +1,14 @@ -BOOT_SIZE_1=26 -BOOT_SIZE_10=2 -BOOT_SIZE_11=2 -BOOT_SIZE_12=2 -BOOT_SIZE_13=2 -BOOT_SIZE_14=2 +BOOT_SIZE_1=45 +BOOT_SIZE_10=1 +BOOT_SIZE_11=1 +BOOT_SIZE_12=1 +BOOT_SIZE_13=1 +BOOT_SIZE_14=1 BOOT_SIZE_2=4 -BOOT_SIZE_3=2 -BOOT_SIZE_4=2 -BOOT_SIZE_5=2 -BOOT_SIZE_6=2 -BOOT_SIZE_7=2 -BOOT_SIZE_8=2 -BOOT_SIZE_9=2 +BOOT_SIZE_3=1 +BOOT_SIZE_4=1 +BOOT_SIZE_5=1 +BOOT_SIZE_6=1 +BOOT_SIZE_7=1 +BOOT_SIZE_8=1 +BOOT_SIZE_9=1 diff --git a/sarge/tools/boot/sarge/boot-ia64.calc b/sarge/tools/boot/sarge/boot-ia64.calc index 4a786942..38c2e158 100644 --- a/sarge/tools/boot/sarge/boot-ia64.calc +++ b/sarge/tools/boot/sarge/boot-ia64.calc @@ -1,9 +1,10 @@ -BOOT_SIZE_1=39 +BOOT_SIZE_1=55 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 BOOT_SIZE_13=2 BOOT_SIZE_14=2 +BOOT_SIZE_15=2 BOOT_SIZE_2=2 BOOT_SIZE_3=2 BOOT_SIZE_4=2 diff --git a/sarge/tools/boot/sarge/boot-m68k.calc b/sarge/tools/boot/sarge/boot-m68k.calc index cc631ccf..43611e2d 100644 --- a/sarge/tools/boot/sarge/boot-m68k.calc +++ b/sarge/tools/boot/sarge/boot-m68k.calc @@ -1,4 +1,4 @@ -BOOT_SIZE_1=29 +BOOT_SIZE_1=46 SIZE_MULT_1=97 BOOT_SIZE_10=2 SIZE_MULT_10=97 @@ -6,6 +6,8 @@ BOOT_SIZE_11=2 SIZE_MULT_11=97 BOOT_SIZE_12=2 SIZE_MULT_12=97 +BOOT_SIZE_13=2 +SIZE_MULT_13=97 BOOT_SIZE_2=2 SIZE_MULT_2=97 BOOT_SIZE_3=2 diff --git a/sarge/tools/boot/sarge/boot-mips.calc b/sarge/tools/boot/sarge/boot-mips.calc index 664e4baf..4dccb040 100644 --- a/sarge/tools/boot/sarge/boot-mips.calc +++ b/sarge/tools/boot/sarge/boot-mips.calc @@ -1,7 +1,8 @@ -BOOT_SIZE_1=15 +BOOT_SIZE_1=31 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 +BOOT_SIZE_13=2 BOOT_SIZE_2=2 BOOT_SIZE_3=2 BOOT_SIZE_4=2 diff --git a/sarge/tools/boot/sarge/boot-mipsel.calc b/sarge/tools/boot/sarge/boot-mipsel.calc index 0f1ee707..40107f43 100644 --- a/sarge/tools/boot/sarge/boot-mipsel.calc +++ b/sarge/tools/boot/sarge/boot-mipsel.calc @@ -1,7 +1,8 @@ -BOOT_SIZE_1=14 +BOOT_SIZE_1=30 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 +BOOT_SIZE_13=2 BOOT_SIZE_2=2 BOOT_SIZE_3=2 BOOT_SIZE_4=2 diff --git a/sarge/tools/boot/sarge/boot-powerpc.calc b/sarge/tools/boot/sarge/boot-powerpc.calc index 8ac5fc0c..82757bf5 100644 --- a/sarge/tools/boot/sarge/boot-powerpc.calc +++ b/sarge/tools/boot/sarge/boot-powerpc.calc @@ -1,4 +1,4 @@ -BOOT_SIZE_1=81 +BOOT_SIZE_1=91 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 @@ -12,4 +12,4 @@ BOOT_SIZE_6=2 BOOT_SIZE_7=2 BOOT_SIZE_8=2 BOOT_SIZE_9=2 -SIZE_MULT_1=93 +SIZE_MULT_1=96 diff --git a/sarge/tools/boot/sarge/boot-s390.calc b/sarge/tools/boot/sarge/boot-s390.calc index aa3d67e3..5a26ed46 100644 --- a/sarge/tools/boot/sarge/boot-s390.calc +++ b/sarge/tools/boot/sarge/boot-s390.calc @@ -1,4 +1,4 @@ -BOOT_SIZE_1=7 +BOOT_SIZE_1=22 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 diff --git a/sarge/tools/boot/sarge/boot-sparc.calc b/sarge/tools/boot/sarge/boot-sparc.calc index 758258a9..d92f457a 100644 --- a/sarge/tools/boot/sarge/boot-sparc.calc +++ b/sarge/tools/boot/sarge/boot-sparc.calc @@ -1,4 +1,4 @@ -BOOT_SIZE_1=13 +BOOT_SIZE_1=32 BOOT_SIZE_10=2 BOOT_SIZE_11=2 BOOT_SIZE_12=2 diff --git a/sarge/tools/cds2src b/sarge/tools/cds2src index b3bb0991..44f73997 100755 --- a/sarge/tools/cds2src +++ b/sarge/tools/cds2src @@ -234,8 +234,14 @@ if ($complete) { || ($a cmp $b) } grep { not ($included{$_} or $excluded{$_}) } keys %sources) { - add_src ($p); + if ($p eq "ia32-libs") { + msg(0, "Leaving ia32-libs to the end\n"); + } else { + add_src ($p); + } } + msg(0, "Now adding ia32-libs\n"); + add_src("ia32-libs"); } msg(0, "CD $cd will only be filled with $cd_size bytes ...\n"); diff --git a/sarge/tools/dedicated_source b/sarge/tools/dedicated_source index 94657866..9482bdb8 100755 --- a/sarge/tools/dedicated_source +++ b/sarge/tools/dedicated_source @@ -31,7 +31,7 @@ do for FILE in $FILES do echo " $FILE" - cp -al $MIRROR/$FILE $BDIR/CD$DISKNUM/extra-sources + cp -aL $MIRROR/$FILE $BDIR/CD$DISKNUM/extra-sources done done diff --git a/sarge/tools/generate_di+k_list b/sarge/tools/generate_di+k_list index 7e6b9e74..116fb14a 100755 --- a/sarge/tools/generate_di+k_list +++ b/sarge/tools/generate_di+k_list @@ -41,67 +41,94 @@ jfsutils reiserfsprogs libfribidi0 localization-config -acpid -initramfs-tools - #ifdef ARCH_i386 discover discover1 grub lilo -/* Note that we do not have to include every optimised kernel flavor for - * i386. Kernel headers are included as third party modules are commonly - * used on this architecture. - */ -kernel-image-2.4-386 -kernel-pcmcia-modules-2.4-386 -kernel-headers-2.4-386 -linux-image-2.6-386 -linux-headers-2.6-386 -#endif +EOF +/bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel-$DI_CODENAME +/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel-$DI_CODENAME +/bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel-$DI_CODENAME + +cat >> debian-installer+kernel-$DI_CODENAME << EOF +#endif #ifdef ARCH_amd64 discover discover1 grub lilo -linux-image-2.6-amd64-generic -linux-headers-2.6-amd64-generic -#endif +EOF +if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then + echo "Cannot find amd64 packages file, inserting static entry as workaround" >&2 + echo kernel-image-2.6.8-11-amd64-generic >> debian-installer+kernel-$DI_CODENAME +else + /bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel-$DI_CODENAME + /bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel-$DI_CODENAME +fi + +cat >> debian-installer+kernel-$DI_CODENAME << EOF +#endif #ifdef ARCH_alpha aboot aboot-base discover1 -kernel-image-2.4-generic -kernel-image-2.4-smp -#endif +EOF +/bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \ + >> debian-installer+kernel-$DI_CODENAME + +cat >> debian-installer+kernel-$DI_CODENAME << EOF +#endif #ifdef ARCH_hppa discover1 -linux-image-2.6-parisc -linux-image-2.6-parisc-smp -linux-image-2.6-parisc64 -linux-image-2.6-parisc64-smp -#endif +EOF +/bin/sed -n 's/Package: \(kernel-image-2.6.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \ + >> debian-installer+kernel-$DI_CODENAME + +cat >> debian-installer+kernel-$DI_CODENAME << EOF +#endif #ifdef ARCH_ia64 discover1 initrd-tools -linux-image-2.6-itanium -linux-image-2.6-itanium-smp -linux-image-2.6-mckinley -linux-image-2.6-mckinley-smp -#endif +EOF +/bin/sed -n 's/Package: \(kernel-image-2\.4\..*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \ + >> debian-installer+kernel-$DI_CODENAME +/bin/sed -n 's/Package: \(kernel-image-2\.4-.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \ + >> debian-installer+kernel-$DI_CODENAME +/bin/sed -n 's/Package: \(kernel-image-2\.6\..*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \ + >> debian-installer+kernel-$DI_CODENAME +/bin/sed -n 's/Package: \(kernel-image-2\.6-.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \ + >> debian-installer+kernel-$DI_CODENAME + +cat >> debian-installer+kernel-$DI_CODENAME << EOF +#endif #ifdef ARCH_mips arcboot EOF # Only include mips kernels that d-i base-installer installs. -# XXX once mips gets kernel-image-2.4- packages, use those -# instead. -for subarch in r4k-ip22 r5k-ip22 sb1-swarm-bn; do +for subarch in r4k-ip22 r5k-ip22; do sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \ $MIRROR/dists/$CODENAME/main/binary-mips/Packages \ | grep -- "-$subarch$" | sort -n | tail -n 1 \ @@ -110,15 +137,12 @@ done cat >> debian-installer+kernel-$DI_CODENAME << EOF #endif - #ifdef ARCH_mipsel delo EOF # Only include mipsel kernels that d-i base-installer installs. -# XXX once mips gets kernel-image-2.4- packages, use those -# instead. -for subarch in r3k-kn02 r4k-kn04 cobalt lasat; do +for subarch in r3k-kn02 r4k-kn04; do sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \ $MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \ | grep -- "-$subarch$" | sort -n | tail -n 1 \ @@ -127,23 +151,16 @@ done cat >> debian-installer+kernel-$DI_CODENAME << EOF #endif - #ifdef ARCH_powerpc discover1 quik yaboot -hfsutils mkvmlinuz module-init-tools initrd-tools -linux-image-2.6-powerpc -linux-image-2.6-powerpc-smp -linux-image-2.6-powerpc64 EOF # Only include powerpc kernels that d-i base-installer installs. -# XXX once powerpc 2.4 gets kernel-image-2.4- packages, use those -# instead, but beware of apus. for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \ power4-pmac power4-chrp-rs6k powerpc-pmac \ powerpc-prep powerpc-chrp powerpc-chrp-rs6k apus; do @@ -155,30 +172,27 @@ done cat >> debian-installer+kernel-$DI_CODENAME << EOF #endif - #ifdef ARCH_sparc discover1 initrd-tools -linux-image-2.6-sparc64 -linux-image-2.6-sparc64-smp -kernel-image-2.4-sparc32 -kernel-image-2.4-sparc32-smp -kernel-image-2.4-sparc64 -kernel-image-2.4-sparc64-smp -#endif +EOF +/bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \ + >> debian-installer+kernel-$DI_CODENAME + +cat >> debian-installer+kernel-$DI_CODENAME << EOF +#endif #ifdef ARCH_m68k fileutils EOF # Get all the latest 2.2 for mac kernel -sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \ +/bin/sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \ $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \ >> debian-installer+kernel-$DI_CODENAME # Get the latest 2.4 kernels, except mac -# XXX once m68k gets kernel-image-2.4- packages, use those -# instead. -sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \ +/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \ $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \ grep -v mac >> debian-installer+kernel-$DI_CODENAME @@ -188,7 +202,7 @@ cat >> debian-installer+kernel-$DI_CODENAME << EOF discover1 EOF -sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \ +/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \ $MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \ >> debian-installer+kernel-$DI_CODENAME diff --git a/sarge/tools/grab_md5 b/sarge/tools/grab_md5 index 10a45c6c..7f75038e 100755 --- a/sarge/tools/grab_md5 +++ b/sarge/tools/grab_md5 @@ -9,86 +9,82 @@ # them into a single list ready for mkisofs to check later MIRROR=$1 -ARCH=$2 +ARCHES="$2" SUITE=$3 -OUT=$4 +DI_SUITE=$4 +OUT=$5 -case $ARCH in - source) - FILES=`find $MIRROR/dists/$SUITE/ -name Sources.gz` - echo -e "Using MD5 sums from Sources files:\n$FILES" - zcat -f $FILES | awk -v MIRROR=$MIRROR ' - /^Directory:/ { - DIR = $2 - next - } - /^Files:/ { - in_files = 1 - next - } - /^ / { - if (in_files) { - gsub("^ ", "", $0) - MD5 = $1 - SIZE = $2 - FILE = $3 - printf("%s %12s %s/%s/%s\n", MD5, SIZE, MIRROR, DIR, FILE); - } - } - /.*/ { - if (!length($0)) { - in_files = 0 - next - } - }' | sort | uniq >> $OUT - ;; - alpha|amd64|arm|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc) - FILES=`find $MIRROR/dists/$SUITE/ -name Packages -o -name Packages.gz | grep binary-$ARCH` - echo -e "Using MD5 sums from Packages files:\n$FILES" - zcat -f $FILES | awk -v MIRROR=$MIRROR ' - /^Filename:/ { - FILE = $2 - } - /^Size:/ { - SIZE = $2 - } - /^MD5sum:/ { - MD5 = $2 - printf("%s %12d %s/%s\n", MD5, SIZE, MIRROR, FILE) - }' | sort | uniq >> $OUT - case $SUITE in - woody) - # Use the old boot-floppies images - FILE=$MIRROR/dists/$SUITE/main/disks-$ARCH/current/md5sum.txt - echo "Using MD5 sums from boot-floppies: $FILE" - LOC=dists/$SUITE/main/disks-$ARCH/current - for ENTRY in `cat $FILE | sed 's/ /:/g'` - do - PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"` - MD5=`echo $ENTRY | /bin/sed 's/:.*$//g'` - SIZE=`/usr/bin/stat -c %s $PATH` - printf '%s %12.12s %s\n' $MD5 $SIZE $PATH - done | sort | uniq >> $OUT - ;; - *) - # Use the new D-I images - FILE=$MIRROR/dists/$SUITE/main/installer-$ARCH/current/images/MD5SUMS - echo "Using MD5 sums from d-i: $FILE" - LOC=dists/$SUITE/main/installer-$ARCH/current/images - for ENTRY in `cat $FILE | sed 's/ /:/g'` - do - PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"` - MD5=`echo $ENTRY | /bin/sed 's/:.*$//g'` - SIZE=`/usr/bin/stat -c %s $PATH` - printf '%s %12.12s %s\n' $MD5 $SIZE $PATH - done | sort | uniq >> $OUT - ;; - esac - ;; - *) - echo "Unknown arch/source $ARCH!" - exit 1 - ;; -esac +for ARCH in $ARCHES +do + LOCATIONS="$MIRROR/dists/$SUITE/ $MIRROR/dists/$DI_SUITE/" + echo "Looking in $LOCATIONS" + + case $ARCH in + source) + FILES=`find $LOCATIONS -name Sources.gz` + echo -e "Using MD5 sums from Sources files:\n$FILES" + zcat -f $FILES | awk -v MIRROR=$MIRROR ' + /^Directory:/ { + DIR = $2 + next + } + /^Files:/ { + in_files = 1 + next + } + /^ / { + if (in_files) { + gsub("^ ", "", $0) + MD5 = $1 + SIZE = $2 + FILE = $3 + printf("%s %12s %s/%s/%s\n", MD5, SIZE, MIRROR, DIR, FILE); + next + } + } + /^[^ ]/ { + in_files = 0 + FILE = "" + DIR = "" + }' | sort | uniq >> $OUT + ;; + alpha|amd64|arm|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc) + FILES=`find $LOCATIONS -name Packages.gz | grep binary-$ARCH` + echo -e "Using MD5 sums from Packages files:\n$FILES" + zcat -f $FILES | awk -v MIRROR=$MIRROR ' + /^Filename:/ { + FILE = $2 + } + /^Size:/ { + SIZE = $2 + } + /^MD5sum:/ { + MD5 = $2 + printf("%s %12d %s/%s\n", MD5, SIZE, MIRROR, FILE) + }' | sort | uniq >> $OUT + # Use the new D-I images. Do NOT use the "current" + # link; it causes problems with overlaid files... + for VER in $MIRROR/dists/$DI_SUITE/main/installer-$ARCH/* + do + if [ -d $VER ] && [ ! -L $VER ] ; then + FILE=$VER/images/MD5SUMS + echo "Using MD5 sums from d-i: $FILE" + LOC=dists/$DI_SUITE/main/installer-$ARCH/`basename $VER`/images + for ENTRY in `cat $FILE | sed 's/ /:/g'` + do + PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"` + MD5=`echo $ENTRY | /bin/sed 's/:.*$//g'` + SIZE=`/usr/bin/stat -c %s $PATH` + printf '%s %12.12s %s\n' $MD5 $SIZE $PATH + done | sort | uniq >> $OUT + fi + done + ;; + *) + echo "Unknown arch/source $ARCH!" + exit 1 + ;; + esac +done exit 0 diff --git a/sarge/tools/imagesums b/sarge/tools/imagesums new file mode 100755 index 00000000..4a85e3a7 --- /dev/null +++ b/sarge/tools/imagesums @@ -0,0 +1,50 @@ +#!/bin/bash + +cd $1 + +:> MD5SUMS +:> SHA1SUMS + +echo "Generating checksums from files in $1" + +case $DOJIGDO in + 0) + for file in `find * -name \*.iso -o -name \*.raw` + do + md5sum $file >> MD5SUMS + sha1sum $file >> SHA1SUMS + done + ;; + 1|2) + for file in `find * -name \*.jigdo` + do + iso=${file%%.jigdo}.iso + + grep -q $iso MD5SUMS + if [ $? -ne 0 ] ; then + MD5=`zcat -f $file | awk '/Image Hex MD5Sum/ {print $5}'` + if [ "$MD5"x != ""x ] ; then + echo "$MD5 $iso" >> MD5SUMS + else + echo "Jigdo file does not contain the Image MD5, calculating by hand" + md5sum $iso >> MD5SUMS + fi + fi + + grep -q $iso SHA1SUMS + if [ $? -ne 0 ] ; then + SHA1=`zcat -f $file | awk '/Image Hex SHA1Sum/ {print $5}'` + if [ "$SHA1"x != ""x ] ; then + echo "$SHA1 $iso" >> SHA1SUMS + else + echo "Jigdo file does not contain the Image SHA1, calculating by hand" + sha1sum $iso >> SHA1SUMS + fi + fi + done + ;; + *) + echo "DOJIGDO not defined!" + exit 1 + ;; +esac diff --git a/sarge/tools/make_image b/sarge/tools/make_image index 4e9a2b3d..34eece6f 100755 --- a/sarge/tools/make_image +++ b/sarge/tools/make_image @@ -15,7 +15,8 @@ MIRROR=$6 MKISOFS=$7 MKISOFS_OPTS=$8 JIGDO_OPTS=$9 -JIGDO_CLEANUP=$10 +shift +JIGDO_CLEANUP=$9 if [ "$CD"x = ""x ] ; then echo "Generating the $ARCH iso/jigdo images ..." @@ -37,6 +38,7 @@ do opts=`cat $DIR/$n.mkisofs_opts` volid=`cat $DIR/$n.volid` relname=`echo $DEBVERSION | sed -e 's/[. ]//g'` + DISKINFO=`cat $DIR/$n.diskinfo` if [ $ARCH = "source" ] ; then OUTFILE="debian-$relname-$ARCH-$n" @@ -47,20 +49,31 @@ do # Clean up any old files rm -f $OUT/$OUTFILE.raw $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template + date + # Actually make the ISO/jigdo images. Long command lines # here... :-( case $DOJIGDO in 0) # No jigdo files, just straight ISO + echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts CD$n $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts CD$n ;; 1) # jigdo files _and_ ISO + echo $MKISOFS $MKISOFS_OPTS -V "$volid" \ + -o $OUT/$OUTFILE.raw \ + -jigdo-jigdo $OUT/$OUTFILE.jigdo \ + -jigdo-template $OUT/$OUTFILE.template \ + -jigdo-map Debian=$MIRROR/ \ + -jigdo-exclude boot$n \ + -md5-list $DIR/md5-check \ + $JIGDO_OPTS $opts CD$n $MKISOFS $MKISOFS_OPTS -V "$volid" \ -o $OUT/$OUTFILE.raw \ - -jigdo-jigdo $OUT/$OUTFILE.jigdo - -jigdo-template $OUT/$OUTFILE.template + -jigdo-jigdo $OUT/$OUTFILE.jigdo \ + -jigdo-template $OUT/$OUTFILE.template \ -jigdo-map Debian=$MIRROR/ \ -jigdo-exclude boot$n \ -md5-list $DIR/md5-check \ @@ -68,8 +81,16 @@ do ;; 2) # jigdo only, no ISO + echo $MKISOFS $MKISOFS_OPTS -V "$volid" \ + -o /dev/null \ + -jigdo-jigdo $OUT/$OUTFILE.jigdo \ + -jigdo-template $OUT/$OUTFILE.template \ + -jigdo-map Debian=$MIRROR/ \ + -jigdo-exclude boot$n \ + -md5-list $DIR/md5-check \ + $JIGDO_OPTS $opts CD$n $MKISOFS $MKISOFS_OPTS -V "$volid" \ - -o /dev/null -v \ + -o /dev/null \ -jigdo-jigdo $OUT/$OUTFILE.jigdo \ -jigdo-template $OUT/$OUTFILE.template \ -jigdo-map Debian=$MIRROR/ \ @@ -84,7 +105,7 @@ do $JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \ $OUTFILE.iso $DIR/CD$n \ "`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \ - $BINDISKINFOND \ + "$DISKINFO" \ $JIGDOFALLBACKURLS fi done diff --git a/sarge/tools/scanpackages b/sarge/tools/scanpackages index aba31f92..f45f9974 100755 --- a/sarge/tools/scanpackages +++ b/sarge/tools/scanpackages @@ -171,7 +171,7 @@ done # Nasty hack - we may need to look at extra override files from sid. # See if the extra override exists; if not redirect. EXTRA_CODENAME=$CODENAME -if [ ! -e $BDIR/indices/override.$EXTRA_CODENAME.extra.main.gz ] ; then +if [ ! -e $BDIR/indices/override.$EXTRA_CODENAME.extra.main ] ; then EXTRA_CODENAME=sid fi cat >$PREFIX.generate-binary < /dev/null 2>&1 - ARCH=$ARCH $scanpackages -noPackages.cd install $CDDIR > /dev/null 2>&1 - rm -f $CDDIR/*.Packages* #>/dev/null 2>&1 + ARCH=$ARCH $scanpackages scan $CDDIR >/dev/null 2>&1 + ARCH=$ARCH $scanpackages -noPackages.cd install $CDDIR >/dev/null 2>&1 + rm -f $CDDIR/*.Packages* >/dev/null 2>&1 ;; esac done @@ -141,19 +182,31 @@ make_cd () { create_control_files CD$CDNUM $THISARCH echo " Creating image for CD$CDNUM ($SRCFILES source files, $ARCHFILES $ARCH debs, $ALLFILES all debs)" echo -n " " + if [ ! -d $OUT/$THISARCH/iso-$TYPE ] ; then + mkdir -p $OUT/$THISARCH/iso-$TYPE + fi if [ $JTE = 1 ] ; then - ${MKISOFS} -J -r -V "Debian $VER update CD" -o \ - /dev/null \ - -jigdo-jigdo $OUT/$CODENAME-update-$THISARCH-$THISNUM.jigdo \ - -jigdo-template $OUT/$CODENAME-update-$THISARCH-$THISNUM.template \ + if [ ! -d $OUT/$THISARCH/jigdo-$TYPE ] ; then + mkdir -p $OUT/$THISARCH/jigdo-$TYPE + fi + ${MKISOFS} -J -r -V "Debian $VER update" -o \ + $OUT/$THISARCH/iso-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.iso \ + -jigdo-jigdo $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.jigdo \ + -jigdo-template $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.template \ -jigdo-map Debian=$MIRROR/ \ -jigdo-map Non-US=$NONUS/ \ -jigdo-force-md5 /pool/ \ -md5-list $UPD/md5-check \ $UPD/CD$CDNUM 2>&1 | grep "extents written" + $BASEDIR/tools/jigdo_cleanup \ + $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.jigdo \ + debian-update-$VER-$THISARCH-$THISNUM.iso \ + $OUT debian-update-$VER-$THISARCH-$THISNUM.template \ + "Debian GNU/Linux $VERSPACE - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM" + echo $SNAPSHOT >> $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.jigdo else ${MKISOFS} -J -r -V "Debian $VER update CD" -o \ - $OUT/$CODENAME-update-$THISARCH-$THISNUM.raw \ + $OUT/iso-$TYPE/$CODENAME-update-$THISARCH-$THISNUM.raw \ $UPD/CD$CDNUM 2>&1 | grep "extents written" fi } @@ -161,10 +214,9 @@ make_cd () { echo Cleaning up rm -rf $UPD -mkdir $UPD +mkdir -p $UPD CDNUM=1 -cd $MIRROR echo Creating file list if [ ! -e $DIFF ] ; then @@ -188,6 +240,12 @@ for THISARCH in $ARCHLIST do THISNUM=0 + if [ $THISARCH = amd64 ] ; then + MIRROR=$MIRROR_AMD64 + else + MIRROR=$MIRROR_NORM + fi + rm -f $UPD/md5-check $GRAB_MD5 $MIRROR $THISARCH $CODENAME $UPD/md5-check if [ "$NONUS"x != ""x ] ; then @@ -200,7 +258,7 @@ do echo cd $MIRROR THISNUM=$((THISNUM + 1)) - if [ $THISARCH = "src" ] ; then + if [ $THISARCH = "source" ] ; then echo "Creating CD$CDNUM for source (part $THISNUM)" else echo "Creating CD$CDNUM for binary-$THISARCH (part $THISNUM)" @@ -223,7 +281,7 @@ do fi case "$THISARCH" in - src) + source) case "$file" in *.gz|*.dsc) copy_file $UPD/CD$CDNUM $file