Bug#931176: unblock: debian-cd/3.1.25
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package debian-cd
This is the customary late-in-release upload so that we have the code
that we're already using from git packaged up in the release. As such,
all the code changes have already been tested and used in (for
example) the buster d-i RC2 release this week.
The debdiff command line includes several excludes for the sake of
diff size:
* Debian-edu-full is a full package list used for the debian-edu image
builds
* kali-dev/kali-rolling/sid are symlinks which just add noise to the
debdiff. Would be nice to maybe have a --no-dereference option like
for normal diff?
debdiff attached compared to 3.1.23
unblock debian-cd/3.1.25
-- System Information:
Debian Release: 10.0
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diffstat for debian-cd-3.1.23 debian-cd-3.1.25
CONF.sh | 5 -
Makefile | 3
contrib/HEADER.html.in | 15 +--
contrib/cronjob.daily | 14 ++-
contrib/cronjob.weekly | 33 ++++++-
contrib/ftp.cron | 4
contrib/iso_run | 2
contrib/testingcds | 7 +
data/buster/exclude-udebs-amd64 | 3
data/buster/exclude-udebs-i386 | 4
data/buster/grub-theme.in | 25 +++--
data/buster/hl_c.png |binary
debian/changelog | 40 +++++++++
tools/boot/buster/boot-arm-common | 46 ----------
tools/boot/buster/boot-arm64 | 61 +++-----------
tools/boot/buster/boot-armel | 37 ++++++++
tools/boot/buster/boot-armhf | 137 +++++++++++++++++++++++++++++++
tools/boot/buster/boot-ia64 | 118 ++++++++++++++++++++++-----
tools/boot/buster/boot-powerpc | 164 +++++++++++---------------------------
tools/boot/buster/boot-ppc64 | 89 ++++++++++++++++++++
tools/boot/buster/boot-sparc | 129 ++++++++++++++---------------
tools/boot/buster/boot-sparc64 | 129 ++++++++++++++---------------
tools/boot/buster/boot-x86 | 48 +++--------
tools/boot/buster/common.sh | 39 +++++++++
tools/buster/installtools.sh | 6 -
tools/generate_di+k_list | 18 +---
tools/jigdo_cleanup | 18 ++--
tools/make_disc_trees.pl | 15 ---
tools/start_new_disc | 22 -----
29 files changed, 740 insertions(+), 491 deletions(-)
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/CONF.sh debian-cd-3.1.25/CONF.sh
--- debian-cd-3.1.23/CONF.sh 2019-01-13 17:19:53.000000000 +0000
+++ debian-cd-3.1.25/CONF.sh 2019-06-26 18:26:02.000000000 +0100
@@ -232,10 +232,7 @@
# DLDVD: standard 8.5 GB dual-layer DVD
# BD: standard 25 GB blu-ray
# DLBD: standard 50 GB dual-layer blu-ray
-# STICK1GB: 1GB USB stick or similar
-# STICK2GB: 2GB USB stick or similar
-# STICK4GB: 4GB USB stick or similar
-# STICK8GB: 8GB USB stick or similar
+# STICK<X>GB: <X>GB USB stick or similar
# CUSTOM: up to you - specify a size to go with it (in 2K blocks)
export DISKTYPE=CD
#export DISKTYPE=CUSTOM
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/Makefile debian-cd-3.1.25/Makefile
--- debian-cd-3.1.23/Makefile 2019-02-02 11:53:15.000000000 +0000
+++ debian-cd-3.1.25/Makefile 2019-06-26 18:26:02.000000000 +0100
@@ -439,6 +439,9 @@
if [ "$(EXCLUDE_686_KERNEL)"x = "1"x ] ; then \
ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_686_KERNEL"; \
fi; \
+ if [ "$(EXCLUDE_686_PAE_KERNEL)"x = "1"x ] ; then \
+ ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_686_PAE_KERNEL"; \
+ fi; \
if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
cpp -nostdinc -P -undef $$ARCHDEFS $$VARIANTDEFS\
$$ARCHUNDEFS -U i386 -U linux -U unix \
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/contrib/HEADER.html.in debian-cd-3.1.25/contrib/HEADER.html.in
--- debian-cd-3.1.23/contrib/HEADER.html.in 2019-02-19 18:04:32.000000000 +0000
+++ debian-cd-3.1.25/contrib/HEADER.html.in 2019-06-26 18:26:02.000000000 +0100
@@ -83,6 +83,8 @@
writeable DVD media
# elif TYPEbd
writeable Blu-Ray media
+# elif TYPE16G
+ 16GB USB media
# elif TYPEdlbd
writeable dual-layer Blu-Ray media
# endif
@@ -202,14 +204,11 @@
# if defined(TYPEbd) && !defined(ARCHsource) && !defined(STYLElist)
- <p>The <code>BD</code> image here is a special large image that
- contains the core Debian installer code and a specific set of
- programs. Depending on the purpose you'll also need an Internet
- connection.</p>
-
# if defined(ARCHi386)
- <p>The <code>edu-usb</code> BD here is a special version of
+ <h2>What is an edu BD image?</h2>
+
+ <p>The <code>edu</code> BD here is a special version of
the BD image that is targeted specifically at 32-bit Intel machines.
It provides a menu to install the Debian Edu Pure Blend without the
need of an Internet connection. See the
@@ -220,7 +219,9 @@
# if defined(ARCHamd64)
- <p>The <code>edu-usb</code> BD here is a special version of
+ <h2>What is an edu BD image?</h2>
+
+ <p>The <code>edu</code> BD here is a special version of
the BD image that is targeted specifically at 64-bit Intel machines.
It provides a menu to install the Debian Edu Pure Blend without the
need of an Internet connection. See the
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/contrib/cronjob.daily debian-cd-3.1.25/contrib/cronjob.daily
--- debian-cd-3.1.23/contrib/cronjob.daily 2019-02-19 18:04:32.000000000 +0000
+++ debian-cd-3.1.25/contrib/cronjob.daily 2019-06-26 18:26:02.000000000 +0100
@@ -107,15 +107,17 @@
if [ "$arch" = "multi-arch" ] ; then
if $(arch_has_firmware $arch) ; then
+ export FORCE_CD_SIZE1=CD700
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started SIDNIFIRMWARE
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
FORCE_FIRMWARE=1 CDNAME=firmware \
+ EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
- DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
+ DI=sid DI_DIST="$DI_DIST" \
DI_DIR="$ARCH_DI_DIR" \
DI_WWW_HOME=default ./testingcds "amd64 i386" &
fi
@@ -127,12 +129,14 @@
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
FORCE_FIRMWARE=1 CDNAME=firmware \
+ EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
- DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
+ DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "amd64 i386" &
fi
fi
+ unset FORCE_CD_SIZE1
fi
if [ "$SID_WANTED" = "1" ] ; then
@@ -140,9 +144,10 @@
build_started SIDNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
+ EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
- DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
+ DI=sid DI_DIST="$DI_DIST" \
DI_DIR="$ARCH_DI_DIR" \
DI_WWW_HOME=default ./testingcds "amd64 i386" &
fi
@@ -153,9 +158,10 @@
build_started TESTINGNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
+ EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
- DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
+ DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "amd64 i386" &
fi
fi
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/contrib/cronjob.weekly debian-cd-3.1.25/contrib/cronjob.weekly
--- debian-cd-3.1.23/contrib/cronjob.weekly 2019-02-19 18:04:32.000000000 +0000
+++ debian-cd-3.1.25/contrib/cronjob.weekly 2019-06-26 18:26:02.000000000 +0100
@@ -209,6 +209,27 @@
esac
fi
+ # 16G USB image
+ if [ "$NOUSB"x = ""x ] ; then
+ unset DESKTOP
+ export MAX_PKG_SIZE=999999999999
+ case $arch in
+ i386|amd64)
+ export MAXISOS=0
+ export MAXJIGDOS=1
+ export DESKTOP=all
+ export VARIANTS=xen
+ build_started USB16G
+ INSTALLER_CD=M TASK=Debian-all \
+ KERNEL_PARAMS='desktop=all' \
+ ./testingcds "$arch" &
+ ;;
+ *)
+ echo " Not running USB16G build for $arch"
+ ;;
+ esac
+ fi
+
# individual desktop cd #1: xfce only these days
if [ "$arch"x != "source"x ] && [ "$NOCD"x = ""x ] ; then
if [ "$NOXFCECD"x = ""x ] ; then
@@ -305,7 +326,7 @@
# USB "BD" image
build_started EDUUSB
NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=K \
- CDNAME=debian-edu-usb \
+ CDNAME=debian-edu \
DEBIAN_EDU=1 \
KERNEL_PARAMS="modules=debian-edu-install-udeb" \
DESKTOP=xfce VARIANTS=xen \
@@ -319,7 +340,7 @@
build_started EDUUSBFIRMWARE
NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=L \
FORCE_FIRMWARE=1 \
- CDNAME=firmware-edu-usb \
+ CDNAME=firmware-edu \
DEBIAN_EDU=1 \
KERNEL_PARAMS="modules=debian-edu-install-udeb" \
DESKTOP=xfce VARIANTS=xen \
@@ -345,7 +366,8 @@
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
KERNEL_PARAMS="desktop=all" \
- DESKTOP=all VARIANTS=xen \
+ DESKTOP=all \
+ EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=${DI} DI_DIST=${DI} \
@@ -353,15 +375,18 @@
if $(arch_has_firmware $arch) ; then
build_started NIFIRMWARE
+ export FORCE_CD_SIZE1=CD700
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
FORCE_FIRMWARE=1 CDNAME=firmware \
KERNEL_PARAMS="desktop=all" \
- DESKTOP=all VARIANTS=xen \
+ DESKTOP=all \
+ EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=${DI} DI_DIST=${DI} \
./testingcds "amd64 i386" &
+ unset FORCE_CD_SIZE1
fi
fi
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/contrib/ftp.cron debian-cd-3.1.25/contrib/ftp.cron
--- debian-cd-3.1.23/contrib/ftp.cron 2019-02-19 18:04:32.000000000 +0000
+++ debian-cd-3.1.25/contrib/ftp.cron 2019-06-26 18:26:02.000000000 +0100
@@ -88,7 +88,7 @@
echo "Triggered by mirror pulse:"
cat "$TRACE"
fi
- $TOPDIR/cronjob.daily
+ $TOPDIR/cronjob.daily 2>&1 | tee ~/build/log/cronjob.daily-$DATE-$BUILDNUM.log
cp "$MYCOPY" "$MYCOPY".lastbuild
if ! /usr/bin/cmp -s "$MYCOPY".lastbuild "$TRACE" ; then
mail_list "testingcds has detected a pulse while we were building dailies"
@@ -101,7 +101,7 @@
echo "BAILING OUT OF WEEKLY BUILD"
mail_list "$HOSTNAME BAILING OUT OF WEEKLY BUILD"
else
- $TOPDIR/cronjob.weekly
+ $TOPDIR/cronjob.weekly 2>&1 | tee ~/build/log/cronjob.weekly-$DATE.log
BUILD_DONE=1
fi
fi
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/contrib/iso_run debian-cd-3.1.25/contrib/iso_run
--- debian-cd-3.1.23/contrib/iso_run 2019-02-19 18:04:32.000000000 +0000
+++ debian-cd-3.1.25/contrib/iso_run 2019-06-26 18:26:02.000000000 +0100
@@ -30,7 +30,7 @@
TARGET=$2
ARCHES=$3
- DISKTYPES="cd dvd bd dlbd"
+ DISKTYPES="cd dvd bd dlbd 16G"
DIRTYPES="iso jigdo list"
# Only make torrent files and dirs for release builds
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/contrib/testingcds debian-cd-3.1.25/contrib/testingcds
--- debian-cd-3.1.23/contrib/testingcds 2019-02-19 18:04:32.000000000 +0000
+++ debian-cd-3.1.25/contrib/testingcds 2019-06-26 18:26:02.000000000 +0100
@@ -81,6 +81,9 @@
export DISKTYPE=DLBD;;
E)
export DISKTYPE=gnome-CD;;
+ M|N)
+ export OUT_TYPE=16G
+ export DISKTYPE=STICK16GB;;
*) export DISKTYPE=CD;;
esac
@@ -144,6 +147,10 @@
export OFFICIAL="Debian-Edu Full USB image"
elif [ "$INSTALLER_CD" = "L" ]; then
export OFFICIAL="Unofficial Debian-Edu Full USB image including firmware"
+elif [ "$INSTALLER_CD" = "M" ]; then
+ export OFFICIAL="Official 16G USB image"
+elif [ "$INSTALLER_CD" = "N" ]; then
+ export OFFICIAL="Unofficial 16G USB image including firmware"
fi
rm -rf "$OUT"
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/data/buster/exclude-udebs-amd64 debian-cd-3.1.25/data/buster/exclude-udebs-amd64
--- debian-cd-3.1.23/data/buster/exclude-udebs-amd64 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/data/buster/exclude-udebs-amd64 2019-06-26 18:26:02.000000000 +0100
@@ -40,3 +40,6 @@
# Not needed on arches that use partman
mdcfg
lvmcfg
+# We only support grub these days, drop lile and elilo
+lilo-installer
+elilo-installer
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/data/buster/exclude-udebs-i386 debian-cd-3.1.25/data/buster/exclude-udebs-i386
--- debian-cd-3.1.23/data/buster/exclude-udebs-i386 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/data/buster/exclude-udebs-i386 2019-06-26 18:26:02.000000000 +0100
@@ -27,8 +27,8 @@
usb-modules-*
usb-serial-modules-*
usb-storage-modules-*
-# 686-bigmem kernel udebs are only used for the Xen netboot image
-*-686-bigmem-di !xen
+# 686-pae kernel udebs are only used for the Xen netboot image
+*-686-pae-di !xen
# Not used on i386
console-keymaps-acorn
console-keymaps-amiga
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/data/buster/grub-theme.in debian-cd-3.1.25/data/buster/grub-theme.in
--- debian-cd-3.1.23/data/buster/grub-theme.in 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/data/buster/grub-theme.in 2019-06-26 18:26:02.000000000 +0100
@@ -15,35 +15,35 @@
#ifdef MENU0
+ hbox {
left = 0
- + label {text = MENU0 font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = MENU0 font = "Sans 10" color = "#c0c0c0" align = "left"}
}
#endif
#ifdef MENU1
+ hbox {
left = 0
+ label {text = " >" font = "Sans 10" color = "white" align = "left"}
- + label {text = MENU1 font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = MENU1 font = "Sans 10" color = "#c0c0c0" align = "left"}
}
#endif
#ifdef MENU2
+ hbox {
left = 0
+ label {text = " >" font = "Sans 10" color = "white" align = "left"}
- + label {text = MENU2 font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = MENU2 font = "Sans 10" color = "#c0c0c0" align = "left"}
}
#endif
#ifdef MENU3
+ hbox {
left = 0
+ label {text = " >" font = "Sans 10" color = "white" align = "left"}
- + label {text = MENU3 font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = MENU3 font = "Sans 10" color = "#c0c0c0" align = "left"}
}
#endif
#ifdef MENU4
+ hbox {
left = 0
+ label {text = " >" font = "Sans 10" color = "white" align = "left"}
- + label {text = MENU4 font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = MENU4 font = "Sans 10" color = "#c0c0c0" align = "left"}
}
#endif
}
@@ -54,11 +54,12 @@
top = 200
height = 200
item_font = "Sans Regular 12"
- item_color = #d3d3d3
- selected_item_color = "white"
+ item_color = #c0c0c0
+ selected_item_color = "black"
+ selected_item_pixmap_style = "hl_*.png"
item_height = 20
item_padding = 15
- item_spacing = 5
+ item_spacing = 10
}
+ vbox {
@@ -68,20 +69,20 @@
top = 0
left = 20%
+ label {text = "Enter: " font = "Sans 10" color = "white" align = "left"}
- + label {text = "Select " font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = "Select " font = "Sans 10" color = "#c0c0c0" align = "left"}
#ifdef MENU1
+ label {text = " " font = "Sans 10" color = "white" align = "left"}
+ label {text = "Esc: " font = "Sans 10" color = "white" align = "left"}
- + label {text = "Back up one level " font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = "Back up one level " font = "Sans 10" color = "#c0c0c0" align = "left"}
#endif
}
+ hbox {
top = 0
left = 20%
+ label {text = "E: " font = "Sans 10" color = "white" align = "left"}
- + label {text = "Edit Selection " font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = "Edit Selection " font = "Sans 10" color = "#c0c0c0" align = "left"}
+ label {text = " " font = "Sans 10" color = "white" align = "left"}
+ label {text = "C: " font = "Sans 10" color = "white" align = "left"}
- + label {text = "GRUB Command line" font = "Sans 10" color = "#d3d3d3" align = "left"}
+ + label {text = "GRUB Command line" font = "Sans 10" color = "#c0c0c0" align = "left"}
}
}
Binary files /tmp/eRtjqNYPqm/debian-cd-3.1.23/data/buster/hl_c.png and /tmp/Nc7OColagP/debian-cd-3.1.25/data/buster/hl_c.png differ
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/debian/changelog debian-cd-3.1.25/debian/changelog
--- debian-cd-3.1.23/debian/changelog 2019-02-19 18:08:26.000000000 +0000
+++ debian-cd-3.1.25/debian/changelog 2019-06-26 18:26:02.000000000 +0100
@@ -1,3 +1,41 @@
+debian-cd (3.1.25) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Fix for stupid bug in 3.1.24 - rebuild without my locally-hacked
+ CONF.sh in the package build. :-(
+
+ -- Steve McIntyre <93sam@debian.org> Wed, 26 Jun 2019 18:26:02 +0100
+
+debian-cd (3.1.24) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * tasks/buster/Debian-edu-full: Force missing packages onto the Edu BD.
+ (This is a workaround for the effects of #601203)
+
+ [ Holger Levsen ]
+ * contrib/cronjob.weekly: drop -usb from CDNAME for Debian Edu BD images, as
+ "usb" is both wrong as well as redundant as 'BD' is also part of the
+ generated filenames.
+
+ [ John Paul Adrian Glaubitz ]
+ * Add grub-efi{,{-ia64,{-bin}}} to tools/generate_di+k_list on ia64
+ * Remove elilo from tools/generate_di+k_list on {i386,ia64}
+ * Switch bootloader from elilo to grub-efi-ia64 on ia64
+ * Switch bootloader from yaboot to grub-ieee1275 on powerpc
+ * Switch bootloader from yaboot to grub-ieee1275 on ppc64
+ * Switch bootloader from silo to grub-ieee1275 on sparc
+ * Switch bootloader from silo to grub-ieee1275 on sparc64
+
+ [ Steve McIntyre ]
+ * Tweak ordering of snapshot URLs - put snapshot.d.o last in the list in
+ jigdo files, to reduce load on the service.
+ * Don't include -686-pae udebs on media - we may not have a kernel
+ to use with them anyway
+ * Add support for USB sticks any integer multiple of 1GB in size.
+ * Copy in the updated buster cronjobs to match current state.
+
+ -- Steve McIntyre <93sam@debian.org> Sat, 22 Jun 2019 18:19:21 +0100
+
debian-cd (3.1.23) unstable; urgency=medium
[ Wolfgang Schweer ]
@@ -8,6 +46,8 @@
[ Steve McIntyre ]
* Add grub-efi packages to armhf media.
+ * Add EFI boot support for armhf media
+ * Factor ESP size calculation for the various platforms
[ Samuel Thibault ]
* Support dark theme boot entries.
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-arm-common debian-cd-3.1.25/tools/boot/buster/boot-arm-common
--- debian-cd-3.1.23/tools/boot/buster/boot-arm-common 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-arm-common 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-# Do common install stuff for armel/armhf, including making bootable CDs
-# Works with debian-installer
-#
-# $1 is the CD number
-# $2 is the temporary CD build dir
-#
-# This is copied from the old arm script and it is currently disabled as there
-# don't seem to be any CD-bootable armel/armhf machines.
-
-. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
-
-N=$1
-CDDIR=$2
-INSTALLDIR="install"
-
-# Common options for all disks
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
-
-# Exit if this is not CD#1/DVD#1
-if [ $N != "1" ]; then
- exit 0
-fi
-
-if [ "$DI_WWW_HOME" = "default" ]; then
- # Tempting as it might be to merge these definitions using $ARCH,
- # do *not* do that - these defs are parsed out by other scripts
- # that won't cope with that
- if [ "$ARCH" = armel ]; then
- DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily";
- elif [ "$ARCH" = armhf ]; then
- DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily";
- else
- echo "$0: unknown arch $ARCH; abort"
- exit 1
- fi
- try_di_image_cache
-else
- DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
-fi
-
-# This arch is currently not bootable directly from CD, and there's
-# not a lot we can do about that. But add the needed files in the
-# right place so that users can find them, at least
-copy_arch_images
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-arm64 debian-cd-3.1.25/tools/boot/buster/boot-arm64
--- debian-cd-3.1.23/tools/boot/buster/boot-arm64 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-arm64 2019-06-26 18:26:02.000000000 +0100
@@ -42,7 +42,7 @@
XORRISO_VER=$(xorriso_version)
;;
*)
- echo "ERROR: debian-cd depends on xorriso for making arm64 bootable CDs."
+ echo "ERROR: debian-cd depends on xorriso for making $ARCH bootable CDs."
exit 1;
;;
esac
@@ -81,65 +81,34 @@
echo " Adding EFI boot code for $ARCH on CD$N"
# Move GRUB files to the right place.
- mkdir -p $CDDIR/efi/boot
- mcopy -i boot$N/grub/efi.img ::efi/boot/bootaa64.efi $CDDIR/efi/boot/bootaa64.efi
+ mkdir -p $CDDIR/EFI/boot
+ mcopy -n -s -i boot$N/grub/efi.img '::efi/*' $CDDIR/EFI
mkdir -p $CDDIR/boot/grub
mv boot$N/grub/* $CDDIR/boot/grub/
rmdir boot$N/grub
# Stuff the EFI boot files into a FAT filesystem, making it as
- # small as possible. 24KiB headroom seems to be enough;
- # (x+31)/32*32 rounds up to multiple of 32.
- # This is the same as in efi-image, but we need to redo it here in
- # the case of a multi-arch image
+ # small as possible. We end up re-packing like this in case we're
+ # making a multi-arch image
- # Stuff the EFI boot files into a FAT filesystem, making it as
- # small as possible.
-
- sector_bytes=512 # -S
- cluster_sectors=4 # -s
- cluster_bytes=$((sector_bytes * cluster_sectors))
-
- clusters=2 # 1 cluster for each sub-directory
- for file in $CDDIR/efi/boot/boot*.efi; do
- [ -f "$file" ] || continue
- clusters=$(($clusters + (($(stat -c %s "$file") + $cluster_bytes - 1) / $cluster_bytes)))
- done
- reserved_sectors=1 # boot-sector -R
- reserved_bytes=$(($reserved_sectors * $sector_bytes))
- fat_copies=2 # -f
- if [ "$clusters" -le $(((1 << 12) - 2)) ]; then
- fat_entry_bytes=3/2 # -F
- elif [ "$clusters" -le $(((1 << 16) - 2)) ]; then
- fat_entry_bytes=2 # -F
- else
- fat_entry_bytes=4 # -F
- fi
- fat_bytes=$((($clusters * $fat_entry_bytes + $sector_bytes - 1) / $sector_bytes * $sector_bytes))
- root_entries=512 # -r
- root_entry_bytes=32
- root_bytes=$(($root_entries * root_entry_bytes))
- size=$(($reserved_bytes + $fat_copies * $fat_bytes + $root_bytes + $clusters * $cluster_bytes))
-
- track_sectors=32
- track_bytes=$((sector_bytes * $track_sectors))
- tracks=$((($size + $track_bytes - 1) / $track_bytes))
- block_bytes=1024
- blocks=$(($tracks * $track_bytes / $block_bytes))
+ # First, work out how many blocks we need
+ blocks=$(calculate_efi_image_size $CDDIR)
+ # Now make a new image to contain the files
rm -f $CDDIR/boot/grub/efi.img
mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
+
+ # And copy them into place
mmd -i "$CDDIR/boot/grub/efi.img" ::efi
- mmd -i "$CDDIR/boot/grub/efi.img" ::efi/boot
- mcopy -o -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \
- "::efi/boot"
+ mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/EFI/* \
+ "::efi"
# Ugh - different code here depending on the version of xorriso we've got
if [ $XORRISO_VER -le 10202 ] ; then
- echo "ERROR: debian-cd depends on xorriso > 1.2.2 for making arm64 bootable CDs."
+ echo "ERROR: debian-cd depends on xorriso > 1.2.2 for making $ARCH bootable CDs."
exit 1;
elif [ $XORRISO_VER -gt 10202 ] ; then
- echo "Using newer EFI support in xorriso $XORRISO_VER"
+ echo " Using newer EFI support in xorriso $XORRISO_VER"
# Location of the EFI boot image, and don't emulate a floppy or HD
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
@@ -149,7 +118,7 @@
# And force alignment
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-partition_cyl_align all"
- fi
+ fi
# Finally, belt and braces - fix up the %install% entries in grub
# in case they're still there
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-armel debian-cd-3.1.25/tools/boot/buster/boot-armel
--- debian-cd-3.1.23/tools/boot/buster/boot-armel 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-armel 2019-06-26 18:26:02.000000000 +0100
@@ -1,2 +1,37 @@
#!/bin/bash
-. $BASEDIR/tools/boot/$DI_CODENAME/boot-arm-common
+# Do install stuff for armel
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+#
+# This is copied from the old arm script and it is currently disabled as there
+# don't seem to be any CD-bootable armel/armhf machines.
+
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
+
+N=$1
+CDDIR=$2
+INSTALLDIR="install"
+
+# Common options for all disks
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# Exit if this is not CD#1/DVD#1
+if [ $N != "1" ]; then
+ exit 0
+fi
+
+if [ "$DI_WWW_HOME" = "default" ]; then
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily";
+ try_di_image_cache
+else
+ DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
+fi
+
+# armel is currently not bootable directly from CD/DVD/USB, and
+# there's not a lot we can do about that. But add the needed files in
+# the right place so that users can find them, at least
+copy_arch_images
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-armhf debian-cd-3.1.25/tools/boot/buster/boot-armhf
--- debian-cd-3.1.23/tools/boot/buster/boot-armhf 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-armhf 2019-06-26 18:26:02.000000000 +0100
@@ -1,2 +1,137 @@
#!/bin/bash
-. $BASEDIR/tools/boot/$DI_CODENAME/boot-arm-common
+# Do install stuff for armhf
+# Sets up a grub-efi installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
+
+set -e
+
+N=$1
+CDDIR=$2
+INSTALLDIR="install.ahf"
+
+# Workaround for #823881:
+export MTOOLS_SKIP_CHECK=1
+
+# Common options for all disks
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# Exit if this is not CD#1/DVD#1
+if [ $N != "1" ]; then
+ exit 0
+fi
+
+if [ "$DI_WWW_HOME" = "default" ]; then
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily";
+ try_di_image_cache
+else
+ DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
+fi
+
+# armhf is not bootable directly from CD/DVD/USB for all plaforms. For
+# those that are not, add the needed files in the right place so that
+# users can find them, at least
+copy_arch_images
+
+# Now for the more clever stuff - for U-Boot EFI support or a direct
+# qemu etc. we can boot using EFI!
+case "$MKISOFS" in
+ *xorriso*)
+ XORRISO_VER=$(xorriso_version)
+ ;;
+ *)
+ echo "ERROR: debian-cd depends on xorriso for making $ARCH bootable CDs."
+ exit 1;
+ ;;
+esac
+
+cd $CDDIR/..
+
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
+
+# Download boot images.
+for image in $BOOT_IMAGES; do
+ if [ ! -e "$image" ]; then
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+ elif [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" "$image"
+ else
+ $WGET "$DI_WWW_HOME/$image" -O "$image"
+ fi
+ fi
+done
+
+mkdir -p $CDDIR/$INSTALLDIR
+cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
+cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
+
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/boot$N
+cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar zx)
+
+if [ -d boot$N/grub ] ; then
+ echo " Adding EFI boot code for $ARCH on CD$N"
+
+ # Move GRUB files to the right place.
+ mkdir -p $CDDIR/EFI/boot
+ mcopy -n -s -i boot$N/grub/efi.img '::efi/*' $CDDIR/EFI
+ mkdir -p $CDDIR/boot/grub
+ mv boot$N/grub/* $CDDIR/boot/grub/
+ rmdir boot$N/grub
+
+ # Stuff the EFI boot files into a FAT filesystem, making it as
+ # small as possible. We end up re-packing like this in case we're
+ # making a multi-arch image
+
+ # First, work out how many blocks we need
+ blocks=$(calculate_efi_image_size $CDDIR)
+
+ # Now make a new image to contain the files
+ rm -f $CDDIR/boot/grub/efi.img
+ mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
+
+ # And copy them into place
+ mmd -i "$CDDIR/boot/grub/efi.img" ::efi
+ mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/EFI/* \
+ "::efi"
+
+ # Ugh - different code here depending on the version of xorriso we've got
+ if [ $XORRISO_VER -le 10202 ] ; then
+ echo "ERROR: debian-cd depends on xorriso > 1.2.2 for making $ARCH bootable CDs."
+ exit 1;
+ elif [ $XORRISO_VER -gt 10202 ] ; then
+ echo " Using newer EFI support in xorriso $XORRISO_VER"
+
+ # Location of the EFI boot image, and don't emulate a floppy or HD
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
+
+ # Add an *extra* partition on the end for the EFI bits
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0xef $CDDIR/boot/grub/efi.img"
+
+ # And force alignment
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-partition_cyl_align all"
+ fi
+
+ # Finally, belt and braces - fix up the %install% entries in grub
+ # in case they're still there
+ sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg
+
+ # Substitute custom KERNEL_PARAMS into grub.cfg
+ sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg
+
+else
+ echo " No EFI boot code for $ARCH on CD$N"
+fi
+
+# th,th, thats all
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-ia64 debian-cd-3.1.25/tools/boot/buster/boot-ia64
--- debian-cd-3.1.23/tools/boot/buster/boot-ia64 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-ia64 2019-06-26 18:26:02.000000000 +0100
@@ -1,6 +1,9 @@
#!/bin/bash
+
+# Based on boot-arm64
#
-# boot-ia64
+# Do install stuff for ia64, including making bootable CDs
+# Works with debian-installer
#
# $1 is the CD number
# $2 is the temporary CD build dir
@@ -8,6 +11,10 @@
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
+#set -x
+
+# Workaround for #823881:
+export MTOOLS_SKIP_CHECK=1
N=$1
CDDIR=$2
@@ -30,33 +37,98 @@
DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
fi
+case "$MKISOFS" in
+ *xorriso*)
+ XORRISO_VER=$(xorriso_version)
+ ;;
+ *)
+ echo "ERROR: debian-cd depends on xorriso for making $ARCH bootable CDs."
+ exit 1;
+ ;;
+esac
+
cd $CDDIR/..
-# Download boot images
-for image in boot.img; do
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
+
+# Download boot images.
+for image in $BOOT_IMAGES; do
if [ ! -e "$image" ]; then
- if [ ! "$DI_WWW_HOME" ];then
- if [ ! "$DI_DIR" ];then
- DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
- fi
- cp "$DI_DIR/cdrom/$image" . || \
- cp "$DI_DIR/$image" .
- else
- $WGET "$DI_WWW_HOME/cdrom/$image" || \
- $WGET "$DI_WWW_HOME/$image"
- fi
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+ elif [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" "$image"
+ else
+ $WGET "$DI_WWW_HOME/$image" -O "$image"
+ fi
fi
done
-mkdir -p boot$N/boot
-cp -f boot.img boot$N/boot/
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/boot.img"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"
-
-bls=$(calc_boot_size "boot$N/boot/boot.img")
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size $bls"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
+mkdir -p $CDDIR/$INSTALLDIR
+cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
+cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
+
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/boot$N
+cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar zx)
+
+if [ -d boot$N/grub ] ; then
+ echo " Adding EFI boot code for $ARCH on CD$N"
+
+ # Move GRUB files to the right place.
+ mkdir -p $CDDIR/EFI/boot
+ mcopy -n -s -i boot$N/grub/efi.img '::efi/*' $CDDIR/EFI
+ mkdir -p $CDDIR/boot/grub
+ mv boot$N/grub/* $CDDIR/boot/grub/
+ rmdir boot$N/grub
+
+ # Stuff the EFI boot files into a FAT filesystem, making it as
+ # small as possible. We end up re-packing like this in case we're
+ # making a multi-arch image
+
+ # First, work out how many blocks we need
+ blocks=$(calculate_efi_image_size $CDDIR)
+
+ # Now make a new image to contain the files
+ rm -f $CDDIR/boot/grub/efi.img
+ mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
+
+ # And copy them into place
+ mmd -i "$CDDIR/boot/grub/efi.img" ::efi
+ mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/EFI/* \
+ "::efi"
+
+ # Ugh - different code here depending on the version of xorriso we've got
+ if [ $XORRISO_VER -le 10202 ] ; then
+ echo "ERROR: debian-cd depends on xorriso > 1.2.2 for making $ARCH bootable CDs."
+ exit 1;
+ elif [ $XORRISO_VER -gt 10202 ] ; then
+ echo " Using newer EFI support in xorriso $XORRISO_VER"
+
+ # Location of the EFI boot image, and don't emulate a floppy or HD
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
+
+ # Add an *extra* partition on the end for the EFI bits
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0xef $CDDIR/boot/grub/efi.img"
-# done
+ # And force alignment
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-partition_cyl_align all"
+ fi
+
+ # Finally, belt and braces - fix up the %install% entries in grub
+ # in case they're still there
+ sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg
+
+ # Substitute custom KERNEL_PARAMS into grub.cfg
+ sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg
+
+else
+ echo " No EFI boot code for $ARCH on CD$N"
+fi
+# th,th, thats all
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-powerpc debian-cd-3.1.25/tools/boot/buster/boot-powerpc
--- debian-cd-3.1.23/tools/boot/buster/boot-powerpc 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-powerpc 2019-06-26 18:26:02.000000000 +0100
@@ -15,6 +15,19 @@
CDDIR=$2
INSTALLDIR=$CDDIR/install
+# Common mkisofs options when creating CDs
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# mkisofs options specific to powerpc
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfsplus -apm-block-size 2048"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfsplus-file-creator-type chrp tbxi /System/Library/CoreServices/BootX"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-bless-by p /System/Library/CoreServices"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-sysid PPC -graft-points"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "/System/Library/CoreServices/BootX=$CDDIR/../CD1/boot/grub/powerpc-ieee1275/grub.chrp"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "/System/Library/CoreServices/grub.elf=$CDDIR/../CD1/boot/grub/powerpc.elf"
+
# Exit if this is not CD#1/DVD#1
if [ $N != "1" ]; then
exit 0
@@ -27,125 +40,50 @@
DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
fi
-cd $CDDIR/..
-
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--iso-level 4"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
-
-# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas
-# MAXDISKBLOCKS is measured in 2K blocks
-newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc`
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
-
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--chrp-boot"
-# For newworld Mac booting - Note, no spaces in volid!
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-part"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-desktop"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-bless CD$N/install"
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-volid Debian/PowerPC_${CODENAME}"
-
-cd $INSTALLDIR
-# Extract yaboot from the archive
-if [ -z "$YABOOT_DEBUG" ]; then
- YADEB=$(find_pkg_file yaboot)
- if [ -z "$YADEB" ]; then
- echo "ERROR: the yaboot package is required." >&2
- exit 1
- fi
- (dpkg --fsys-tarfile "$MIRROR/$YADEB" | \
- tar xf - -C . ./usr/lib/yaboot/yaboot)
- mv usr/lib/yaboot/yaboot .
- rm -rf usr
-
- if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
- echo $YADEB >> $CDDIR/../$N.pkgs_extracted
- find_pkg_file yaboot source >> $CDDIR/../$N.pkgs_extracted
- fi
-
-else
- cp -f $YABOOT_DEBUG yaboot
-fi
+case "$MKISOFS" in
+ *xorriso*)
+ XORRISO_VER=$(xorriso_version)
+ ;;
+ *)
+ echo "ERROR: debian-cd now depends on xorriso for making powerpc bootable CDs."
+ exit 1;
+ ;;
+esac
-#
-# generate/download images for "powerpc"
-# (missing: bootvars1.3b.sit.hqx, BootX_1.2.2.sit, boot-floppy-hfs.img)
-
-cp $BASEDIR/data/$DI_CODENAME/yaboot/ofboot.b ofboot.b
+cd $CDDIR/..
-if [ "$DESKTOP"x = ""x ] || [ "$DESKTOP"x = "all"x ] ; then
- DEFAULT_DESKTOP="$UNSPEC_DESKTOP_DEFAULT"
-else
- DEFAULT_DESKTOP="$DESKTOP"
-fi
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinux cdrom/debian-cd_info.tar.gz"
-for subarch in powerpc powerpc64 #prep
-do
- case $subarch in
- powerpc|prep)
- bitness=
- yabootconf=mac32.conf
- yabootmsg=boot32.msg
- ;;
- powerpc64)
- bitness=64
- yabootconf=yaboot.conf
- yabootmsg=boot.msg
- ;;
- esac
-
- cat $BASEDIR/data/$DI_CODENAME/yaboot/$yabootconf \
- | sed "s/CODENAME/${CODENAME}/g" \
- > $yabootconf
-
- cat $BASEDIR/data/$DI_CODENAME/yaboot/$yabootmsg \
- | sed "s/\${MEDIA_TYPE}/CDROM/" \
- | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
- | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
- | sed "s/\${DEFAULT_DESKTOP}/${DEFAULT_DESKTOP}/g" \
- > $yabootmsg
-
- if [ -n "$KERNEL_PARAMS" ]; then
- sed -i "/^[[:space:]]\+append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" $yabootconf
- fi
-
- if [ ! "$DI_WWW_HOME" ];then
- if [ ! "$DI_DIR" ];then
- DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+# Download boot images.
+for image in $BOOT_IMAGES; do
+ if [ ! -e "$image" ]; then
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+ elif [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" "$image"
+ else
+ $WGET "$DI_WWW_HOME/$image" -O "$image"
fi
- if ! cp -a "$DI_DIR/$subarch/cdrom" "$subarch" && [ "$bitness" ]; then
- cp -a "$DI_DIR/$subarch/cdrom${bitness}" "$subarch"
- fi
- else
- if ! $WGET -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" && [ "$bitness" ]; then
- $WGET -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/"
- fi
- fi
-
+ fi
done
-if [ -f prep/vmlinuz-prep.initrd ]; then
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-prep-boot install/prep/vmlinuz-prep.initrd"
-elif [ -f powerpc/vmlinuz-prep.initrd ]; then
- # We are still missing this for prep
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-prep-boot install/powerpc/vmlinuz-prep.initrd"
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/CD$N
+cat cdrom/debian-cd_info.tar.gz | (cd CD$N/; tar zx)
+
+# Copy kernel and initrd
+mkdir -p $INSTALLDIR
+cp -lf cdrom/vmlinux $INSTALLDIR/
+cp -lf cdrom/initrd.gz $INSTALLDIR/
+
+# Add CHRP boot header
+if [ -f CD$N/ppc/bootinfo.txt ] ; then
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part"
fi
-# Copy pegasos forth script, since pegasos machines don't support yaboot yet.
-cat $BASEDIR/data/$DI_CODENAME/pegasos/pegasos \
- | sed "s/\${MEDIA_TYPE}/CDROM/" \
- | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
- | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
- > pegasos
-
-# Let's copy the IBM CHRP stuff into place now.
-cd $CDDIR
-mkdir ppc
-mkdir ppc/chrp
-cp $BASEDIR/data/$DI_CODENAME/chrp/bootinfo.txt ppc
-mkdir etc
-cp $INSTALLDIR/yaboot.conf etc
-
exit 0
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-ppc64 debian-cd-3.1.25/tools/boot/buster/boot-ppc64
--- debian-cd-3.1.23/tools/boot/buster/boot-ppc64 1970-01-01 01:00:00.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-ppc64 2019-06-26 18:26:02.000000000 +0100
@@ -0,0 +1,89 @@
+#!/bin/bash
+#
+# Do install stuff for ppc64, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
+
+set -e
+#set -x
+
+N=$1
+CDDIR=$2
+INSTALLDIR=$CDDIR/install
+
+# Common mkisofs options when creating CDs
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# mkisofs options specific to ppc64
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfsplus -apm-block-size 2048"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfsplus-file-creator-type chrp tbxi /System/Library/CoreServices/BootX"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-bless-by p /System/Library/CoreServices"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-sysid PPC -graft-points"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "/System/Library/CoreServices/BootX=$CDDIR/../CD1/boot/grub/powerpc-ieee1275/grub.chrp"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "/System/Library/CoreServices/grub.elf=$CDDIR/../CD1/boot/grub/powerpc.elf"
+
+# Exit if this is not CD#1/DVD#1
+if [ $N != "1" ]; then
+ exit 0
+fi
+
+if [ "$DI_WWW_HOME" = "default" ]; then
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/ppc64/daily";
+ try_di_image_cache
+else
+ DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
+fi
+
+case "$MKISOFS" in
+ *xorriso*)
+ XORRISO_VER=$(xorriso_version)
+ ;;
+ *)
+ echo "ERROR: debian-cd now depends on xorriso for making ppc64 bootable CDs."
+ exit 1;
+ ;;
+esac
+
+cd $CDDIR/..
+
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinux cdrom/debian-cd_info.tar.gz"
+
+# Download boot images.
+for image in $BOOT_IMAGES; do
+ if [ ! -e "$image" ]; then
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+ elif [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" "$image"
+ else
+ $WGET "$DI_WWW_HOME/$image" -O "$image"
+ fi
+ fi
+done
+
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/CD$N
+cat cdrom/debian-cd_info.tar.gz | (cd CD$N/; tar zx)
+
+# Copy kernel and initrd
+mkdir -p $INSTALLDIR
+cp -lf cdrom/vmlinux $INSTALLDIR/
+cp -lf cdrom/initrd.gz $INSTALLDIR/
+
+# Add CHRP boot header
+if [ -f CD$N/ppc/bootinfo.txt ] ; then
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part"
+fi
+
+exit 0
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-sparc debian-cd-3.1.25/tools/boot/buster/boot-sparc
--- debian-cd-3.1.23/tools/boot/buster/boot-sparc 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-sparc 2019-06-26 18:26:02.000000000 +0100
@@ -1,93 +1,86 @@
-#!/bin/bash -e
-#
-# boot-sparc
+#!/bin/bash
#
-# Do install stuff for sparc, including making first CD bootable
+# Do install stuff for sparc, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
+#set -x
N=$1
CDDIR=$2
+INSTALLDIR=$CDDIR/install
+
+# Common mkisofs options when creating CDs
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# mkisofs options specific to sparc
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-G $CDDIR/../CD1/cdboot.img"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-B '...'"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--grub2-sparc-core /boot/grub/core.img"
# Exit if this is not CD#1/DVD#1
if [ $N != "1" ]; then
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
exit 0
fi
if [ "$DI_WWW_HOME" = "default" ]; then
- DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily";
try_di_image_cache
else
DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
fi
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-G boot1/boot/isofs.b -B ..."
-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot1"
-
-inst=boot1
+case "$MKISOFS" in
+ *xorriso*)
+ XORRISO_VER=$(xorriso_version)
+ ;;
+ *)
+ echo "ERROR: debian-cd now depends on xorriso for making sparc bootable CDs."
+ exit 1;
+ ;;
+esac
cd $CDDIR/..
-# Setup directories
-mkdir -p $inst/boot
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinux cdrom/debian-cd_info.tar.gz"
-silo_deb=$(find_pkg_file silo)
-if [ -z "$silo_deb" ]; then
- echo "ERROR: silo package is required"
- exit 1
-fi
-# put the relevant parts of SILO boot loader
-(dpkg --fsys-tarfile $MIRROR/$silo_deb | \
- tar xf - -C $inst/ ./boot/{isofs,second}.b)
-
-if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
- echo $silo_deb >> $CDDIR/../$N.pkgs_extracted
- find_pkg_file silo source >> $CDDIR/../$N.pkgs_extracted
-fi
+# Download boot images.
+for image in $BOOT_IMAGES; do
+ if [ ! -e "$image" ]; then
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+ elif [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" "$image"
+ else
+ $WGET "$DI_WWW_HOME/$image" -O "$image"
+ fi
+ fi
+done
+
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/CD$N
+cat cdrom/debian-cd_info.tar.gz | (cd CD$N/; tar zx)
+
+# Prepend cdboot.img with 512 zero bytes as block 0 contains
+# the SUN disk label and would get overwritten by xorriso
+dd if=/dev/zero of=$CDDIR/../CD1/cdboot.img bs=512 count=1
+dd if=$CDDIR/../CD1/boot/grub/sparc64-ieee1275/cdboot.img of=$CDDIR/../CD1/cdboot.img bs=512 count=1 oflag=append conv=notrunc
+
+# Copy kernel and initrd
+mkdir -p $INSTALLDIR
+cp -lf cdrom/vmlinux $INSTALLDIR/
+cp -lf cdrom/initrd.gz $INSTALLDIR/
-# Some custom etc files
-cp -f -p $BASEDIR/data/${CODENAME}/sparc/silo.conf $inst/boot/
-if [ -n "$KERNEL_PARAMS" ]; then
- # Add KERNEL_PARAMS to any existing append line
- sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \
- $inst/boot/silo.conf
- # If there is no default append= line, add it
- if ! grep -q "^append=" $inst/boot/silo.conf; then
- sed -i "/^default=/ a\append=\"$KERNEL_PARAMS\"" \
- $inst/boot/silo.conf
- fi
-fi
-cat $BASEDIR/data/${CODENAME}/sparc/debian.txt \
- | sed "s/\${MEDIA_TYPE}/CDROM/" \
- | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
- | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
- > $inst/boot/debian.txt
-cp $BASEDIR/data/${CODENAME}/sparc/notsupported.txt $inst/boot/
-
-# Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so
-# uncompress it before hand.
-
-if [ ! "$DI_WWW_HOME" ];then
- if [ ! "$DI_DIR" ];then
- DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
- fi
-else
- DI_DIR="cdrom"
- mkdir "./$DI_DIR"
- $WGET "$DI_WWW_HOME" -O ./$DI_DIR/di.dir
- sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/ip' ./$DI_DIR/di.dir)
- $WGET "$DI_WWW_HOME/$sparc64" -O ./$DI_DIR/vmlinuz-x-sparc64
- $WGET "$DI_WWW_HOME/initrd.gz" -O ./$DI_DIR/initrd.gz
-fi
-
-if [ ! -e "$DI_DIR"/initrd.gz ] ; then
- DI_DIR="$DI_DIR"/2.6
-fi
-cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
-#cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"
-zcat "$DI_DIR"/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
+exit 0
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-sparc64 debian-cd-3.1.25/tools/boot/buster/boot-sparc64
--- debian-cd-3.1.23/tools/boot/buster/boot-sparc64 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/boot-sparc64 2019-06-26 18:26:02.000000000 +0100
@@ -1,93 +1,86 @@
-#!/bin/bash -e
-#
-# boot-sparc64
+#!/bin/bash
#
-# Do install stuff for sparc64, including making first CD bootable
+# Do install stuff for sparc64, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
+#set -x
N=$1
CDDIR=$2
+INSTALLDIR=$CDDIR/install
+
+# Common mkisofs options when creating CDs
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# mkisofs options specific to sparc64
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-G $CDDIR/../CD1/cdboot.img"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-B '...'"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--grub2-sparc-core /boot/grub/core.img"
# Exit if this is not CD#1/DVD#1
if [ $N != "1" ]; then
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
exit 0
fi
if [ "$DI_WWW_HOME" = "default" ]; then
- DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc64/daily/cdrom/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc64/daily";
try_di_image_cache
else
DI_WWW_HOME=$(echo $DI_WWW_HOME | sed "s,%ARCH%,$ARCH,")
fi
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-G boot1/boot/isofs.b -B ..."
-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot1"
-
-inst=boot1
+case "$MKISOFS" in
+ *xorriso*)
+ XORRISO_VER=$(xorriso_version)
+ ;;
+ *)
+ echo "ERROR: debian-cd now depends on xorriso for making sparc64 bootable CDs."
+ exit 1;
+ ;;
+esac
cd $CDDIR/..
-# Setup directories
-mkdir -p $inst/boot
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinux cdrom/debian-cd_info.tar.gz"
-silo_deb=$(find_pkg_file silo)
-if [ -z "$silo_deb" ]; then
- echo "ERROR: silo package is required"
- exit 1
-fi
-# put the relevant parts of SILO boot loader
-(dpkg --fsys-tarfile $MIRROR/$silo_deb | \
- tar xf - -C $inst/ ./boot/{isofs,second}.b)
-
-if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
- echo $silo_deb >> $CDDIR/../$N.pkgs_extracted
- find_pkg_file silo source >> $CDDIR/../$N.pkgs_extracted
-fi
+# Download boot images.
+for image in $BOOT_IMAGES; do
+ if [ ! -e "$image" ]; then
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+ elif [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" "$image"
+ else
+ $WGET "$DI_WWW_HOME/$image" -O "$image"
+ fi
+ fi
+done
+
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/CD$N
+cat cdrom/debian-cd_info.tar.gz | (cd CD$N/; tar zx)
+
+# Prepend cdboot.img with 512 zero bytes as block 0 contains
+# the SUN disk label and would get overwritten by xorriso
+dd if=/dev/zero of=$CDDIR/../CD1/cdboot.img bs=512 count=1
+dd if=$CDDIR/../CD1/boot/grub/sparc64-ieee1275/cdboot.img of=$CDDIR/../CD1/cdboot.img bs=512 count=1 oflag=append conv=notrunc
+
+# Copy kernel and initrd
+mkdir -p $INSTALLDIR
+cp -lf cdrom/vmlinux $INSTALLDIR/
+cp -lf cdrom/initrd.gz $INSTALLDIR/
-# Some custom etc files
-cp -f -p $BASEDIR/data/${CODENAME}/sparc64/silo.conf $inst/boot/
-if [ -n "$KERNEL_PARAMS" ]; then
- # Add KERNEL_PARAMS to any existing append line
- sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \
- $inst/boot/silo.conf
- # If there is no default append= line, add it
- if ! grep -q "^append=" $inst/boot/silo.conf; then
- sed -i "/^default=/ a\append=\"$KERNEL_PARAMS\"" \
- $inst/boot/silo.conf
- fi
-fi
-cat $BASEDIR/data/${CODENAME}/sparc64/debian.txt \
- | sed "s/\${MEDIA_TYPE}/CDROM/" \
- | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
- | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
- > $inst/boot/debian.txt
-cp $BASEDIR/data/${CODENAME}/sparc64/notsupported.txt $inst/boot/
-
-# Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so
-# uncompress it before hand.
-
-if [ ! "$DI_WWW_HOME" ];then
- if [ ! "$DI_DIR" ];then
- DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
- fi
-else
- DI_DIR="cdrom"
- mkdir "./$DI_DIR"
- $WGET "$DI_WWW_HOME" -O ./$DI_DIR/di.dir
- sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/ip' ./$DI_DIR/di.dir)
- $WGET "$DI_WWW_HOME/$sparc64" -O ./$DI_DIR/vmlinuz-x-sparc64
- $WGET "$DI_WWW_HOME/initrd.gz" -O ./$DI_DIR/initrd.gz
-fi
-
-if [ ! -e "$DI_DIR"/initrd.gz ] ; then
- DI_DIR="$DI_DIR"/cdrom
-fi
-cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
-#cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"
-zcat "$DI_DIR"/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
+exit 0
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/boot-x86 debian-cd-3.1.25/tools/boot/buster/boot-x86
--- debian-cd-3.1.23/tools/boot/buster/boot-x86 2019-01-15 17:43:48.000000000 +0000
+++ debian-cd-3.1.25/tools/boot/buster/boot-x86 2019-06-26 18:26:02.000000000 +0100
@@ -130,7 +130,7 @@
if [ -e "$MIRROR/tools" ] && \
[ ! -e $CDDIR/tools ] && \
[ "$OMIT_DOC_TOOLS" != "1" ] ; then
- echo " Adding tools to CD1"
+ echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
rm -Rf $CDDIR/tools/win32-loader
@@ -156,7 +156,7 @@
for doppelganger in $doppelgangers ; do
if [ -f "$CDDIR/$INSTALLDIR/$dir/$doppelganger" ] &&
cmp -s $CDDIR/$INSTALLDIR/"$image" $CDDIR/$INSTALLDIR/"$dir"/"$doppelganger" ; then
- echo " $image identical to $doppelganger. Linking"
+ echo " $image identical to $doppelganger. Linking"
ln -nf $CDDIR/$INSTALLDIR/"$dir"/"$doppelganger" $CDDIR/$INSTALLDIR/"$image"
break
fi
@@ -204,8 +204,10 @@
# Not everything in the tarball is isolinux stuff
if [ -e boot$N/isolinux/win32-loader.ini ] ; then
+ echo " Moving extra loader files into place:"
for file in boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe boot$N/isolinux/win32-loader.ini; do
if [ -e $file ] ; then
+ printf " "
mv -v $file CD$N/
fi
done
@@ -473,46 +475,22 @@
$BASEDIR/tools/boot/$DI_CODENAME/parse_isolinux \
boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "$DISKINFO_DISTRO" "$DEBIAN_KERNEL" "$DEBVERSION" \
>> $CDDIR/boot/grub/grub.cfg
+ cp -v $BASEDIR/data/$DI_CODENAME/hl*png $CDDIR/boot/grub/theme
NUM_ENTRIES=$(grep menuentry $CDDIR/boot/grub/grub.cfg | wc -l)
echo " CD$N/boot/grub/grub.cfg has $NUM_ENTRIES boot entries defined"
# Stuff the EFI boot files into a FAT filesystem, making it as
- # small as possible.
+ # small as possible. We end up re-packing like this in case we're
+ # making a multi-arch image
- sector_bytes=512 # -S
- cluster_sectors=4 # -s
- cluster_bytes=$((sector_bytes * cluster_sectors))
-
- clusters=4 # 1 cluster for each sub-directory
- for file in $CDDIR/EFI/*/*; do
- [ -f "$file" ] || continue
- clusters=$(($clusters + (($(stat -c %s "$file") + $cluster_bytes - 1) / $cluster_bytes)))
- done
- reserved_sectors=1 # boot-sector -R
- reserved_bytes=$(($reserved_sectors * $sector_bytes))
- fat_copies=2 # -f
- if [ "$clusters" -le $(((1 << 12) - 2)) ]; then
- fat_entry_bytes=3/2 # -F
- elif [ "$clusters" -le $(((1 << 16) - 2)) ]; then
- fat_entry_bytes=2 # -F
- else
- fat_entry_bytes=4 # -F
- fi
- fat_bytes=$((($clusters * $fat_entry_bytes + $sector_bytes - 1) / $sector_bytes * $sector_bytes))
- root_entries=512 # -r
- root_entry_bytes=32
- root_bytes=$(($root_entries * root_entry_bytes))
- size=$(($reserved_bytes + $fat_copies * $fat_bytes + $root_bytes + $clusters * $cluster_bytes))
-
- track_sectors=32
- track_bytes=$((sector_bytes * $track_sectors))
- tracks=$((($size + $track_bytes - 1) / $track_bytes))
- block_bytes=1024
- blocks=$(($tracks * $track_bytes / $block_bytes))
+ # First, work out how many blocks we need
+ blocks=$(calculate_efi_image_size $CDDIR)
+ # Now make a new image to contain the files
rm -f $CDDIR/boot/grub/efi.img
mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
+ # And copy them into place
mmd -i "$CDDIR/boot/grub/efi.img" ::efi
mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/EFI/* \
"::efi"
@@ -528,7 +506,7 @@
# Ugh - different code here depending on the version of xorriso we've got
if [ $XORRISO_VER -le 10202 ] ; then
# 1.2.2 shipping in Wheezy
- echo "Using older EFI command line for xorriso $XORRISO_VER"
+ echo " Using older EFI command line for xorriso $XORRISO_VER"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--efi-boot boot/grub/efi.img"
# Add the efi image as a FAT partition too, so our CD image will
@@ -537,7 +515,7 @@
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0x01 $CDDIR/boot/grub/efi.img"
elif [ $XORRISO_VER -gt 10202 ] ; then
- echo "Using newer EFI support in xorriso $XORRISO_VER"
+ echo " Using newer EFI support in xorriso $XORRISO_VER"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
fi
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/boot/buster/common.sh debian-cd-3.1.25/tools/boot/buster/common.sh
--- debian-cd-3.1.23/tools/boot/buster/common.sh 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/boot/buster/common.sh 2019-06-26 18:26:02.000000000 +0100
@@ -157,3 +157,42 @@
print ver[1]*10000+ver[2]*100+ver[3]
}'
}
+
+# Work out how many blocks we need for a FAT filesystem to hold all
+# the EFI boot files
+calculate_efi_image_size() {
+ CDDIR=$1
+
+ sector_bytes=512 # -S
+ cluster_sectors=4 # -s
+ cluster_bytes=$((sector_bytes * cluster_sectors))
+
+ clusters=4 # 1 cluster for each sub-directory
+ for file in $CDDIR/EFI/*/*; do
+ [ -f "$file" ] || continue
+ clusters=$(($clusters + (($(stat -c %s "$file") + $cluster_bytes - 1) / $cluster_bytes)))
+ done
+ reserved_sectors=1 # boot-sector -R
+ reserved_bytes=$(($reserved_sectors * $sector_bytes))
+ fat_copies=2 # -f
+ if [ "$clusters" -le $(((1 << 12) - 2)) ]; then
+ fat_entry_bytes=3/2 # -F
+ elif [ "$clusters" -le $(((1 << 16) - 2)) ]; then
+ fat_entry_bytes=2 # -F
+ else
+ fat_entry_bytes=4 # -F
+ fi
+ fat_bytes=$((($clusters * $fat_entry_bytes + $sector_bytes - 1) / $sector_bytes * $sector_bytes))
+ root_entries=512 # -r
+ root_entry_bytes=32
+ root_bytes=$(($root_entries * root_entry_bytes))
+ size=$(($reserved_bytes + $fat_copies * $fat_bytes + $root_bytes + $clusters * $cluster_bytes))
+
+ track_sectors=32
+ track_bytes=$((sector_bytes * $track_sectors))
+ tracks=$((($size + $track_bytes - 1) / $track_bytes))
+ block_bytes=1024
+ blocks=$(($tracks * $track_bytes / $block_bytes))
+
+ echo $blocks
+}
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/buster/installtools.sh debian-cd-3.1.25/tools/buster/installtools.sh
--- debian-cd-3.1.23/tools/buster/installtools.sh 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/buster/installtools.sh 2019-06-26 18:26:02.000000000 +0100
@@ -52,7 +52,7 @@
fi
if [ "$OMIT_RELEASE_NOTES"x = "1"x ]; then
- echo "Omitting release notes, as requested"
+ echo " Omitting release notes, as requested"
else
for ARCH in $ARCHES
do
@@ -60,14 +60,14 @@
RN=$DIR/doc/release-notes
mkdir -p $RN
cd $RN
- echo "Downloading most recent release notes for $ARCH"
+ echo " Downloading most recent release notes for $ARCH"
$WGET $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz
if [ -e release-notes-$ARCH.tar.gz ] ; then
tar xzvf release-notes-$ARCH.tar.gz
rm -f release-notes-$ARCH.tar.gz
rm -f */*.ps
else
- echo "No release notes found at $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz"
+ echo " No release notes found at $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz"
fi
fi
done
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/generate_di+k_list debian-cd-3.1.25/tools/generate_di+k_list
--- debian-cd-3.1.23/tools/generate_di+k_list 2019-02-11 17:27:30.000000000 +0000
+++ debian-cd-3.1.25/tools/generate_di+k_list 2019-06-26 18:26:02.000000000 +0100
@@ -117,17 +117,14 @@
grub-efi
grub-efi-ia32
grub-efi-ia32-bin
+shim-signed
laptop-detect
-lilo
-elilo
libc6-i686
/* Note that we do not have to include every optimised kernel flavor for
* i386, but this does control what kernels are available on the netinst CD.
* Kernel headers are included as third party modules are commonly
* used on this architecture.
*/
-linux-image-686-pae
-linux-headers-686-pae
#ifndef ARCH_i386_EXCLUDE_486_KERNEL
linux-image-486
linux-headers-486
@@ -140,6 +137,10 @@
linux-image-686
linux-headers-686
#endif
+#ifndef ARCH_i386_EXCLUDE_686_PAE_KERNEL
+linux-image-686-pae
+linux-headers-686-pae
+#endif
#endif
@@ -153,7 +154,6 @@
grub-efi-amd64-signed
shim-signed
laptop-detect
-lilo
linux-image-amd64
linux-headers-amd64
#endif
@@ -161,11 +161,13 @@
#ifdef ARCH_ia64
initramfs-tools
busybox
+grub-efi
+grub-efi-ia64
+grub-efi-ia64-bin
linux-image-itanium
linux-image-itanium-smp
linux-image-mckinley
linux-image-mckinley-smp
-elilo
#endif
#ifdef ARCH_mips
@@ -234,7 +236,6 @@
initramfs-tools
grub-ieee1275
busybox
-silo
libc6-sparcv9b
libc6-sparcv9
linux-image-sparc32
@@ -247,7 +248,6 @@
initramfs-tools
grub-ieee1275
busybox
-silo
linux-image-sparc64
linux-image-sparc64-smp
#endif
@@ -264,7 +264,6 @@
busybox
laptop-detect
quik
-yaboot
powerpc-utils
hfsutils
mkvmlinuz
@@ -278,7 +277,6 @@
initramfs-tools
grub-ieee1275
busybox
-yaboot
hfsutils
powerpc-utils
powerpc-ibm-utils
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/jigdo_cleanup debian-cd-3.1.25/tools/jigdo_cleanup
--- debian-cd-3.1.23/tools/jigdo_cleanup 2018-07-29 04:22:33.000000000 +0100
+++ debian-cd-3.1.25/tools/jigdo_cleanup 2019-06-26 18:26:02.000000000 +0100
@@ -40,24 +40,24 @@
' > $jigdo.1
mv -f $jigdo.1 $jigdo
-# Snapshot URL
-if [ "$snapurl"x != ""x ] ; then
- echo "$snapurl" >> $jigdo
-fi
-
# If some fallbacks were specified, output a servers section with the
# URLs. The entries of the variable are expected to be already of the
# form "Label=http://some.url/";
if test -n "$JIGDOFALLBACKURLS"; then
for url in "$JIGDOFALLBACKURLS"
do
- # The --try-last switch assigns a lower priority to the URL,
- # so it will only be used if other server entries (without the
- # --try-last) have already been tried without success.
- echo "$url --try-last" >> $jigdo
+ echo "$url" >> $jigdo
done
fi
+# Snapshot URL - use last
+if [ "$snapurl"x != ""x ] ; then
+ # The --try-last switch assigns a lower priority to the URL,
+ # so it will only be used if other server entries (without the
+ # --try-last) have already been tried without success.
+ echo "$snapurl --try-last" >> $jigdo
+fi
+
# Create a snapshot tree if we've been told where to create one
if test -n "$JIGDOFALLBACKPATH"; then
echo "Creating snapshot tree:"
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/make_disc_trees.pl debian-cd-3.1.25/tools/make_disc_trees.pl
--- debian-cd-3.1.23/tools/make_disc_trees.pl 2019-01-25 10:46:16.000000000 +0000
+++ debian-cd-3.1.25/tools/make_disc_trees.pl 2019-06-26 18:26:02.000000000 +0100
@@ -757,18 +757,9 @@
# Useable capacity, found by checking some disks
$maxdiskblocks = 23652352 - $reserved;
$diskdesc = "50GB DLBD";
- } elsif ($chosen_disk eq "STICK1GB") {
- $maxdiskblocks = int(1 * $GB / $blocksize) - $reserved;
- $diskdesc = "1GB STICK";
- } elsif ($chosen_disk eq "STICK2GB") {
- $maxdiskblocks = int(2 * $GB / $blocksize) - $reserved;
- $diskdesc = "2GB STICK";
- } elsif ($chosen_disk eq "STICK4GB") {
- $maxdiskblocks = int(4 * $GB / $blocksize) - $reserved;
- $diskdesc = "4GB STICK";
- } elsif ($chosen_disk eq "STICK8GB") {
- $maxdiskblocks = int(8 * $GB / $blocksize) - $reserved;
- $diskdesc = "8GB STICK";
+ } elsif ($chosen_disk =~ /STICK(\d+)GB/) {
+ $maxdiskblocks = int($1 * $GB / $blocksize) - $reserved;
+ $diskdesc = "$1GB STICK";
} elsif ($chosen_disk eq "CUSTOM") {
$maxdiskblocks = $ENV{'CUSTOMSIZE'} - $reserved ||
die "Need to specify a custom size for the CUSTOM disktype\n";
diff -Nru --exclude Debian-edu-full --exclude kali-dev --exclude kali-rolling --exclude sid debian-cd-3.1.23/tools/start_new_disc debian-cd-3.1.25/tools/start_new_disc
--- debian-cd-3.1.23/tools/start_new_disc 2019-02-11 17:27:30.000000000 +0000
+++ debian-cd-3.1.25/tools/start_new_disc 2019-06-26 18:26:02.000000000 +0100
@@ -256,6 +256,8 @@
if [ "$OMIT_DOC_TOOLS" != "1" ]; then
echo " Adding docs to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR doc
+
+ echo " Removing old dedications"
DEBMAINVER="`echo $DEBVERSION | sed -e 's/[ _r].*//;s/\..*//'`"
find $CDDIR/doc -name "dedication-*" | grep -v "$DEBMAINVER" | xargs rm -vf
find $CDDIR/doc -name "debian-keyring.tar.gz" | xargs rm -f
@@ -279,26 +281,6 @@
$BASEDIR/tools/$CODENAME/installtools.sh $CDDIR "$ARCHES"
fi
- for ARCH in $ARCHES
- do
- if [ -e $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH ] ; then
- echo " Adding disks-$ARCH stuff ..."
- mkdir -p $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH
- $BASEDIR/tools/add_files $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH .
- touch $CDDIR/.disk/kernel_installable
- cd $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH
- rm -rf base-images-*
- if [ -L current ] ; then
- CURRENT_LINK=`readlink current`
- mv $CURRENT_LINK .tmp_link
- rm -rf [0123456789]*
- mv .tmp_link $CURRENT_LINK
- elif [ -d current ] ; then
- rm -rf [0123456789]*
- fi
- fi
- done
-
# See if we had to remove anything because it was too big. Warn the user.
if [ -s $BDIR/sourcetoobig ] ; then
echo " Adding README.excluded (some source files were too big)"
Reply to: