diff -pruN 20101020/build/boot/arm/armel-kirkwood-u-boot-image-config 20201202/build/boot/arm/armel-kirkwood-u-boot-image-config
--- 20101020/build/boot/arm/armel-kirkwood-u-boot-image-config 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/armel-kirkwood-u-boot-image-config 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,6 @@
+# Directory to create; and file to copy
+# Plug computers
+dockstar /usr/lib/u-boot/dockstar/u-boot.kwb
+dreamplug /usr/lib/u-boot/dreamplug/u-boot.kwb
+guruplug /usr/lib/u-boot/guruplug/u-boot.kwb
+sheevaplug /usr/lib/u-boot/sheevaplug/u-boot.kwb
diff -pruN 20101020/build/boot/arm/bootscr.mainline_common 20201202/build/boot/arm/bootscr.mainline_common
--- 20101020/build/boot/arm/bootscr.mainline_common 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/bootscr.mainline_common 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,44 @@
+# Bootscript using the new unified bootcmd handling
+# introduced with u-boot v2014.10
+
+if test -n "${boot_targets}"; then
+ echo "Mainline u-boot / new-style environment detected."
+else
+ echo "Non-mainline u-boot or old-style mainline u-boot detected."
+ echo "This boot script uses the unified bootcmd handling of mainline"
+ echo "u-boot >=v2014.10, which is not available on your system."
+ echo "Please boot the installer manually."
+ exit 0
+fi
+
+if test -z "${fdtfile}"; then
+ echo 'fdtfile environment variable not set. Aborting boot process.'
+ exit 0
+fi
+
+if test -n "${distro_bootpart}"; then
+ setenv partition "${distro_bootpart}"
+else
+ setenv partition "${bootpart}"
+fi
+
+if test ! -e ${devtype} ${devnum}:${partition} dtbs/${fdtfile}; then
+ echo "This installer medium does not contain a suitable device-tree file for"
+ echo "this system (${fdtfile}). Aborting boot process."
+ exit 0
+fi
+
+# Some i.MX6-based systems do not encode the baudrate in the console variable
+if test "${console}" = "ttymxc0" && test -n "${baudrate}"; then
+ setenv console "${console},${baudrate}"
+fi
+
+if test -n "${console}"; then
+ setenv bootargs "${bootargs} console=${console}"
+fi
+
+load ${devtype} ${devnum}:${partition} ${kernel_addr_r} vmlinuz \
+&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} dtbs/${fdtfile} \
+&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} initrd.gz \
+&& echo "Booting the Debian installer..." \
+&& bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}
diff -pruN 20101020/build/boot/arm/bootscr.mx5 20201202/build/boot/arm/bootscr.mx5
--- 20101020/build/boot/arm/bootscr.mx5 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/bootscr.mx5 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+setenv ramdisk uInitrd;
+setenv kernel uImage;
+setenv bootargs initrd=0x91000000 console=ttymxc0,115200 root=/dev/sda2 rootwait rw video=imx-ipuv3-fb:1024x600M-16@60 quiet lpj=3997696 earlyprintk=serial;
+${loadcmd} ${ramdiskaddr} ${ramdisk};
+if imi ${ramdiskaddr}; then; else
+ setenv bootargs ${bootargs} noinitrd;
+ setenv ramdiskaddr "";
+fi;
+${loadcmd} ${kerneladdr} ${kernel}
+if imi ${kerneladdr}; then
+ bootm ${kerneladdr} ${ramdiskaddr}
+fi;
diff -pruN 20101020/build/boot/arm/bootscr.tftpboot 20201202/build/boot/arm/bootscr.tftpboot
--- 20101020/build/boot/arm/bootscr.tftpboot 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/bootscr.tftpboot 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,21 @@
+if test -z "${fdtfile}"; then
+ echo 'fdtfile environment variable not set. Aborting boot process.'
+ exit 0
+fi
+
+# Some i.MX6-based systems do not encode the baudrate in the console variable
+if test "${console}" = "ttymxc0" && test -n "${baudrate}" ; then
+ setenv console "${console},${baudrate}"
+fi
+
+if test -n "${console}"; then
+ setenv bootargs "${bootargs} console=${console}"
+fi
+
+setenv installer-path "/debian-installer/armhf/"
+
+tftpboot ${fdt_addr_r} ${installer-path}dtbs/${fdtfile} \
+&& tftpboot ${kernel_addr_r} ${installer-path}vmlinuz \
+&& tftpboot ${ramdisk_addr_r} ${installer-path}initrd.gz \
+&& echo "Booting the Debian installer..." \
+&& bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}
diff -pruN 20101020/build/boot/arm/glantank.preseed 20201202/build/boot/arm/glantank.preseed
--- 20101020/build/boot/arm/glantank.preseed 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/arm/glantank.preseed 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# Make sure we won't wait for the user to accept this network-console
-# won't have been started at this point yet.
-d-i lowmem/low note
-
-d-i netcfg/choose_interface select eth0
-d-i netcfg/use_dhcp boolean true
-
-# Fallback to a static IP if DHCP fails
-d-i netcfg/dhcp_failed note
-d-i netcfg/dhcp_options select Configure network manually
-d-i netcfg/get_ipaddress string 192.168.1.77
-d-i netcfg/get_netmask string 255.255.255.0
-d-i netcfg/get_gateway string 192.168.1.1
-d-i netcfg/get_nameservers string 192.168.1.1
-
-# Any hostname and domain names assigned from dhcp take precedence over
-# values set here. However, setting the values still prevents the questions
-# from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
-
-d-i network-console/password string install
-d-i network-console/password-again string install
-
diff -pruN 20101020/build/boot/arm/linkstation-config-debian 20201202/build/boot/arm/linkstation-config-debian
--- 20101020/build/boot/arm/linkstation-config-debian 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/linkstation-config-debian 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# This code is covered by the GNU General Public License (GPLv2 or higher)
+
+NVRAM=$(which nvram)
+FW_PRINTENV=$(which fw_printenv)
+
+path=$(mount | grep ext[23] | sed -n '/sda2\|md0\|disk1_1/ {s/\/dev\/\(sda2\|md0\|.*disk1_1\) on \(.*\) type.*/\2/; p}')
+if [ -z "$path" ]; then
+ echo "You have to create an ext2 filesystem on the first physical partition"
+ exit 1
+fi
+
+if [ ! -e $path/uImage.buffalo ]; then
+ echo "You have to download the uImage.buffalo file from the debian-installer for Linkstation, and put it in $path"
+ exit 1
+fi
+
+if [ ! -e $path/initrd.buffalo ]; then
+ echo "You have to download the initrd.buffalo file from the debian-installer for Linkstation, and put it in $path"
+ exit 1
+fi
+
+if [ -n "$NVRAM" ]; then
+ PRINTENV="$NVRAM -c printenv"
+ SETENV="$NVRAM -c set"
+ GETENV="$NVRAM -c get"
+elif [ -n "$FW_PRINTENV" ]; then
+ if [ -z "$(which fw_setenv)" ]; then
+ echo "Program fw_setenv not found, cannot modify U-Boot environment..."
+ exit 1
+ elif [ ! -f /etc/fw_env.config ]; then
+ echo "Configuration file for fw_printenv not found."
+ exit 1
+ else
+ PRINTENV=$FW_PRINTENV
+ SETENV=$(which fw_setenv)
+ GETENV="$FW_PRINTENV -n"
+ fi
+else
+ echo "No tool found for modifying U-Boot environment..."
+ exit 1
+fi
+
+BOOTVER=$($GETENV buffalo_ver | sed 's/^.*=//')
+if [ -z "$BOOTVER" ]; then
+ echo "Unable to detect Buffalo bootloader version. Please ensure that your bootloader supports automatic initrd position/size detection."
+ exit 1
+else
+ BOOTVER_MAJOR=${BOOTVER%.*}
+ BOOTVER_MINOR=${BOOTVER#*.}
+ if [ $BOOTVER_MAJOR -eq 1 -a $BOOTVER_MINOR -lt 10 ]; then
+ echo "Incompatible bootloader version detected. Please update to the latest firmware version."
+ exit 1
+ fi
+fi
+
+printf "Saving U-Boot environment to ubootenv.bak... "
+$PRINTENV > ubootenv.bak || exit 1
+echo "done."
+
+echo "Changing U-Boot environment... "
+$SETENV bootargs_root "root=/dev/sda2 rw panic=5"
+echo "done."
+
+echo "Please reboot your Linkstation."
diff -pruN 20101020/build/boot/arm/lspro-config-debian 20201202/build/boot/arm/lspro-config-debian
--- 20101020/build/boot/arm/lspro-config-debian 2010-05-24 14:51:08.000000000 +0000
+++ 20201202/build/boot/arm/lspro-config-debian 1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# This code is covered by the GNU General Public License (GPLv2 or higher)
-
-NVRAM=$(which nvram)
-FW_PRINTENV=$(which fw_printenv)
-
-path=$(mount | grep ext2 | sed -n '/sda1/ {s/\/dev\/sda1 on \(.*\) type.*/\1/; p}')
-if [ -z "$path" ]; then
- echo "You have to create an ext2 filesystem on /dev/sda1"
- exit 1
-fi
-
-if [ ! -e $path/uImage.buffalo ]; then
- echo "You have to download the uImage.buffalo file from the debian-installer for Linkstation Pro/Live, and put it in $path"
- exit 1
-fi
-
-if [ ! -e $path/initrd.buffalo ]; then
- echo "You have to download the initrd.buffalo file from the debian-installer for Linkstation Pro/Live, and put it in $path"
- exit 1
-fi
-
-if [ -n "$NVRAM" ]; then
- PRINTENV="$NVRAM -c printenv"
- SETENV="$NVRAM -c set"
- GETENV="$NVRAM -c get"
-elif [ -n "$FW_PRINTENV" ]; then
- if [ -z "$(which fw_setenv)" ]; then
- echo "Program fw_setenv not found, cannot modify U-Boot environment..."
- exit 1
- elif [ ! -f /etc/fw_env.config ]; then
- echo "Configuration file for fw_printenv not found."
- exit 1
- else
- PRINTENV=$FW_PRINTENV
- SETENV=$(which fw_setenv)
- GETENV="$FW_PRINTENV -n"
- fi
-else
- echo "No tool found for modifying U-Boot environment..."
- exit 1
-fi
-
-BOOTVER=$($GETENV buffalo_ver | sed 's/^.*=//')
-if [ -z "$BOOTVER" ]; then
- echo "Unable to detect Buffalo bootloader version. Please ensure that your bootloader supports automatic initrd position/size detection."
-else
- BOOTVER_MAJOR=${BOOTVER%.*}
- BOOTVER_MINOR=${BOOTVER#*.}
- if [ $BOOTVER_MAJOR -eq 1 -a $BOOTVER_MINOR -lt 10 ]; then
- echo "Incompatible bootloader version detected. Please update to the latest firmware version."
- exit 1
- fi
-fi
-
-printf "Saving U-Boot environment to ubootenv.bak... "
-$PRINTENV > ubootenv.bak
-echo "done."
-
-echo "Changing U-Boot environment... "
-$SETENV bootargs_root "root=/dev/sda2 rw panic=5"
-echo "done."
-
-echo "Please reboot your Linkstation."
diff -pruN 20101020/build/boot/arm/olpc.fth 20201202/build/boot/arm/olpc.fth
--- 20101020/build/boot/arm/olpc.fth 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/olpc.fth 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,26 @@
+\ OLPC XO boot script
+
+: check-ofw-version ( -- )
+ " /" find-device
+ " compatible" get-property abort" No compatible property on /" ( -- compatible$ )
+ " mrvl,mmp2" 2swap substring? not if
+ cr
+ ." Firmware Q4E00 or newer is needed to boot a Devicetree enabled kernel." cr
+ cr
+ ." One way to update is to copy http://dev.laptop.org/~quozl/q4e00ja.rom" cr
+ ." to a FAT partition on a USB flash stick and run ""flash u:\q4e00ja.rom""" cr
+ cr
+ ." Aborting boot." cr
+ show-sad
+ abort
+ then
+ \ Make sure the model is sensible -- flash-kernel relies on this.
+ " model" delete-property
+ " OLPC XO-1.75" " model" string-property
+;
+
+visible unfreeze
+check-ofw-version
+" last:2,\vmlinuz" to boot-device
+" last:2,\initrd.gz" to ramdisk
+boot
diff -pruN 20101020/build/boot/arm/qnap-flash-debian 20201202/build/boot/arm/qnap-flash-debian
--- 20101020/build/boot/arm/qnap-flash-debian 2010-07-05 22:11:56.000000000 +0000
+++ 20201202/build/boot/arm/qnap-flash-debian 2020-04-09 07:06:18.000000000 +0000
@@ -4,21 +4,16 @@
# 1) Check the files are okay
-if [ ! -e kernel ]; then
- echo "You have to download the kernel file from the debian-installer for QNAP."
+if [ ! -e initrd ]; then
+ echo "You have to download the initrd file from the debian-installer for QNAP."
exit 1
fi
-if [ ! -e initrd.gz ]; then
- echo "You have to download the initrd.gz file from the debian-installer for QNAP."
- exit 1
-fi
-
-ifilesize=$(ls -l initrd.gz | awk '{print $5}')
+ifilesize=$(ls -l initrd | awk '{print $5}')
# The ramdisk partition is 4 MB on the QNAP TS-109 and TS-209, and
# 9 MB on the QNAP TS-119, TS-219 and TS-219P.
if [ $ifilesize -ne 4194304 -a $ifilesize -ne 9437184 ]; then
- echo "The initrd.gz file is corrupt"
+ echo "The initrd file is corrupt"
exit 1
fi
@@ -32,10 +27,16 @@ if [ -n "$qnap" ]; then
"TS-409"*)
qnap="TS-409"
;;
- "Q600" | "Q700" | "TS-110"* | "TS-119"* | "TS-210"* | "TS-219"*)
+ "HS-210"* | "Q600" | "Q700" | "TS-110"* | "TS-112"* | "TS-119"* | "TS-210"* | "TS-212"* | "TS-219"*)
qnap="TS-11x/TS-21x"
;;
- "TS-410"* | "TS-419"*)
+ "TS-120"* | "TS-121"* | "TS-220"* | "TS-221"*)
+ qnap="TS-11x/TS-21x"
+ ;;
+ "TS-410"* | "TS-412"* | "TS-419"*)
+ qnap="TS-41x"
+ ;;
+ "TS-420"* | "TS-421"*)
qnap="TS-41x"
;;
*)
@@ -55,7 +56,41 @@ if [ -n "$qnap" ]; then
fi
fi
-# 3) Change the MAC address on Kirkwood-based QNAP devices
+# 3) Determine the CPU variant
+if [ ! -e /proc/cpuinfo ]; then
+ echo "Cannot determine CPU as /proc/cpuinfo doesn't exist"
+ exit 1
+fi
+
+# cpuinfo should contain "Processor name" or "Processor"
+cpu=$(grep "^Processor" /proc/cpuinfo)
+if [ -z "$cpu" ]; then
+ echo "Cannot determine CPU from /proc/cpuinfo"
+ exit 1
+fi
+
+case "$cpu" in
+ *"ARM926EJ"*)
+ kernel="kernel"
+ ;;
+ *"88F6281"*)
+ kernel="kernel-6281"
+ ;;
+ *"88F6282"*)
+ kernel="kernel-6282"
+ ;;
+ *)
+ echo "Cannot determine CPU variant"
+ exit 1
+ ;;
+esac
+
+if [ ! -e $kernel ]; then
+ echo "You have to download the $kernel file from the debian-installer for QNAP."
+ exit 1
+fi
+
+# 4) Change the MAC address on Kirkwood-based QNAP devices
uboot_mac() {
ubootcfg -b 0 -f /dev/mtdblock4 -o - | grep "^ethaddr=" | sed "s/^ethaddr=//"
}
@@ -127,8 +162,8 @@ rmdir $path
# 5) Finally, write the installer to flash
printf "Writing debian-installer to flash... "
-cat kernel > /dev/mtdblock1
-cat initrd.gz > /dev/mtdblock2
+cat $kernel > /dev/mtdblock1
+cat initrd > /dev/mtdblock2
echo "done."
echo "Please reboot your QNAP device."
diff -pruN 20101020/build/boot/arm/seagate-uboot-config 20201202/build/boot/arm/seagate-uboot-config
--- 20101020/build/boot/arm/seagate-uboot-config 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/seagate-uboot-config 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,15 @@
+setenv debian_kernel_addr 0x2000000
+setenv debian_initrd_addr 0x5100000
+setenv debian_dtb_addr 0x5000000
+setenv initrd_high 0xffffffff
+setenv fdt_high 0xffffffff
+setenv debian_boot_part 1
+setenv debian_kernel_img /uImage
+setenv debian_initrd_img /uInitrd
+setenv debian_dtb_img /dtb
+setenv debian_bootargs setenv bootargs ${console}
+setenv debian_load_image 'ext2load ${disk_iface} ${disk_num}:${boot_part} ${kern_addr} ${debian_kernel_img} && iminfo ${debian_kernel_addr}; ext2load ${disk_iface} ${disk_num}:${boot_part} ${debian_initrd_addr} ${debian_initrd_img}; ext2load ${disk_iface} ${disk_num}:${boot_part} ${debian_dtb_addr} ${debian_dtb_img}'
+setenv debian_boot 'hdd start; ide reset; setenv boot_part ${debian_boot_part}; for disk in ${disk_list}; do run disk_expand; echo Booting Debian from disk ${disk}...; run debian_load_image; run debian_bootargs; bootm ${debian_kernel_addr} ${debian_initrd_addr} ${debian_dtb_addr}; done'
+setenv bootcmd run debian_boot
+saveenv
+run bootcmd
diff -pruN 20101020/build/boot/arm/ssh-noninteractive.preseed 20201202/build/boot/arm/ssh-noninteractive.preseed
--- 20101020/build/boot/arm/ssh-noninteractive.preseed 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/ssh-noninteractive.preseed 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,39 @@
+# Assume eth0 is the network device
+d-i netcfg/choose_interface select eth0
+
+# Use DHCP by default
+d-i netcfg/use_dhcp boolean true
+
+# Fall back to a static address
+d-i netcfg/dhcp_failed note
+d-i netcfg/dhcp_options select Configure network manually
+d-i netcfg/get_ipaddress string 192.168.1.100
+d-i netcfg/get_netmask string 255.255.255.0
+d-i netcfg/get_gateway string 192.168.1.1
+d-i netcfg/get_nameservers string 192.168.1.1
+
+# The following options are needed so network configuration is
+# non-interactive in all cases.
+
+# Just continue if d-i enters lowmem mode
+d-i lowmem/low note
+
+# Any hostname and domain names assigned from DHCP take precedence
+# over values set here. However, setting the values still prevents
+# the questions from being shown, even if values come from dhcp.
+d-i netcfg/get_hostname string debian
+d-i netcfg/get_domain string example.org
+
+# I'm not terribly happy to preseed a generic password but I guess
+# there's no other way on some machines.
+d-i network-console/password password install
+d-i network-console/password-again password install
+
+# Continue if there is missing firmware at ethdetect, and hope that
+# it is not actually needed to get on the network.
+d-i ethdetect/prompt_missing_firmware boolean false
+
+# Allow network configuration to finish even if the DHCP server
+# doesn't send a gateway. This way, users can at least connect
+# to the installer and fix their config.
+d-i netcfg/no_default_route boolean true
diff -pruN 20101020/build/boot/arm/u-boot-image-config 20201202/build/boot/arm/u-boot-image-config
--- 20101020/build/boot/arm/u-boot-image-config 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm/u-boot-image-config 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,41 @@
+# U-Boot SPL/TPL files and offsets for various platforms
+#
+# Line format (offsets are given in blocks of 512 Bytes):
+# platform_name SPL_filename SPL_offset TPL_filename TPL_offset
+#
+# Images from u-boot-imx
+MX53LOCO /usr/lib/u-boot/mx53loco/u-boot.imx 2
+MX6_Cubox-i /usr/lib/u-boot/mx6cuboxi/SPL 2 /usr/lib/u-boot/mx6cuboxi/u-boot.img 138
+Wandboard /usr/lib/u-boot/wandboard/SPL 2 /usr/lib/u-boot/wandboard/u-boot.img 138
+Novena /usr/lib/u-boot/novena-rawsd/SPL 2 /usr/lib/u-boot/novena-rawsd/u-boot.img 138
+#
+# Images from u-boot-omap
+BeagleBoneBlack /usr/lib/u-boot/am335x_boneblack/MLO 256 /usr/lib/u-boot/am335x_boneblack/u-boot.img 768
+PandaBoard /usr/lib/u-boot/omap4_panda/MLO 256 /usr/lib/u-boot/omap4_panda/u-boot.img 768
+BeagleBoard-X15 /usr/lib/u-boot/am57xx_evm/MLO 256 /usr/lib/u-boot/am57xx_evm/u-boot.img 768
+#
+# Images from u-boot-sunxi
+A10-OLinuXino-Lime /usr/lib/u-boot/A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin 16
+A20-Olimex-SOM-EVB /usr/lib/u-boot/A20-Olimex-SOM-EVB/u-boot-sunxi-with-spl.bin 16
+A20-OLinuXino-Lime /usr/lib/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin 16
+A20-OLinuXino-Lime2 /usr/lib/u-boot/A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin 16
+A20-OLinuXino-Lime2-eMMC /usr/lib/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin 16
+A20-OLinuXino-MICRO /usr/lib/u-boot/A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin 16
+BananaPi /usr/lib/u-boot/Bananapi/u-boot-sunxi-with-spl.bin 16
+BananaPiM2Berry /usr/lib/u-boot/bananapi_m2_berry/u-boot-sunxi-with-spl.bin 16
+BananaPro /usr/lib/u-boot/Bananapro/u-boot-sunxi-with-spl.bin 16
+Cubieboard /usr/lib/u-boot/Cubieboard/u-boot-sunxi-with-spl.bin 16
+Cubieboard2 /usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin 16
+Cubietruck /usr/lib/u-boot/Cubietruck/u-boot-sunxi-with-spl.bin 16
+Cubietruck_plus /usr/lib/u-boot/Cubietruck_plus/u-boot-sunxi-with-spl.bin 16
+Lamobo_R1 /usr/lib/u-boot/Lamobo_R1/u-boot-sunxi-with-spl.bin 16
+orangepi_plus /usr/lib/u-boot/orangepi_plus/u-boot-sunxi-with-spl.bin 16
+pcDuino /usr/lib/u-boot/Linksprite_pcDuino/u-boot-sunxi-with-spl.bin 16
+pcDuino3 /usr/lib/u-boot/Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin 16
+NanoPiNeo /usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin 16
+NanoPiNeoAir /usr/lib/u-boot/nanopi_neo_air/u-boot-sunxi-with-spl.bin 16
+Sinovoip_BPI_M3 /usr/lib/u-boot/Sinovoip_BPI_M3/u-boot-sunxi-with-spl.bin 16
+
+#
+# Images from u-boot-rockchip
+Firefly-RK3288 /usr/lib/u-boot/firefly-rk3288/idbloader.img 64 /usr/lib/u-boot/firefly-rk3288/u-boot.img 16384
diff -pruN 20101020/build/boot/arm64/extlinux/extlinux.conf 20201202/build/boot/arm64/extlinux/extlinux.conf
--- 20101020/build/boot/arm64/extlinux/extlinux.conf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm64/extlinux/extlinux.conf 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,10 @@
+default l0
+menu title Debian-Installer
+prompt 0
+timeout 50
+
+label l0
+menu label Debian-Installer
+linux /vmlinuz
+initrd /initrd.gz
+fdtdir /dtbs/
diff -pruN 20101020/build/boot/arm64/grub/grub-efi.cfg 20201202/build/boot/arm64/grub/grub-efi.cfg
--- 20101020/build/boot/arm64/grub/grub-efi.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/arm64/grub/grub-efi.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,5 @@
+set menu_color_normal=cyan/blue
+set menu_color_highlight=white/blue
+
+insmod gzio
+
diff -pruN 20101020/build/boot/armhf/grub/grub-efi.cfg 20201202/build/boot/armhf/grub/grub-efi.cfg
--- 20101020/build/boot/armhf/grub/grub-efi.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/armhf/grub/grub-efi.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,5 @@
+set menu_color_normal=cyan/blue
+set menu_color_highlight=white/blue
+
+insmod gzio
+
diff -pruN 20101020/build/boot/hurd/grub-hurd-cdrom.cfg 20201202/build/boot/hurd/grub-hurd-cdrom.cfg
--- 20101020/build/boot/hurd/grub-hurd-cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/grub-hurd-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,102 @@
+set cd=$root
+set default=3
+set timeout=-1
+
+insmod multiboot
+insmod cpuid
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+insmod chain
+
+if loadfont /boot/grub/font.pf2 ; then
+ set gfxmode=640x480
+ set gfxpayload=keep
+ insmod vbe
+ insmod gfxterm
+ terminal_output gfxterm
+fi
+
+insmod png
+if background_image /boot/grub/splash.png ; then
+ set color_normal=white/black
+ set color_highlight=black/white
+else
+ set menu_color_normal=cyan/blue
+ set menu_color_highlight=white/blue
+fi
+
+insmod play
+play 960 440 1 0 4 440 1
+
+menuentry "Debian GNU/Hurd installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ set root=$cd
+ multiboot /boot/kernel/gnumach.gz $options
+ module --nounzip /boot/${gtk}initrd.gz initrd '$(ramdisk-create)'
+ module /boot/kernel/ext2fs.static ext2fs \
+ --multiboot-command-line='${kernel-command-line}' \
+ --host-priv-port='${host-port}' \
+ --device-master-port='${device-port}' \
+ --exec-server-task='${exec-task}' -T typed gunzip:device:rd0 \
+ '$(task-create)' '$(task-resume)'
+ module /boot/kernel/exec.static exec '$(exec-task=task-create)'
+}
+
+menuentry "Text install" {
+ set options="TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Pseudo-graphical install" {
+ set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=9"
+ boot_one
+}
+
+menuentry "Pseudo-graphical install with CJK support" {
+ set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=8"
+ boot_one
+}
+
+menuentry "Graphical install" {
+ set options=""
+ if test -e /boot/gtk ; then
+ set gtk="gtk/"
+ else
+ set gtk=""
+ fi
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
+
+menuentry "" {
+ true
+}
+
+menuentry "Boot from first hard disk" {
+ set root=hd0
+ chainloader +1
+}
diff -pruN 20101020/build/boot/hurd/grub-hurd-efi.cfg 20201202/build/boot/hurd/grub-hurd-efi.cfg
--- 20101020/build/boot/hurd/grub-hurd-efi.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/grub-hurd-efi.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,105 @@
+set cd=$root
+set default=3
+set timeout=-1
+
+insmod multiboot
+insmod cpuid
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+insmod chain
+
+if loadfont $prefix/font.pf2 ; then
+ set gfxmode=640x480
+ set gfxpayload=keep
+ insmod efi_gop
+ insmod efi_uga
+ insmod video_bochs
+ insmod video_cirrus
+ insmod gfxterm
+ terminal_output gfxterm
+fi
+
+insmod png
+if background_image /boot/grub/splash.png ; then
+ set color_normal=white/black
+ set color_highlight=black/white
+else
+ set menu_color_normal=cyan/blue
+ set menu_color_highlight=white/blue
+fi
+
+insmod play
+play 960 440 1 0 4 440 1
+
+menuentry "Debian GNU/Hurd installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ set root=$cd
+ multiboot /boot/kernel/gnumach.gz $options
+ module --nounzip /boot/${gtk}initrd.gz initrd '$(ramdisk-create)'
+ module /boot/kernel/ext2fs.static ext2fs \
+ --multiboot-command-line='${kernel-command-line}' \
+ --host-priv-port='${host-port}' \
+ --device-master-port='${device-port}' \
+ --exec-server-task='${exec-task}' -T typed gunzip:device:rd0 \
+ '$(task-create)' '$(task-resume)'
+ module /boot/kernel/exec.static exec '$(exec-task=task-create)'
+}
+
+menuentry "Text install" {
+ set options="TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Pseudo-graphical install" {
+ set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=9"
+ boot_one
+}
+
+menuentry "Pseudo-graphical install with CJK support" {
+ set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=8"
+ boot_one
+}
+
+menuentry "Graphical install" {
+ set options=""
+ if test -e /boot/gtk ; then
+ set gtk="gtk/"
+ else
+ set gtk=""
+ fi
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
+
+menuentry "" {
+ true
+}
+
+menuentry "Boot from first hard disk" {
+ set root=hd0
+ chainloader +1
+}
diff -pruN 20101020/build/boot/hurd/grub-hurd-i386.cfg 20201202/build/boot/hurd/grub-hurd-i386.cfg
--- 20101020/build/boot/hurd/grub-hurd-i386.cfg 2010-09-18 18:10:52.000000000 +0000
+++ 20201202/build/boot/hurd/grub-hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-
-set cd=$root
-set timeout=-1
-
-if loadfont /boot/grub/font.pf2 ; then
- set gfxmode=640x480
- insmod vbe
- insmod gfxterm
- terminal_output gfxterm
-fi
-
-insmod png
-if background_image /boot/grub/splash.png ; then
- set color_normal=white/black
- set color_highlight=black/white
-else
- set menu_color_normal=cyan/blue
- set menu_color_highlight=white/blue
-fi
-
-menuentry "Default install" {
- echo "Loading ..."
- set root=$cd
- multiboot /boot/kernel/gnumach.gz root=gunzip:device:rd0
- module --nounzip /boot/initrd.gz initrd '$(ramdisk-create)'
- module /boot/kernel/ext2fs.static ext2fs \
- --multiboot-command-line='${kernel-command-line}' \
- --host-priv-port='${host-port}' \
- --device-master-port='${device-port}' \
- --exec-server-task='${exec-task}' -T typed '${root}' \
- '$(task-create)' '$(task-resume)'
- module /boot/kernel/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
-}
-
-menuentry "Automated install" {
- echo "Loading ..."
- set root=$cd
- multiboot /boot/kernel/gnumach.gz root=gunzip:device:rd0 auto=true priority=critical
- module --nounzip /boot/initrd.gz initrd '$(ramdisk-create)'
- module /boot/kernel/ext2fs.static ext2fs \
- --multiboot-command-line='${kernel-command-line}' \
- --host-priv-port='${host-port}' \
- --device-master-port='${device-port}' \
- --exec-server-task='${exec-task}' -T typed '${root}' \
- '$(task-create)' '$(task-resume)'
- module /boot/kernel/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
-}
-
-menuentry "Expert install" {
- echo "Loading ..."
- set root=$cd
- multiboot /boot/kernel/gnumach.gz root=gunzip:device:rd0 priority=low
- module --nounzip /boot/initrd.gz initrd '$(ramdisk-create)'
- module /boot/kernel/ext2fs.static ext2fs \
- --multiboot-command-line='${kernel-command-line}' \
- --host-priv-port='${host-port}' \
- --device-master-port='${device-port}' \
- --exec-server-task='${exec-task}' -T typed '${root}' \
- '$(task-create)' '$(task-resume)'
- module /boot/kernel/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
-}
-
-menuentry "" {
- true
-}
-
-menuentry "Boot from first hard disk" {
- set root=hd0
- chainloader +1
-}
diff -pruN 20101020/build/boot/hurd/grub-hurd-pxe.cfg 20201202/build/boot/hurd/grub-hurd-pxe.cfg
--- 20101020/build/boot/hurd/grub-hurd-pxe.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/grub-hurd-pxe.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,80 @@
+set default=3
+set timeout=-1
+
+if loadfont $prefix/font.pf2 ; then
+ set gfxmode=640x480
+ set gfxpayload=keep
+ insmod vbe
+ insmod gfxterm
+ terminal_output gfxterm
+fi
+
+insmod png
+if background_image $prefix/splash.png ; then
+ set color_normal=white/black
+ set color_highlight=black/white
+else
+ set menu_color_normal=cyan/blue
+ set menu_color_highlight=white/blue
+fi
+
+insmod play
+play 960 440 1 0 4 440 1
+
+menuentry "Debian GNU/Hurd installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ set root=$cd
+ multiboot $prefix/gnumach.gz $options
+ module --nounzip /boot/${gtk}initrd.gz initrd '$(ramdisk-create)'
+ module /boot/kernel/ext2fs.static ext2fs \
+ --multiboot-command-line='${kernel-command-line}' \
+ --host-priv-port='${host-port}' \
+ --device-master-port='${device-port}' \
+ --exec-server-task='${exec-task}' -T typed gunzip:device:rd0 \
+ '$(task-create)' '$(task-resume)'
+ module /boot/kernel/exec.static exec '$(exec-task=task-create)'
+}
+
+menuentry "Text install" {
+ set options="TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Pseudo-graphical install" {
+ set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=9"
+ boot_one
+}
+
+menuentry "Pseudo-graphical install with CJK support" {
+ set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=8"
+ boot_one
+}
+
+menuentry "Graphical install" {
+ set options=""
+ set gtk="gtk/"
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low TERM=mach-gnu-color"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
diff -pruN 20101020/build/boot/hurd/pics/joy-hurd.svg 20201202/build/boot/hurd/pics/joy-hurd.svg
--- 20101020/build/boot/hurd/pics/joy-hurd.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/pics/joy-hurd.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GNU/Hurd
+
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/build/boot/hurd/pics/lines-hurd.svg 20201202/build/boot/hurd/pics/lines-hurd.svg
--- 20101020/build/boot/hurd/pics/lines-hurd.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/pics/lines-hurd.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,764 @@
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GNU/Hurd
+
diff -pruN 20101020/build/boot/hurd/pics/softwaves-hurd.svg 20201202/build/boot/hurd/pics/softwaves-hurd.svg
--- 20101020/build/boot/hurd/pics/softwaves-hurd.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/pics/softwaves-hurd.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,390 @@
+
+
+
+image/svg+xml
\ No newline at end of file
diff -pruN 20101020/build/boot/hurd/xen/debian.cfg 20201202/build/boot/hurd/xen/debian.cfg
--- 20101020/build/boot/hurd/xen/debian.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/hurd/xen/debian.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,234 @@
+# -*- mode: python; -*-
+#============================================================================
+# Example Python setup script for Debian guest installation.
+#============================================================================
+#
+# Standard options are configured as normal. Only a subset are included below.
+# See /usr/share/doc/xen-utils-common/examples for full examples.
+#
+# After standard options are configure use
+# xm create debian.cfg install=true"
+# to start the Debian Installer.
+#
+# In the installation case the following additional variables exist:
+#
+# COMMON OPTIONS
+# install-method: "cdrom" or "network"
+# install-arch: which architecture to install. e.g. i386 or amd64
+# install-installer: URL or path to the Debian Installer bits. By
+# default for a network install these are located under
+# install-mirror. For a CDROM install the default is a fixed path on
+# the CD.
+# install-kernel, install-ramdisk: URL/path to the installer kernel and
+# ramdisk to use, by default these are located via install-installer.
+# install-extra: extra command line arguments
+#
+# CDROM SPECIFIC OPTIONS
+# install-media: Path to the Debian install media (i.e. an ISO)
+# install-cdrom-device: Name of the CD-ROM device within the guest.
+#
+# NETWORK SPECIFIC OPTIONS
+# install-suite: which Debian version to install. e.g. lenny, squeeze or sid
+# install-mirror: which Debian mirror to use
+# e.g. http://ftp.uk.debian.org/debian
+#============================================================================
+
+
+#----------------------------------------------------------------------------
+# Standard variables
+
+# Initial memory allocation (in megabytes) for the new domain.
+memory = 256
+
+# A name for your domain. All domains must have different names.
+name = "ExampleDomain"
+
+# 128-bit UUID for the domain. The default behavior is to generate a new UUID
+# on each call to 'xm create'.
+#uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
+
+# List of which CPUS this domain is allowed to use, default Xen picks
+#cpus = "" # leave to Xen to pick
+#cpus = "0" # all vcpus run on CPU0
+#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+
+# Number of Virtual CPUS to use, default is 1
+#vcpus = 1
+
+#----------------------------------------------------------------------------
+# Define network interfaces.
+
+# By default, no network interfaces are configured. You may have one created
+# with sensible defaults using an empty vif clause:
+#
+# vif = ['']
+#
+# or optionally override backend, bridge, ip, mac, script, type, or vifname:
+#
+# vif = ['mac=00:16:3e:00:00:11, bridge=xenbr0']
+#
+# or more than one interface may be configured:
+#
+# vif = ['', 'bridge=xenbr1']
+
+vif = ['']
+
+#----------------------------------------------------------------------------
+# Define the disk devices you want the domain to have access to, and
+# what you want them accessible as.
+# Each disk entry is of the form phy:UNAME,DEV,MODE
+# where UNAME is the device, DEV is the device name the domain will see,
+# and MODE is r for read-only, w for read-write.
+#
+# NB: Only xvd devices are supported by the kernel in Debian Lenny and later.
+
+disk = ['file:/path/to/disk.img,xvda,w']
+
+#============================================================================
+# Debian Installer specific variables
+
+def check_bool(name, value):
+ value = str(value).lower()
+ if value in ('t', 'tr', 'tru', 'true'):
+ return True
+ return False
+
+global var_check_with_default
+def var_check_with_default(default, var, val):
+ if val:
+ return val
+ return default
+
+xm_vars.var('install', use='Install Debian, default: false', check=check_bool)
+xm_vars.var("install-method",
+ use='Installation method to use "cdrom" or "network" (default: @XEN_INSTALL_METHOD@)',
+ check=lambda var, val: var_check_with_default('@XEN_INSTALL_METHOD@', var, val))
+
+# install-method == "network"
+xm_vars.var("install-mirror",
+ use='Debian mirror to install from (default: http://ftp.debian.org/debian)',
+ check=lambda var, val: var_check_with_default('http://ftp.debian.org/debian', var, val))
+xm_vars.var("install-suite",
+ use='Debian suite to install (default: @DEBIAN_RELEASE@)',
+ check=lambda var, val: var_check_with_default('@DEBIAN_RELEASE@', var, val))
+
+# install-method == "cdrom"
+xm_vars.var("install-media",
+ use='Installation media to use (default: None)',
+ check=lambda var, val: var_check_with_default(None, var, val))
+xm_vars.var("install-cdrom-device",
+ use='Installation media to use (default: xvdd)',
+ check=lambda var, val: var_check_with_default('xvdd', var, val))
+
+# Common options
+xm_vars.var("install-arch",
+ use='Debian mirror to install from (default: @ARCH@)',
+ check=lambda var, val: var_check_with_default('@ARCH@', var, val))
+xm_vars.var("install-extra",
+ use='Extra command line options (default: None)',
+ check=lambda var, val: var_check_with_default(None, var, val))
+xm_vars.var("install-installer",
+ use='Debian installer to use (default: network uses install-mirror; cdrom uses /install.ARCH)',
+ check=lambda var, val: var_check_with_default(None, var, val))
+xm_vars.var("install-kernel",
+ use='Debian installer kernel to use (default: uses install-installer)',
+ check=lambda var, val: var_check_with_default(None, var, val))
+xm_vars.var("install-ramdisk",
+ use='Debian installer ramdisk to use (default: uses install-installer)',
+ check=lambda var, val: var_check_with_default(None, var, val))
+
+xm_vars.check()
+
+if not xm_vars.env.get('install'):
+ bootloader="pygrub"
+elif xm_vars.env['install-method'] == "network":
+ import os.path
+ print "Install Mirror: %s" % xm_vars.env['install-mirror']
+ print "Install Suite: %s" % xm_vars.env['install-suite']
+ if xm_vars.env['install-installer']:
+ installer = xm_vars.env['install-installer']
+ else:
+ installer = xm_vars.env['install-mirror']+"/dists/"+xm_vars.env['install-suite'] + \
+ "/main/installer-"+xm_vars.env['install-arch']+"/current/images"
+ print "Installer: %s" % installer
+
+ print
+ print "WARNING: Installer kernel and ramdisk are not authenticated."
+ print
+
+ if xm_vars.env.get('install-kernel'):
+ kernelurl = xm_vars.env['install-kernel']
+ else:
+ kernelurl = installer + "/netboot/xen/gnumach"
+
+ if xm_vars.env.get('install-ramdisk'):
+ ramdiskurl = xm_vars.env['install-ramdisk']
+ else:
+ ramdiskurl = installer + "/netboot/xen/modules"
+
+ import urllib
+ class MyUrlOpener(urllib.FancyURLopener):
+ def http_error_default(self, req, fp, code, msg, hdrs):
+ raise IOError("%s %s" % (code, msg))
+ urlopener = MyUrlOpener()
+
+ try:
+ print "Fetching %s" % kernelurl
+ kernel, _ = urlopener.retrieve(kernelurl)
+ print "Fetching %s" % ramdiskurl
+ ramdisk, _ = urlopener.retrieve(ramdiskurl)
+ except IOError, _:
+ raise
+
+elif xm_vars.env['install-method'] == "cdrom":
+ arch_path = { 'i386': "/install.386",
+ 'amd64': "/install.amd" }
+
+ if xm_vars.env['install-media']:
+ print "Install Media: %s" % xm_vars.env['install-media']
+ else:
+ raise OptionError("No installation media given.")
+
+ if xm_vars.env['install-installer']:
+ installer = xm_vars.env['install-installer']
+ else:
+ installer = arch_path[xm_vars.env['install-arch']]
+
+ print "Installer: %s" % installer
+
+ if xm_vars.env.get('install-kernel'):
+ kernelpath = xm_vars.env['install-kernel']
+ else:
+ kernelpath = installer + "/xen/gnumach"
+
+ if xm_vars.env.get('install-ramdisk'):
+ ramdiskpath = xm_vars.env['install-ramdisk']
+ else:
+ ramdiskpath = installer + "/xen/modules"
+
+ disk.insert(0, 'file:%s,%s:cdrom,r' % (xm_vars.env['install-media'],
+ xm_vars.env['install-cdrom-device']))
+
+ bootloader="pygrub"
+ bootargs="--kernel=%s --ramdisk=%s" % (kernelpath, ramdiskpath)
+ print "From CD"
+else:
+ print "WARNING: Unknown install-method: %s." % xm_vars.env['install-method']
+
+if xm_vars.env.get('install'):
+ # Figure out command line
+ if xm_vars.env['install-extra']:
+ extras=[xm_vars.env['install-extra']]
+ else:
+ extras=[]
+
+ # Reboot will just restart the installer since this file is not
+ # reparsed, so halt and restart that way.
+ extras.append("-H")
+
+ extras.append("root=gunzip:device:rd0")
+ # TODO: actually inherit
+ extras.append("TERM=ansi")
+
+ extra = str.join(" ", extras)
+ print "command line is \"%s\"" % extra
diff -pruN 20101020/build/boot/ia64/elilo.conf 20201202/build/boot/ia64/elilo.conf
--- 20101020/build/boot/ia64/elilo.conf 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/ia64/elilo.conf 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-chooser=textmenu
-default=install
-delay=20
-prompt
-
-message=${SYSDIR}elilo_menu.msg
-f1=${SYSDIR}general.msg
-f2=${SYSDIR}params.msg
-
-relocatable
-
-image=${KERNEL}
- label=install
- description="Install"
- initrd=${INITRD}
- append="--"
- read-only
-
-image=${KERNEL}
- label=expert
- description="Install [Expert mode]"
- initrd=${INITRD}
- append="priority=low --"
- read-only
-
-image=${KERNEL}
- label=rescue
- description="Rescue"
- initrd=${INITRD}
- append="rescue/enable=true --"
- read-only
diff -pruN 20101020/build/boot/ia64/elilo_menu.msg 20201202/build/boot/ia64/elilo_menu.msg
--- 20101020/build/boot/ia64/elilo_menu.msg 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/ia64/elilo_menu.msg 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-
-10
- 7fĴ 74Debian Installer7f 7f10
- 7f70 This is the Debian GNU/Linux installation system, built on ${BUILD_DATE}. 7f10
- 7f70 7f10
- 7f70 Use the arrow keys to select a menu item and then Enter to select it. 7f10
- 7f70 Use the function keys for help. On a serial console, use Ctrl-F and the 7f10
- 7f70 function key number instead. 7f10
- 7f70 7f10
- 7f70 7eBeware that this is an OS installer, and misuse can result in the loss of 7f10
- 7f70 7eany data currently on your disks. 7f10
- 7f70 707f 10
- 7f70 70 70 7f10
- 7f70 70 707f 10
- 7f70 70 707f 10
- 7f70 70 707f 10
- 7f70 70 707f 10
- 7f70 70 1e70 7f10
- 7f70 70 7f10
- 7f70 7f10
- 7f70 Boot: 35 70 7f10
- 7f70 7f10
- 7f70 Help: [71F170-General] [71F270-Params] 7f10
- 7f10
diff -pruN 20101020/build/boot/ia64/general.msg 20201202/build/boot/ia64/general.msg
--- 20101020/build/boot/ia64/general.msg 2009-01-10 16:12:13.000000000 +0000
+++ 20201202/build/boot/ia64/general.msg 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-
-10
- 7fĴ 74General Screen7f 7010
- 7f70 10
- 7f70 There are two ways to install Debian from this image. Expert mode 10
- 7f70 gives you more control over the configuration of the system by 10
- 7f70 giving you the option to change configuration parameters and control 10
- 7f70 which packages are loaded. Normal mode installs the default set of 10
- 7f70 packages and automatically configures them with the default settings. 10
- 7f70 10
- 7f70 10
- 7f70 See the Installation Manual or the FAQ for more information; both 10
- 7f70 documents are available at the Debian web site: 10
- 7f70 http://www.debian.org/ 10
- 7f70 10
- 7f70 10
- 7f70 Debian GNU/Linux is Copyright (C) 1993-2009 Software in the Public 10
- 7f70 Interest and others and comes with ABSOLUTELY NO WARRANTY, to the 10
- 7f70 extent permitted by applicable law. 10
- 7f70 10
- 7f70 10
- 7f70 Press any key to return to main screen 10
- 7f70 10
- 7f7010
diff -pruN 20101020/build/boot/ia64/grub/grub-efi.cfg 20201202/build/boot/ia64/grub/grub-efi.cfg
--- 20101020/build/boot/ia64/grub/grub-efi.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/ia64/grub/grub-efi.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,5 @@
+set menu_color_normal=cyan/blue
+set menu_color_highlight=white/blue
+
+insmod gzio
+
diff -pruN 20101020/build/boot/ia64/params.msg 20201202/build/boot/ia64/params.msg
--- 20101020/build/boot/ia64/params.msg 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/ia64/params.msg 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-
-10
- 7fĴ 74Params Screen7f 7010
- 7f70 10
- 7f70 You can enter boot parameters on the Boot: line. 10
- 7f70 10
- 7f70 For the serial console console=ttyS0,9600n8 10
- 7f70 10
- 7f70 Verbose debugging DEBCONF_DEBUG=5 10
- 7f70 Force static network config netcfg/disable_dhcp=true 10
- 7f70 10
- 7f70 Text mode (improves interactivity DEBIAN_FRONTEND=text 10
- 7f70 for slow consoles) 10
- 7f70 10
- 7f70 Rescue mode rescue/enable=true 10
- 7f70 10
- 7f70 10
- 7f70 10
- 7f70 10
- 7f70 10
- 7f70 10
- 7f70 10
- 7f70 Press any key to return to main screen 10
- 7f70 10
- 7f7010
diff -pruN 20101020/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg 20201202/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg
--- 20101020/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg 2010-09-18 18:10:52.000000000 +0000
+++ 20201202/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,18 @@
-set cd=$root
+set default=2
set timeout=-1
+insmod bsd
+insmod cpuid
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+insmod chain
+
if loadfont /boot/grub/font.pf2 ; then
set gfxmode=640x480
+ set gfxpayload=keep
insmod vbe
insmod gfxterm
terminal_output gfxterm
@@ -18,33 +27,69 @@ else
set menu_color_highlight=white/blue
fi
-menuentry "Default install" {
- echo "Loading ..."
- set root=$cd
- kfreebsd /boot/kernel/kfreebsd.gz
- kfreebsd_module /boot/mfsroot.gz type=mfs_root
- set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0
+insmod play
+play 480 440 1
+
+menuentry "Debian GNU/kFreeBSD installer boot menu" {
+ true
}
-menuentry "Automated install" {
- echo "Loading ..."
- set root=$cd
- kfreebsd /boot/kernel/kfreebsd.gz
- kfreebsd_module /boot/mfsroot.gz type=mfs_root
- set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0
- set kFreeBSD.auto=true
- set kFreeBSD.priority=critical
+menuentry "" {
+ true
}
-menuentry "Expert install" {
- echo "Loading ..."
- set root=$cd
- kfreebsd /boot/kernel/kfreebsd.gz
- kfreebsd_module /boot/mfsroot.gz type=mfs_root
- set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0
- set kFreeBSD.priority=low
+function menuentry_set {
+ set kernel_path="$1"
+ set mfsroot_path="$2"
+ set desc_suffix="$3"
+
+ menuentry "Default install$desc_suffix" $kernel_path $mfsroot_path {
+ echo "Loading ..."
+ kfreebsd $2
+ kfreebsd_module $3 type=mfs_root
+ }
+
+ menuentry "Automated install$desc_suffix" $kernel_path $mfsroot_path {
+ echo "Loading ..."
+ kfreebsd $2
+ kfreebsd_module $3 type=mfs_root
+ set kFreeBSD.auto=true
+ set kFreeBSD.priority=critical
+ }
+
+ menuentry "Expert install$desc_suffix" $kernel_path $mfsroot_path {
+ echo "Loading ..."
+ kfreebsd $2
+ kfreebsd_module $3 type=mfs_root
+ set kFreeBSD.priority=low
+ }
}
+# Default kernel
+if test -e /boot/kernel/kfreebsd-9.gz ; then
+ menuentry_set /boot/kernel/kfreebsd-9.gz /boot/mfsroot.gz " (using kernel of FreeBSD 9)"
+
+ if test -e /boot/gtk/mfsroot.gz ; then
+ menuentry "" { true }
+ menuentry_set /boot/kernel/kfreebsd-9.gz /boot/gtk/mfsroot.gz " (graphical mode with kernel of FreeBSD 9)"
+ fi
+fi
+
+# Alternate kernel
+if test -e /boot/kernel/kfreebsd-10.gz ; then
+ # When both options are available, add an empty line in-between.
+ if test -e /boot/kernel/kfreebsd-9.gz ; then
+ menuentry "" { true }
+ fi
+
+ menuentry_set /boot/kernel/kfreebsd-10.gz /boot/mfsroot.gz " (using kernel of FreeBSD 10)"
+
+ if test -e /boot/gtk/mfsroot.gz ; then
+ menuentry "" { true }
+ menuentry_set /boot/kernel/kfreebsd-10.gz /boot/gtk/mfsroot.gz " (graphical mode with kernel of FreeBSD 10)"
+ fi
+fi
+
menuentry "" {
true
}
diff -pruN 20101020/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg 20201202/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg
--- 20101020/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg 2010-09-18 18:10:52.000000000 +0000
+++ 20201202/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,9 @@
+set default=2
set timeout=-1
if loadfont $prefix/font.pf2 ; then
set gfxmode=640x480
+ set gfxpayload=keep
insmod vbe
insmod gfxterm
terminal_output gfxterm
@@ -16,26 +18,34 @@ else
set menu_color_highlight=white/blue
fi
+insmod play
+play 480 440 1
+
+menuentry "Debian GNU/kFreeBSD installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
menuentry "Default install" {
echo "Loading ..."
- kfreebsd $prefix/kfreebsd.gz
+ kfreebsd $prefix/@KERNEL@
kfreebsd_module $prefix/initrd.gz type=mfs_root
- set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0
}
menuentry "Automated install" {
echo "Loading ..."
- kfreebsd $prefix/kfreebsd.gz
+ kfreebsd $prefix/@KERNEL@
kfreebsd_module $prefix/initrd.gz type=mfs_root
- set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0
set kFreeBSD.auto=true
set kFreeBSD.priority=critical
}
menuentry "Expert install" {
echo "Loading ..."
- kfreebsd $prefix/kfreebsd.gz
+ kfreebsd $prefix/@KERNEL@
kfreebsd_module $prefix/initrd.gz type=mfs_root
- set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0
set kFreeBSD.priority=low
}
diff -pruN 20101020/build/boot/kfreebsd/pics/joy-kbsd.svg 20201202/build/boot/kfreebsd/pics/joy-kbsd.svg
--- 20101020/build/boot/kfreebsd/pics/joy-kbsd.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/kfreebsd/pics/joy-kbsd.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GNU/kFreeBSD
+
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/build/boot/kfreebsd/pics/lines-kbsd.svg 20201202/build/boot/kfreebsd/pics/lines-kbsd.svg
--- 20101020/build/boot/kfreebsd/pics/lines-kbsd.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/kfreebsd/pics/lines-kbsd.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,976 @@
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GNU/kFreeBSD
+
diff -pruN 20101020/build/boot/kfreebsd/pics/softwaves-kbsd.svg 20201202/build/boot/kfreebsd/pics/softwaves-kbsd.svg
--- 20101020/build/boot/kfreebsd/pics/softwaves-kbsd.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/kfreebsd/pics/softwaves-kbsd.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,390 @@
+
+
+
+image/svg+xml
\ No newline at end of file
diff -pruN 20101020/build/boot/kfreebsd/xen/debian.cfg 20201202/build/boot/kfreebsd/xen/debian.cfg
--- 20101020/build/boot/kfreebsd/xen/debian.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/kfreebsd/xen/debian.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,172 @@
+#============================================================================
+# Example configuration script for Debian guest installation.
+#============================================================================
+#
+# To install uncomment the relevant options under either the network
+# or CDROM install section in "AT INSTALLATION TIME" below.
+#
+# Once you have installed you should comment out the installation options again
+# (or just delete them) and uncomment the options under "TO BOOT INSTALLED
+# SYSTEM" instead.
+
+#============================================================================
+# AT INSTALLATION TIME
+#============================================================================
+
+#----------------------------------------------------------------------------
+# Network install:
+#----------------------------------------------------------------------------
+#
+# Download kfreebsd and initrd.gz from the same location as this file.
+#
+# e.g. depending on the architecture you wish to install:
+# http://ftp.XX.debian.org/debian/dists/stable/main/installer-kfreebsd-amd64/current/images/netboot/xen/
+# -or-
+# http://ftp.XX.debian.org/debian/dists/stable/main/installer-kfreebsd-i386/current/images/netboot/xen/
+# where XX is a country code, see http://www.debian.org/mirror/list
+# for a complete list of official mirrors. "stable" can be any distro
+# name (e.g. squeeze, wheezy, jessie, stretch, testing, sid, unstable).
+#
+# Uncomment the "kernel" and "ramdisk" options and adjust the path to
+# point to the downloaded files.
+
+#kernel = "kfreebsd"
+#ramdisk = "initrd.gz"
+
+#----------------------------------------------------------------------------
+# CDROM install:
+#----------------------------------------------------------------------------
+#
+# Download an ISO image which supports installation under Xen. Typically these
+# are the amd64+i386 multiarch images. e.g. those under:
+# http://cdimage.debian.org/debian-cd/current/multi-arch/
+#
+# Uncomment "bootloader" and the correct "bootargs" for the
+# architecture you wish to install.
+#
+# Be sure to configure a CDROM device with the installation image in
+# addition to your regular disk HDD in your disk stanza.
+#
+# e.g. for an ISO image:
+# file:/path/to/debian-6.0.0-kfreebsd-amd64-i386-netinst.iso,xvdd:cdrom,r
+# -or- if you have a phyiscal cdrom in your drive, phy:
+# phy:/dev/cdrom,xvdd:cdrom,r
+
+#bootloader="pygrub"
+
+# For kfreebsd-i386:
+#bootargs="--kernel=install.i386/xen/kfreebsd --ramdisk=install.i386/xen/initrd.gz"
+# For kfreebsd-amd64:
+#bootargs="--kernel=install.amd/xen/kfreebsd --ramdisk=install.amd/xen/initrd.gz"
+
+#----------------------------------------------------------------------------
+# Installation options common to all methods
+#----------------------------------------------------------------------------
+#
+# If you configure a vfb below then use "console=tty0" instead of
+# "console=hvc0".
+#
+# You can prepend your own command line options too
+
+#extra = "debian-installer/exit/always_halt=true -- quiet console=hvc0"
+
+#============================================================================
+# TO BOOT INSTALLED SYSTEM
+#
+# Comment all of the above installation options and uncomment the
+# below instead
+#============================================================================
+
+#bootloader="pygrub"
+
+#============================================================================
+# STANDARD OPTIONS
+#============================================================================
+#
+# The following options are common to both installation time and normal booting.
+#
+# Only a subset of the available options are included below.
+# See /usr/share/doc/xen-utils-common/examples for full examples.
+
+#----------------------------------------------------------------------------
+
+# Initial memory allocation (in megabytes) for the new domain.
+memory = 128
+
+# A name for your domain. All domains must have different names.
+name = "ExampleDomain"
+
+# 128-bit UUID for the domain. The default behavior is to generate a new UUID
+# on each call to 'xm create'.
+#uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
+
+# List of which CPUS this domain is allowed to use, default Xen picks
+#cpus = "" # leave to Xen to pick
+#cpus = "0" # all vcpus run on CPU0
+#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+
+# Number of Virtual CPUS to use, default is 1
+#vcpus = 1
+
+#----------------------------------------------------------------------------
+# Define network interfaces.
+
+# By default, no network interfaces are configured. You may have one created
+# with sensible defaults using an empty vif clause:
+#
+# vif = ['']
+#
+# or optionally override backend, bridge, ip, mac, script, type, or vifname:
+#
+# vif = ['mac=00:16:3e:00:00:11, bridge=xenbr0']
+#
+# or more than one interface may be configured:
+#
+# vif = ['', 'bridge=xenbr1']
+
+vif = ['']
+
+#----------------------------------------------------------------------------
+# Define the disk devices you want the domain to have access to, and
+# what you want them accessible as.
+# Each disk entry is of the form phy:UNAME,DEV,MODE
+# where UNAME is the device, DEV is the device name the domain will see,
+# and MODE is r for read-only, w for read-write.
+#
+# NB: Only xvd devices are supported by the kernel in Debian Lenny and later.
+
+disk = ['file:/path/to/disk.img,xvda,w']
+
+#----------------------------------------------------------------------------
+# Define frame buffer device.
+#
+# By default, no frame buffer device is configured.
+#
+# To create one using the SDL backend and sensible defaults:
+#
+# vfb = [ 'type=sdl' ]
+#
+# This uses environment variables XAUTHORITY and DISPLAY. You
+# can override that:
+#
+# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
+#
+# To create one using the VNC backend and sensible defaults:
+#
+# vfb = [ 'type=vnc' ]
+#
+# The backend listens on 127.0.0.1 port 5900+N by default, where N is
+# the domain ID. You can override both address and N:
+#
+# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=1' ]
+#
+# Or you can bind the first unused port above 5900:
+#
+# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
+#
+# You can override the password:
+#
+# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
+#
+# Empty password disables authentication. Defaults to the vncpasswd
+# configured in xend-config.sxp.
diff -pruN 20101020/build/boot/mipsel/cobalt.preseed 20201202/build/boot/mipsel/cobalt.preseed
--- 20101020/build/boot/mipsel/cobalt.preseed 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/boot/mipsel/cobalt.preseed 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# Make sure we won't wait for the user to accept this network-console
-# won't have been started at this point yet.
-d-i lowmem/low note
-
-d-i netcfg/choose_interface select eth0
-d-i netcfg/use_dhcp boolean true
-
-# Fallback to a static IP if DHCP fails
-d-i netcfg/dhcp_failed note
-d-i netcfg/dhcp_options select Configure network manually
-d-i netcfg/get_ipaddress string 192.168.1.77
-d-i netcfg/get_netmask string 255.255.255.0
-d-i netcfg/get_gateway string 192.168.1.1
-d-i netcfg/get_nameservers string 192.168.1.1
-
-# Any hostname and domain names assigned from dhcp take precedence over
-# values set here. However, setting the values still prevents the questions
-# from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
-
diff -pruN 20101020/build/boot/mipsel/colo.nfs-2.6 20201202/build/boot/mipsel/colo.nfs-2.6
--- 20101020/build/boot/mipsel/colo.nfs-2.6 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/boot/mipsel/colo.nfs-2.6 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#:CoLo:#
-#
-# load debian-installer via NFS
-#
-var args ""
-select 'BOOT SELECTION' 50 'install SSH' 'install serial' 'rescue SSH' 'rescue serial'
-goto {menu-option}
-@var title1 'Starting the'
-var title2 'installer (SSH)'
-var initrd "ssh_initrd.gz"
-goto 4
-@var title1 'Starting the'
-var title2 'installer (ttyS)'
-var initrd "serial_initrd.gz"
-goto 3
-@var title1 'Starting rescue'
-var title2 'mode (SSH)'
-var initrd "ssh_initrd.gz"
-var args "rescue/enable=true"
-goto 2
-@var title1 'Starting rescue'
-var title2 'mode (serial)'
-var initrd "serial_initrd.gz"
-var args "rescue/enable=true"
-@lcd "{title1}" "{title2}"
-nfs {dhcp-next-server} {dhcp-root-path} vmlinux-${KERNELVERSION} {initrd}
-relocate
-execute rd_start=0x{initrd-start} rd_size=0x{initrd-size} console=ttyS0,{console-speed} {args}
diff -pruN 20101020/build/boot/mipsel/loongson.cfg 20201202/build/boot/mipsel/loongson.cfg
--- 20101020/build/boot/mipsel/loongson.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/mipsel/loongson.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,8 @@
+default 0
+timeout 0
+showmenu 0
+
+title Boot d-i
+ kernel (usb0,0)/vmlinuz-${KERNELVERSION}
+ initrd (usb0,0)/initrd.gz
+ args nil
diff -pruN 20101020/build/boot/powerpc/bootinfo.txt 20201202/build/boot/powerpc/bootinfo.txt
--- 20101020/build/boot/powerpc/bootinfo.txt 2009-04-21 17:18:57.000000000 +0000
+++ 20201202/build/boot/powerpc/bootinfo.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,266 +0,0 @@
-
-Debian/GNU Linux Installation on IBM CHRP hardware
-Debian/GNU Linux for PowerPC
-boot &device;:\install\yaboot
-
-
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-
-
-
-
diff -pruN 20101020/build/boot/powerpc/boot.msg 20201202/build/boot/powerpc/boot.msg
--- 20101020/build/boot/powerpc/boot.msg 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/powerpc/boot.msg 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE},
-built on ${BUILD_DATE}.
-
-The default option is 'install'. For maximum
-control, you can use the 'expert' option.
-
-If the system fails to boot at all (the typical
-symptom is a white screen which doesn't go away),
-use 'install video=ofonly' or 'expert video=ofonly'.
-
-Press the tab key for a list of options, or type
-'help' for help.
-
-************************************
-If in doubt, just choose 'install', and if that
-doesn't work, try 'install video=ofonly'.
-************************************
diff -pruN 20101020/build/boot/powerpc/grub-cdrom.cfg 20201202/build/boot/powerpc/grub-cdrom.cfg
--- 20101020/build/boot/powerpc/grub-cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/powerpc/grub-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,40 @@
+set default=2
+set timeout=-1
+
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+
+menuentry "Debian GNU/Linux installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ linux ${KERNEL} $options --- quiet
+ initrd ${INITRD}
+}
+
+menuentry "Default install" {
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
diff -pruN 20101020/build/boot/powerpc/hfs.map 20201202/build/boot/powerpc/hfs.map
--- 20101020/build/boot/powerpc/hfs.map 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/powerpc/hfs.map 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# ext. xlate creator type comment
-.hqx Ascii 'BnHx' 'TEXT' "BinHex file"
-.sit Raw 'SIT!' 'SITD' "StuffIT Expander"
-.mov Raw 'TVOD' 'MooV' "QuickTime Movie"
-.deb Raw 'Debn' 'bina' "Debian package"
-.bin Raw 'ddsk' 'DDim' "Floppy or ramdisk image"
-.img Raw 'ddsk' 'DDim' "Floppy or ramdisk image"
-.b Raw 'UNIX' 'tbxi' "bootstrap"
-yaboot Raw 'UNIX' 'boot' "bootstrap"
-vmlinux Raw 'UNIX' 'boot' "bootstrap"
-.conf Raw 'UNIX' 'conf' "bootstrap"
-* Ascii '????' '????' "Text file"
diff -pruN 20101020/build/boot/powerpc/ofboot.b 20201202/build/boot/powerpc/ofboot.b
--- 20101020/build/boot/powerpc/ofboot.b 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/powerpc/ofboot.b 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-
-
-MacRISC MacRISC3 MacRISC4
-
-
-Debian GNU/Linux PowerPC first stage CDROM bootloader
-
-
-" screen" output
-load-base release-load-area
-boot cd:,\install\yaboot
-
-
diff -pruN 20101020/build/boot/powerpc/yaboot.conf 20201202/build/boot/powerpc/yaboot.conf
--- 20101020/build/boot/powerpc/yaboot.conf 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/powerpc/yaboot.conf 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-## This yaboot.conf is for CD booting only, do not use as reference.
-## Debian GNU/Linux PowerPC
-
-default=install
-root=/dev/ram
-
-message=/install/boot.msg
-
-image=/install/${TYPE}-linux
- label=install
- initrd=/install/${TYPE}-initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="--"
- read-only
-
-image=/install/${TYPE}-linux
- label=expert
- initrd=/install/${TYPE}-initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="priority=low --"
- read-only
-
-image=/install/${TYPE}-linux
- label=rescue
- initrd=/install/${TYPE}-initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="rescue/enable=true --"
- read-only
-
-image=/install/${TYPE}-linux
- label=auto
- initrd=/install/${TYPE}-initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="auto=true priority=critical --"
- read-only
diff -pruN 20101020/build/boot/powerpc/yaboot.conf.hd-media 20201202/build/boot/powerpc/yaboot.conf.hd-media
--- 20101020/build/boot/powerpc/yaboot.conf.hd-media 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/powerpc/yaboot.conf.hd-media 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-## This yaboot.conf is for hd-media booting only, do not use as reference.
-## Debian GNU/Linux PowerPC
-
-default=install
-root=/dev/ram
-
-message=/boot.msg
-
-image=/vmlinux
- label=install
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="--"
- read-only
-
-image=/vmlinux
- label=expert
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="priority=low --"
- read-only
-
-image=/vmlinux
- label=rescue
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="rescue/enable=true --"
- read-only
-
-image=/vmlinux
- label=auto
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="auto=true priority=critical --"
- read-only
diff -pruN 20101020/build/boot/powerpc/yaboot.conf.netboot 20201202/build/boot/powerpc/yaboot.conf.netboot
--- 20101020/build/boot/powerpc/yaboot.conf.netboot 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/boot/powerpc/yaboot.conf.netboot 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-## This yaboot.conf is for netbooting only, do not use as reference.
-## Debian GNU/Linux PowerPC
-
-default=install
-root=/dev/ram
-
-message=/boot.msg
-
-image=/vmlinux
- label=install
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="--"
- read-only
-
-image=/vmlinux
- label=expert
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="priority=low --"
- read-only
-
-image=/vmlinux
- label=rescue
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="rescue/enable=true --"
- read-only
-
-image=/vmlinux
- label=auto
- initrd=/initrd.gz
- initrd-size=${RAMDISK_SIZE}
- append="auto=true priority=critical --"
- read-only
diff -pruN 20101020/build/boot/ppc64/grub-cdrom.cfg 20201202/build/boot/ppc64/grub-cdrom.cfg
--- 20101020/build/boot/ppc64/grub-cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/ppc64/grub-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,40 @@
+set default=2
+set timeout=-1
+
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+
+menuentry "Debian GNU/Linux installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ linux ${KERNEL} $options --- quiet
+ initrd ${INITRD}
+}
+
+menuentry "Default install" {
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
diff -pruN 20101020/build/boot/ppc64el/grub-cdrom.cfg 20201202/build/boot/ppc64el/grub-cdrom.cfg
--- 20101020/build/boot/ppc64el/grub-cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/ppc64el/grub-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,40 @@
+set default=2
+set timeout=-1
+
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+
+menuentry "Debian GNU/Linux installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ linux ${KERNEL} $options --- quiet
+ initrd ${INITRD}
+}
+
+menuentry "Default install" {
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
diff -pruN 20101020/build/boot/README.concatenateable_images 20201202/build/boot/README.concatenateable_images
--- 20101020/build/boot/README.concatenateable_images 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/README.concatenateable_images 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,26 @@
+This directory provides installer images in the form of a device-specific
+part (containing the partition table and the system firmware) and a
+device-independent part (containing the actual installer), which can be
+unpacked and concatenated together to build a complete installer image.
+
+The device-specific part is named firmware..img.gz
+and the device-independent part is named partition.img.gz.
+
+In addition to providing several firmware..img.gz files for
+a number of devices with device-specific system firmware, we also
+provide a firmware.none.img.gz file (containing the partition table but
+without any system firmware) to provide generic installer images for
+devices for which no firmware..img.gz file is provided.
+
+To create a complete image from the two parts on Linux systems, you can
+use zcat as follows:
+
+ zcat firmware..img.gz partition.img.gz > complete_image.img
+
+On Windows systems, you have to first decompress the two parts separately,
+which can be done e.g. by using 7-Zip, and then concatenate the decompressed
+parts together by running the command
+
+ copy /b firmware..img + partition.img complete_image.img
+
+in a Windows CMD.exe window.
diff -pruN 20101020/build/boot/README.device-tree 20201202/build/boot/README.device-tree
--- 20101020/build/boot/README.device-tree 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/README.device-tree 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,2 @@
+This directory contains all of the device-tree files shipped by the Debian
+kernel package.
diff -pruN 20101020/build/boot/riscv64/pxe/default-riscv 20201202/build/boot/riscv64/pxe/default-riscv
--- 20101020/build/boot/riscv64/pxe/default-riscv 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/riscv64/pxe/default-riscv 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1 @@
+include debian-installer/riscv64/menu.cfg
diff -pruN 20101020/build/boot/riscv64/pxe/menu.cfg 20201202/build/boot/riscv64/pxe/menu.cfg
--- 20101020/build/boot/riscv64/pxe/menu.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/riscv64/pxe/menu.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,20 @@
+menu title Debian GNU/Linux installer menu
+prompt 1
+
+label install
+ menu label Install
+ menu default
+ linux debian-installer/riscv64/linux
+ initrd debian-installer/riscv64/initrd.gz
+
+label expert
+ menu label Expert Install
+ linux debian-installer/riscv64/linux
+ initrd debian-installer/riscv64/initrd.gz
+ append priority=low
+
+label rescue
+ menu label Rescue Mode
+ linux debian-installer/riscv64/linux
+ initrd debian-installer/riscv64/initrd.gz
+ append rescue/enable=true
diff -pruN 20101020/build/boot/s390x/exec 20201202/build/boot/s390x/exec
--- 20101020/build/boot/s390x/exec 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/s390x/exec 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,11 @@
+/* REXX EXEC TO IPL DEBIAN GNU/LINUX */
+/* FOR S/390 FROM THE VM READER. */
+/* */
+'CP CLOSE RDR'
+'PURGE RDR ALL'
+'SPOOL PUNCH * RDR'
+'PUNCH KERNEL DEBIAN * (NOHEADER'
+'PUNCH PARMFILE DEBIAN * (NOHEADER'
+'PUNCH INITRD DEBIAN * (NOHEADER'
+'CHANGE RDR ALL KEEP NOHOLD'
+'CP IPL 000C CLEAR'
diff -pruN 20101020/build/boot/s390x/parmfile 20201202/build/boot/s390x/parmfile
--- 20101020/build/boot/s390x/parmfile 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/s390x/parmfile 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+ro locale=C
diff -pruN 20101020/build/boot/sparc/debian.txt 20201202/build/boot/sparc/debian.txt
--- 20101020/build/boot/sparc/debian.txt 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/boot/sparc/debian.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-
- Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE}, built on ${BUILD_DATE}.
-Keep it once you have installed your system, as you can boot from it
-to repair the system on your hard disk if that ever becomes necessary.
-
-WARNING: You should completely back up all of your hard disks before
- proceeding. The installation procedure can completely and irreversibly
- erase them! If you haven't made backups yet, remove the rescue CD from
- the drive and press L1-A to get back to the OpenBoot prompt.
-
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
-by applicable law.
-
-[ ENTER - Boot install ] [ Type "expert" - Boot into expert mode ]
- [ Type "rescue" - Boot into rescue mode ]
diff -pruN 20101020/build/boot/sparc/grub-cdrom.cfg 20201202/build/boot/sparc/grub-cdrom.cfg
--- 20101020/build/boot/sparc/grub-cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/sparc/grub-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,40 @@
+set default=2
+set timeout=-1
+
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+
+menuentry "Debian GNU/Linux installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ linux ${KERNEL} $options --- quiet
+ initrd ${INITRD}
+}
+
+menuentry "Default install" {
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
diff -pruN 20101020/build/boot/sparc/notsupported.txt 20201202/build/boot/sparc/notsupported.txt
--- 20101020/build/boot/sparc/notsupported.txt 2009-06-18 13:16:14.000000000 +0000
+++ 20201202/build/boot/sparc/notsupported.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-
-This subarchitecture is currently not supported by Debian.
-Only 64-bit systems are supported (sparc64).
-
-The last Debian release to support sparc32 (sun4m) was Etch (4.0).
diff -pruN 20101020/build/boot/sparc/silo.conf 20201202/build/boot/sparc/silo.conf
--- 20101020/build/boot/sparc/silo.conf 2009-06-18 13:16:14.000000000 +0000
+++ 20201202/build/boot/sparc/silo.conf 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-partition=1
-timeout=600
-message=/boot/debian.txt
-default=install
-initrd=/boot/initrd.gz
-read-write
-
-# Standard boot images
-image[sun4u]=/boot/vmlinuz-sparc64
- label=install
-image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt"
- label=install
-
-# Expert boots
-image[sun4u]=/boot/vmlinuz-sparc64
- label=expert
- append="priority=low"
-image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt"
- label=expert
-
-# Rescue boots
-image[sun4u]=/boot/vmlinuz-sparc64
- label=rescue
- append="rescue/enable=true"
-image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt"
- label=rescue
-
-# Auto install boots
-image[sun4u]=/boot/vmlinuz-sparc64
- label=auto
- append="auto=true priority=critical"
-image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt"
- label=auto
diff -pruN 20101020/build/boot/sparc64/grub-cdrom.cfg 20201202/build/boot/sparc64/grub-cdrom.cfg
--- 20101020/build/boot/sparc64/grub-cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/sparc64/grub-cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,40 @@
+set default=2
+set timeout=-1
+
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+
+menuentry "Debian GNU/Linux installer boot menu" {
+ true
+}
+
+menuentry "" {
+ true
+}
+
+function boot_one {
+ echo "Loading ..."
+ linux ${KERNEL} $options --- quiet
+ initrd ${INITRD}
+}
+
+menuentry "Default install" {
+ boot_one
+}
+
+menuentry "Automated install" {
+ set options="auto=true priority=critical"
+ boot_one
+}
+
+menuentry "Expert install" {
+ set options="priority=low"
+ boot_one
+}
+
+menuentry "Rescue mode" {
+ set options="rescue/enable=true"
+ boot_one
+}
diff -pruN 20101020/build/boot/x86/addrk.cfg 20201202/build/boot/x86/addrk.cfg
--- 20101020/build/boot/x86/addrk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/addrk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+label expertdark
+ menu label E^xpert install
+ kernel ${KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} theme=dark --- ${CONSOLE}
+include ${SYSDIR}rqdrk.cfg
+label autodark
+ menu label ^Automated install
+ kernel ${KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/addrkgtk.cfg 20201202/build/boot/x86/addrkgtk.cfg
--- 20101020/build/boot/x86/addrkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/addrkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+menu hshift 9
+menu width 58
+
+label expertdarkgui
+ menu label Graphical expert install
+ kernel ${KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} theme=dark --- ${CONSOLE}
+include ${SYSDIR}rqdrkgtk.cfg
+label autodarkgui
+ menu label Graphical automated install
+ kernel ${KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/adgtk.cfg 20201202/build/boot/x86/adgtk.cfg
--- 20101020/build/boot/x86/adgtk.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/adgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -4,9 +4,9 @@ menu width 58
label expertgui
menu label Graphical expert install
kernel ${KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- ${CONSOLE}
include ${SYSDIR}rqgtk.cfg
label autogui
menu label Graphical automated install
kernel ${KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/adspk.cfg 20201202/build/boot/x86/adspk.cfg
--- 20101020/build/boot/x86/adspk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/adspk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,16 @@
+menu begin adspk
+ menu label ^Speech-enabled advanced options
+ menu title Speech-enabled advanced options
+ label advancedmenu
+ menu label ^Back..
+ menu exit
+ label expertspk
+ menu label E^xpert speech install
+ kernel ${KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft --- ${CONSOLE}
+ include ${SYSDIR}rqspk.cfg
+ label autospk
+ menu label ^Automated speech install
+ kernel ${KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft --- quiet ${CONSOLE}
+menu end
diff -pruN 20101020/build/boot/x86/adspkgtk.cfg 20201202/build/boot/x86/adspkgtk.cfg
--- 20101020/build/boot/x86/adspkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/adspkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,19 @@
+menu hshift 9
+menu width 58
+
+menu begin adspk
+ menu label ^Speech-enabled advanced options
+ menu title Speech-enabled advanced options
+ label advancedmenu
+ menu label ^Back..
+ menu exit
+ label expertspk
+ menu label E^xpert speech install
+ kernel ${KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} speakup.synth=soft --- ${CONSOLE}
+ include ${SYSDIR}rqspkgtk.cfg
+ label autospk
+ menu label ^Automated speech install
+ kernel ${KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} speakup.synth=soft --- quiet ${CONSOLE}
+menu end
diff -pruN 20101020/build/boot/x86/adtxt.cfg 20201202/build/boot/x86/adtxt.cfg
--- 20101020/build/boot/x86/adtxt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/adtxt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,9 @@
label expert
- menu label ^Expert install
+ menu label E^xpert install
kernel ${KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} --- ${CONSOLE}
include ${SYSDIR}rqtxt.cfg
label auto
menu label ^Automated install
kernel ${KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/amdadgtk.cfg 20201202/build/boot/x86/amdadgtk.cfg
--- 20101020/build/boot/x86/amdadgtk.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/amdadgtk.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-label amd64-expertgui
- menu label 64 bit graphical expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- ${CONSOLE}
-include ${SYSDIR}amdrqgtk.cfg
-label amd64-autogui
- menu label 64 bit graphical automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/amdadtxt.cfg 20201202/build/boot/x86/amdadtxt.cfg
--- 20101020/build/boot/x86/amdadtxt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/amdadtxt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-menu hshift 9
-menu width 58
-
-label amd64-expert
- menu label 64 bit expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${AMD_INITRD} -- ${CONSOLE}
-include ${SYSDIR}amdrqtxt.cfg
-label amd64-auto
- menu label 64 bit automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/amdgtk.cfg 20201202/build/boot/x86/amdgtk.cfg
--- 20101020/build/boot/x86/amdgtk.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/amdgtk.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-label amd64-installgui
- menu label 64 bit graphical install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/amdrqgtk.cfg 20201202/build/boot/x86/amdrqgtk.cfg
--- 20101020/build/boot/x86/amdrqgtk.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/amdrqgtk.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-label amd64-rescuegui
- menu label 64 bit graphical rescue mode
- kernel ${AMD_KERNEL}
- append ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/amdrqtxt.cfg 20201202/build/boot/x86/amdrqtxt.cfg
--- 20101020/build/boot/x86/amdrqtxt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/amdrqtxt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-label amd64-rescue
- menu label 64 bit rescue mode
- kernel ${AMD_KERNEL}
- append ${VIDEO_MODE} initrd=${AMD_INITRD} rescue/enable=true -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/amdtxt.cfg 20201202/build/boot/x86/amdtxt.cfg
--- 20101020/build/boot/x86/amdtxt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/amdtxt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-default64 amd64-install
-label amd64-install
- menu label ^64 bit install
- menu default64
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/adgtkdt.cfg 20201202/build/boot/x86/desktop/adgtkdt.cfg
--- 20101020/build/boot/x86/desktop/adgtkdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/adgtkdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-menu hshift 9
-menu width 58
-
-label expertgui-%desktop%
- menu label Graphical expert install
- kernel ${KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
-label autogui-%desktop%
- menu label Graphical automated install
- kernel ${KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/adtxtdt.cfg 20201202/build/boot/x86/desktop/adtxtdt.cfg
--- 20101020/build/boot/x86/desktop/adtxtdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/adtxtdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-label expert-%desktop%
- menu label ^Expert install
- kernel ${KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
-label auto-%desktop%
- menu label ^Automated install
- kernel ${KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/amdagdt.cfg 20201202/build/boot/x86/desktop/amdagdt.cfg
--- 20101020/build/boot/x86/desktop/amdagdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/amdagdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-label amd64-expertgui-%desktop%
- menu label 64 bit graphical expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- ${CONSOLE}
-label amd64-autogui-%desktop%
- menu label 64 bit graphical automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/amdatdt.cfg 20201202/build/boot/x86/desktop/amdatdt.cfg
--- 20101020/build/boot/x86/desktop/amdatdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/amdatdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-menu hshift 9
-menu width 58
-
-label amd64-expert-%desktop%
- menu label 64 bit expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${AMD_INITRD} -- ${CONSOLE}
-label amd64-auto-%desktop%
- menu label 64 bit automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/amdgtkdt.cfg 20201202/build/boot/x86/desktop/amdgtkdt.cfg
--- 20101020/build/boot/x86/desktop/amdgtkdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/amdgtkdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-label amd64-installgui-%desktop%
- menu label 64 bit graphical install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/amdtxtdt.cfg 20201202/build/boot/x86/desktop/amdtxtdt.cfg
--- 20101020/build/boot/x86/desktop/amdtxtdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/amdtxtdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#default64 amd64-install
-label amd64-install-%desktop%
- menu label ^64 bit install
- menu default64
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/gtkdt.cfg 20201202/build/boot/x86/desktop/gtkdt.cfg
--- 20101020/build/boot/x86/desktop/gtkdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/gtkdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-label installgui-%desktop%
- menu label ^Graphical install
- kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/desktop/menu.cfg 20201202/build/boot/x86/desktop/menu.cfg
--- 20101020/build/boot/x86/desktop/menu.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/menu.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-include ${SYSDIR}%desktop%/txtdt.cfg
-include ${SYSDIR}%desktop%/amdtxtdt.cfg
-include ${SYSDIR}%desktop%/gtkdt.cfg
-include ${SYSDIR}%desktop%/amdgtkdt.cfg
-menu begin advanced-%desktop%
- menu label Advanced options
- menu title %dt-name% advanced options
- include ${SYSDIR}stdmenu.cfg
- label dtmenu-%desktop%
- menu label ^Back..
- menu exit
- include ${SYSDIR}%desktop%/adtxtdt.cfg
- include ${SYSDIR}%desktop%/amdatdt.cfg
- include ${SYSDIR}%desktop%/adgtkdt.cfg
- include ${SYSDIR}%desktop%/amdagdt.cfg
-menu end
-label help-%desktop%
- menu label ^Help
- text help
- Display help screens; type 'menu' at boot prompt to return to this menu
- endtext
- config ${SYSDIR}%desktop%/prompt.cfg
diff -pruN 20101020/build/boot/x86/desktop/prmenu.cfg 20201202/build/boot/x86/desktop/prmenu.cfg
--- 20101020/build/boot/x86/desktop/prmenu.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/prmenu.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-include ${SYSDIR}%desktop%/txt.cfg
-include ${SYSDIR}%desktop%/amdtxt.cfg
-include ${SYSDIR}%desktop%/gtk.cfg
-include ${SYSDIR}%desktop%/amdgtk.cfg
-include ${SYSDIR}%desktop%/adtxt.cfg
-include ${SYSDIR}%desktop%/amdadtxt.cfg
-include ${SYSDIR}%desktop%/adgtk.cfg
-include ${SYSDIR}%desktop%/amdadgtk.cfg
diff -pruN 20101020/build/boot/x86/desktop/prompt.cfg 20201202/build/boot/x86/desktop/prompt.cfg
--- 20101020/build/boot/x86/desktop/prompt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/prompt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-prompt 1
-display ${SYSDIR}f1.txt
-timeout 0
-include ${SYSDIR}%desktop%/prmenu.cfg
-default install
-include ${SYSDIR}exithelp.cfg
-
-f1 ${SYSDIR}f1.txt
-f2 ${SYSDIR}f2.txt
-f3 ${SYSDIR}f3.txt
-f4 ${SYSDIR}f4.txt
-f5 ${SYSDIR}f5.txt
-f6 ${SYSDIR}f6.txt
-f7 ${SYSDIR}f7.txt
-f8 ${SYSDIR}f8.txt
-f9 ${SYSDIR}f9.txt
-f0 ${SYSDIR}f10.txt
diff -pruN 20101020/build/boot/x86/desktop/txtdt.cfg 20201202/build/boot/x86/desktop/txtdt.cfg
--- 20101020/build/boot/x86/desktop/txtdt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/desktop/txtdt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#default install
-label install-%desktop%
- menu label ^Install
- menu default
- kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/drk.cfg 20201202/build/boot/x86/drk.cfg
--- 20101020/build/boot/x86/drk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/drk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,6 @@
+label installdark
+default installdark
+ menu label ^Install
+ menu default
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/drkgtk.cfg 20201202/build/boot/x86/drkgtk.cfg
--- 20101020/build/boot/x86/drkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/drkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,6 @@
+label installdarkgui
+default installdarkgui
+ menu label ^Graphical install
+ menu default
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/drkmenu.cfg 20201202/build/boot/x86/drkmenu.cfg
--- 20101020/build/boot/x86/drkmenu.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/drkmenu.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,21 @@
+menu background #00000000
+menu color title * #FFFFFFFF *
+menu color border * #00000000 #00000000 none
+menu color unsel * #ffffffff #ff000000 *
+menu color hotkey * #ffdddd00 #ff000000 *
+menu color sel * #ffffffff #ff808080 *
+menu color hotsel * #ffdddd00 #ff808080 *
+menu color tabmsg * #ffffffff #00000000 *
+menu color help 37;40 #ffdddd00 #00000000 none
+# XXX When adjusting vshift, take care that rows is set to a small
+# enough value so any possible menu will fit on the screen,
+# rather than falling off the bottom.
+menu vshift 8
+menu rows 12
+# The help line must be at least one line from the bottom.
+menu helpmsgrow 14
+# The command line must be at least one line from the help line.
+menu cmdlinerow 16
+menu timeoutrow 16
+menu tabmsgrow 18
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff -pruN 20101020/build/boot/x86/dtmenu.cfg 20201202/build/boot/x86/dtmenu.cfg
--- 20101020/build/boot/x86/dtmenu.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/dtmenu.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-menu hshift 9
-menu width 58
-
-menu begin desktop
- include ${SYSDIR}stdmenu.cfg
- menu hshift 13
- menu width 49
- menu label Alternative desktop environments
- menu title Desktop environment menu
- label mainmenu-kde
- menu label ^Back..
- text help
- Higher level options install the GNOME desktop environment
- endtext
- menu exit
- menu begin kde-desktop
- include ${SYSDIR}stdmenu.cfg
- menu label ^KDE
- menu title KDE desktop boot menu
- text help
- Select the 'K Desktop Environment' for the Desktop task
- endtext
- label mainmenu-kde
- menu label ^Back..
- menu exit
- include ${SYSDIR}kde/menu.cfg
- menu end
- menu begin lxde-desktop
- include ${SYSDIR}stdmenu.cfg
- menu label ^LXDE
- menu title LXDE desktop boot menu
- text help
- Select the 'Lightweight X11 Desktop Environment' for the Desktop task
- endtext
- label mainmenu-lxde
- menu label ^Back..
- menu exit
- include ${SYSDIR}lxde/menu.cfg
- menu end
- menu begin xfce-desktop
- include ${SYSDIR}stdmenu.cfg
- menu label ^Xfce
- menu title Xfce desktop boot menu
- text help
- Select the 'Xfce lightweight desktop environment' for the Desktop task
- endtext
- label mainmenu-xfce
- menu label ^Back..
- menu exit
- include ${SYSDIR}xfce/menu.cfg
- menu end
-menu end
diff -pruN 20101020/build/boot/x86/f10.txt 20201202/build/boot/x86/f10.txt
--- 20101020/build/boot/x86/f10.txt 2009-01-10 16:12:13.000000000 +0000
+++ 20201202/build/boot/x86/f10.txt 2020-04-09 07:06:18.000000000 +0000
@@ -1,6 +1,6 @@
0fCOPYRIGHTS AND WARRANTIES07 09F1007
-Debian GNU/Linux is Copyright (C) 1993-2009 Software in the Public Interest,
+Debian GNU/Linux is Copyright (C) 1993-2016 Software in the Public Interest,
and others.
The Debian GNU/Linux system is freely redistributable. After installation,
diff -pruN 20101020/build/boot/x86/f2.txt 20201202/build/boot/x86/f2.txt
--- 20101020/build/boot/x86/f2.txt 2008-11-18 03:17:33.000000000 +0000
+++ 20201202/build/boot/x86/f2.txt 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,9 @@
0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207
-You must have at least 44 megabytes of RAM to use this Debian installer.
+You must have at least 170 megabytes of RAM to use this Debian installer.
You should have space on your hard disk to create a new disk partition
-of at least 500 megabytes to install the base system. You'll need more
+of at least 850 megabytes to install the base system. You'll need more
disk space to install additional packages, depending on what you wish
to do with your new Debian system.
diff -pruN 20101020/build/boot/x86/f3.txt.withgtk 20201202/build/boot/x86/f3.txt.withgtk
--- 20101020/build/boot/x86/f3.txt.withgtk 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/boot/x86/f3.txt.withgtk 2020-04-09 07:06:18.000000000 +0000
@@ -2,14 +2,16 @@
0fAvailable boot methods:07
-0finstall07
- Start the installation -- this is the default ${MEDIA_TYPE} install.
0finstallgui07
- Start the installation using the graphical installer.
-0fexpert07
- Start the installation in expert mode, for maximum control.
+ Start the installation using the graphical installer -- this is the
+ default ${MEDIA_TYPE} install
+0finstall07
+ Start the installation using the text mode installer
0fexpertgui07
- Start the installation in expert mode using the graphical installer.
+ Start the installation in expert mode, for maximum control, using
+ the graphical installer
+0fexpert07
+ Start the installation in expert mode using the text mode installer
To use one of these boot methods, type it at the prompt, optionally
followed by any boot parameters. For example:
diff -pruN 20101020/build/boot/x86/f4.txt.withgtk 20201202/build/boot/x86/f4.txt.withgtk
--- 20101020/build/boot/x86/f4.txt.withgtk 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/boot/x86/f4.txt.withgtk 2020-04-09 07:06:18.000000000 +0000
@@ -2,10 +2,10 @@
0fUse one of these boot methods to rescue an existing install:07
-0frescue07
- Boot into rescue mode.
0frescuegui07
Boot into rescue mode using the graphical installer.
+0frescue07
+ Boot into rescue mode.
diff -pruN 20101020/build/boot/x86/f8.txt 20201202/build/boot/x86/f8.txt
--- 20101020/build/boot/x86/f8.txt 2010-05-22 19:06:13.000000000 +0000
+++ 20201202/build/boot/x86/f8.txt 2020-04-09 07:06:18.000000000 +0000
@@ -9,10 +9,10 @@ Disable framebuffer
Don't start PCMCIA 0fhw-detect/start_pcmcia=false07
Force static network config 0fnetcfg/disable_dhcp=true07
Set keyboard map 0fbootkbd=es07
-Select the kde or xfce desktops 0fdesktop=kde07
+Select the desktop 0fdesktop=kde07
Accessibility options (last 2 options not available for all images):
- Use high contrast theme 0ftheme=dark07
+ Use dark contrast theme 0ftheme=dark07
Use Braille tty 0fbrltty=driver,device,texttable07
Use Speakup 0fspeakup.synth=driver07
diff -pruN 20101020/build/boot/x86/grub/grub-efi.cfg 20201202/build/boot/x86/grub/grub-efi.cfg
--- 20101020/build/boot/x86/grub/grub-efi.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/grub/grub-efi.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,25 @@
+if loadfont $prefix/font.pf2 ; then
+ set gfxmode=800x600
+ set gfxpayload=keep
+ insmod efi_gop
+ insmod efi_uga
+ insmod video_bochs
+ insmod video_cirrus
+ insmod gfxterm
+ insmod png
+ terminal_output gfxterm
+fi
+
+if background_image /isolinux/splash.png; then
+ set color_normal=light-gray/black
+ set color_highlight=white/black
+elif background_image /splash.png; then
+ set color_normal=light-gray/black
+ set color_highlight=white/black
+else
+ set menu_color_normal=cyan/blue
+ set menu_color_highlight=white/blue
+fi
+
+insmod play
+play 960 440 1 0 4 440 1
diff -pruN 20101020/build/boot/x86/gtk.cfg 20201202/build/boot/x86/gtk.cfg
--- 20101020/build/boot/x86/gtk.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,6 @@
+default installgui
label installgui
menu label ^Graphical install
+ menu default
kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
+ append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/menu.cfg 20201202/build/boot/x86/menu.cfg
--- 20101020/build/boot/x86/menu.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/menu.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,27 +1,55 @@
-menu hshift 13
-menu width 49
+menu hshift 4
+menu width 70
-menu title Installer boot menu${BEEP}
+menu title ${BEEP}Debian GNU/Linux installer menu (BIOS mode)
include ${SYSDIR}stdmenu.cfg
-include ${SYSDIR}txt.cfg
-include ${SYSDIR}amdtxt.cfg
include ${SYSDIR}gtk.cfg
-include ${SYSDIR}amdgtk.cfg
+include ${SYSDIR}txt.cfg
menu begin advanced
+ menu label ^Advanced options
menu title Advanced options
include ${SYSDIR}stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
- include ${SYSDIR}adtxt.cfg
- include ${SYSDIR}amdadtxt.cfg
include ${SYSDIR}adgtk.cfg
- include ${SYSDIR}amdadgtk.cfg
- include ${SYSDIR}dtmenu.cfg
+ include ${SYSDIR}adtxt.cfg
+ include ${SYSDIR}adspkgtk.cfg
+ include ${SYSDIR}adspk.cfg
+menu end
+menu begin dark
+ menu label Accessible ^dark contrast installer menu
+ menu title Accessible dark contrast option
+ include ${SYSDIR}drkmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include ${SYSDIR}drkgtk.cfg
+ include ${SYSDIR}drk.cfg
+ menu begin advanced
+ menu label ^Advanced options
+ menu title Advanced options
+ include ${SYSDIR}drkmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include ${SYSDIR}addrkgtk.cfg
+ include ${SYSDIR}addrk.cfg
+ menu end
+ include ${SYSDIR}x86drkme.cfg
+ label help
+ menu label ^Help
+ text help
+ Display help screens; type 'menu' at boot prompt to return to this menu
+ endtext
+ config ${SYSDIR}prompt.cfg
menu end
+include ${SYSDIR}x86menu.cfg
label help
menu label ^Help
text help
Display help screens; type 'menu' at boot prompt to return to this menu
endtext
config ${SYSDIR}prompt.cfg
+include ${SYSDIR}spkgtk.cfg
+include ${SYSDIR}spk.cfg
diff -pruN 20101020/build/boot/x86/pics/futurePrototype.svg 20201202/build/boot/x86/pics/futurePrototype.svg
--- 20101020/build/boot/x86/pics/futurePrototype.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/pics/futurePrototype.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/build/boot/x86/pics/joy.svg 20201202/build/boot/x86/pics/joy.svg
--- 20101020/build/boot/x86/pics/joy.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/pics/joy.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,261 @@
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GNU/Linux
+
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/build/boot/x86/pics/lines.svg 20201202/build/boot/x86/pics/lines.svg
--- 20101020/build/boot/x86/pics/lines.svg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/pics/lines.svg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,649 @@
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GNU/Linux
+
diff -pruN 20101020/build/boot/x86/prompt.cfg 20201202/build/boot/x86/prompt.cfg
--- 20101020/build/boot/x86/prompt.cfg 2008-11-19 20:48:21.000000000 +0000
+++ 20201202/build/boot/x86/prompt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -13,4 +13,4 @@ f6 ${SYSDIR}f6.txt
f7 ${SYSDIR}f7.txt
f8 ${SYSDIR}f8.txt
f9 ${SYSDIR}f9.txt
-f0 ${SYSDIR}f10.txt
+f10 ${SYSDIR}f10.txt
diff -pruN 20101020/build/boot/x86/rqdrk.cfg 20201202/build/boot/x86/rqdrk.cfg
--- 20101020/build/boot/x86/rqdrk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/rqdrk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label rescuedark
+ menu label ^Rescue mode
+ kernel ${KERNEL}
+ append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/rqdrkgtk.cfg 20201202/build/boot/x86/rqdrkgtk.cfg
--- 20101020/build/boot/x86/rqdrkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/rqdrkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label rescuedarkgui
+ menu label Graphical rescue mode
+ kernel ${KERNEL}
+ append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/rqgtk.cfg 20201202/build/boot/x86/rqgtk.cfg
--- 20101020/build/boot/x86/rqgtk.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/rqgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,4 @@
label rescuegui
menu label Graphical rescue mode
kernel ${KERNEL}
- append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
+ append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/rqspk.cfg 20201202/build/boot/x86/rqspk.cfg
--- 20101020/build/boot/x86/rqspk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/rqspk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label rescuespk
+ menu label ^Rescue speech mode
+ kernel ${KERNEL}
+ append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/rqspkgtk.cfg 20201202/build/boot/x86/rqspkgtk.cfg
--- 20101020/build/boot/x86/rqspkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/rqspkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label rescuespk
+ menu label ^Rescue speech mode
+ kernel ${KERNEL}
+ append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/rqtxt.cfg 20201202/build/boot/x86/rqtxt.cfg
--- 20101020/build/boot/x86/rqtxt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/rqtxt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,4 @@
label rescue
menu label ^Rescue mode
kernel ${KERNEL}
- append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE}
+ append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/spk.cfg 20201202/build/boot/x86/spk.cfg
--- 20101020/build/boot/x86/spk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/spk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label installspk
+ menu label Install with ^speech synthesis
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/spkgtk.cfg 20201202/build/boot/x86/spkgtk.cfg
--- 20101020/build/boot/x86/spkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/spkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label installspk
+ menu label Install with ^speech synthesis
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD_GTK} speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/stdmenu.cfg 20201202/build/boot/x86/stdmenu.cfg
--- 20101020/build/boot/x86/stdmenu.cfg 2008-11-29 11:10:56.000000000 +0000
+++ 20201202/build/boot/x86/stdmenu.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -5,10 +5,14 @@ menu color sel * #ffffffff #76a1d0ff *
menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
menu color tabmsg * #ffffffff #00000000 *
menu color help 37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
+# XXX When adjusting vshift, take care that rows is set to a small
+# enough value so any possible menu will fit on the screen,
+# rather than falling off the bottom.
+menu vshift 8
+menu rows 12
+# The help line must be at least one line from the bottom.
+menu helpmsgrow 14
+# The command line must be at least one line from the help line.
menu cmdlinerow 16
menu timeoutrow 16
menu tabmsgrow 18
diff -pruN 20101020/build/boot/x86/syslinux.cfg 20201202/build/boot/x86/syslinux.cfg
--- 20101020/build/boot/x86/syslinux.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/syslinux.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,6 @@
# D-I config version 2.0
+# search path for the c32 support libraries (libcom32, libutil etc.)
+path ${SYSDIR}
include ${SYSDIR}menu.cfg
default ${SYSDIR}vesamenu.c32
prompt 0
diff -pruN 20101020/build/boot/x86/txt.cfg 20201202/build/boot/x86/txt.cfg
--- 20101020/build/boot/x86/txt.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/boot/x86/txt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,6 +1,4 @@
-default install
label install
menu label ^Install
- menu default
kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86addrk.cfg 20201202/build/boot/x86/x86addrk.cfg
--- 20101020/build/boot/x86/x86addrk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86addrk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+menu hshift 9
+menu width 58
+
+label x86-expertdark
+ menu label E^xpert install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${X86_INITRD} theme=dark --- ${CONSOLE}
+include ${SYSDIR}x86rqdrk.cfg
+label x86-autodark
+ menu label ^Automated install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${X86_INITRD} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86adgtk.cfg 20201202/build/boot/x86/x86adgtk.cfg
--- 20101020/build/boot/x86/x86adgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86adgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+label x86-expertgui
+ menu label Graphical expert install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} --- ${CONSOLE}
+include ${SYSDIR}x86rqgtk.cfg
+label x86-autogui
+ menu label Graphical automated inst (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86adspk.cfg 20201202/build/boot/x86/x86adspk.cfg
--- 20101020/build/boot/x86/x86adspk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86adspk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,19 @@
+menu hshift 9
+menu width 58
+
+menu begin x86-adspk
+ menu label ^Speech-enabled advanced options
+ menu title Speech-enabled advanced options
+ label x86-advancedmenu
+ menu label ^Back..
+ menu exit
+ label x86-expertspk
+ menu label E^xpert speech install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${X86_INITRD} speakup.synth=soft --- ${CONSOLE}
+ include ${SYSDIR}x86rqspk.cfg
+ label x86-autospk
+ menu label ^Automated speech install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${X86_INITRD} speakup.synth=soft --- quiet ${CONSOLE}
+menu end
diff -pruN 20101020/build/boot/x86/x86adtxt.cfg 20201202/build/boot/x86/x86adtxt.cfg
--- 20101020/build/boot/x86/x86adtxt.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86adtxt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+menu hshift 9
+menu width 58
+
+label x86-expert
+ menu label E^xpert install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${X86_INITRD} --- ${CONSOLE}
+include ${SYSDIR}x86rqtxt.cfg
+label x86-auto
+ menu label ^Automated install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${X86_INITRD} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86akgtk.cfg 20201202/build/boot/x86/x86akgtk.cfg
--- 20101020/build/boot/x86/x86akgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86akgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+label x86-expertdarkgui
+ menu label Graphical expert install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} theme=dark --- ${CONSOLE}
+include ${SYSDIR}x86rkgtk.cfg
+label x86-autodarkgui
+ menu label Graphical automated inst (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86asgtk.cfg 20201202/build/boot/x86/x86asgtk.cfg
--- 20101020/build/boot/x86/x86asgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86asgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,16 @@
+menu begin x86-adspk
+ menu label ^Speech-enabled advanced options
+ menu title Speech-enabled advanced options
+ label x86-advancedmenu
+ menu label ^Back..
+ menu exit
+ label x86-expertspk
+ menu label E^xpert speech install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} speakup.synth=soft --- ${CONSOLE}
+ include ${SYSDIR}x86rsgtk.cfg
+ label x86-autospk
+ menu label ^Automated speech inst (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} speakup.synth=soft --- quiet ${CONSOLE}
+menu end
diff -pruN 20101020/build/boot/x86/x86.cfg 20201202/build/boot/x86/x86.cfg
--- 20101020/build/boot/x86/x86.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,32 @@
+menu hshift 7
+menu width 61
+
+menu title ${BEEP}Debian GNU/Linux i386 installer menu
+include ${SYSDIR}stdmenu.cfg
+
+include ${SYSDIR}x86gtk.cfg
+include ${SYSDIR}x86txt.cfg
+menu begin advanced
+ menu label ^Advanced options
+ menu title Advanced options
+ include ${SYSDIR}stdmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include ${SYSDIR}x86adgtk.cfg
+ include ${SYSDIR}x86adtxt.cfg
+ include ${SYSDIR}x86asgtk.cfg
+ include ${SYSDIR}x86adspk.cfg
+menu end
+menu begin dark
+ menu label Accessible ^dark contrast option
+ include ${SYSDIR}x86drkm.cfg
+menu end
+label help
+ menu label ^Help
+ text help
+ Display help screens; type 'menu' at boot prompt to return to this menu
+ endtext
+ config ${SYSDIR}prompt.cfg
+include ${SYSDIR}x86spgtk.cfg
+include ${SYSDIR}x86spk.cfg
diff -pruN 20101020/build/boot/x86/x86dkgtk.cfg 20201202/build/boot/x86/x86dkgtk.cfg
--- 20101020/build/boot/x86/x86dkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86dkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,6 @@
+label x86-installdarkgui
+default x86-installdarkgui
+ menu label ^Graphical install (32-bit)
+ menu default
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86drk.cfg 20201202/build/boot/x86/x86drk.cfg
--- 20101020/build/boot/x86/x86drk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86drk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,6 @@
+label x86-installdark
+default x86-installdark
+ menu label ^Install (32-bit)
+ menu default
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${X86_INITRD} theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86drkm.cfg 20201202/build/boot/x86/x86drkm.cfg
--- 20101020/build/boot/x86/x86drkm.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86drkm.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,23 @@
+menu title Accessible dark contrast i386 installer menu
+include ${SYSDIR}drkmenu.cfg
+label mainmenu
+ menu label ^Back..
+ menu exit
+include ${SYSDIR}x86dkgtk.cfg
+include ${SYSDIR}x86drk.cfg
+menu begin advanced
+ menu label ^Advanced options
+ menu title Advanced options
+ include ${SYSDIR}drkmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include ${SYSDIR}x86akgtk.cfg
+ include ${SYSDIR}x86addrk.cfg
+menu end
+label help
+ menu label ^Help
+ text help
+ Display help screens; type 'menu' at boot prompt to return to this menu
+ endtext
+ config ${SYSDIR}prompt.cfg
diff -pruN 20101020/build/boot/x86/x86drkme.cfg 20201202/build/boot/x86/x86drkme.cfg
--- 20101020/build/boot/x86/x86drkme.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86drkme.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,5 @@
+menu begin x86dark
+ menu label ^32-bit install options
+ menu title 32-bit install options
+ include ${SYSDIR}x86drkm.cfg
+menu end
diff -pruN 20101020/build/boot/x86/x86gtk.cfg 20201202/build/boot/x86/x86gtk.cfg
--- 20101020/build/boot/x86/x86gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-installgui
+ menu label ^Graphical install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86menu.cfg 20201202/build/boot/x86/x86menu.cfg
--- 20101020/build/boot/x86/x86menu.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86menu.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+menu begin x86
+ menu label ^32-bit install options
+ menu title 32-bit install options
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include ${SYSDIR}stdmenu.cfg
+ include ${SYSDIR}x86.cfg
+menu end
diff -pruN 20101020/build/boot/x86/x86rkgtk.cfg 20201202/build/boot/x86/x86rkgtk.cfg
--- 20101020/build/boot/x86/x86rkgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86rkgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-rescuedarkgui
+ menu label Graphical rescue mode (32-bit)
+ kernel ${X86_KERNEL}
+ append ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} rescue/enable=true theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86rqdrk.cfg 20201202/build/boot/x86/x86rqdrk.cfg
--- 20101020/build/boot/x86/x86rqdrk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86rqdrk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-rescuedark
+ menu label ^Rescue mode (32-bit)
+ kernel ${X86_KERNEL}
+ append ${VIDEO_MODE} initrd=${X86_INITRD} rescue/enable=true theme=dark --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86rqgtk.cfg 20201202/build/boot/x86/x86rqgtk.cfg
--- 20101020/build/boot/x86/x86rqgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86rqgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-rescuegui
+ menu label Graphical rescue mode (32-bit)
+ kernel ${X86_KERNEL}
+ append ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} rescue/enable=true --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86rqspk.cfg 20201202/build/boot/x86/x86rqspk.cfg
--- 20101020/build/boot/x86/x86rqspk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86rqspk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-rescuespk
+ menu label ^Rescue mode speech (32-bit)
+ kernel ${X86_KERNEL}
+ append ${VIDEO_MODE} initrd=${X86_INITRD} rescue/enable=true speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86rqtxt.cfg 20201202/build/boot/x86/x86rqtxt.cfg
--- 20101020/build/boot/x86/x86rqtxt.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86rqtxt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-rescue
+ menu label ^Rescue mode (32-bit)
+ kernel ${X86_KERNEL}
+ append ${VIDEO_MODE} initrd=${X86_INITRD} rescue/enable=true --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86rsgtk.cfg 20201202/build/boot/x86/x86rsgtk.cfg
--- 20101020/build/boot/x86/x86rsgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86rsgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-rescuespk
+ menu label ^Rescue mode speech (32-bit)
+ kernel ${X86_KERNEL}
+ append ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} rescue/enable=true speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86spgtk.cfg 20201202/build/boot/x86/x86spgtk.cfg
--- 20101020/build/boot/x86/x86spgtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86spgtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-installspk
+ menu label 32-bit ^speech install
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${X86_INITRD_GTK} speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86spk.cfg 20201202/build/boot/x86/x86spk.cfg
--- 20101020/build/boot/x86/x86spk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86spk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-installspk
+ menu label 32-bit ^speech install
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${X86_INITRD} speakup.synth=soft --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/x86syslinux.cfg 20201202/build/boot/x86/x86syslinux.cfg
--- 20101020/build/boot/x86/x86syslinux.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86syslinux.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,15 @@
+# D-I config version 3.0
+# search path for the c32 support libraries (libcom32, libutil etc.)
+path ${SYSDIR}
+label archdetect
+ kernel ${SYSDIR}ifcpu64.c32
+ append amd64 -- i386
+label amd64
+ kernel ${SYSDIR}vesamenu.c32
+ append menu.cfg
+label i386
+ kernel ${SYSDIR}vesamenu.c32
+ append x86.cfg
+default archdetect
+prompt 0
+timeout 0
diff -pruN 20101020/build/boot/x86/x86txt.cfg 20201202/build/boot/x86/x86txt.cfg
--- 20101020/build/boot/x86/x86txt.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/x86txt.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+label x86-install
+ menu label ^Install (32-bit)
+ kernel ${X86_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${X86_INITRD} --- quiet ${CONSOLE}
diff -pruN 20101020/build/boot/x86/xen/debian.cfg 20201202/build/boot/x86/xen/debian.cfg
--- 20101020/build/boot/x86/xen/debian.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/boot/x86/xen/debian.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,172 @@
+#============================================================================
+# Example configuration script for Debian guest installation.
+#============================================================================
+#
+# To install uncomment the relevant options under either the network
+# or CDROM install section in "AT INSTALLATION TIME" below.
+#
+# Once you have installed you should comment out the installation options again
+# (or just delete them) and uncomment the options under "TO BOOT INSTALLED
+# SYSTEM" instead.
+
+#============================================================================
+# AT INSTALLATION TIME
+#============================================================================
+
+#----------------------------------------------------------------------------
+# Network install:
+#----------------------------------------------------------------------------
+#
+# Download vmlinuz and initrd.gz from the same location as this file.
+#
+# e.g. depending on the architecture you wish to install:
+# http://ftp.XX.debian.org/debian/dists/stable/main/installer-amd64/current/images/netboot/xen/
+# -or-
+# http://ftp.XX.debian.org/debian/dists/stable/main/installer-i386/current/images/netboot/xen/
+# where XX is a country code, see http://www.debian.org/mirror/list
+# for a complete list of official mirrors. "stable" can be any distro
+# name (e.g. squeeze, wheezy, jessie, stretch, testing, sid, unstable).
+#
+# Uncomment the "kernel" and "ramdisk" options and adjust the path to
+# point to the downloaded files.
+
+#kernel = "vmlinuz"
+#ramdisk = "initrd.gz"
+
+#----------------------------------------------------------------------------
+# CDROM install:
+#----------------------------------------------------------------------------
+#
+# Download an ISO image which supports installation under Xen. Typically these
+# are the amd64+i386 multiarch images. e.g. those under:
+# http://cdimage.debian.org/debian-cd/current/multi-arch/
+#
+# Uncomment "bootloader" and the correct "bootargs" for the
+# architecture you wish to install.
+#
+# Be sure to configure a CDROM device with the installation image in
+# addition to your regular disk HDD in your disk stanza.
+#
+# e.g. for an ISO image:
+# file:/path/to/debian-6.0.0-amd64-i386-netinst.iso,xvdd:cdrom,r
+# -or- if you have a phyiscal cdrom in your drive, phy:
+# phy:/dev/cdrom,xvdd:cdrom,r
+
+#bootloader="pygrub"
+
+# For i386:
+#bootargs="--kernel=install.i386/xen/vmlinuz --ramdisk=install.i386/xen/initrd.gz"
+# For amd64:
+#bootargs="--kernel=install.amd/xen/vmlinuz --ramdisk=install.amd/xen/initrd.gz"
+
+#----------------------------------------------------------------------------
+# Installation options common to all methods
+#----------------------------------------------------------------------------
+#
+# If you configure a vfb below then use "console=tty0" instead of
+# "console=hvc0".
+#
+# You can prepend your own command line options too
+
+#extra = "debian-installer/exit/always_halt=true -- quiet console=hvc0"
+
+#============================================================================
+# TO BOOT INSTALLED SYSTEM
+#
+# Comment all of the above installation options and uncomment the
+# below instead
+#============================================================================
+
+#bootloader="pygrub"
+
+#============================================================================
+# STANDARD OPTIONS
+#============================================================================
+#
+# The following options are common to both installation time and normal booting.
+#
+# Only a subset of the available options are included below.
+# See /usr/share/doc/xen-utils-common/examples for full examples.
+
+#----------------------------------------------------------------------------
+
+# Initial memory allocation (in megabytes) for the new domain.
+memory = 128
+
+# A name for your domain. All domains must have different names.
+name = "ExampleDomain"
+
+# 128-bit UUID for the domain. The default behavior is to generate a new UUID
+# on each call to 'xm create'.
+#uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
+
+# List of which CPUS this domain is allowed to use, default Xen picks
+#cpus = "" # leave to Xen to pick
+#cpus = "0" # all vcpus run on CPU0
+#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+
+# Number of Virtual CPUS to use, default is 1
+#vcpus = 1
+
+#----------------------------------------------------------------------------
+# Define network interfaces.
+
+# By default, no network interfaces are configured. You may have one created
+# with sensible defaults using an empty vif clause:
+#
+# vif = ['']
+#
+# or optionally override backend, bridge, ip, mac, script, type, or vifname:
+#
+# vif = ['mac=00:16:3e:00:00:11, bridge=xenbr0']
+#
+# or more than one interface may be configured:
+#
+# vif = ['', 'bridge=xenbr1']
+
+vif = ['']
+
+#----------------------------------------------------------------------------
+# Define the disk devices you want the domain to have access to, and
+# what you want them accessible as.
+# Each disk entry is of the form phy:UNAME,DEV,MODE
+# where UNAME is the device, DEV is the device name the domain will see,
+# and MODE is r for read-only, w for read-write.
+#
+# NB: Only xvd devices are supported by the kernel in Debian Lenny and later.
+
+disk = ['file:/path/to/disk.img,xvda,w']
+
+#----------------------------------------------------------------------------
+# Define frame buffer device.
+#
+# By default, no frame buffer device is configured.
+#
+# To create one using the SDL backend and sensible defaults:
+#
+# vfb = [ 'type=sdl' ]
+#
+# This uses environment variables XAUTHORITY and DISPLAY. You
+# can override that:
+#
+# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
+#
+# To create one using the VNC backend and sensible defaults:
+#
+# vfb = [ 'type=vnc' ]
+#
+# The backend listens on 127.0.0.1 port 5900+N by default, where N is
+# the domain ID. You can override both address and N:
+#
+# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=1' ]
+#
+# Or you can bind the first unused port above 5900:
+#
+# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
+#
+# You can override the password:
+#
+# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
+#
+# Empty password disables authentication. Defaults to the vncpasswd
+# configured in xend-config.sxp.
diff -pruN 20101020/build/boot/x86/xen/xm-debian.cfg 20201202/build/boot/x86/xen/xm-debian.cfg
--- 20101020/build/boot/x86/xen/xm-debian.cfg 2009-12-15 14:33:37.000000000 +0000
+++ 20201202/build/boot/x86/xen/xm-debian.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-# -*- mode: python; -*-
-#============================================================================
-# Example Python setup script for Debian guest installation.
-#============================================================================
-#
-# Standard options are configured as normal. Only a subset are included below.
-# See /usr/share/doc/xen-utils-common/examples for full examples.
-#
-# After standard options are configure use
-# xm create xm-debian.cfg install=true"
-# to start the Debian Installer.
-#
-# In the installation case the following additional variables exist:
-#
-# COMMON OPTIONS
-# install-method: "cdrom" or "network"
-# install-arch: which architecture to install. e.g. i386 or amd64
-# install-installer: URL or path to the Debian Installer bits. By
-# default for a network install these are located under
-# install-mirror. For a CDROM install the default is a fixed path on
-# the CD.
-# install-kernel, install-ramdisk: URL/path to the installer kernel and
-# ramdisk to use, by default these are located via install-installer.
-# install-extra: extra command line arguments
-#
-# CDROM SPECIFIC OPTIONS
-# install-media: Path to the Debian install media (i.e. an ISO)
-# install-cdrom-device: Name of the CD-ROM device within the guest.
-#
-# NETWORK SPECIFIC OPTIONS
-# install-suite: which Debian version to install. e.g. lenny, squeeze or sid
-# install-mirror: which Debian mirror to use
-# e.g. http://ftp.uk.debian.org/debian
-#============================================================================
-
-
-#----------------------------------------------------------------------------
-# Standard variables
-
-# Initial memory allocation (in megabytes) for the new domain.
-memory = 128
-
-# A name for your domain. All domains must have different names.
-name = "ExampleDomain"
-
-# 128-bit UUID for the domain. The default behavior is to generate a new UUID
-# on each call to 'xm create'.
-#uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
-
-# List of which CPUS this domain is allowed to use, default Xen picks
-#cpus = "" # leave to Xen to pick
-#cpus = "0" # all vcpus run on CPU0
-#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
-
-# Number of Virtual CPUS to use, default is 1
-#vcpus = 1
-
-#----------------------------------------------------------------------------
-# Define network interfaces.
-
-# By default, no network interfaces are configured. You may have one created
-# with sensible defaults using an empty vif clause:
-#
-# vif = ['']
-#
-# or optionally override backend, bridge, ip, mac, script, type, or vifname:
-#
-# vif = ['mac=00:16:3e:00:00:11, bridge=xenbr0']
-#
-# or more than one interface may be configured:
-#
-# vif = ['', 'bridge=xenbr1']
-
-vif = ['']
-
-#----------------------------------------------------------------------------
-# Define the disk devices you want the domain to have access to, and
-# what you want them accessible as.
-# Each disk entry is of the form phy:UNAME,DEV,MODE
-# where UNAME is the device, DEV is the device name the domain will see,
-# and MODE is r for read-only, w for read-write.
-#
-# NB: Only xvd devices are supported by the kernel in Debian Lenny and later.
-
-disk = ['file:/path/to/disk.img,xvda,w']
-
-#----------------------------------------------------------------------------
-# Define frame buffer device.
-#
-# By default, no frame buffer device is configured.
-#
-# To create one using the SDL backend and sensible defaults:
-#
-# vfb = [ 'type=sdl' ]
-#
-# This uses environment variables XAUTHORITY and DISPLAY. You
-# can override that:
-#
-# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
-#
-# To create one using the VNC backend and sensible defaults:
-#
-# vfb = [ 'type=vnc' ]
-#
-# The backend listens on 127.0.0.1 port 5900+N by default, where N is
-# the domain ID. You can override both address and N:
-#
-# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=1' ]
-#
-# Or you can bind the first unused port above 5900:
-#
-# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
-#
-# You can override the password:
-#
-# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
-#
-# Empty password disables authentication. Defaults to the vncpasswd
-# configured in xend-config.sxp.
-
-
-#============================================================================
-# Debian Installer specific variables
-
-def check_bool(name, value):
- value = str(value).lower()
- if value in ('t', 'tr', 'tru', 'true'):
- return True
- return False
-
-global var_check_with_default
-def var_check_with_default(default, var, val):
- if val:
- return val
- return default
-
-xm_vars.var('install', use='Install Debian, default: false', check=check_bool)
-xm_vars.var("install-method",
- use='Installation method to use "cdrom" or "network" (default: @XEN_INSTALL_METHOD@)',
- check=lambda var, val: var_check_with_default('@XEN_INSTALL_METHOD@', var, val))
-
-# install-method == "network"
-xm_vars.var("install-mirror",
- use='Debian mirror to install from (default: http://ftp.debian.org/debian)',
- check=lambda var, val: var_check_with_default('http://ftp.debian.org/debian', var, val))
-xm_vars.var("install-suite",
- use='Debian suite to install (default: @DEBIAN_RELEASE@)',
- check=lambda var, val: var_check_with_default('@DEBIAN_RELEASE@', var, val))
-
-# install-method == "cdrom"
-xm_vars.var("install-media",
- use='Installation media to use (default: None)',
- check=lambda var, val: var_check_with_default(None, var, val))
-xm_vars.var("install-cdrom-device",
- use='Installation media to use (default: xvdd)',
- check=lambda var, val: var_check_with_default('xvdd', var, val))
-
-# Common options
-xm_vars.var("install-arch",
- use='Debian mirror to install from (default: @ARCH@)',
- check=lambda var, val: var_check_with_default('@ARCH@', var, val))
-xm_vars.var("install-extra",
- use='Extra command line options (default: None)',
- check=lambda var, val: var_check_with_default(None, var, val))
-xm_vars.var("install-installer",
- use='Debian installer to use (default: network uses install-mirror; cdrom uses /install.ARCH)',
- check=lambda var, val: var_check_with_default(None, var, val))
-xm_vars.var("install-kernel",
- use='Debian installer kernel to use (default: uses install-installer)',
- check=lambda var, val: var_check_with_default(None, var, val))
-xm_vars.var("install-ramdisk",
- use='Debian installer ramdisk to use (default: uses install-installer)',
- check=lambda var, val: var_check_with_default(None, var, val))
-
-xm_vars.check()
-
-if not xm_vars.env.get('install'):
- bootloader="pygrub"
-elif xm_vars.env['install-method'] == "network":
- import os.path
- print "Install Mirror: %s" % xm_vars.env['install-mirror']
- print "Install Suite: %s" % xm_vars.env['install-suite']
- if xm_vars.env['install-installer']:
- installer = xm_vars.env['install-installer']
- else:
- installer = xm_vars.env['install-mirror']+"/dists/"+xm_vars.env['install-suite'] + \
- "/main/installer-"+xm_vars.env['install-arch']+"/current/images"
- print "Installer: %s" % installer
-
- print
- print "WARNING: Installer kernel and ramdisk are not authenticated."
- print
-
- if xm_vars.env.get('install-kernel'):
- kernelurl = xm_vars.env['install-kernel']
- else:
- kernelurl = installer + "/netboot/xen/vmlinuz"
-
- if xm_vars.env.get('install-ramdisk'):
- ramdiskurl = xm_vars.env['install-ramdisk']
- else:
- ramdiskurl = installer + "/netboot/xen/initrd.gz"
-
- import urllib
- class MyUrlOpener(urllib.FancyURLopener):
- def http_error_default(self, req, fp, code, msg, hdrs):
- raise IOError("%s %s" % (code, msg))
- urlopener = MyUrlOpener()
-
- try:
- print "Fetching %s" % kernelurl
- kernel, _ = urlopener.retrieve(kernelurl)
- print "Fetching %s" % ramdiskurl
- ramdisk, _ = urlopener.retrieve(ramdiskurl)
- except IOError, _:
- raise
-
-elif xm_vars.env['install-method'] == "cdrom":
- arch_path = { 'i386': "/install.386",
- 'amd64': "/install.amd" }
-
- if xm_vars.env['install-media']:
- print "Install Media: %s" % xm_vars.env['install-media']
- else:
- raise OptionError("No installation media given.")
-
- if xm_vars.env['install-installer']:
- installer = xm_vars.env['install-installer']
- else:
- installer = arch_path[xm_vars.env['install-arch']]
-
- print "Installer: %s" % installer
-
- if xm_vars.env.get('install-kernel'):
- kernelpath = xm_vars.env['install-kernel']
- else:
- kernelpath = installer + "/xen/vmlinuz"
-
- if xm_vars.env.get('install-ramdisk'):
- ramdiskpath = xm_vars.env['install-ramdisk']
- else:
- ramdiskpath = installer + "/xen/initrd.gz"
-
- disk.insert(0, 'file:%s,%s:cdrom,r' % (xm_vars.env['install-media'],
- xm_vars.env['install-cdrom-device']))
-
- bootloader="pygrub"
- bootargs="--kernel=%s --ramdisk=%s" % (kernelpath, ramdiskpath)
- print "From CD"
-else:
- print "WARNING: Unknown install-method: %s." % xm_vars.env['install-method']
-
-if xm_vars.env.get('install'):
- # Figure out command line
- if xm_vars.env['install-extra']:
- extras=[xm_vars.env['install-extra']]
- else:
- extras=[]
-
- # Reboot will just restart the installer since this file is not
- # reparsed, so halt and restart that way.
- extras.append("debian-installer/exit/always_halt=true")
- extras.append("--")
- extras.append("quiet")
-
- console="hvc0"
- try:
- if len(vfb) >= 1:
- console="tty0"
- except NameError, e:
- pass
-
- extras.append("console="+ console)
-
- extra = str.join(" ", extras)
- print "command line is \"%s\"" % extra
diff -pruN 20101020/build/config/alpha/miniiso.cfg 20201202/build/config/alpha/miniiso.cfg
--- 20101020/build/config/alpha/miniiso.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/alpha/miniiso.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,6 +1,5 @@
# This is completely meaningless, since the mini-ISO uses prebuilt
# boot images, but some Makefile magic depends on those definitions.
-KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
MEDIA_TYPE = CD-ROM
diff -pruN 20101020/build/config/alpha.cfg 20201202/build/config/alpha.cfg
--- 20101020/build/config/alpha.cfg 2010-02-27 23:38:59.000000000 +0000
+++ 20201202/build/config/alpha.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,18 @@
-MEDIUM_SUPPORTED = cdrom netboot miniiso
+MEDIUM_SUPPORTED = cdrom netboot # miniiso
# The version of the kernel to use.
-KERNELVERSION = 2.6.30-2-alpha-generic
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-alpha-generic
KERNELMAJOR = 2.6
-KERNEL_FLAVOUR = di
-KERNELNAME = vmlinuz
-KERNELIMAGEVERSION = $(KERNELVERSION)
+KERNELNAME = vmlinuz-$(KERNELVERSION)
+VERSIONED_SYSTEM_MAP = t
+
+DEBIAN_RELEASE = unstable
+
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+
+# include firmware files (qlogic, cciss, radeon)
+# EXTRAFILES = `find /lib/firmware/ -type f`
arch_tree:
diff -pruN 20101020/build/config/amd64/cdrom/gtk.cfg 20201202/build/config/amd64/cdrom/gtk.cfg
--- 20101020/build/config/amd64/cdrom/gtk.cfg 2010-03-26 12:17:14.000000000 +0000
+++ 20201202/build/config/amd64/cdrom/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -8,6 +8,8 @@ TYPE = cdrom/isolinux/gtk
EXTRANAME = gtk/
+IS_PURE_GTK = 1
+
KEEP_GI_LANGS = 1
VIDEO_MODE=$(VIDEO_MODE_GTK)
diff -pruN 20101020/build/config/amd64/hd-media/gtk.cfg 20201202/build/config/amd64/hd-media/gtk.cfg
--- 20101020/build/config/amd64/hd-media/gtk.cfg 2010-03-26 12:17:19.000000000 +0000
+++ 20201202/build/config/amd64/hd-media/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -7,6 +7,8 @@ EXTRANAME = gtk/
EXTRATARGETS =
TARGET = $(KERNEL) $(INITRD)
+IS_PURE_GTK = 1
+
KEEP_GI_LANGS = 1
VIDEO_MODE=$(VIDEO_MODE_GTK)
diff -pruN 20101020/build/config/amd64/hd-media.cfg 20201202/build/config/amd64/hd-media.cfg
--- 20101020/build/config/amd64/hd-media.cfg 2010-03-26 12:17:23.000000000 +0000
+++ 20201202/build/config/amd64/hd-media.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,10 @@
FLAVOUR_SUPPORTED = "" gtk
-# Not really a floppy, this is a 239 mb image, large enough to put a
-# netinst iso in, and small enough to fit on a mid-range memory stick,
-# such as those advertised as being 256 mb in size.
-FLOPPY_SIZE = 244736
+# Not really a floppy, this is a 953 MiB image, large enough to put a
+# netinst iso in (being able to fit the full CD on it is just a bonus..),
+# and small enough to fit on a low-end memory stick, such as those
+# advertised as being 1 gigabyte in size.
+FLOPPY_SIZE = 976560
DISK_LABEL = "bootable drive"
MEDIA_TYPE = bootable drive
@@ -16,6 +17,6 @@ EXTRATARGETS = build_hd-media_gtk
INITRD_GTK = dest/hd-media/gtk/initrd.gz
TARGET = $(KERNEL) $(INITRD) $(BOOT)
-MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick"
+MANIFEST-BOOT = "1 gb image (compressed) for USB memory stick"
MANIFEST-INITRD = "for use on USB memory sticks"
MANIFEST-KERNEL = "for use on USB memory sticks"
diff -pruN 20101020/build/config/amd64/netboot.cfg 20201202/build/config/amd64/netboot.cfg
--- 20101020/build/config/amd64/netboot.cfg 2009-06-07 17:27:37.000000000 +0000
+++ 20201202/build/config/amd64/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -10,6 +10,3 @@ BOOT_SCREEN_DIR = $(NETBOOT_PATH)/boot-s
MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
-
-# Syslinux configuration
-SYSLINUX_CFG=all-desktop
diff -pruN 20101020/build/config/amd64/netboot-gtk.cfg 20201202/build/config/amd64/netboot-gtk.cfg
--- 20101020/build/config/amd64/netboot-gtk.cfg 2010-03-26 12:17:23.000000000 +0000
+++ 20201202/build/config/amd64/netboot-gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -14,8 +14,7 @@ MANIFEST-NETBOOT_DIR = "PXE boot directo
MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory (graphical installer)"
MANIFEST-MINIISO = "not so tiny CD image that boots the graphical netboot installer"
-# Syslinux configuration
-SYSLINUX_CFG=all-desktop
+IS_PURE_GTK = 1
KEEP_GI_LANGS = 1
diff -pruN 20101020/build/config/amd64.cfg 20201202/build/config/amd64.cfg
--- 20101020/build/config/amd64.cfg 2010-05-24 14:52:31.000000000 +0000
+++ 20201202/build/config/amd64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -2,11 +2,9 @@ MEDIUM_SUPPORTED = cdrom cdrom-xen netbo
MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
-KERNELVERSION = 2.6.32-5-amd64
+KERNELVERSION = $(LINUX_KERNEL_ABI)-amd64
KERNELMAJOR = 2.6
-KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
-KERNELIMAGEVERSION = $(KERNELVERSION)
# Not used for amd64.
#UPX=upx-ucl-beta
@@ -15,7 +13,16 @@ KERNELIMAGEVERSION = $(KERNELVERSION)
SYSLINUX_CFG=standard
# The default video modes
+# These should be kept in sync with win32-loader's preseed line as
+# defined in graphics.nsi around line 58
VIDEO_MODE="vga=788"
-VIDEO_MODE_GTK="video=vesa:ywrap,mtrr vga=788"
+VIDEO_MODE_GTK="vga=788"
+
+# Configuration for generating EFI images
+GRUB_EFI=y
+GRUB_EFI_PLATFORM=x86_64-efi
+GRUB_EFI_NAME=x64
+# We have support for UEFI Secure Boot on this arch
+EFI_SIGNED=y
include config/x86.cfg
diff -pruN 20101020/build/config/arm64/cdrom/grub.cfg 20201202/build/config/arm64/cdrom/grub.cfg
--- 20101020/build/config/arm64/cdrom/grub.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/cdrom/grub.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with EFI to build a CD"
+MANIFEST-INITRD = "initrd for use with EFI to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "EFI config files for CD"
+
+TYPE = cdrom/grub
diff -pruN 20101020/build/config/arm64/cdrom/gtk.cfg 20201202/build/config/arm64/cdrom/gtk.cfg
--- 20101020/build/config/arm64/cdrom/gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/cdrom/gtk.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,19 @@
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with EFI to build a CD (graphical)"
+MANIFEST-INITRD = "initrd for use with EFI to build a CD (graphical)"
+MANIFEST-DEBIAN_CD_INFO = "EFI config files for CD (graphical)"
+
+TYPE = cdrom/grub/gtk
+
+EXTRANAME = gtk/
+
+IS_PURE_GTK = 1
+
+KEEP_GI_LANGS = 1
+
+VIDEO_MODE=$(VIDEO_MODE_GTK)
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/arm64/cdrom.cfg 20201202/build/config/arm64/cdrom.cfg
--- 20101020/build/config/arm64/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/cdrom.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,3 @@
+FLAVOUR_SUPPORTED = grub gtk
+
+MEDIA_TYPE = CD-ROM
diff -pruN 20101020/build/config/arm64/device-tree.cfg 20201202/build/config/arm64/device-tree.cfg
--- 20101020/build/config/arm64/device-tree.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/device-tree.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+MEDIA_TYPE = device-tree blobs
+
+TARGET = $(DTBS)
+EXTRANAME = $(MEDIUM)/
diff -pruN 20101020/build/config/arm64/netboot.cfg 20201202/build/config/arm64/netboot.cfg
--- 20101020/build/config/arm64/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/netboot.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,38 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO) netboot_images_concatenateable
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+
+IMAGE_SIZE = 100000
+
+.PHONY: netboot_images_concatenateable
+netboot_images_concatenateable: $(TEMP_KERNEL) $(TEMP_INITRD) $(TEMP_DTBS)
+ -rm -rf $(TEMP)/netboot_images_concatenateable
+ mkdir $(TEMP)/netboot_images_concatenateable
+ cp $(TEMP_KERNEL) $(TEMP)/netboot_images_concatenateable/vmlinuz
+ cp $(TEMP_INITRD) $(TEMP)/netboot_images_concatenateable/initrd.gz
+ mkdir $(TEMP)/netboot_images_concatenateable/extlinux
+ cp boot/arm64/extlinux/extlinux.conf $(TEMP)/netboot_images_concatenateable/extlinux/
+ cp -r $(TEMP_DTBS) $(TEMP)/netboot_images_concatenateable/dtbs/
+ cp boot/README.device-tree $(TEMP)/netboot_images_concatenateable/dtbs/README
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)
+ for target in a64-olinuxino nanopi_neo2 orangepi_zero_plus2 pine64_plus pinebook teres_i ; do \
+ echo "Providing u-boot binaries for $$target ..." ; \
+ gen-hd-image -v -s "$(IMAGE_SIZE)" -p 32768 -b firmware -o $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ TARGET=/usr/lib/u-boot/$${target} u-boot-install-sunxi64 $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ gzip -9n $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ done
+ for target in firefly-rk3399 pinebook-pro-rk3399 rockpro64-rk3399 rock64-rk3328 rock-pi-4-rk3399; do \
+ echo "Providing u-boot binaries for $$target ..." ; \
+ gen-hd-image -v -p 32768 -s "$(IMAGE_SIZE)" -b firmware -o $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ TARGET=/usr/lib/u-boot/$${target} u-boot-install-rockchip $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ gzip -9n $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ done
+ gen-hd-image -v -z -p 32768 -b firmware -s "$(IMAGE_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.none.img"
+ gen-hd-image -v -z -p 32768 -b partition -s "$(IMAGE_SIZE)" -i "$(TEMP)/netboot_images_concatenateable" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/partition.img"
+ cp boot/README.concatenateable_images "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/"
diff -pruN 20101020/build/config/arm64/netboot-gtk.cfg 20201202/build/config/arm64/netboot-gtk.cfg
--- 20101020/build/config/arm64/netboot-gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/netboot-gtk.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,53 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+
+TYPE = netboot/gtk
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO) netboot_images_concatenateable
+EXTRANAME = netboot/gtk/
+
+BOOT_SCREEN_DIR = $(NETBOOT_PATH)/boot-screens/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server (graphical installer)"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory (graphical installer)"
+MANIFEST-MINIISO = "not so tiny CD image that boots the graphical netboot installer"
+
+IS_PURE_GTK = 1
+
+KEEP_GI_LANGS = 1
+
+VIDEO_MODE=$(VIDEO_MODE_GTK)
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+EXTRAUDEBS += cdebconf-gtk-entropy
+
+IMAGE_SIZE = 100000
+
+.PHONY: netboot_images_concatenateable
+netboot_images_concatenateable: $(TEMP_KERNEL) $(TEMP_INITRD) $(TEMP_DTBS)
+ -rm -rf $(TEMP)/netboot_images_concatenateable
+ mkdir $(TEMP)/netboot_images_concatenateable
+ cp $(TEMP_KERNEL) $(TEMP)/netboot_images_concatenateable/vmlinuz
+ cp $(TEMP_INITRD) $(TEMP)/netboot_images_concatenateable/initrd.gz
+ mkdir $(TEMP)/netboot_images_concatenateable/extlinux
+ cp boot/arm64/extlinux/extlinux.conf $(TEMP)/netboot_images_concatenateable/extlinux/
+ cp -r $(TEMP_DTBS) $(TEMP)/netboot_images_concatenateable/dtbs/
+ cp boot/README.device-tree $(TEMP)/netboot_images_concatenateable/dtbs/README
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)
+ for target in a64-olinuxino nanopi_neo2 orangepi_zero_plus2 pine64_plus pinebook teres_i ; do \
+ echo "Providing u-boot binaries for $$target ..." ; \
+ gen-hd-image -v -s "$(IMAGE_SIZE)" -p 32768 -b firmware -o $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ TARGET=/usr/lib/u-boot/$${target} u-boot-install-sunxi64 $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ gzip -9n $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ done
+ for target in firefly-rk3399 pinebook-pro-rk3399 rockpro64-rk3399 rock64-rk3328 rock-pi-4-rk3399; do \
+ echo "Providing u-boot binaries for $$target ..." ; \
+ gen-hd-image -v -p 32768 -s "$(IMAGE_SIZE)" -b firmware -o $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ TARGET=/usr/lib/u-boot/$${target} u-boot-install-rockchip $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ gzip -9n $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${target}.img ; \
+ done
+ gen-hd-image -v -z -p 32768 -b firmware -s "$(IMAGE_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.none.img"
+ gen-hd-image -v -z -p 32768 -b partition -s "$(IMAGE_SIZE)" -i "$(TEMP)/netboot_images_concatenateable" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/partition.img"
+ cp boot/README.concatenateable_images "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/"
diff -pruN 20101020/build/config/arm64/u-boot.cfg 20201202/build/config/arm64/u-boot.cfg
--- 20101020/build/config/arm64/u-boot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64/u-boot.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,22 @@
+MEDIA_TYPE = u-boot binaries
+
+TARGET = u-boot-binaries
+EXTRANAME = $(MEDIUM)/
+
+.PHONY: u-boot-binaries
+u-boot-binaries:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/
+ for target in a64-olinuxino nanopi_neo2 orangepi_zero_plus2 pine64_plus pinebook teres_i ; do \
+ echo "Providing u-boot binaries for $$target ..." ; \
+ gen-hd-image -v -b firmware -o $(SOME_DEST)/$(EXTRANAME)/$${target}.img ; \
+ TARGET=/usr/lib/u-boot/$${target} u-boot-install-sunxi64 $(SOME_DEST)/$(EXTRANAME)/$${target}.img ; \
+ gzip -9n $(SOME_DEST)/$(EXTRANAME)/$${target}.img ; \
+ update-manifest "$(SOME_DEST)/$(EXTRANAME)/$${target}.gz" "u-boot image for $${target}" ; \
+ done
+ for target in firefly-rk3399 pinebook-pro-rk3399 rockpro64-rk3399 rock64-rk3328 rock-pi-4-rk3399; do \
+ echo "Providing u-boot binaries for $$target ..." ; \
+ gen-hd-image -v -p 32768 -b firmware -o $(SOME_DEST)/$(EXTRANAME)/$${target}.img ; \
+ TARGET=/usr/lib/u-boot/$${target} u-boot-install-rockchip $(SOME_DEST)/$(EXTRANAME)/$${target}.img ; \
+ gzip -9n $(SOME_DEST)/$(EXTRANAME)/$${target}.img ; \
+ update-manifest "$(SOME_DEST)/$(EXTRANAME)/$${target}.gz" "u-boot image for $${target}" ; \
+ done
diff -pruN 20101020/build/config/arm64.cfg 20201202/build/config/arm64.cfg
--- 20101020/build/config/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,21 @@
+MEDIUM_SUPPORTED = cdrom netboot netboot-gtk device-tree u-boot
+
+KERNELMAJOR = 2.6
+# The version of the kernel to use.
+KERNELVERSION = $(LINUX_KERNEL_ABI)-arm64
+KERNELNAME = vmlinuz
+
+# Configuration for generating EFI images
+GRUB_EFI=y
+GRUB_EFI_PLATFORM=arm64-efi
+GRUB_EFI_NAME=aa64
+# We have support for UEFI Secure Boot on this arch
+EFI_SIGNED=y
+
+# We build a gtk installer for this arch
+GRAPHICAL_INSTALLER=y
+
+arch_boot_screens:
+arch_tree:
+
+include config/arm.cfg
diff -pruN 20101020/build/config/arm.cfg 20201202/build/config/arm.cfg
--- 20101020/build/config/arm.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/arm.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,125 @@
+# Common configuration and targets for armhf and arm64 systems.
+
+# The font to load in GRUB
+GRUB_FONT = /usr/share/grub/ascii.pf2
+
+# Extract GRUB EFI files.
+.PHONY: arm_grub_efi
+arm_grub_efi: $(TEMP_DTBS)
+ifeq ($(GRUB_EFI),y)
+ efi-image -o $(TEMP_GRUB_EFI) -g $(GRUB_EFI_PLATFORM) \
+ -e $(GRUB_EFI_NAME) -n $(NETBOOT_PATH) \
+ -s $(EFI_SIGNED) -d $(TEMP_DTBS)
+endif
+
+# Supply GRUB EFI configuration.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir: arm_grub_efi
+ -rm -f $(TEMP_CD_INFO_DIR)/*
+ mkdir -p $(TEMP_CD_INFO_DIR)
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_INFO_DIR)/grub/; \
+ if [ "$(GRAPHICAL_INSTALLER)" = y ]; then \
+ grub-gencfg \
+ KERNEL /%install%/vmlinuz \
+ INITRD /%install%/initrd.gz \
+ INITRD_GTK /%install%/gtk/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
+ else \
+ grub-gencfg \
+ KERNEL /%install%/vmlinuz \
+ INITRD /%install%/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
+ fi; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM)/; \
+ fi
+
+.PHONY: arch_miniiso
+arch_miniiso: arm_grub_efi
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)
+
+ ln -f $(TEMP_KERNEL) $(TEMP_CD_TREE)/linux
+ ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/initrd.gz
+ if [ "$(GRAPHICAL_INSTALLER)" = y ]; then \
+ mkdir -p $(TEMP_CD_TREE)/gtk; \
+ ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/gtk/initrd.gz; \
+ fi
+
+ mkdir -p $(TEMP_CD_TREE)/.disk
+ echo "Debian GNU/Linux $(DEBIAN_VERSION) $(ARCH) - netboot mini.iso $(BUILD_DATE)"\
+ > $(TEMP_CD_TREE)/.disk/info
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_TREE)/boot/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_TREE)/boot/grub/; \
+ if [ "$(GRAPHICAL_INSTALLER)" = y ]; then \
+ grub-gencfg \
+ KERNEL /linux \
+ INITRD /initrd.gz \
+ INITRD_GTK /gtk/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_CD_TREE)/boot/grub/grub.cfg; \
+ else \
+ grub-gencfg \
+ KERNEL /linux \
+ INITRD /initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_CD_TREE)/boot/grub/grub.cfg; \
+ fi; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_TREE)/boot/grub/$(GRUB_EFI_PLATFORM)/; \
+ mkdir -p $(TEMP_CD_TREE)/EFI/debian; \
+ echo "search --file --set=root /.disk/info" >> $(TEMP_CD_TREE)/EFI/debian/grub.cfg; \
+ echo "set prefix=(\$$root)/boot/grub" >> $(TEMP_CD_TREE)/EFI/debian/grub.cfg; \
+ echo "source \$$prefix/$(GRUB_EFI_PLATFORM)/grub.cfg" >> $(TEMP_CD_TREE)/EFI/debian/grub.cfg; \
+ fi
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ xorriso -as mkisofs -r -J -c boot.cat \
+ -boot-load-size 4 -boot-info-table \
+ -eltorito-alt-boot \
+ --efi-boot boot/grub/efi.img -no-emul-boot \
+ -append_partition 2 0xef $(TEMP_CD_TREE)/boot/grub/efi.img \
+ -partition_cyl_align all \
+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
+ fi
+
+.PHONY: arch_netboot_dir
+arch_netboot_dir: arm_grub_efi
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/initrd.gz
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/*.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
+ cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_EFI_PLATFORM)/; \
+ if [ "$(GRAPHICAL_INSTALLER)" = y ]; then \
+ grub-gencfg \
+ KERNEL /$(NETBOOT_PATH)/linux \
+ INITRD /$(NETBOOT_PATH)/initrd.gz \
+ INITRD_GTK /$(NETBOOT_PATH)/gtk/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
+ else \
+ grub-gencfg \
+ KERNEL /$(NETBOOT_PATH)/linux \
+ INITRD /$(NETBOOT_PATH)/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
+ fi; \
+ fi
diff -pruN 20101020/build/config/armel/ads/cf.cfg 20201202/build/config/armel/ads/cf.cfg
--- 20101020/build/config/armel/ads/cf.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/armel/ads/cf.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-MEDIA_TYPE = compact flash boot image
-
-TARGET = $(RAMDISK)
-EXTRANAME = $(MEDIUM)/
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir
-# hierarchy. Also, the compact flash is mostly useful as a boot device,
-# so get the rest of the installer over the network.
-TYPE=netboot
-
-MANIFEST-RAMDISK = "compact flash initrd for ADS boards"
-# Note: no kernel currently available in Debian, so have to provide your
-# own.
diff -pruN 20101020/build/config/armel/ads.cfg 20201202/build/config/armel/ads.cfg
--- 20101020/build/config/armel/ads.cfg 2009-03-16 00:50:59.000000000 +0000
+++ 20201202/build/config/armel/ads.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-MEDIUM_SUPPORTED = cf
-
-# The version of the kernel to use.
-# FIXME: no kernel in Debian yet for ADS boards, users must provide their own.
-#KERNELVERSION = $(KERNELMAJOR).$(KERNELMINOR)-ads
-KERNELVERSION=
-KERNELNAME=
-# 2.4 kernels are also a possibility, but a faint one at this point.
-KERNELMAJOR=2.6
-
-INITRD_FS = ext2
-
diff -pruN 20101020/build/config/armel/iop32x/netboot.cfg 20201202/build/config/armel/iop32x/netboot.cfg
--- 20101020/build/config/armel/iop32x/netboot.cfg 2010-07-17 15:51:11.000000000 +0000
+++ 20201202/build/config/armel/iop32x/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(TEMP_KERNEL) $(TEMP_INITRD) ss4000e
-EXTRANAME = $(MEDIUM)
-
-# Intel SS4000-e
-ss4000e:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/ss4000e
- # Set machine id to 1212 (0x04bc)
- devio > $(SOME_DEST)/$(EXTRANAME)/ss4000e/zImage 'wl 0xe3a01c04,4' 'wl 0xe38110bc,4'
- cat $(TEMP_KERNEL) >> $(SOME_DEST)/$(EXTRANAME)/ss4000e/zImage
- update-manifest $(SOME_DEST)/$(EXTRANAME)/ss4000e/zImage "kernel for Intel SS4000-e"
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/ss4000e/initrd.gz
- update-manifest $(SOME_DEST)/$(EXTRANAME)/ss4000e/initrd.gz "initrd for Intel SS4000-e"
- mkdir -p $(TEMP)/upgrade
- install -m 755 util/arm/ss4000e/up.sh $(TEMP)/upgrade.sh
- mkdir -p $(TEMP)/upgrade/etc
- echo "fs-bc - 9.9-b999" > $(TEMP)/upgrade/etc/version
- cp $(SOME_DEST)/$(EXTRANAME)/ss4000e/zImage $(TEMP)/upgrade/zImage
- cp $(TEMP_INITRD) $(TEMP)/upgrade/initrd.gz
- (cd $(TEMP) && tar -cpzf ss4000e.tar.gz upgrade)
- util/arm/ss4000e/mkfwimage.sh $(TEMP)/ss4000e.tar.gz $(SOME_DEST)/$(EXTRANAME)/ss4000e/ss4000e.pkg
- update-manifest $(SOME_DEST)/$(EXTRANAME)/ss4000e/ss4000e.pkg "Firmware image for Intel SS4000-E"
-
diff -pruN 20101020/build/config/armel/iop32x/network-console/glantank.cfg 20201202/build/config/armel/iop32x/network-console/glantank.cfg
--- 20101020/build/config/armel/iop32x/network-console/glantank.cfg 2010-07-17 15:51:11.000000000 +0000
+++ 20201202/build/config/armel/iop32x/network-console/glantank.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-TARGET = $(TEMP_KERNEL) $(INITRD) glantank
-EXTRANAME = glantank/
-PRESEED = boot/arm/glantank.preseed
-
-MANIFEST-INITRD = "initrd for GLAN Tank"
-
-glantank:
- # Set machine id to 1100 (0x044c)
- devio > $(SOME_DEST)/$(EXTRANAME)zImage 'wl 0xe3a01c04,4' 'wl 0xe381104c,4'
- cat $(TEMP_KERNEL) >> $(SOME_DEST)/$(EXTRANAME)zImage
- update-manifest $(SOME_DEST)/$(EXTRANAME)zImage "kernel for GLAN Tank"
- cp $(PRESEED) $(SOME_DEST)/$(EXTRANAME)preseed.cfg
-
diff -pruN 20101020/build/config/armel/iop32x/network-console/n2100.cfg 20201202/build/config/armel/iop32x/network-console/n2100.cfg
--- 20101020/build/config/armel/iop32x/network-console/n2100.cfg 2010-07-17 15:51:11.000000000 +0000
+++ 20201202/build/config/armel/iop32x/network-console/n2100.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-TARGET = $(KERNEL) $(INITRD) n2100
-
-# This has to be empty so the generic kernel/ramdisk will be put in the right directory
-EXTRANAME =
-MANIFEST-INITRD = "initrd"
-MANIFEST-KERNEL = "kernel image to netboot"
-
-n2100:
- mkdir -p $(SOME_DEST)
- mkdir -p $(TEMP)/upgrade
- install -m 755 util/arm/thecus/up.sh $(TEMP)/upgrade/
- cp $(TEMP_INITRD) $(TEMP)/upgrade/initrd
- # Set machine id 1101 (0x044d)
- devio > $(TEMP)/upgrade/vmlinuz 'wl 0xe3a01c04,4' 'wl 0xe381104d,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/upgrade/vmlinuz
- echo 9.9.9 > $(TEMP)/upgrade/version
- (cd $(TEMP) && tar -cpzf n2100.tar.gz upgrade)
- util/arm/thecus/pad $(TEMP)/n2100.tar.gz
- openssl enc -e -des -in $(TEMP)/n2100.tar.gz -out $(SOME_DEST)/n2100.bin -K 7A9816A4C275D557 -iv 0 -nosalt -nopad
- update-manifest $(SOME_DEST)/n2100.bin "Firmware image for Thecus N2100"
-
diff -pruN 20101020/build/config/armel/iop32x/network-console/ss4000e.cfg 20201202/build/config/armel/iop32x/network-console/ss4000e.cfg
--- 20101020/build/config/armel/iop32x/network-console/ss4000e.cfg 2010-07-17 15:51:11.000000000 +0000
+++ 20201202/build/config/armel/iop32x/network-console/ss4000e.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-TARGET = $(TEMP_KERNEL) $(INITRD) ss4000e
-EXTRANAME = ss4000e/
-PRESEED = boot/arm/glantank.preseed
-
-MANIFEST-INITRD = "initrd for Intel SS4000-e"
-
-ss4000e:
- # Set machine id to 1212 (0x04bc)
- devio > $(SOME_DEST)/$(EXTRANAME)zImage 'wl 0xe3a01c04,4' 'wl 0xe38110bc,4'
- cat $(TEMP_KERNEL) >> $(SOME_DEST)/$(EXTRANAME)zImage
- update-manifest $(SOME_DEST)/$(EXTRANAME)zImage "kernel for Intel SS4000-e"
- cp $(PRESEED) $(SOME_DEST)/$(EXTRANAME)preseed.cfg
- mkdir -p $(SOME_DEST)
- mkdir -p $(TEMP)/upgrade
- install -m 755 util/arm/ss4000e/up.sh $(TEMP)/upgrade.sh
- mkdir -p $(TEMP)/upgrade/etc
- echo "fs-bc - 9.9-b999" > $(TEMP)/upgrade/etc/version
- cp $(SOME_DEST)/$(EXTRANAME)zImage $(TEMP)/upgrade/zImage
- cp $(TEMP_INITRD) $(TEMP)/upgrade/initrd.gz
- (cd $(TEMP) && tar -cpzf ss4000e.tar.gz upgrade)
- util/arm/ss4000e/mkfwimage.sh $(TEMP)/ss4000e.tar.gz $(SOME_DEST)/ss4000e.pkg
- update-manifest $(SOME_DEST)/ss4000e.pkg "Firmware image for Intel SS4000-E"
diff -pruN 20101020/build/config/armel/iop32x/network-console.cfg 20201202/build/config/armel/iop32x/network-console.cfg
--- 20101020/build/config/armel/iop32x/network-console.cfg 2010-07-17 15:51:11.000000000 +0000
+++ 20201202/build/config/armel/iop32x/network-console.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-FLAVOUR_SUPPORTED = glantank n2100 ss4000e
-
-MEDIA_TYPE = netboot image
-EXTRANAME = $(MEDIUM)/
-TYPE = netboot/network-console
-
diff -pruN 20101020/build/config/armel/iop32x.cfg 20201202/build/config/armel/iop32x.cfg
--- 20101020/build/config/armel/iop32x.cfg 2010-07-17 15:51:12.000000000 +0000
+++ 20201202/build/config/armel/iop32x.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-MEDIUM_SUPPORTED = netboot network-console
-
-KERNELVERSION := $(KERNELVERSION)-iop32x
-
diff -pruN 20101020/build/config/armel/ixp4xx/network-console.cfg 20201202/build/config/armel/ixp4xx/network-console.cfg
--- 20101020/build/config/armel/ixp4xx/network-console.cfg 2010-07-17 15:51:12.000000000 +0000
+++ 20201202/build/config/armel/ixp4xx/network-console.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) nslu2_swap $(SOME_DEST)/$(EXTRANAME)di-nslu2.bin
-EXTRANAME = $(MEDIUM)/
-TYPE = netboot/network-console
-
-MANIFEST-INITRD = "initrd"
-MANIFEST-KERNEL = "kernel image"
-
-# byteswap boot loader, initrd and kernel for NSLU2
-nslu2_swap: $(INITRD) $(KERNEL)
- cp /boot/apex.flash $(TEMP)/apex.flash
- util/pad $(TEMP)/apex.flash 131040 # < 1 block, multiple of 4
- devio "<<"$(TEMP)/apex.flash > $(TEMP)/apex.flash.swapped \
- 'xp $$,4'
- cp $(TEMP)/initrd.gz $(TEMP)/initrd.gz.nslu2
- util/pad $(TEMP)/initrd.gz.nslu2 6291440 # size of partition - 16 for header
- devio "<<"$(TEMP)/initrd.gz.nslu2 > $(TEMP)/initrd.gz.nslu2.swapped \
- 'xp $$,4'
- cp $(TEMP)/$(KERNELNAME) $(TEMP)/$(KERNELNAME).nslu2
- # Let's pad the kernel to 131072 * 11 - 32 so slugimage will pad the
- # kernel area to 131072 * 11, i.e. 11 blocks.
- util/pad $(TEMP)/$(KERNELNAME).nslu2 1441760
- devio "<<"$(TEMP)/$(KERNELNAME).nslu2 > $(TEMP)/$(KERNELNAME).nslu2.swapped \
- 'xp $$,4'
-
-# Generate an image for Linksys NSLU2 which can be flashed
-$(SOME_DEST)/$(EXTRANAME)di-nslu2.bin:
- slugimage -p -L $(TEMP)/apex.flash.swapped -r $(TEMP)/initrd.gz.nslu2.swapped \
- -k $(TEMP)/$(KERNELNAME).nslu2.swapped -o $@
- update-manifest $@ "Flashable firmware image of debian-installer for NSLU2"
-
diff -pruN 20101020/build/config/armel/ixp4xx.cfg 20201202/build/config/armel/ixp4xx.cfg
--- 20101020/build/config/armel/ixp4xx.cfg 2010-09-04 22:16:15.000000000 +0000
+++ 20201202/build/config/armel/ixp4xx.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MEDIUM_SUPPORTED = network-console
-
-KERNELVERSION := $(KERNELVERSION)-ixp4xx
-
-# Uncomment this to build images containing the nslu2's non-free firmware.
-# This assumes you have the firmware installed in /lib/firmware/,
-# from the ixp4xx-microcode package.
-#EXTRAFILES = /lib/firmware/NPE-B.01020201 /lib/firmware/NPE-B
diff -pruN 20101020/build/config/armel/kirkwood/device-tree.cfg 20201202/build/config/armel/kirkwood/device-tree.cfg
--- 20101020/build/config/armel/kirkwood/device-tree.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armel/kirkwood/device-tree.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+MEDIA_TYPE = device-tree blobs
+
+TARGET = $(DTBS)
+EXTRANAME = $(MEDIUM)/
diff -pruN 20101020/build/config/armel/kirkwood/netboot.cfg 20201202/build/config/armel/kirkwood/netboot.cfg
--- 20101020/build/config/armel/kirkwood/netboot.cfg 2010-06-26 17:56:00.000000000 +0000
+++ 20201202/build/config/armel/kirkwood/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,36 +1,47 @@
MEDIA_TYPE = netboot image
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) openrd sheevaplug t5325
-EXTRANAME = $(MEDIUM)
+TARGET = $(INITRD) $(KERNEL) sheevaplug sheevaplug-esata guruplug dreamplug dockstar
+EXTRANAME = $(MEDIUM)/
-# OpenRD
-openrd:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/openrd
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uImage
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uInitrd
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uImage "Linux kernel for OpenRD"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uInitrd "initrd for OpenRD"
+MANIFEST-INITRD = "netboot initrd"
+MANIFEST-KERNEL = "kernel image to netboot"
-# SheevaPlug and GuruPlug
sheevaplug:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uImage
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uInitrd
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uImage "Linux kernel for SheevaPlug"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uInitrd "initrd for SheevaPlug"
- ln -s sheevaplug $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uImage "Linux kernel for GuruPlug"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uInitrd "initrd for GuruPlug"
-
-# HP t5325 Thin Client
-t5325:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/hp/t5325
- mkdir -p $(TEMP)/t5325
- # Set machine id 2846 (0x0b1e)
- devio > $(TEMP)/t5325/kernel 'wl 0xe3a01c0b,4' 'wl 0xe381101e,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/t5325/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/t5325/kernel $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uImage.usb
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uInitrd.usb
- update-manifest $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uImage.usb "Linux kernel for HP t5325"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uInitrd.usb "initrd for HP t5325"
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-sheevaplug.dtb > $(TEMP)/vmlinuz-sheevaplug
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-sheevaplug $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug/uImage
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug/uImage "Linux kernel for SheevaPlug"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug/uInitrd "initrd for SheevaPlug"
+sheevaplug-esata: sheevaplug
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug-esata
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-sheevaplug-esata.dtb > $(TEMP)/vmlinuz-sheevaplug-esata
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-sheevaplug-esata $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug-esata/uImage
+ ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug-esata/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug-esata/uImage "Linux kernel for SheevaPlug eSATA"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/sheevaplug-esata/uInitrd "initrd for SheevaPlug eSATA"
+
+guruplug: sheevaplug
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)marvell/guruplug
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-guruplug-server-plus.dtb > $(TEMP)/vmlinuz-guruplug
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-guruplug $(SOME_DEST)/$(EXTRANAME)marvell/guruplug/uImage
+ ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)marvell/guruplug/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/guruplug/uImage "Linux kernel for GuruPlug"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/guruplug/uInitrd "initrd for GuruPlug"
+
+dreamplug: sheevaplug
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)marvell/dreamplug
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dreamplug.dtb > $(TEMP)/vmlinuz-dreamplug
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-dreamplug $(SOME_DEST)/$(EXTRANAME)marvell/dreamplug/uImage
+ ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)marvell/dreamplug/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/dreamplug/uImage "Linux kernel for DreamPlug"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)marvell/dreamplug/uInitrd "initrd for DreamPlug"
+
+dockstar:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)seagate/dockstar
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dockstar.dtb > $(TEMP)/vmlinuz-dockstar
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-dockstar $(SOME_DEST)/$(EXTRANAME)seagate/dockstar/uImage
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)seagate/dockstar/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)seagate/dockstar/uImage "Linux kernel for Seagate DockStar"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)seagate/dockstar/uInitrd "initrd for Seagate DockStar"
diff -pruN 20101020/build/config/armel/kirkwood/netboot-gtk.cfg 20201202/build/config/armel/kirkwood/netboot-gtk.cfg
--- 20101020/build/config/armel/kirkwood/netboot-gtk.cfg 2010-07-26 21:25:31.000000000 +0000
+++ 20201202/build/config/armel/kirkwood/netboot-gtk.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) openrd t5325
-
-TYPE = netboot/gtk
-EXTRANAME = netboot/gtk/
-
-KEEP_GI_LANGS = 1
-
-# All images that include cdebconf should include symbols needed by these
-# plugins.
-EXTRAUDEBS += cdebconf-gtk-entropy
-
-# OpenRD
-openrd:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/openrd
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uImage
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uInitrd
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uImage "Linux kernel for OpenRD"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uInitrd "initrd for OpenRD"
-
-# HP t5325 Thin Client
-t5325:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/hp/t5325
- mkdir -p $(TEMP)/t5325
- # Set machine id 2846 (0x0b1e)
- devio > $(TEMP)/t5325/kernel 'wl 0xe3a01c0b,4' 'wl 0xe381101e,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/t5325/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/t5325/kernel $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uImage.usb
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uInitrd.usb
- update-manifest $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uImage.usb "Linux kernel for HP t5325"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/hp/t5325/uInitrd.usb "initrd for HP t5325"
-
diff -pruN 20101020/build/config/armel/kirkwood/network-console.cfg 20201202/build/config/armel/kirkwood/network-console.cfg
--- 20101020/build/config/armel/kirkwood/network-console.cfg 2010-07-17 15:51:12.000000000 +0000
+++ 20201202/build/config/armel/kirkwood/network-console.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,42 +1,133 @@
MEDIA_TYPE = netboot image (SSH)
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) ts219 ts41x
-EXTRANAME = $(MEDIUM)
+TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-320 lacie lschlv2 lsqvl lsvl lswsxl lswvl lswxl lsxhl
+EXTRANAME = $(MEDIUM)/
TYPE = netboot/network-console
-# QNAP TS-119, TS-219 and TS-219P
-ts219:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219
- mkdir -p $(TEMP)/ts-219
- echo "TS-11x/TS-21x" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/model
- # Set machine id 2139 (0x085b)
- devio > $(TEMP)/ts-219/kernel 'wl 0xe3a01c08,4' 'wl 0xe381105b,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/ts-219/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-219/kernel $(TEMP)/ts-219/kernel.uboot
- cp $(TEMP)/ts-219/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/kernel
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz
- util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz 9437184
- install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/flash-debian
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/flash-debian "Script to flash debian-installer"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/kernel "Linux kernel for QNAP TS-119, TS-219 and TS-219P"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz "initrd for QNAP TS-119, TS-219 and TS-219P"
- ln -s ts-219 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-119
- ln -s ts-219 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219p
-
-# QNAP TS-41x
-ts41x:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x
- mkdir -p $(TEMP)/ts-41x
- echo "TS-41x" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/model
- # Set machine id 2502 (0x09c6)
- devio > $(TEMP)/ts-41x/kernel 'wl 0xe3a01c09,4' 'wl 0xe38110c6,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/ts-41x/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-41x/kernel $(TEMP)/ts-41x/kernel.uboot
- cp $(TEMP)/ts-41x/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/kernel
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz
- util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz 9437184
- install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/flash-debian
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/flash-debian "Script to flash debian-installer"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/kernel "Linux kernel for QNAP TS-41x"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz "initrd for QNAP TS-41x"
+TEMP_INITRD_XZ = $(TEMP)/initrd.xz
+$(TEMP_INITRD_XZ): $(TEMP_INITRD)
+ zcat $(TEMP_INITRD) | xz --check=crc32 -9 > $(TEMP_INITRD_XZ)
+
+# D-Link DNS-320
+dns-320:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)d-link/dns-320
+ mkdir -p $(TEMP)/dns-320
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dns320.dtb > $(TEMP)/dns-320/vmlinuz-dns320
+ mkimage -A arm -O linux -T kernel -C none -e 0x00008000 -a 0x00008000 -n "Debian kernel" -d $(TEMP)/dns-320/vmlinuz-dns320 $(TEMP)/dns-320/kernel.uboot
+ mkimage -A arm -O linux -T ramdisk -C gzip -e 0x00e00000 -a 0x00e00000 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(TEMP)/dns-320/initrd.uboot
+ mkdns323fw -k $(TEMP)/dns-320/kernel.uboot -i $(TEMP)/dns-320/initrd.uboot -t DNS-320 -o $(SOME_DEST)/$(EXTRANAME)d-link/dns-320/netboot.img
+ update-manifest $(SOME_DEST)/$(EXTRANAME)d-link/dns-320/netboot.img "installer image (dlink firmware) for D-Link DNS-320"
+
+# LaCie NAS series: Network Space v2 (and parents), d2 Network v2 and *Big Network v2
+lacie:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)lacie/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/uInitrd "initrd for LaCie NAS"
+ # LaCie 2Big Network v2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie/net2big
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-net2big.dtb > $(TEMP)/vmlinuz-net2big
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-net2big $(SOME_DEST)/$(EXTRANAME)lacie/net2big/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/net2big/uImage "Linux kernel for LaCie 2Big Network v2"
+ # LaCie 5Big Network v2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie/net5big
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-net5big.dtb > $(TEMP)/vmlinuz-net5big
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-net5big $(SOME_DEST)/$(EXTRANAME)lacie/net5big/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/net5big/uImage "Linux kernel for LaCie 5Big Network v2"
+ # LaCie Internet Space v2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie/is2
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-is2.dtb > $(TEMP)/vmlinuz-is2
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-is2 $(SOME_DEST)/$(EXTRANAME)lacie/is2/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/is2/uImage "Linux kernel for LaCie Internet Space v2"
+ # LaCie Network Space v2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie/ns2
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ns2.dtb > $(TEMP)/vmlinuz-ns2
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ns2 $(SOME_DEST)/$(EXTRANAME)lacie/ns2/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/ns2/uImage "Linux kernel for LaCie Network Space v2"
+ # LaCie Network Space Max v2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie/ns2max
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ns2max.dtb > $(TEMP)/vmlinuz-ns2max
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ns2max $(SOME_DEST)/$(EXTRANAME)lacie/ns2max/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/ns2max/uImage "Linux kernel for LaCie Network Space Max v2"
+ # LaCie d2 Network v2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie/d2net
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-d2net.dtb > $(TEMP)/vmlinuz-d2net
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-d2net $(SOME_DEST)/$(EXTRANAME)lacie/d2net/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)lacie/d2net/uImage "Linux kernel for LaCie d2 Network v2"
+
+# Buffalo Linkstation LS-CHLv2
+lschlv2:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-lschlv2.dtb > $(TEMP)/vmlinuz-lschlv2
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lschlv2 $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2/uImage.buffalo
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2/initrd.buffalo
+ install -m 744 boot/arm/linkstation-config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2/config-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2/uImage.buffalo "Linux kernel for LS-CHLv2"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chlv2/initrd.buffalo "initrd for LS-CHLv2"
+
+# Buffalo Linkstation LS-VL
+lsvl: lschlv2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-linkstation-lsvl.dtb > $(TEMP)/vmlinuz-lsvl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lsvl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl/uImage.buffalo
+ ln -nfs ../ls-chlv2/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl/
+ ln -nfs ../ls-chlv2/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl/uImage.buffalo "Linux kernel for LS-VL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-vl/initrd.buffalo "initrd for LS-VL"
+
+# Buffalo Linkstation LS-QVL
+lsqvl: lschlv2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-linkstation-lsqvl.dtb > $(TEMP)/vmlinuz-lsqvl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lsqvl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl/uImage.buffalo
+ ln -nfs ../ls-chlv2/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl/
+ ln -nfs ../ls-chlv2/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl/uImage.buffalo "Linux kernel for LS-QVL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-qvl/initrd.buffalo "initrd for LS-QVL"
+
+# Buffalo Linkstation LS-WSXL
+lswsxl: lschlv2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-linkstation-lswsxl.dtb > $(TEMP)/vmlinuz-lswsxl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lswsxl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl/uImage.buffalo
+ ln -nfs ../ls-chlv2/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl/
+ ln -nfs ../ls-chlv2/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl/uImage.buffalo "Linux kernel for LS-WSXL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsxl/initrd.buffalo "initrd for LS-WSXL"
+
+# Buffalo Linkstation LS-WVL
+lswvl: lschlv2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-linkstation-lswvl.dtb > $(TEMP)/vmlinuz-lswvl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lswvl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl/uImage.buffalo
+ ln -nfs ../ls-chlv2/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl/
+ ln -nfs ../ls-chlv2/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl/uImage.buffalo "Linux kernel for LS-WVL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wvl/initrd.buffalo "initrd for LS-WVL"
+
+# Buffalo Linkstation LS-WXL
+lswxl: lschlv2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-linkstation-lswxl.dtb > $(TEMP)/vmlinuz-lswxl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lswxl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl/uImage.buffalo
+ ln -nfs ../ls-chlv2/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl/
+ ln -nfs ../ls-chlv2/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl/uImage.buffalo "Linux kernel for LS-WXL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wxl/initrd.buffalo "initrd for LS-WXL"
+
+# Buffalo Linkstation LS-XHL
+lsxhl: lschlv2
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-lsxhl.dtb > $(TEMP)/vmlinuz-lsxhl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lsxhl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl/uImage.buffalo
+ ln -nfs ../ls-chlv2/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl/
+ ln -nfs ../ls-chlv2/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl/uImage.buffalo "Linux kernel for LS-XHL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-xhl/initrd.buffalo "initrd for LS-XHL"
diff -pruN 20101020/build/config/armel/kirkwood/u-boot.cfg 20201202/build/config/armel/kirkwood/u-boot.cfg
--- 20101020/build/config/armel/kirkwood/u-boot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armel/kirkwood/u-boot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,17 @@
+MEDIA_TYPE = u-boot binaries
+
+TARGET = u-boot-binaries
+EXTRANAME = $(MEDIUM)/
+
+.PHONY: u-boot-binaries
+u-boot-binaries:
+ set -e; while read LINE; \
+ do \
+ if [ -n "$${LINE}" ] && ! echo $${LINE} | grep -q -e "^#"; then \
+ set -- $${LINE}; \
+ mkdir -p "$(SOME_DEST)/$(EXTRANAME)/$$1"; \
+ echo "Providing u-boot binaries for $$1 ..."; \
+ cp "$$2" "$(SOME_DEST)/$(EXTRANAME)/$$1/"; \
+ update-manifest "$(SOME_DEST)/$(EXTRANAME)$$1" "u-boot image for $$1"; \
+ fi; \
+ done < boot/arm/armel-kirkwood-u-boot-image-config
diff -pruN 20101020/build/config/armel/kirkwood.cfg 20201202/build/config/armel/kirkwood.cfg
--- 20101020/build/config/armel/kirkwood.cfg 2010-07-26 21:25:31.000000000 +0000
+++ 20201202/build/config/armel/kirkwood.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,5 +1,5 @@
-MEDIUM_SUPPORTED = netboot netboot-gtk network-console
+MEDIUM_SUPPORTED = netboot network-console device-tree u-boot
# The version of the kernel to use.
-KERNELVERSION := $(KERNELVERSION)-kirkwood
+KERNELVERSION := $(KERNELVERSION)-marvell
diff -pruN 20101020/build/config/armel/orion5x/device-tree.cfg 20201202/build/config/armel/orion5x/device-tree.cfg
--- 20101020/build/config/armel/orion5x/device-tree.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armel/orion5x/device-tree.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+MEDIA_TYPE = device-tree blobs
+
+TARGET = $(DTBS)
+EXTRANAME = $(MEDIUM)/
diff -pruN 20101020/build/config/armel/orion5x/netboot.cfg 20201202/build/config/armel/orion5x/netboot.cfg
--- 20101020/build/config/armel/orion5x/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armel/orion5x/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,45 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) kuroboxpro lsgl lswtgl
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "netboot initrd"
+MANIFEST-KERNEL = "kernel image to netboot"
+
+TEMP_INITRD_XZ = $(TEMP)/initrd.xz
+
+$(TEMP_INITRD_XZ): $(TEMP_INITRD)
+ zcat $(TEMP_INITRD) | xz --check=crc32 -9 > $(TEMP_INITRD_XZ)
+
+# Buffalo Kurobox Pro
+kuroboxpro: $(TEMP_INITRD_XZ)
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-kuroboxpro.dtb > $(TEMP)/vmlinuz-kuroboxpro
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-kuroboxpro $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/uImage.buffalo
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/initrd.buffalo
+ install -m 744 boot/arm/kuroboxpro-config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/config-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/uImage.buffalo "Linux kernel for Kurobox Pro"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/initrd.buffalo "initrd for Kurobox Pro"
+
+# Buffalo Linkstation LS-WTGL
+lswtgl: lsgl
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-linkstation-lswtgl.dtb > $(TEMP)/vmlinuz-lswtgl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lswtgl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/uImage.buffalo
+ ln -nfs ../kuroboxpro/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/
+ ln -nfs ../lspro_ls-gl/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/uImage.buffalo "Linux kernel for Linkstation LS-WTGL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/initrd.buffalo "initrd for Linkstation LS-WTGL"
+
+# Buffalo Linkstation Pro/Live (LS-GL)
+lsgl: kuroboxpro
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-linkstation-lsgl.dtb > $(TEMP)/vmlinuz-lsgl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lsgl $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/uImage.buffalo
+ ln -nfs ../kuroboxpro/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/
+ install -m 744 boot/arm/linkstation-config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/config-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/uImage.buffalo "Linux kernel for Linkstation Pro/Live (LS-GL)"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/initrd.buffalo "initrd for Linkstation Pro/Live (LS-GL)"
diff -pruN 20101020/build/config/armel/orion5x/network-console.cfg 20201202/build/config/armel/orion5x/network-console.cfg
--- 20101020/build/config/armel/orion5x/network-console.cfg 2010-07-17 15:51:11.000000000 +0000
+++ 20201202/build/config/armel/orion5x/network-console.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,101 +1,65 @@
MEDIA_TYPE = netboot image
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-323 kuroboxpro lspro mv2120 ts209 ts409
-EXTRANAME = $(MEDIUM)
+TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) kuroboxpro lschl lsgl lswsgl lswtgl
+EXTRANAME = $(MEDIUM)/
TYPE = netboot/network-console
-# D-Link DNS-323 / Conceptronic CH3SNAS
-dns-323:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323
- mkdir -p $(TEMP)/dns-323
- # Set machine id 1542 (0x0606)
- devio > $(TEMP)/dns-323/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811006,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/dns-323/kernel
- mkimage -A arm -O linux -T kernel -C none -e 0x00008000 -a 0x00008000 -n "Debian kernel" -d $(TEMP)/dns-323/kernel $(TEMP)/dns-323/kernel.uboot
- mkimage -A arm -O linux -T ramdisk -C gzip -e 0x00800000 -a 0x00800000 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(TEMP)/dns-323/initrd.uboot
- mkdns323fw -k $(TEMP)/dns-323/kernel.uboot -i $(TEMP)/dns-323/initrd.uboot -p 7 -c 1 -m 1 -o $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323/netboot.img
- update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323/netboot.img "installer image for D-Link DNS-323"
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/conceptronic/ch3snas
- mkdns323fw -k $(TEMP)/dns-323/kernel.uboot -i $(TEMP)/dns-323/initrd.uboot -p 7 -c 2 -m 1 -o $(SOME_DEST)/$(EXTRANAME)/conceptronic/ch3snas/netboot.img
- update-manifest $(SOME_DEST)/$(EXTRANAME)/conceptronic/ch3snas/netboot.img "installer image for Conceptronic CH3SNAS"
+TEMP_INITRD_XZ = $(TEMP)/initrd.xz
-# Buffalo Kurobox Pro
-kuroboxpro:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro
- mkdir -p $(TEMP)/kuroboxpro
- # Set machine id 1509 (0x05e5)
- devio > $(TEMP)/kuroboxpro/kernel 'wl 0xe3a01c05,4' 'wl 0xe38110e5,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/kuroboxpro/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/kuroboxpro/kernel $(TEMP)/kuroboxpro/kernel.uboot
- cp $(TEMP)/kuroboxpro/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro/uImage.buffalo
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x02000000 -e 0x02000000 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(TEMP)/kuroboxpro/initrd.uboot
- cp $(TEMP)/kuroboxpro/initrd.uboot $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro/initrd.buffalo
- install -m 744 boot/arm/kuroboxpro-config-debian $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro/config-debian
- update-manifest $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro/config-debian "Script to run debian-installer"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro/uImage.buffalo "Linux kernel for Kurobox Pro"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/buffalo/kuroboxpro/initrd.buffalo "initrd for Kurobox Pro"
-
-# Buffalo Linkstation Pro/Live
-lspro:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro
- mkdir -p $(TEMP)/lspro
- # Set machine id 1585 (0x0631)
- devio > $(TEMP)/lspro/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811031,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/lspro/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/lspro/kernel $(TEMP)/lspro/kernel.uboot
- cp $(TEMP)/lspro/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro/uImage.buffalo
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x02000000 -e 0x02000000 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(TEMP)/lspro/initrd.uboot
- cp $(TEMP)/lspro/initrd.uboot $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro/initrd.buffalo
- install -m 744 boot/arm/lspro-config-debian $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro/config-debian
- update-manifest $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro/config-debian "Script to run debian-installer"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro/uImage.buffalo "Linux kernel for Linkstation Pro/Live"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/buffalo/lspro/initrd.buffalo "initrd for Linkstation Pro/Live"
-
-# HP Media Vault mv2120
-mv2120:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/hp/mv2120
- mkdir -p $(TEMP)/mv2120
- # Set machine id 1693 (0x069d)
- devio > $(TEMP)/mv2120/kernel 'wl 0xe3a01c06,4' 'wl 0xe381109d,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/mv2120/kernel
- mkimage -A arm -O linux -T kernel -C none -e 0x01000000 -a 0x01000000 -n "Debian kernel" -d $(TEMP)/mv2120/kernel $(TEMP)/mv2120/kernel.uboot
- util/pad $(TEMP)/mv2120/kernel.uboot 2097152 # 2 MB
- mkimage -A arm -O linux -T ramdisk -C none -n "Debian installer" -d $(TEMP_INITRD) $(TEMP)/mv2120/initrd.uboot
- cat $(TEMP)/mv2120/kernel.uboot $(TEMP)/mv2120/initrd.uboot > $(SOME_DEST)/$(EXTRANAME)/hp/mv2120/netboot.img
- update-manifest $(SOME_DEST)/$(EXTRANAME)/hp/mv2120/netboot.img "installer image for HP Media Vault mv2120/mv51x0"
-
-# QNAP TS-109/TS-209
-ts209:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209
- mkdir -p $(TEMP)/ts-209
- echo "TS-109/TS-209" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/model
- # Set machine id 1565 (0x061d)
- devio > $(TEMP)/ts-209/kernel 'wl 0xe3a01c06,4' 'wl 0xe381101d,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/ts-209/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-209/kernel $(TEMP)/ts-209/kernel.uboot
- cp $(TEMP)/ts-209/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/kernel
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd.gz
- util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd.gz 4194304
- install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/flash-debian
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/flash-debian "Script to flash debian-installer"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/kernel "Linux kernel for QNAP TS-109/TS-209"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd.gz "initrd for QNAP TS-109/TS-209"
- ln -s ts-209 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-109
-
-# QNAP TS-409
-ts409:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409
- mkdir -p $(TEMP)/ts-409
- echo "TS-409" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/model
- # Set machine id 1601 (0x0641)
- devio > $(TEMP)/ts-409/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811041,4'
- cat $(TEMP_KERNEL) >> $(TEMP)/ts-409/kernel
- mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-409/kernel $(TEMP)/ts-409/kernel.uboot
- cp $(TEMP)/ts-409/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/kernel
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd.gz
- util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd.gz 4194304
- install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/flash-debian
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/flash-debian "Script to flash debian-installer"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/kernel "Linux kernel for QNAP TS-409"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd.gz "initrd for QNAP TS-409"
+$(TEMP_INITRD_XZ): $(TEMP_INITRD)
+ zcat $(TEMP_INITRD) | xz --check=crc32 -9 > $(TEMP_INITRD_XZ)
+# Buffalo Kurobox Pro
+kuroboxpro: $(TEMP_INITRD_XZ)
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-kuroboxpro.dtb > $(TEMP)/vmlinuz-kuroboxpro
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-kuroboxpro $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/uImage.buffalo
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/initrd.buffalo
+ install -m 744 boot/arm/kuroboxpro-config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/config-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/uImage.buffalo "Linux kernel for Kurobox Pro"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/kuroboxpro/initrd.buffalo "initrd for Kurobox Pro"
+
+# Buffalo Linkstation Live V3 (LS-CHL)
+lschl: kuroboxpro
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-linkstation-lschl.dtb > $(TEMP)/vmlinuz-lschl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lschl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl/uImage.buffalo
+ ln -nfs ../kuroboxpro/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl/
+ install -m 744 boot/arm/linkstation-config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl/config-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl/uImage.buffalo "Linux kernel for Linkstation Live V3"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-chl/initrd.buffalo "initrd for Linkstation Live V3"
+
+# Buffalo Linkstation LS-WTGL
+lswtgl: lschl
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-linkstation-lswtgl.dtb > $(TEMP)/vmlinuz-lswtgl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lswtgl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/uImage.buffalo
+ ln -nfs ../kuroboxpro/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/
+ ln -nfs ../ls-chl/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/uImage.buffalo "Linux kernel for Linkstation LS-WTGL"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wtgl/initrd.buffalo "initrd for Linkstation LS-WTGL"
+
+# Buffalo Linkstation Mini (LS-WSGL)
+lswsgl: lschl
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-lswsgl.dtb > $(TEMP)/vmlinuz-lswsgl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lswsgl $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl/uImage.buffalo
+ ln -nfs ../kuroboxpro/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl/
+ ln -nfs ../ls-chl/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl/uImage.buffalo "Linux kernel for Linkstation Mini (LS-WSGL)"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/ls-wsgl/initrd.buffalo "initrd for Linkstation Mini (LS-WSGL)"
+
+# Buffalo Linkstation Pro/Live (LS-GL)
+lsgl: lschl
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl
+ cat $(TEMP_KERNEL) $(TEMP_DTBS)/orion5x-linkstation-lsgl.dtb > $(TEMP)/vmlinuz-lsgl
+ mkimage -A arm -O linux -T kernel -C none -a 0x01a00000 -e 0x01a00000 -n "Debian kernel" -d $(TEMP)/vmlinuz-lsgl $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/uImage.buffalo
+ ln -nfs ../kuroboxpro/initrd.buffalo $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/
+ ln -nfs ../ls-chl/config-debian $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/config-debian "Script to run debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/uImage.buffalo "Linux kernel for Linkstation Pro/Live (LS-GL)"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/initrd.buffalo "initrd for Linkstation Pro/Live (LS-GL)"
diff -pruN 20101020/build/config/armel/orion5x.cfg 20201202/build/config/armel/orion5x.cfg
--- 20101020/build/config/armel/orion5x.cfg 2010-07-17 15:51:12.000000000 +0000
+++ 20201202/build/config/armel/orion5x.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,7 @@
-MEDIUM_SUPPORTED = network-console
+MEDIUM_SUPPORTED = netboot network-console device-tree
# The version of the kernel to use.
-KERNELVERSION := $(KERNELVERSION)-orion5x
+KERNELVERSION := $(KERNELVERSION)-marvell
# Drop some additional languages as we're too tight on space here
DROP_LANG = '(ast|eu|ca|gl|nn_NO|se_NO|cy|ga|eo)'
diff -pruN 20101020/build/config/armel/versatile/netboot.cfg 20201202/build/config/armel/versatile/netboot.cfg
--- 20101020/build/config/armel/versatile/netboot.cfg 2009-03-16 00:50:59.000000000 +0000
+++ 20201202/build/config/armel/versatile/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "netboot initrd"
-MANIFEST-KERNEL = "kernel image to netboot"
-
diff -pruN 20101020/build/config/armel/versatile.cfg 20201202/build/config/armel/versatile.cfg
--- 20101020/build/config/armel/versatile.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/armel/versatile.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-MEDIUM_SUPPORTED = netboot
-
-# The version of the kernel to use.
-KERNELVERSION := $(KERNELVERSION)-versatile
diff -pruN 20101020/build/config/armel.cfg 20201202/build/config/armel.cfg
--- 20101020/build/config/armel.cfg 2010-06-02 19:02:01.000000000 +0000
+++ 20201202/build/config/armel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,7 @@
-SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads
+SUBARCH_SUPPORTED = kirkwood orion5x
KERNELMAJOR = 2.6
-KERNELVERSION = 2.6.32-5
-KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
+KERNELVERSION = $(LINUX_KERNEL_ABI)
KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
VERSIONED_SYSTEM_MAP = t
diff -pruN 20101020/build/config/armhf/cdrom/grub.cfg 20201202/build/config/armhf/cdrom/grub.cfg
--- 20101020/build/config/armhf/cdrom/grub.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/cdrom/grub.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with EFI to build a CD"
+MANIFEST-INITRD = "initrd for use with EFI to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "EFI config files for CD"
+
+TYPE = cdrom/grub
diff -pruN 20101020/build/config/armhf/cdrom.cfg 20201202/build/config/armhf/cdrom.cfg
--- 20101020/build/config/armhf/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+# el-torito is too large at the moment, so is disabled.
+FLAVOUR_SUPPORTED = grub
+
+MEDIA_TYPE = CD-ROM
diff -pruN 20101020/build/config/armhf/device-tree.cfg 20201202/build/config/armhf/device-tree.cfg
--- 20101020/build/config/armhf/device-tree.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/device-tree.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+MEDIA_TYPE = device-tree blobs
+
+TARGET = $(DTBS)
+EXTRANAME = $(MEDIUM)/
diff -pruN 20101020/build/config/armhf/hd-media.cfg 20201202/build/config/armhf/hd-media.cfg
--- 20101020/build/config/armhf/hd-media.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/hd-media.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,59 @@
+FLAVOUR_SUPPORTED = ""
+FLOPPY_SIZE = 100000
+
+GZIPPED = .gz
+EXTRANAME = hd-media/
+
+CONCATENATEABLE_SUFFIX =
+
+TARGET = $(KERNEL) $(INITRD) hd-media_bootscript hd-media_tarball hd-media_images_concatenateable
+
+MANIFEST-INITRD = "Initrd for use on USB memory sticks"
+MANIFEST-KERNEL = "Kernel for use on USB memory sticks"
+
+.PHONY: hd-media_bootscript
+hd-media_bootscript:
+ mkimage -T script -A arm -d boot/arm/bootscr.mainline_common $(SOME_DEST)/$(EXTRANAME)boot.scr
+ update-manifest $(SOME_DEST)/$(EXTRANAME)boot.scr "Universal boot script for mainline u-boot (>= v2014.10)"
+
+.PHONY: hd-media_tarball
+hd-media_tarball: $(KERNEL) $(INITRD) $(TEMP_DTBS) hd-media_bootscript
+ -rm -rf $(TEMP)/hd-media
+ mkdir $(TEMP)/hd-media
+ cp $(KERNEL) $(TEMP)/hd-media/vmlinuz
+ cp $(INITRD) $(TEMP)/hd-media/initrd.gz
+ cp $(SOME_DEST)/$(EXTRANAME)boot.scr $(TEMP)/hd-media/boot.scr
+ cp -r $(TEMP_DTBS) $(TEMP)/hd-media/dtbs/
+ cp boot/README.device-tree $(TEMP)/hd-media/dtbs/README
+ tar -C $(TEMP)/hd-media -zcf $(TEMP)/hd-media.tar.gz boot.scr initrd.gz vmlinuz dtbs/
+ mv $(TEMP)/hd-media.tar.gz $(SOME_DEST)/$(EXTRANAME)
+
+.PHONY: hd-media_image_olpc_xo
+hd-media_image_olpc_xo: boot/arm/olpc.fth
+ dd if=/dev/zero bs=512 seek=1985 count=0 of=$(TEMP)/OLPC_XO.boot
+ mkfs.msdos -v -F 16 $(TEMP)/OLPC_XO.boot
+ mmd -i $(TEMP)/OLPC_XO.boot boot
+ mcopy -s -i $(TEMP)/OLPC_XO.boot boot/arm/olpc.fth ::boot
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)
+ gen-hd-image -v -z -b firmware -d 0x0e -s "$(FLOPPY_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.OLPC_XO.img" $(TEMP)/OLPC_XO.boot 63
+
+.PHONY: hd-media_images_concatenateable
+hd-media_images_concatenateable: $(KERNEL) $(INITRD) $(TEMP_DTBS) hd-media_bootscript hd-media_image_olpc_xo
+ -rm -rf $(TEMP)/hd-media_images_concatenateable
+ mkdir $(TEMP)/hd-media_images_concatenateable
+ cp $(KERNEL) $(TEMP)/hd-media_images_concatenateable/vmlinuz
+ cp $(INITRD) $(TEMP)/hd-media_images_concatenateable/initrd.gz
+ cp $(SOME_DEST)/$(EXTRANAME)boot.scr $(TEMP)/hd-media_images_concatenateable/boot.scr
+ cp -r $(TEMP_DTBS) $(TEMP)/hd-media_images_concatenateable/dtbs/
+ cp boot/README.device-tree $(TEMP)/hd-media_images_concatenateable/dtbs/README
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)
+ set -e; while read LINE; \
+ do \
+ if [ -n "$${LINE}" ] && ! echo $${LINE}|grep -q -e "^#"; then \
+ set -- $${LINE} ;\
+ gen-hd-image -v -z -b firmware -s "$(FLOPPY_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${1}.img" "$$2" "$$3" "$$4" "$$5" ;\
+ fi ;\
+ done < boot/arm/u-boot-image-config
+ gen-hd-image -v -z -b firmware -s "$(FLOPPY_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.none.img"
+ gen-hd-image -v -z -b partition -s "$(FLOPPY_SIZE)" -i "$(TEMP)/hd-media_images_concatenateable" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/partition.img"
+ cp boot/README.concatenateable_images "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/"
diff -pruN 20101020/build/config/armhf/netboot.cfg 20201202/build/config/armhf/netboot.cfg
--- 20101020/build/config/armhf/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,60 @@
+MEDIA_TYPE = netboot image
+
+CONCATENATEABLE_SUFFIX =
+TFTP_INSTALLER_PATH = debian-installer/armhf/
+
+TARGET = $(KERNEL) $(INITRD) $(MINIISO) netboot_bootscript_sd netboot_bootscript_tftp netboot_tarball netboot_images_concatenateable
+
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "netboot initrd"
+MANIFEST-KERNEL = "kernel image to netboot"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+
+FLOPPY_SIZE = 100000
+
+GZIPPED = .gz
+
+.PHONY: netboot_bootscript_sd
+netboot_bootscript_sd:
+ mkimage -T script -A arm -d boot/arm/bootscr.mainline_common $(SOME_DEST)/$(EXTRANAME)boot.scr
+ update-manifest $(SOME_DEST)/$(EXTRANAME)boot.scr "Universal boot script for mainline u-boot (>= v2014.10)"
+
+.PHONY: netboot_bootscript_tftp
+netboot_bootscript_tftp:
+ mkimage -T script -A arm -d boot/arm/bootscr.tftpboot $(SOME_DEST)/$(EXTRANAME)tftpboot.scr
+ update-manifest $(SOME_DEST)/$(EXTRANAME)tftpboot.scr "TFTP boot script for mainline u-boot (>= v2014.10)"
+
+.PHONY: netboot_tarball
+netboot_tarball: $(KERNEL) $(INITRD) $(TEMP_DTBS) netboot_bootscript_tftp
+ rm -rf $(TEMP)/netboot_tarball
+ mkdir -p $(TEMP)/netboot_tarball/$(TFTP_INSTALLER_PATH)
+ echo 'Debian version: $(DEBIAN_VERSION)' > $(TEMP)/netboot_tarball/version.info
+ echo 'Installer build: $(BUILD_DATE)' >> $(TEMP)/netboot_tarball/version.info
+ cp $(KERNEL) $(TEMP)/netboot_tarball/$(TFTP_INSTALLER_PATH)vmlinuz
+ cp $(INITRD) $(TEMP)/netboot_tarball/$(TFTP_INSTALLER_PATH)initrd.gz
+ cp -r $(TEMP_DTBS) $(TEMP)/netboot_tarball/$(TFTP_INSTALLER_PATH)dtbs/
+ cp $(SOME_DEST)/$(EXTRANAME)tftpboot.scr $(TEMP)/netboot_tarball/$(TFTP_INSTALLER_PATH)
+ ( cd $(TEMP)/netboot_tarball; ln -s $(TFTP_INSTALLER_PATH)tftpboot.scr boot.scr.uimg )
+ tar -C $(TEMP)/netboot_tarball/ -zcf $(SOME_DEST)/$(EXTRANAME)netboot.tar.gz ./$(TFTP_INSTALLER_PATH)tftpboot.scr ./$(TFTP_INSTALLER_PATH)initrd.gz ./$(TFTP_INSTALLER_PATH)vmlinuz ./$(TFTP_INSTALLER_PATH)dtbs/ ./boot.scr.uimg ./version.info
+
+.PHONY: netboot_images_concatenateable
+netboot_images_concatenateable: $(KERNEL) $(INITRD) $(TEMP_DTBS) netboot_bootscript_sd
+ -rm -rf $(TEMP)/netboot_images_concatenateable
+ mkdir $(TEMP)/netboot_images_concatenateable
+ cp $(KERNEL) $(TEMP)/netboot_images_concatenateable/vmlinuz
+ cp $(INITRD) $(TEMP)/netboot_images_concatenateable/initrd.gz
+ cp $(SOME_DEST)/$(EXTRANAME)boot.scr $(TEMP)/netboot_images_concatenateable/boot.scr
+ cp -r $(TEMP_DTBS) $(TEMP)/netboot_images_concatenateable/dtbs/
+ cp boot/README.device-tree $(TEMP)/netboot_images_concatenateable/dtbs/README
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)
+ set -e; while read LINE; \
+ do \
+ if [ -n "$${LINE}" ] && ! echo $${LINE}|grep -q -e "^#"; then \
+ set -- $${LINE} ;\
+ gen-hd-image -v -z -b firmware -s "$(FLOPPY_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.$${1}.img" "$$2" "$$3" "$$4" "$$5" ;\
+ fi ;\
+ done < boot/arm/u-boot-image-config
+ gen-hd-image -v -z -b firmware -s "$(FLOPPY_SIZE)" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/firmware.none.img"
+ gen-hd-image -v -z -b partition -s "$(FLOPPY_SIZE)" -i "$(TEMP)/netboot_images_concatenateable" -o "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/partition.img"
+ cp boot/README.concatenateable_images "$(SOME_DEST)/$(EXTRANAME)/SD-card-images/$(CONCATENATEABLE_SUFFIX)/"
diff -pruN 20101020/build/config/armhf/netboot-gtk.cfg 20201202/build/config/armhf/netboot-gtk.cfg
--- 20101020/build/config/armhf/netboot-gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/netboot-gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,16 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+
+TYPE = netboot/gtk
+EXTRANAME = netboot/gtk/
+
+MANIFEST-INITRD = "netboot initrd"
+MANIFEST-KERNEL = "kernel image to netboot"
+
+KEEP_GI_LANGS = 1
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/armhf/network-console.cfg 20201202/build/config/armhf/network-console.cfg
--- 20101020/build/config/armhf/network-console.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/network-console.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,24 @@
+MEDIA_TYPE = netboot image (SSH)
+
+TARGET = $(INITRD) $(KERNEL) seagate
+EXTRANAME = $(MEDIUM)/
+TYPE = netboot/network-console
+
+MANIFEST-INITRD = "network-console initrd"
+MANIFEST-KERNEL = "kernel image for network-console"
+
+.PHONY: seagate
+seagate:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud
+ mkimage -A arm -O linux -T kernel -C none -a 0x2000040 -e 0x2000040 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud/uImage
+ update-manifest $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud/uImage "Linux kernel"
+ # Generate an initrd with a preseed file and append it to the network-console initrd
+ mkdir $(TEMP)/noninteractive-preseed
+ cp boot/arm/ssh-noninteractive.preseed $(TEMP)/noninteractive-preseed/preseed.cfg
+ (cd $(TEMP)/noninteractive-preseed && find . | sort | cpio --quiet -o -H newc) > $(TEMP)/noninteractive-preseed-initrd
+ gzip $(TEMP)/noninteractive-preseed-initrd
+ cat $(TEMP_INITRD) $(TEMP)/noninteractive-preseed-initrd.gz > $(TEMP)/noninteractive-initrd.gz
+ mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP)/noninteractive-initrd.gz $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud/uInitrd
+ update-manifest $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud/uInitrd "Debian installer ramdisk"
+ install -m 644 boot/arm/seagate-uboot-config $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud/uboot-config
+ update-manifest $(SOME_DEST)/$(EXTRANAME)seagate/personal-cloud/uboot-config "U-Boot configuration for Seagate"
diff -pruN 20101020/build/config/armhf/u-boot.cfg 20201202/build/config/armhf/u-boot.cfg
--- 20101020/build/config/armhf/u-boot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf/u-boot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,28 @@
+MEDIA_TYPE = u-boot binaries
+
+TARGET = u-boot-binaries
+EXTRANAME = $(MEDIUM)/
+
+.PHONY: u-boot-binaries
+u-boot-binaries:
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/
+ set -e; while read LINE; \
+ do \
+ if [ -n "$${LINE}" ] && ! echo $${LINE}|grep -q -e "^#"; then \
+ set -- $${LINE}; \
+ mkdir -p "$(SOME_DEST)/$(EXTRANAME)/$$1"; \
+ if [ -n "$$2" ]; then \
+ echo "Providing u-boot binaries for $$1 ..."; \
+ cp "$$2" "$(SOME_DEST)/$(EXTRANAME)/$$1/"; \
+ dd 2>/dev/null if="$$2" of="$(SOME_DEST)/$(EXTRANAME)/$$1/$$1.sdcard.img" bs=512 seek="$$3"; \
+ gzip -9 -n "$(SOME_DEST)/$(EXTRANAME)/$$1/$$(basename $$2)"; \
+ fi; \
+ if [ -n "$$4" ]; then \
+ cp "$$4" "$(SOME_DEST)/$(EXTRANAME)/$$1/"; \
+ dd 2>/dev/null if="$$4" of="$(SOME_DEST)/$(EXTRANAME)/$$1/$$1.sdcard.img" bs=512 seek="$$5" conv=notrunc; \
+ gzip -9 -n "$(SOME_DEST)/$(EXTRANAME)/$$1/$$(basename $$4)"; \
+ fi; \
+ gzip -9 -n "$(SOME_DEST)/$(EXTRANAME)/$$1/$$1.sdcard.img"; \
+ update-manifest "$(SOME_DEST)/$(EXTRANAME)$$1" "u-boot image for $$1"; \
+ fi ;\
+ done < boot/arm/u-boot-image-config
diff -pruN 20101020/build/config/armhf.cfg 20201202/build/config/armhf.cfg
--- 20101020/build/config/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/armhf.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,21 @@
+MEDIUM_SUPPORTED = hd-media netboot network-console netboot-gtk device-tree u-boot cdrom
+
+KERNELMAJOR = 2.6
+# The version of the kernel to use.
+KERNELVERSION = $(LINUX_KERNEL_ABI)-armmp
+KERNELNAME = vmlinuz
+
+# Configuration for generating EFI images
+GRUB_EFI=y
+GRUB_EFI_PLATFORM=arm-efi
+GRUB_EFI_NAME=arm
+# We do *NOT* have support for UEFI Secure Boot on this arch
+EFI_SIGNED=n
+
+# We do *NOT* build a gtk installer for this arch
+GRAPHICAL_INSTALLER=n
+
+arch_boot_screens:
+arch_tree:
+
+include config/arm.cfg
diff -pruN 20101020/build/config/common 20201202/build/config/common
--- 20101020/build/config/common 2010-02-20 16:43:06.000000000 +0000
+++ 20201202/build/config/common 2020-12-02 13:28:39.000000000 +0000
@@ -9,6 +9,13 @@
# debug versions of the needed udebs
#DEBUG = y
+# Default kernel ABI version to use. Append a kernel flavour to
+# produce KERNELVERSION.
+LINUX_KERNEL_ABI ?= 5.9.0-4
+
+# Always "di" these days
+KERNEL_FLAVOUR ?= di
+
# List here any extra udebs that are not in the list file but that
# should still be included on the system.
EXTRAS ?=
@@ -22,10 +29,6 @@ EXTRAS ?=
# It will be loaded by the initrd-preseed udeb.
PRESEED =
-# The library reducer to use. Set to mklibs (to build with library reduction)
-# or mklibs-copy (to build without library reduction).
-MKLIBS = mklibs
-
# Normally the sources.list for building d-i will be derived from your
# "normal" sources.list. However, you can specify a mirror here to override
# this. You can use copy:/ to use a local mirror
@@ -37,13 +40,13 @@ MKLIBS = mklibs
DPKG_UNPACK_OPTIONS = --force-overwrite
# The codename of the Debian release that should be installed by default.
-DEBIAN_RELEASE = squeeze
+DEBIAN_RELEASE = bullseye
# The version (number and codename) of the Debian release targeted by the
# installation images. (Only the codename is used while the version number
# has not yet been determined.)
-DEBIAN_VERSION = 6.0 (squeeze)
-DEBIAN_VERSION ?= squeeze
+DEBIAN_VERSION = 11 (bullseye)
+DEBIAN_VERSION ?= bullseye
# Define here from what release (codename!) components (udebs) should be taken
# to build debian-installer. By default this is set to 'unstable' for building
@@ -53,17 +56,23 @@ USE_UDEBS_FROM ?= unstable
# Archive components from which to fetch debian-installer modules.
UDEB_COMPONENTS ?= main/debian-installer
-# The date the installer is built.
-BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H:%M')
+# The date the installer source was last changed; we prefer that the
+# caller defines a meaningful value, but below is a safe fallback.
+SOURCE_DATE_EPOCH ?= $(shell date '+%s')
+
+# The date the installer was built. We use second-level resolution to ensure
+# the generated image implicitly contains the SOURCE_DATE_EPOCH value required
+# to reproduce the build.
+BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H:%M:%S' -d '@$(SOURCE_DATE_EPOCH)')
+
+# Set consistent file creation modes for a reproducible build, taking care
+# not to modify existing executable bits on files.
+DIR_MODE = 755
+FILE_MODE = u+rw,g+r-w,o+r-w
# Produce a beep at boot menu
BOOTMENU_BEEP ?= n
-# x86: configure syslinux to have tasksel install a different desktop
-# environment than the default (gnome).
-# Possible values: kde, xfce, lxde
-DESKTOP =
-
# Filesystem type for the initrd, currently valid values are ext2, cramfs,
# and initramfs.
# NOTE: Your kernel must support this filesystem, not just a module.
diff -pruN 20101020/build/config/dir 20201202/build/config/dir
--- 20101020/build/config/dir 2009-06-07 17:27:37.000000000 +0000
+++ 20201202/build/config/dir 2020-04-09 07:06:18.000000000 +0000
@@ -62,6 +62,7 @@ NETBOOT_PATH = $(NETBOOT_DI_DIR)/$(ARCH)
# The files we may want to have in dest/
INITRD = $(SOME_DEST)/$(EXTRANAME)initrd.gz
KERNEL = $(foreach name,$(KERNELNAME),$(SOME_DEST)/$(EXTRANAME)$(name))
+DTBS = $(SOME_DEST)/$(EXTRANAME)README
BOOT = $(SOME_DEST)/$(EXTRANAME)boot.img$(GZIPPED)
ROOT = $(SOME_DEST)/$(EXTRANAME)root.img$(GZIPPED)
EXTRA = $(SOME_DEST)/$(EXTRANAME).img$(GZIPPED)
@@ -76,6 +77,7 @@ MISC = $(foreach name,$(MISCNAME),$(SOME
TEMP_INITRD = $(TEMP)/initrd.gz
TEMP_UDEB_LIST = $(TEMP)/udeb.list
TEMP_KERNEL = $(foreach name,$(KERNELNAME),$(TEMP)/$(name))
+TEMP_DTBS = $(TEMP)/lib
TEMP_BOOT = $(TEMP)/boot.img
TEMP_ROOT = $(TEMP)/root.img
TEMP_MINIISO = $(TEMP)/mini.iso
@@ -86,6 +88,7 @@ TEMP_NETBOOT_DIR = $(TEMP)/dir_tree
TEMP_CD_INFO_DIR = $(TEMP)/cd_info
TEMP_CD_TREE = $(TEMP)/cd_tree
TEMP_POWERPC_INITRD = $(TEMP)/powerpc_initrd_tree
+TEMP_GRUB_EFI = $(TEMP)/grub_efi
DPKGDIR = $(TREE)/var/lib/dpkg
diff -pruN 20101020/build/config/hppa/miniiso.cfg 20201202/build/config/hppa/miniiso.cfg
--- 20101020/build/config/hppa/miniiso.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/hppa/miniiso.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -11,8 +11,8 @@ MANIFEST-MINIISO = "tiny bootable CD ima
arch_miniiso:
-rm -rf $(TEMP_CD_TREE)/*
install -m 644 -D $(BASE_TMP)miniiso/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
- install -m 644 -D $(BASE_TMP)miniiso/vmlinux*parisc $(TEMP_CD_TREE)/boot/vmlinux-parisc
- install -m 644 -D $(BASE_TMP)miniiso/vmlinux*parisc64 $(TEMP_CD_TREE)/boot/vmlinux-parisc64
+ install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc $(TEMP_CD_TREE)/boot/vmlinux-parisc
+ install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc64 $(TEMP_CD_TREE)/boot/vmlinux-parisc64
install -m 644 -D /usr/share/palo/iplboot $(TEMP_CD_TREE)/boot/iplboot
genisoimage -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
diff -pruN 20101020/build/config/hppa.cfg 20201202/build/config/hppa.cfg
--- 20101020/build/config/hppa.cfg 2010-06-26 17:56:00.000000000 +0000
+++ 20201202/build/config/hppa.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,22 +1,22 @@
MEDIUM_SUPPORTED = cdrom netboot miniiso
-KERNEL_FLAVOUR = di
-
-BASEVERSION = 2.6.32-5
+BASEVERSION = $(LINUX_KERNEL_ABI)
KERNELMAJOR = 2.6
-KERNELIMAGEVERSION = $(BASEVERSION)-parisc $(BASEVERSION)-parisc64
-KERNELVERSION = $(foreach ver,${KERNELIMAGEVERSION},$(ver))
-KERNELNAME = $(foreach ver,${KERNELVERSION},vmlinux-$(ver))
+KERNELVERSION = $(BASEVERSION)-parisc $(BASEVERSION)-parisc64
+KERNELNAME = $(foreach ver,${KERNELVERSION},vmlinuz-$(ver))
VERSIONED_SYSTEM_MAP = t
-
+
+DEBIAN_RELEASE = unstable
+
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
arch_boot_screens:
arch_tree:
arch_netboot:
- palo -f /dev/null -k $(TEMP)/vmlinux*parisc \
- -k $(TEMP)/vmlinux*parisc64 \
+ palo -f /dev/null -k $(TEMP)/vmlinuz*parisc \
+ -k $(TEMP)/vmlinuz*parisc64 \
-r $(TEMP_INITRD) -b /usr/share/palo/iplboot \
-c "0/linux initrd=0/ramdisk" \
-s $(TEMP_BOOT)
diff -pruN 20101020/build/config/hurd.cfg 20201202/build/config/hurd.cfg
--- 20101020/build/config/hurd.cfg 2010-08-22 20:42:08.000000000 +0000
+++ 20201202/build/config/hurd.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,28 +1,91 @@
# Filesystem type for the initrd.
INITRD_FS = ext2
+ifeq ($(targetstring),monolithic)
+# Keep just 16MiB for monolithic builds
+ extra_sz=4000
+else
+# Need a lot more room for udebs for network and CD builds
+# TODO: fix & use tmpfs instead
+ extra_sz=18000
+endif
+
# We have to redefine genext2fs to use 4k blocks and leave some space
define genext2fs
nb=$$(find $(TREE) | wc -l); \
sz=$$(du -s $(TREE) | cut -f 1); \
genext2fs -d $(TREE) -B 4096 -o hurd -m 0 \
- -b $$(expr $$sz / 4 + $$nb / 2 + 1024) \
+ -b $$(expr $$sz / 4 + $$nb / 2 + $(extra_sz)) \
-N $$(expr $$nb + 1024)
endef
# The image to use for a syslinux splash screen.
-SPLASH_PNG=boot/hurd/pics/klowner-hurd.png
+SPLASH_PNG=boot/x86/pics/futurePrototype.png
+SPLASH_SVG=$(patsubst %.png,%.svg,$(SPLASH_PNG))
# The font to load in GRUB
GRUB_FONT=/usr/share/grub/ascii.pf2
-# Library reduction needs some extra stuff which for now
-# is not usually available.
-MKLIBS = mklibs-copy
+# GRUB configuration files
+GRUB_CFG_CDROM=boot/hurd/grub-hurd-cdrom.cfg
+GRUB_CFG_PXE=boot/hurd/grub-hurd-pxe.cfg
+
+# GRUB modules
+GRUB_MODDIR=/usr/lib/grub/$(GRUB_PLATFORM)
+GRUB_MODULES_PXE=pxe tftp multiboot cpuid echo play gfxterm gfxterm_background gzio minicmd normal png vbe
+
+# Location for Xen example configuration.
+XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
+
+# fakeroot-hurd does not support -s and -i
+ifneq ($(shell id -u),0)
+ ROOTCMD = fakeroot-tcp
+endif
+
+# Extract GRUB EFI files.
+.PHONY: x86_grub_efi
+x86_grub_efi:
+ifeq ($(GRUB_EFI),y)
+ efi-image -o $(TEMP_GRUB_EFI) -g $(GRUB_EFI_PLATFORM) \
+ -e $(GRUB_EFI_NAME) -n $(NETBOOT_PATH) \
+ -s $(EFI_SIGNED)
+endif
# Unsupported targets
-arch_boot_screens:
arch_tree:
+arch_boot:
+arch_boot_screens:
+
+# genisoimage CD info directory, including grub and configuration files
+# Note that the configuration is extensively manipulated by debian-cd to
+# support all the available CD/DVD variants.
+# Supply GRUB EFI configuration.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir: x86_grub_efi
+ x86-image $(TEMP_CD_INFO_DIR) $(GRUB_PLATFORM)
+
+ sed -e "s/@ARCH@/$(ARCH)/g" $(GRUB_CFG_CDROM) \
+ > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+ if [ -n "$(GRUB_FONT)" ] ; then \
+ cp $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/boot/grub/font.pf2; \
+ fi
+ if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
+ cp $(SPLASH_PNG) $(TEMP_CD_INFO_DIR)/boot/grub/splash.png; \
+ fi
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_INFO_DIR)/grub/; \
+ cp boot/hurd/grub-hurd-efi.cfg \
+ $(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM)/; \
+ fi
# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
.PHONY: arch_miniiso
@@ -33,11 +96,15 @@ arch_miniiso: $(TEMP_INITRD) $(TEMP_KERN
cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/boot/kernel/
cp $(TEMP_INITRD) $(TEMP_CD_TREE)/boot/initrd.gz
- cp $(GRUB_CFG) $(TEMP_CD_TREE)/boot/grub/grub.cfg
+ sed -e "s/@ARCH@/$(ARCH)/g" $(GRUB_CFG_CDROM) \
+ > $(TEMP_CD_TREE)/boot/grub/grub.cfg
if [ -n "$(GRUB_FONT)" ] ; then \
cp $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
fi
if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
cp $(SPLASH_PNG) $(TEMP_CD_TREE)/boot/grub/splash.png; \
fi
@@ -50,4 +117,37 @@ arch_netboot_dir:
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+
+ sed -e "s/@ARCH@/$(ARCH)/g" $(GRUB_CFG_PXE) \
+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg
+ if [ -n "$(GRUB_FONT)" ] ; then \
+ cp $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/font.pf2; \
+ fi
+ if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
+ cp $(SPLASH_PNG) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/splash.png; \
+ fi
+
+ # Generate grub2pxe
+ grub-mkimage -O $(GRUB_PLATFORM)-pxe --prefix="(pxe)/$(NETBOOT_PATH)" \
+ -o $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe \
+ $(GRUB_MODULES_PXE)
+
+ # This symlink is not strictly required, but it allows more usual
+ # dhcp server setups to work without modification.
+ rm -f $(TEMP_NETBOOT_DIR)/grub2pxe
+ ln -sf $(NETBOOT_PATH)/grub2pxe $(TEMP_NETBOOT_DIR)/grub2pxe
+
+
+.PHONY: xen_config
+xen_config: $(TEMP_INITRD)
+ util/xen/build_modules $(SOME_DEST)/$(EXTRANAME)/modules $(TEMP_INITRD) 'initrd $$(ramdisk-create)' $(TEMP)/ext2fs.static 'ext2fs -A --multiboot-command-line=$${kernel-command-line} --host-priv-port=$${host-port} --device-master-port=$${device-port} --exec-server-task=$${exec-task} -T typed $${root} $$(task-create) $$(task-resume)' $(TEMP)/exec.static 'exec $$(exec-task=task-create)'
+ sed -e "s/@ARCH@/$(ARCH)/g" \
+ -e "s/@XEN_INSTALL_METHOD@/$(XEN_INSTALL_METHOD)/g" \
+ -e "s/@DEBIAN_RELEASE@/$(DEBIAN_RELEASE)/g" \
+ $(XENCFG)
+ chmod 644 $(XENCFG)
+ update-manifest $(XENCFG) $(MANIFEST-XENCFG)
diff -pruN 20101020/build/config/hurd-i386/cdrom/grub.cfg 20201202/build/config/hurd-i386/cdrom/grub.cfg
--- 20101020/build/config/hurd-i386/cdrom/grub.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/cdrom/grub.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
+
+TYPE = cdrom/grub
+
+# Add the gtk images on to the grub info.
+INITRD_GTK = dest/cdrom/gtk/initrd.gz
+
+EXTRATARGETS = build_cdrom_gtk
diff -pruN 20101020/build/config/hurd-i386/cdrom/gtk.cfg 20201202/build/config/hurd-i386/cdrom/gtk.cfg
--- 20101020/build/config/hurd-i386/cdrom/gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/cdrom/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,13 @@
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD (graphical)"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD (graphical)"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD (graphical)"
+
+TYPE = cdrom/grub/gtk
+
+EXTRANAME = gtk/
+
+KEEP_GI_LANGS = 1
+
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/hurd-i386/cdrom.cfg 20201202/build/config/hurd-i386/cdrom.cfg
--- 20101020/build/config/hurd-i386/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+FLAVOUR_SUPPORTED = grub gtk
+
+MEDIA_TYPE = CD-ROM
diff -pruN 20101020/build/config/hurd-i386/cdrom-xen.cfg 20201202/build/config/hurd-i386/cdrom-xen.cfg
--- 20101020/build/config/hurd-i386/cdrom-xen.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/cdrom-xen.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,16 @@
+KERNELVERSION = $(BASEVERSION)-xen-486
+TYPE=cdrom
+
+include config/hurd-i386/cdrom.cfg
+
+EXTRANAME = cdrom/xen/
+
+MEDIA_TYPE = CD-ROM
+
+MANIFEST-KERNEL = "kernel image for installing under Xen"
+MANIFEST-INITRD = "initrd for installing under Xen"
+MANIFEST-XENCFG = "example Xen configuration"
+
+XEN_INSTALL_METHOD = cdrom
+
+TARGET = $(KERNEL) $(INITRD) xen_config
diff -pruN 20101020/build/config/hurd-i386/hd-media/gtk.cfg 20201202/build/config/hurd-i386/hd-media/gtk.cfg
--- 20101020/build/config/hurd-i386/hd-media/gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/hd-media/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,16 @@
+TYPE = hd-media/gtk
+
+EXTRANAME = gtk/
+
+# Only build the gtk initrd and kernel, the bootable image is built by the
+# main hd-media target and includes this initrd.
+EXTRATARGETS =
+TARGET = $(KERNEL) $(INITRD)
+
+KEEP_GI_LANGS = 1
+
+VIDEO_MODE=$(VIDEO_MODE_GTK)
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/hurd-i386/hd-media.cfg 20201202/build/config/hurd-i386/hd-media.cfg
--- 20101020/build/config/hurd-i386/hd-media.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/hd-media.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,22 @@
+FLAVOUR_SUPPORTED = "" gtk
+
+# Not really a floppy, this is a 953 MiB image, large enough to put a
+# netinst iso in (being able to fit the full CD on it is just a bonus..),
+# and small enough to fit on a low-end memory stick, such as those
+# advertised as being 1 gigabyte in size.
+FLOPPY_SIZE = 976560
+
+DISK_LABEL = "bootable drive"
+MEDIA_TYPE = bootable drive
+
+GZIPPED = .gz
+EXTRANAME = hd-media/
+
+# Add the gtk images on to the bootable image.
+EXTRATARGETS = build_hd-media_gtk
+INITRD_GTK = dest/hd-media/gtk/initrd.gz
+TARGET = $(KERNEL) $(INITRD)
+
+MANIFEST-BOOT = "1 gb image (compressed) for USB memory stick"
+MANIFEST-INITRD = "for use on USB memory sticks"
+MANIFEST-KERNEL = "for use on USB memory sticks"
diff -pruN 20101020/build/config/hurd-i386/netboot.cfg 20201202/build/config/hurd-i386/netboot.cfg
--- 20101020/build/config/hurd-i386/netboot.cfg 2010-01-11 15:35:40.000000000 +0000
+++ 20201202/build/config/hurd-i386/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,8 @@
MEDIA_TYPE = netboot image
-NETBOOT_DIR_TARGETS = pkg-lists/kernel-module-udebs $(TEMP_INITRD) $(TEMP_KERNEL)
-TARGET = pkg-lists/kernel-module-udebs $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
EXTRANAME = $(MEDIUM)/
MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
diff -pruN 20101020/build/config/hurd-i386/netboot-gtk.cfg 20201202/build/config/hurd-i386/netboot-gtk.cfg
--- 20101020/build/config/hurd-i386/netboot-gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/netboot-gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,21 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot/gtk
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = netboot/gtk/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+MANIFEST-MINIISO = "not so tiny CD image that boots the netboot installer"
+
+KEEP_GI_LANGS = 1
+
+VIDEO_MODE=$(VIDEO_MODE_GTK)
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/hurd-i386/netboot-xen.cfg 20201202/build/config/hurd-i386/netboot-xen.cfg
--- 20101020/build/config/hurd-i386/netboot-xen.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/hurd-i386/netboot-xen.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,14 @@
+KERNELVERSION = $(BASEVERSION)-xen-486
+TYPE=netboot
+
+include config/hurd-i386/netboot.cfg
+
+EXTRANAME=netboot/xen/
+
+MANIFEST-KERNEL = "kernel image for installing under Xen"
+MANIFEST-INITRD = "initrd for installing under Xen"
+MANIFEST-XENCFG = "example Xen configuration"
+
+XEN_INSTALL_METHOD = network
+
+TARGET = $(KERNEL) $(INITRD) xen_config
diff -pruN 20101020/build/config/hurd-i386.cfg 20201202/build/config/hurd-i386.cfg
--- 20101020/build/config/hurd-i386.cfg 2010-02-27 23:38:36.000000000 +0000
+++ 20201202/build/config/hurd-i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,17 +1,26 @@
-MEDIUM_SUPPORTED = netboot
+MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
-KERNELVERSION = 1.3.99-1-486
-KERNELMAJOR = 1.3.99
-KERNEL_FLAVOUR = di
-KERNELNAME = gnumach.gz ext2fs.static ld.so.1
-KERNELIMAGEVERSION = $(KERNELVERSION)
+KERNELMAJOR = 1.8
+BASEVERSION = $(KERNELMAJOR)
+KERNELVERSION = $(BASEVERSION)-486
+KERNELNAME = gnumach.gz ext2fs.static exec.static
# The codename of the Debian release that should be installed by default.
DEBIAN_RELEASE = unstable
-# GRUB configuration file
-GRUB_CFG=boot/hurd/grub-hurd-i386.cfg
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+
+USE_UNRELEASED = 1
+
+GRUB_PLATFORM=i386-pc
+
+# Configuration for generating EFI images
+GRUB_EFI=y
+GRUB_EFI_PLATFORM=i386-efi
+GRUB_EFI_NAME=ia32
+# We don't have support for UEFI Secure Boot on this arch
+EFI_SIGNED=n
include config/hurd.cfg
diff -pruN 20101020/build/config/i386/cdrom/gtk.cfg 20201202/build/config/i386/cdrom/gtk.cfg
--- 20101020/build/config/i386/cdrom/gtk.cfg 2010-03-26 12:17:13.000000000 +0000
+++ 20201202/build/config/i386/cdrom/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -10,6 +10,8 @@ TYPE = cdrom/isolinux/gtk
EXTRANAME = gtk/
+IS_PURE_GTK = 1
+
KEEP_GI_LANGS = 1
VIDEO_MODE=$(VIDEO_MODE_GTK)
diff -pruN 20101020/build/config/i386/cdrom-xen.cfg 20201202/build/config/i386/cdrom-xen.cfg
--- 20101020/build/config/i386/cdrom-xen.cfg 2010-03-26 12:17:14.000000000 +0000
+++ 20201202/build/config/i386/cdrom-xen.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,4 @@
-KERNELVERSION = $(BASEVERSION)-686-bigmem
+KERNELVERSION = $(BASEVERSION)-686-pae
TYPE=cdrom/gtk
include config/i386/cdrom/gtk.cfg
EXTRANAME=cdrom/xen/
diff -pruN 20101020/build/config/i386/floppy/boot.cfg 20201202/build/config/i386/floppy/boot.cfg
--- 20101020/build/config/i386/floppy/boot.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/config/i386/floppy/boot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-DISK_LABEL = "Boot floppy"
-
-TARGET = $(BOOT)
-BOOT = $(SOME_DEST)/$(EXTRANAME)boot.img$(GZIPPED)
-
-MANIFEST-BOOT = "boot floppy for network, CD installs"
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-# Use type -ng to not interfere with sparc and powerpc floppies
-TYPE=bootfloppy-ng
-
-# Release info not needed on boot floppy
-OMIT_RELEASE_INFO=1
-# Nor is modules.dep
-OMIT_DEPMOD=1
-# Nor is a lsb release file.
-OMIT_LSB=1
-# Nor dpkg
-OMIT_DPKG=1
-# Even the syslinux help screens no longer fit. :-(
-OMIT_BOOT_HELP=1
-OMIT_WIN32_LOADER=1
-# No debconf either, so no preseeding.
-PRESEED=
-EXTRAUDEBS=
-TRANSSTATUS=
-
-# Save some much needed space by compressing busybox. This is kind of a
-# trial too, if it works ok we might do this for all busybox binaries
-# later. (Except that busybox is no longer included on the boot floppy.)
-#UPX_BINS=bin/busybox
-
-# use klibc, not libc
-ONLY_KLIBC=1
-
-# Syslinux configuration
-SYSLINUX_CFG=prompt
diff -pruN 20101020/build/config/i386/floppy/cd-drivers.cfg 20201202/build/config/i386/floppy/cd-drivers.cfg
--- 20101020/build/config/i386/floppy/cd-drivers.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/i386/floppy/cd-drivers.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-DISK_LABEL = "$(FLAVOUR):CD-ROM drivers floppy"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "CD drivers, including all IDE, PCMCIA and SCSI drivers"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=cd_drivers
-DRIVER_FOR=floppy-ng
-
-INITRD_FS=ext2
diff -pruN 20101020/build/config/i386/floppy/net-drivers-1.cfg 20201202/build/config/i386/floppy/net-drivers-1.cfg
--- 20101020/build/config/i386/floppy/net-drivers-1.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/i386/floppy/net-drivers-1.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-DISK_LABEL = "$(FLAVOUR):Network drivers floppy:1"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "common network drivers"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=net_drivers-1
-DRIVER_FOR=floppy-ng
-
-INITRD_FS=ext2
diff -pruN 20101020/build/config/i386/floppy/net-drivers-2.cfg 20201202/build/config/i386/floppy/net-drivers-2.cfg
--- 20101020/build/config/i386/floppy/net-drivers-2.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/i386/floppy/net-drivers-2.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-DISK_LABEL = "$(FLAVOUR):Network drivers floppy:2"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "PCMCIA and wireless network drivers"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=net_drivers-2
-DRIVER_FOR=floppy-ng
-
-INITRD_FS = ext2
diff -pruN 20101020/build/config/i386/floppy/net-drivers-3.cfg 20201202/build/config/i386/floppy/net-drivers-3.cfg
--- 20101020/build/config/i386/floppy/net-drivers-3.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/i386/floppy/net-drivers-3.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# Note that this disc does not depend on net-drivers-2, only on
-# net-drivers-1, which is why the :2 is used here.
-DISK_LABEL = "$(FLAVOUR):Network drivers floppy:2"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "extra network drivers"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=net_drivers-3
-DRIVER_FOR=floppy-ng
-
-INITRD_FS = ext2
diff -pruN 20101020/build/config/i386/floppy/root.cfg 20201202/build/config/i386/floppy/root.cfg
--- 20101020/build/config/i386/floppy/root.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/i386/floppy/root.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-DISK_LABEL = "Root floppy"
-
-# Library and font reduction need the dependencies of additional drivers.
-EXTRADRIVERS = $(BASE_TMP)floppy_cd-drivers/tree \
- $(BASE_TMP)floppy_net-drivers-1/tree \
- $(BASE_TMP)floppy_net-drivers-2/tree \
- $(BASE_TMP)floppy_net-drivers-3/tree
-EXTRATARGETS = build_floppy_cd-drivers \
- build_floppy_net-drivers-1 \
- build_floppy_net-drivers-2 \
- build_floppy_net-drivers-3
-TARGET = $(ROOT)
-ROOT = $(SOME_DEST)/$(EXTRANAME)root.img$(GZIPPED)
-
-MANIFEST-ROOT = "second floppy for network or CD installs"
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-# Use type -ng to not interfere with sparc and powerpc floppies
-TYPE=floppy-ng
-
-# Drop all languages from the floppy to save space. If you need a localised
-# floppy, modify the list below, adding your language(s) in addition to en.
-# for example: DROP_LANG = '(?!en|es|pt_BR)'
-DROP_LANG = '(?!en)'
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
diff -pruN 20101020/build/config/i386/floppy.cfg 20201202/build/config/i386/floppy.cfg
--- 20101020/build/config/i386/floppy.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/i386/floppy.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-FLAVOUR_SUPPORTED = boot root net-drivers-1 net-drivers-2 net-drivers-3 cd-drivers
-
-MEDIA_TYPE = floppy
-
-# How big a floppy image should I make? (in kilobytes)
-FLOPPY_SIZE = 1440
-
-# media where images may be written to (via dd).
-WRITE_MEDIA += $(FLAVOUR_SUPPORTED)
diff -pruN 20101020/build/config/i386/hd-media/gtk.cfg 20201202/build/config/i386/hd-media/gtk.cfg
--- 20101020/build/config/i386/hd-media/gtk.cfg 2010-03-26 12:17:14.000000000 +0000
+++ 20201202/build/config/i386/hd-media/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -7,6 +7,8 @@ EXTRANAME = gtk/
EXTRATARGETS =
TARGET = $(KERNEL) $(INITRD)
+IS_PURE_GTK = 1
+
KEEP_GI_LANGS = 1
VIDEO_MODE=$(VIDEO_MODE_GTK)
diff -pruN 20101020/build/config/i386/hd-media.cfg 20201202/build/config/i386/hd-media.cfg
--- 20101020/build/config/i386/hd-media.cfg 2010-03-26 12:17:14.000000000 +0000
+++ 20201202/build/config/i386/hd-media.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,10 @@
FLAVOUR_SUPPORTED = "" gtk
-# Not really a floppy, this is a 239 mb image, large enough to put a
-# netinst iso in, and small enough to fit on a mid-range memory stick,
-# such as those advertised as being 256 mb in size.
-FLOPPY_SIZE = 244736
+# Not really a floppy, this is a 953 MiB image, large enough to put a
+# netinst iso in (being able to fit the full CD on it is just a bonus..),
+# and small enough to fit on a low-end memory stick, such as those
+# advertised as being 1 gigabyte in size.
+FLOPPY_SIZE = 976560
DISK_LABEL = "bootable drive"
MEDIA_TYPE = bootable drive
@@ -16,6 +17,6 @@ EXTRATARGETS = build_hd-media_gtk
INITRD_GTK = dest/hd-media/gtk/initrd.gz
TARGET = $(KERNEL) $(INITRD) $(BOOT)
-MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick"
+MANIFEST-BOOT = "1 gb image (compressed) for USB memory stick"
MANIFEST-INITRD = "for use on USB memory sticks"
MANIFEST-KERNEL = "for use on USB memory sticks"
diff -pruN 20101020/build/config/i386/netboot.cfg 20201202/build/config/i386/netboot.cfg
--- 20101020/build/config/i386/netboot.cfg 2009-06-07 17:27:36.000000000 +0000
+++ 20201202/build/config/i386/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -10,6 +10,3 @@ BOOT_SCREEN_DIR = $(NETBOOT_PATH)/boot-s
MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
-
-# Syslinux configuration
-SYSLINUX_CFG=all-desktop
diff -pruN 20101020/build/config/i386/netboot-gtk.cfg 20201202/build/config/i386/netboot-gtk.cfg
--- 20101020/build/config/i386/netboot-gtk.cfg 2010-03-26 12:17:14.000000000 +0000
+++ 20201202/build/config/i386/netboot-gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -14,8 +14,7 @@ MANIFEST-NETBOOT_DIR = "PXE boot directo
MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory (graphical installer)"
MANIFEST-MINIISO = "not so tiny CD image that boots the graphical netboot installer"
-# Syslinux configuration
-SYSLINUX_CFG=all-desktop
+IS_PURE_GTK = 1
KEEP_GI_LANGS = 1
diff -pruN 20101020/build/config/i386/netboot-xen.cfg 20201202/build/config/i386/netboot-xen.cfg
--- 20101020/build/config/i386/netboot-xen.cfg 2010-03-26 12:17:14.000000000 +0000
+++ 20201202/build/config/i386/netboot-xen.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,4 @@
-KERNELVERSION = $(BASEVERSION)-686-bigmem
+KERNELVERSION = $(BASEVERSION)-686-pae
TYPE=netboot/gtk
KEEP_GI_LANGS = 1
diff -pruN 20101020/build/config/i386.cfg 20201202/build/config/i386.cfg
--- 20101020/build/config/i386.cfg 2010-05-24 14:52:39.000000000 +0000
+++ 20201202/build/config/i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,13 +1,11 @@
-MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media #floppy
+MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
-BASEVERSION = 2.6.32-5
-KERNELVERSION = $(BASEVERSION)-486
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-686
KERNELMAJOR = 2.6
-KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
-KERNELIMAGEVERSION = $(KERNELVERSION)
# upx can be used to make the kernel a lot smaller and compress binaries too,
# allowing us to put more on the floppy.
@@ -17,7 +15,16 @@ KERNELIMAGEVERSION = $(KERNELVERSION)
SYSLINUX_CFG=standard
# The default video modes
+# These should be kept in sync with win32-loader's preseed line as
+# defined in graphics.nsi around line 58
VIDEO_MODE="vga=788"
-VIDEO_MODE_GTK="video=vesa:ywrap,mtrr vga=788"
+VIDEO_MODE_GTK="vga=788"
+
+# Configuration for generating EFI images
+GRUB_EFI=y
+GRUB_EFI_PLATFORM=i386-efi
+GRUB_EFI_NAME=ia32
+# We have support for UEFI Secure Boot on this arch
+EFI_SIGNED=y
include config/x86.cfg
diff -pruN 20101020/build/config/ia64/cdrom.cfg 20201202/build/config/ia64/cdrom.cfg
--- 20101020/build/config/ia64/cdrom.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/ia64/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,8 +1,8 @@
MEDIA_TYPE = CD-ROM
-TARGET = $(KERNEL) $(INITRD) $(BOOT)
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
EXTRANAME = $(MEDIUM)/
-MANIFEST-KERNEL = "kernel for use to build a CD"
-MANIFEST-INITRD = "initrd for use to build a CD"
-MANIFEST-BOOT = "CDROM image for Itanium systems"
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -pruN 20101020/build/config/ia64/netboot.cfg 20201202/build/config/ia64/netboot.cfg
--- 20101020/build/config/ia64/netboot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/ia64/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,8 @@
MEDIA_TYPE = netboot image
-NETBOOT_DIR_TARGETS := $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
EXTRANAME = $(MEDIUM)/
-BOOT_SCREEN_DIR = boot-screens/
-
-MANIFEST-NETBOOT_DIR = "netboot directory for tftp server"
-MANIFEST-NETBOOT_TAR = "tarball of netboot directory"
-MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff -pruN 20101020/build/config/ia64.cfg 20201202/build/config/ia64.cfg
--- 20101020/build/config/ia64.cfg 2010-06-26 17:56:00.000000000 +0000
+++ 20201202/build/config/ia64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,95 +1,107 @@
-# How big a floppy image should I make? (in kilobytes)
-FLOPPY_SIZE = 32768
-
MEDIUM_SUPPORTED = cdrom netboot
# The version of the kernel to use.
KERNELMAJOR = 2.6
-KERNELVERSION = 2.6.32-5-itanium
-KERNEL_FLAVOUR = di
+KERNELVERSION = $(LINUX_KERNEL_ABI)-itanium
KERNELNAME = vmlinuz
-KERNELIMAGEVERSION = $(KERNELVERSION)
-INITRD_FS = initramfs
+DEBIAN_RELEASE = unstable
-# The DOS volume id to use for DOS floppies. This is a 32 bit hexidecimal
-# number.
-DOS_VOLUME_ID = deb00001
-# The DOS volume label to use for DOS floppies. This is a 11 character
-# string.
-DOS_VOLUME_LABEL = "Debian Inst"
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+# Configuration for generating EFI images
+GRUB_EFI=y
+GRUB_EFI_PLATFORM=ia64-efi
+GRUB_EFI_NAME=ia64
+# We do *NOT* have support for UEFI Secure Boot on this arch
+EFI_SIGNED=n
+arch_boot_screens:
arch_tree:
-# Create a bootable floppy image.
-# 1. make a dos filesystem image
-# 2. copy over kernel, initrd
-# 3. copy over elilo files
-.PHONY: arch_boot
-arch_boot:
- dd if=/dev/zero of=$@.new bs=1k count=$(FLOPPY_SIZE)
- mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
-
- mmd -i$(TEMP_BOOT) ::/efi
- mmd -i$(TEMP_BOOT) ::/efi/boot
- mcopy -i$(TEMP_BOOT) $(TEMP_KERNEL) ::/linux
- mcopy -i$(TEMP_BOOT) $(TEMP_INITRD) ::/initrd.gz
- mcopy -i$(TEMP_BOOT) /usr/lib/elilo/elilo.efi ::/efi/boot/bootia64.efi
- mcopy -i$(TEMP_BOOT) /usr/lib/elilo/elilo.efi ::/elilo.efi
-
- cat boot/ia64/elilo.conf \
- | ramdisk-size-subst $(TEMP_INITRD) \
- | bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
- DEBIAN_VERSION "$(DEBIAN_VERSION)" \
- BUILD_DATE "$(BUILD_DATE)" \
- SYSDIR "/efi/boot/" \
- KERNEL /linux INITRD /initrd.gz \
- > $(TEMP)/elilo-cd.conf
- mcopy -i$(TEMP_BOOT) $(TEMP)/elilo-cd.conf ::/elilo.conf
- mcopy -i$(TEMP_BOOT) $(TEMP)/elilo-cd.conf ::/efi/boot/elilo.conf
-
- $(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.msg), \
- mcopy -i$(TEMP_BOOT) $(file) ::/efi/boot/`basename $(file)`; \
- )
- echo "elilo linux" | mcopy -i$(TEMP_BOOT) - ::/install.nsh
+# The font to load in GRUB
+GRUB_FONT = /usr/share/grub/ascii.pf2
-arch_boot_screens:
- -rm -f $(TEMP_BOOT_SCREENS)/*
- mkdir -p $(TEMP_BOOT_SCREENS)
- $(foreach SCREEN,$(wildcard boot/ia64/*.msg), \
- bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
- DEBIAN_VERSION "$(DEBIAN_VERSION)" \
- BUILD_DATE "$(BUILD_DATE)" \
- < $(SCREEN) > $(TEMP_BOOT_SCREENS)/`basename $(SCREEN)`\
- ;)
+# Extract GRUB EFI files.
+.PHONY: ia64_grub_efi
+ia64_grub_efi:
+ifeq ($(GRUB_EFI),y)
+ efi-image -o $(TEMP_GRUB_EFI) -g $(GRUB_EFI_PLATFORM) \
+ -e $(GRUB_EFI_NAME) -n $(NETBOOT_PATH) \
+ -s $(EFI_SIGNED)
+endif
+
+# Supply GRUB EFI configuration.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir: ia64_grub_efi
+ -rm -f $(TEMP_CD_INFO_DIR)/*
+ mkdir -p $(TEMP_CD_INFO_DIR)
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_INFO_DIR)/grub/; \
+ grub-gencfg \
+ KERNEL /%install%/vmlinuz \
+ INITRD /%install%/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM)/; \
+ fi
.PHONY: arch_miniiso
-arch_miniiso: $(TEMP_BOOT)
- -rm -rf $(TEMP_CD_TREE)/*
- install -m 644 -D $(TEMP_BOOT) $(TEMP_CD_TREE)/boot/boot.img
-
- genisoimage -no-emul-boot -J -o $(TEMP_MINIISO) -b boot/boot.img \
- -c boot/boot.catalog $(TEMP_CD_TREE)
+arch_miniiso: ia64_grub_efi
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)
+
+ ln -f $(TEMP_KERNEL) $(TEMP_CD_TREE)/linux
+ ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/initrd.gz
+
+ mkdir -p $(TEMP_CD_TREE)/.disk
+ echo "Debian GNU/Linux $(DEBIAN_VERSION) $(ARCH) - netboot mini.iso $(BUILD_DATE)"\
+ > $(TEMP_CD_TREE)/.disk/info
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_TREE)/boot/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_TREE)/boot/grub/; \
+ grub-gencfg \
+ KERNEL /linux \
+ INITRD /initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_CD_TREE)/boot/grub/grub.cfg; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_TREE)/boot/grub/$(GRUB_EFI_PLATFORM)/; \
+ fi
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ xorriso -as mkisofs -r -J -c boot.cat \
+ -boot-load-size 4 -boot-info-table \
+ -eltorito-alt-boot \
+ --efi-boot boot/grub/efi.img -no-emul-boot \
+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
+ fi
.PHONY: arch_netboot_dir
-arch_netboot_dir:
+arch_netboot_dir: ia64_grub_efi
-rm -f $(TEMP_NETBOOT_DIR)
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
- cp $(TEMP_INITRD) $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
-
- cp /usr/lib/elilo/elilo.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
- cat boot/ia64/elilo.conf \
- | ramdisk-size-subst $(TEMP_INITRD) \
- | bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
- DEBIAN_VERSION "$(DEBIAN_VERSION)" \
- BUILD_DATE "$(BUILD_DATE)" \
- SYSDIR "$(BOOT_SCREEN_DIR)" \
- KERNEL vmlinuz INITRD initrd.gz \
- > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/elilo.conf
-
- mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/$(BOOT_SCREEN_DIR)
- set -e; \
- $(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.msg), \
- cp $(file) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/$(BOOT_SCREEN_DIR); \
- )
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/initrd.gz
+
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/*.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
+ cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_EFI_PLATFORM)/; \
+ grub-gencfg \
+ KERNEL /$(NETBOOT_PATH)/linux \
+ INITRD /$(NETBOOT_PATH)/initrd.gz \
+ HEADER boot/$(ARCH)/grub/grub-efi.cfg \
+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
+ fi
diff -pruN 20101020/build/config/kfreebsd-amd64/cdrom/grub.cfg 20201202/build/config/kfreebsd-amd64/cdrom/grub.cfg
--- 20101020/build/config/kfreebsd-amd64/cdrom/grub.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/cdrom/grub.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
+
+TYPE = cdrom/grub
+
+# Add the gtk images on to the grub info.
+INITRD_GTK = dest/cdrom/gtk/initrd.gz
+
+EXTRATARGETS = build_cdrom_gtk
diff -pruN 20101020/build/config/kfreebsd-amd64/cdrom/gtk.cfg 20201202/build/config/kfreebsd-amd64/cdrom/gtk.cfg
--- 20101020/build/config/kfreebsd-amd64/cdrom/gtk.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/cdrom/gtk.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,13 @@
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD (graphical)"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD (graphical)"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD (graphical)"
+
+TYPE = cdrom/grub/gtk
+
+EXTRANAME = gtk/
+
+KEEP_GI_LANGS = 1
+
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/kfreebsd-amd64/cdrom.cfg 20201202/build/config/kfreebsd-amd64/cdrom.cfg
--- 20101020/build/config/kfreebsd-amd64/cdrom.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,8 +1,6 @@
-MEDIA_TYPE = CD-ROM
+KERNELVERSION = $(BASEVERSION_10)-amd64
+KERNELNAME = kfreebsd-10.gz
-TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
-EXTRANAME = $(MEDIUM)/
+FLAVOUR_SUPPORTED = grub gtk
-MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
-MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
-MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
+MEDIA_TYPE = CD-ROM
diff -pruN 20101020/build/config/kfreebsd-amd64/cdrom-xen.cfg 20201202/build/config/kfreebsd-amd64/cdrom-xen.cfg
--- 20101020/build/config/kfreebsd-amd64/cdrom-xen.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/cdrom-xen.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,14 @@
+KERNELVERSION = $(BASEVERSION_10)-xen
+TYPE=cdrom
+
+include config/kfreebsd-amd64/cdrom.cfg
+
+EXTRANAME = cdrom/xen/
+
+MANIFEST-KERNEL = "kernel image for installing under Xen"
+MANIFEST-INITRD = "initrd for installing under Xen"
+MANIFEST-XENCFG = "example Xen configuration"
+
+XEN_INSTALL_METHOD = cdrom
+
+TARGET = $(KERNEL) xen_config
diff -pruN 20101020/build/config/kfreebsd-amd64/monolithic-10.cfg 20201202/build/config/kfreebsd-amd64/monolithic-10.cfg
--- 20101020/build/config/kfreebsd-amd64/monolithic-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/monolithic-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,13 @@
+MEDIA_TYPE = boot image
+
+KERNELVERSION = $(BASEVERSION_10)-amd64
+KERNELNAME = kfreebsd-10.gz
+
+TYPE = monolithic
+
+TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "initrd"
+MANIFEST-KERNEL = "kernel image"
+MANIFEST-MINIISO = "small bootable CD image for network install"
diff -pruN 20101020/build/config/kfreebsd-amd64/monolithic.cfg 20201202/build/config/kfreebsd-amd64/monolithic.cfg
--- 20101020/build/config/kfreebsd-amd64/monolithic.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "initrd"
-MANIFEST-KERNEL = "kernel image"
-MANIFEST-MINIISO = "small bootable CD image for network install"
diff -pruN 20101020/build/config/kfreebsd-amd64/netboot-10.cfg 20201202/build/config/kfreebsd-amd64/netboot-10.cfg
--- 20101020/build/config/kfreebsd-amd64/netboot-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/netboot-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,17 @@
+MEDIA_TYPE = netboot image
+
+KERNELVERSION = $(BASEVERSION_10)-amd64
+KERNELNAME = kfreebsd-10.gz
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+
diff -pruN 20101020/build/config/kfreebsd-amd64/netboot.cfg 20201202/build/config/kfreebsd-amd64/netboot.cfg
--- 20101020/build/config/kfreebsd-amd64/netboot.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-MEDIA_TYPE = netboot image
-
-NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
-NETBOOT_DIR_LINKS = grub2pxe
-TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
-MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
-MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
-
diff -pruN 20101020/build/config/kfreebsd-amd64/netboot-gtk-10.cfg 20201202/build/config/kfreebsd-amd64/netboot-gtk-10.cfg
--- 20101020/build/config/kfreebsd-amd64/netboot-gtk-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/netboot-gtk-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,22 @@
+MEDIA_TYPE = netboot image
+
+KERNELVERSION = $(BASEVERSION_10)-amd64
+KERNELNAME = kfreebsd-10.gz
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot/gtk/10
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = netboot-10/gtk/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server (graphical installer)"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory (graphical installer)"
+MANIFEST-MINIISO = "not so tiny CD image that boots the graphical netboot installer"
+
+KEEP_GI_LANGS = 1
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/kfreebsd-amd64/netboot-xen-10.cfg 20201202/build/config/kfreebsd-amd64/netboot-xen-10.cfg
--- 20101020/build/config/kfreebsd-amd64/netboot-xen-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64/netboot-xen-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,14 @@
+KERNELVERSION = $(BASEVERSION_10)-xen
+TYPE=netboot
+
+include config/kfreebsd-amd64/netboot-10.cfg
+
+EXTRANAME = netboot-10/xen/
+
+MANIFEST-KERNEL = "kernel image for installing under Xen"
+MANIFEST-INITRD = "initrd for installing under Xen"
+MANIFEST-XENCFG = "example Xen configuration"
+
+XEN_INSTALL_METHOD = network
+
+TARGET = $(KERNEL) $(INITRD) xen_config
diff -pruN 20101020/build/config/kfreebsd-amd64.cfg 20201202/build/config/kfreebsd-amd64.cfg
--- 20101020/build/config/kfreebsd-amd64.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,8 @@
-MEDIUM_SUPPORTED = cdrom netboot
-MEDIUM_SUPPORTED_EXTRA = monolithic
+MEDIUM_SUPPORTED = cdrom netboot-10 netboot-gtk-10 netboot-xen-10
+MEDIUM_SUPPORTED_EXTRA = monolithic-10
# The version of the kernel to use.
-KERNELVERSION = 8.1-1-amd64
-KERNELMAJOR = 8
-KERNEL_FLAVOUR = di
-KERNELNAME = kfreebsd.gz
-KERNELIMAGEVERSION = $(KERNELVERSION)
+BASEVERSION_10 = 10.3-0
+KERNELMAJOR = 10
include config/kfreebsd.cfg
diff -pruN 20101020/build/config/kfreebsd.cfg 20201202/build/config/kfreebsd.cfg
--- 20101020/build/config/kfreebsd.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,8 +1,14 @@
+# The codename of the Debian release that should be installed by default.
+DEBIAN_RELEASE = unstable
+
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+
# Filesystem type for the initrd.
INITRD_FS = ufs1
# The image to use for a syslinux splash screen.
-SPLASH_PNG=boot/kfreebsd/pics/klowner-kbsd.png
+SPLASH_PNG=boot/x86/pics/futurePrototype.png
+SPLASH_SVG=$(patsubst %.png,%.svg,$(SPLASH_PNG))
# The font to load in GRUB
GRUB_FONT=/usr/share/grub/ascii.pf2
@@ -12,10 +18,12 @@ GRUB_CFG_CDROM=boot/kfreebsd/grub-kfreeb
GRUB_CFG_PXE=boot/kfreebsd/grub-kfreebsd-pxe.cfg
# GRUB modules
-GRUB_MODDIR=/usr/lib/grub/i386-pc
-GRUB_MODULES=bsd cpuid echo gfxterm minicmd normal png vbe
-GRUB_MODULES_PXE=pxe pxecmd
-GRUB_MODULES_CDROM=biosdisk chain iso9660
+GRUB_PLATFORM=i386-pc
+GRUB_MODDIR=/usr/lib/grub/$(GRUB_PLATFORM)
+GRUB_MODULES_PXE=pxe tftp bsd cpuid echo play gfxterm gfxterm_background gzio minicmd normal png vbe
+
+# Location for Xen example configuration.
+XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
# Unsupported targets
arch_boot_screens:
@@ -26,23 +34,40 @@ arch_tree:
# support all the available CD/DVD variants.
.PHONY: arch_cd_info_dir
arch_cd_info_dir:
- -rm -f $(TEMP_CD_INFO_DIR)/*
- mkdir -p $(TEMP_CD_INFO_DIR)
+ x86-image $(TEMP_CD_INFO_DIR) $(GRUB_PLATFORM)
- mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub
sed -e "s/@ARCH@/$(ARCH)/g" $(GRUB_CFG_CDROM) \
> $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
if [ -n "$(GRUB_FONT)" ] ; then \
cp $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/boot/grub/font.pf2; \
fi
if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
cp $(SPLASH_PNG) $(TEMP_CD_INFO_DIR)/boot/grub/splash.png; \
fi
- grub-mkimage -O i386-pc -o $(TEMP_CD_INFO_DIR)/boot/grub/core.img $(GRUB_MODULES) $(GRUB_MODULES_CDROM)
- cat $(GRUB_MODDIR)/cdboot.img $(TEMP_CD_INFO_DIR)/boot/grub/core.img \
- > $(TEMP_CD_INFO_DIR)/boot/grub/grub_eltorito
- rm $(TEMP_CD_INFO_DIR)/boot/grub/core.img
+ # win32-loader
+ if [ -z "$(OMIT_WIN32_LOADER)" ]; then \
+ cp /usr/share/win32/win32-loader.exe $(TEMP_CD_INFO_DIR)/setup.exe; \
+ cp /usr/share/win32/win32-loader/g2ldr $(TEMP_CD_INFO_DIR)/g2ldr; \
+ cp /usr/share/win32/win32-loader/g2ldr.mbr $(TEMP_CD_INFO_DIR)/g2ldr.mbr; \
+ \
+ (printf "[installer]\n"; \
+ printf "kernel=kfreebsd\n"; \
+ printf "arch=$(subst kfreebsd-,,$(ARCH))\n"; \
+ #if [ -n "$(INITRD_GTK)" ]; then \
+ # printf "$(ARCH)/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/kfreebsd_module=boot/mfsroot.gz\n"; \
+ # printf "$(ARCH)/gtk/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/gtk/kfreebsd_module=boot/gtk/mfsroot.gz\n"; \
+ #else \
+ printf "user_interface=text\n"; \
+ printf "$(ARCH)/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/kfreebsd_module=boot/mfsroot.gz\n"; \
+ #fi; \
+ printf "\n[grub]\ng2ldr=g2ldr\ng2ldr.mbr=g2ldr.mbr\n") \
+ | todos > $(TEMP_CD_INFO_DIR)/win32-loader.ini; \
+ fi
+
# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
.PHONY: arch_miniiso
@@ -59,10 +84,34 @@ arch_miniiso: $(TEMP_INITRD) $(TEMP_KERN
cp $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
fi
if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
cp $(SPLASH_PNG) $(TEMP_CD_TREE)/boot/grub/splash.png; \
fi
- grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+ # win32-loader
+ if [ -z "$(OMIT_WIN32_LOADER)" ]; then \
+ cp /usr/share/win32/win32-loader.exe $(TEMP_CD_TREE)/setup.exe; \
+ cp /usr/share/win32/win32-loader/g2ldr $(TEMP_CD_TREE)/g2ldr; \
+ cp /usr/share/win32/win32-loader/g2ldr.mbr $(TEMP_CD_TREE)/g2ldr.mbr; \
+ \
+ (printf "[installer]\n"; \
+ printf "kernel=kfreebsd\n"; \
+ printf "arch=$(subst kfreebsd-,,$(ARCH))\n"; \
+ if [ "$(TYPE)" = "netboot/gtk" ]; then \
+ printf "user_interface=graphical\n"; \
+ printf "$(ARCH)/gtk/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/gtk/kfreebsd_module=boot/mfsroot.gz\n"; \
+ else \
+ printf "user_interface=text\n"; \
+ printf "$(ARCH)/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/kfreebsd_module=boot/mfsroot.gz\n"; \
+ fi; \
+ printf "\n[grub]\ng2ldr=g2ldr\ng2ldr.mbr=g2ldr.mbr\n") \
+ | todos > $(TEMP_CD_TREE)/win32-loader.ini; \
+ fi
+
+ # Create the ISO with Joliet extensions, needed for win32-loader.ini
+ grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE) -J
# Netboot files
.PHONY: arch_netboot_dir
@@ -72,24 +121,23 @@ arch_netboot_dir:
cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
- sed -e "s/@ARCH@/$(ARCH)/g" $(GRUB_CFG_PXE) \
- > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg
+ sed -e "s/@ARCH@/$(ARCH)/g" \
+ -e "s/@KERNEL@/$(notdir $(TEMP_KERNEL))/g" \
+ $(GRUB_CFG_PXE) > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg
if [ -n "$(GRUB_FONT)" ] ; then \
cp $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/font.pf2; \
fi
if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
cp $(SPLASH_PNG) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/splash.png; \
fi
# Generate grub2pxe
- grub-mkimage -O i386-pc --prefix="(pxe)/$(NETBOOT_PATH)" \
- -o $(TEMP_NETBOOT_DIR)/core.img \
- $(GRUB_MODULES) $(GRUB_MODULES_PXE)
- # workaround a gPXE bug
- sed -i -e 's/\x02\xb0\xad\x1b/\x03\xb0\xad\x1b/' $(TEMP_NETBOOT_DIR)/core.img
- cat $(GRUB_MODDIR)/pxeboot.img $(TEMP_NETBOOT_DIR)/core.img \
- > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe
- rm $(TEMP_NETBOOT_DIR)/core.img
+ grub-mkimage -O $(GRUB_PLATFORM)-pxe --prefix="(pxe)/$(NETBOOT_PATH)" \
+ -o $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe \
+ $(GRUB_MODULES_PXE)
# This symlink is not strictly required, but it allows more usual
# dhcp server setups to work without modification.
@@ -97,3 +145,11 @@ arch_netboot_dir:
ln -sf $(NETBOOT_PATH)/grub2pxe $(TEMP_NETBOOT_DIR)/grub2pxe
+.PHONY: xen_config
+xen_config: $(TEMP_INITRD)
+ sed -e "s/@ARCH@/$(ARCH)/g" \
+ -e "s/@XEN_INSTALL_METHOD@/$(XEN_INSTALL_METHOD)/g" \
+ -e "s/@DEBIAN_RELEASE@/$(DEBIAN_RELEASE)/g" \
+ $(XENCFG)
+ chmod 644 $(XENCFG)
+ update-manifest $(XENCFG) $(MANIFEST-XENCFG)
diff -pruN 20101020/build/config/kfreebsd-i386/cdrom/grub.cfg 20201202/build/config/kfreebsd-i386/cdrom/grub.cfg
--- 20101020/build/config/kfreebsd-i386/cdrom/grub.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/cdrom/grub.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,7 @@
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
+
+TYPE = cdrom/grub
diff -pruN 20101020/build/config/kfreebsd-i386/cdrom.cfg 20201202/build/config/kfreebsd-i386/cdrom.cfg
--- 20101020/build/config/kfreebsd-i386/cdrom.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,8 +1,6 @@
-MEDIA_TYPE = CD-ROM
+KERNELVERSION = $(BASEVERSION_10)-486
+KERNELNAME = kfreebsd-10.gz
-TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
-EXTRANAME = $(MEDIUM)/
+FLAVOUR_SUPPORTED = grub
-MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
-MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
-MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
+MEDIA_TYPE = CD-ROM
diff -pruN 20101020/build/config/kfreebsd-i386/cdrom-xen.cfg 20201202/build/config/kfreebsd-i386/cdrom-xen.cfg
--- 20101020/build/config/kfreebsd-i386/cdrom-xen.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/cdrom-xen.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,14 @@
+KERNELVERSION = $(BASEVERSION_10)-xen
+TYPE=cdrom
+
+include config/kfreebsd-i386/cdrom.cfg
+
+EXTRANAME = cdrom/xen/
+
+MANIFEST-KERNEL = "kernel image for installing under Xen"
+MANIFEST-INITRD = "initrd for installing under Xen"
+MANIFEST-XENCFG = "example Xen configuration"
+
+XEN_INSTALL_METHOD = cdrom
+
+TARGET = $(KERNEL) xen_config
diff -pruN 20101020/build/config/kfreebsd-i386/monolithic-10.cfg 20201202/build/config/kfreebsd-i386/monolithic-10.cfg
--- 20101020/build/config/kfreebsd-i386/monolithic-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/monolithic-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,13 @@
+MEDIA_TYPE = boot image
+
+KERNELVERSION = $(BASEVERSION_10)-486
+KERNELNAME = kfreebsd-10.gz
+
+TYPE = monolithic
+
+TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "initrd"
+MANIFEST-KERNEL = "kernel image"
+MANIFEST-MINIISO = "small bootable CD image for network install"
diff -pruN 20101020/build/config/kfreebsd-i386/monolithic.cfg 20201202/build/config/kfreebsd-i386/monolithic.cfg
--- 20101020/build/config/kfreebsd-i386/monolithic.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "initrd"
-MANIFEST-KERNEL = "kernel image"
-MANIFEST-MINIISO = "small bootable CD image for network install"
diff -pruN 20101020/build/config/kfreebsd-i386/netboot-10.cfg 20201202/build/config/kfreebsd-i386/netboot-10.cfg
--- 20101020/build/config/kfreebsd-i386/netboot-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/netboot-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,17 @@
+MEDIA_TYPE = netboot image
+
+KERNELVERSION = $(BASEVERSION_10)-486
+KERNELNAME = kfreebsd-10.gz
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+
diff -pruN 20101020/build/config/kfreebsd-i386/netboot.cfg 20201202/build/config/kfreebsd-i386/netboot.cfg
--- 20101020/build/config/kfreebsd-i386/netboot.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-MEDIA_TYPE = netboot image
-
-NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
-NETBOOT_DIR_LINKS = grub2pxe
-TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
-MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
-MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
-
diff -pruN 20101020/build/config/kfreebsd-i386/netboot-xen-10.cfg 20201202/build/config/kfreebsd-i386/netboot-xen-10.cfg
--- 20101020/build/config/kfreebsd-i386/netboot-xen-10.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386/netboot-xen-10.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,14 @@
+KERNELVERSION = $(BASEVERSION_10)-xen
+TYPE=netboot
+
+include config/kfreebsd-i386/netboot-10.cfg
+
+EXTRANAME = netboot-10/xen/
+
+MANIFEST-KERNEL = "kernel image for installing under Xen"
+MANIFEST-INITRD = "initrd for installing under Xen"
+MANIFEST-XENCFG = "example Xen configuration"
+
+XEN_INSTALL_METHOD = network
+
+TARGET = $(KERNEL) $(INITRD) xen_config
diff -pruN 20101020/build/config/kfreebsd-i386.cfg 20201202/build/config/kfreebsd-i386.cfg
--- 20101020/build/config/kfreebsd-i386.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/config/kfreebsd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,8 @@
-MEDIUM_SUPPORTED = cdrom netboot
-MEDIUM_SUPPORTED_EXTRA = monolithic
+MEDIUM_SUPPORTED = cdrom netboot-10 netboot-xen-10
+MEDIUM_SUPPORTED_EXTRA = monolithic-10
# The version of the kernel to use.
-KERNELVERSION = 8.1-1-486
-KERNELMAJOR = 8
-KERNEL_FLAVOUR = di
-KERNELNAME = kfreebsd.gz
-KERNELIMAGEVERSION = $(KERNELVERSION)
+BASEVERSION_10 = 10.3-0
+KERNELMAJOR = 10
include config/kfreebsd.cfg
diff -pruN 20101020/build/config/m68k/cdrom.cfg 20201202/build/config/m68k/cdrom.cfg
--- 20101020/build/config/m68k/cdrom.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -7,4 +7,3 @@ EXTRANAME = cdrom/
MANIFEST-INITRD = "m68k cdrom root image"
TARGET = $(INITRD)
-
diff -pruN 20101020/build/config/m68k/floppy.cfg 20201202/build/config/m68k/floppy.cfg
--- 20101020/build/config/m68k/floppy.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/floppy.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -67,12 +67,12 @@ endef
# vme root
#
-define vme_root
+define vme_root
mkdir -p $(TEMP)/$(SUB)root/etc
cp $(TEMP_INITRD) $(TEMP)/$(SUB)root/root.bin
makelabel $(DISK_LABEL) $(BUILD_DATE) > $(TEMP)/$(SUB)root/disk.lbl
genext2fs -d $(TEMP)/$(SUB)root -b $(FLOPPY_SIZE) -r 0 $(TEMP)/$(SUB)root.img
- $(e2fsck) $(TEMP)/$(SUB)root.img || true
+ $(e2fsck) $(TEMP)/$(SUB)root.img || true
$(if $(GZIPPED),gzip -v9f $(TEMP)/$(SUB)root.img)
install -m 644 -D $(TEMP)/$(SUB)root.img$(GZIPPED) $(FINAL_IMAGE)
update-manifest $(FINAL_IMAGE) $(MANIFEST-INITRD) $(UDEB_LISTS)
@@ -91,13 +91,13 @@ DOS_VOLUME_LABEL = "Debian Inst"
# msdos fat 12, auto/bootstra.prg, bootargs, linux
define atari_boot
- mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)boot.img $(FLOPPY_SIZE)
+ mkfs.msdos --invariant -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)boot.img $(FLOPPY_SIZE)
# mkfs.msdos gets the mode wrong (bug filed)
chmod 644 $(TEMP)/$(SUB)boot.img
# generate a disk label
makelabel $(DISK_LABEL) $(BUILD_DATE) > $(TEMP)/disk.lbl
- ls -l $(TEMP)/disk.lbl $(shell echo $(TEMP_KERNEL) | cut -d' ' -f 1)
+ ls -l $(TEMP)/disk.lbl $(shell echo $(TEMP_KERNEL) | cut -d' ' -f 1)
mcopy -i$(TEMP)/$(SUB)boot.img $(TEMP)/disk.lbl ::disk.lbl
mcopy -i$(TEMP)/$(SUB)boot.img $(shell echo $(TEMP_KERNEL) | cut -d' ' -f 1) ::/linux
@@ -106,9 +106,9 @@ define atari_boot
mmd -i$(TEMP)/$(SUB)boot.img ::/auto
mcopy -i$(TEMP)/$(SUB)boot.img $(TEMP)/bootstra.tos ::/auto
mcopy -i$(TEMP)/$(SUB)boot.img boot/m68k/atari-bootargs-floppy ::/bootargs
-
+
$(if $(GZIPPED),gzip -v9f $(TEMP)/$(SUB)boot.img)
-
+
install -m 644 -D $(TEMP)/$(SUB)boot.img$(GZIPPED) $(FINAL_IMAGE)
update-manifest $(FINAL_IMAGE) $(MANIFEST-INITRD) $(UDEB_LISTS)
endef
@@ -117,8 +117,8 @@ endef
# atari root
#
-define atari_root
- mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)root.img $(FLOPPY_SIZE)
+define atari_root
+ mkfs.msdos --invariant -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)root.img $(FLOPPY_SIZE)
# mkfs.msdos gets the mode wrong (bug filed)
chmod 644 $(TEMP)/$(SUB)root.img
@@ -130,7 +130,7 @@ define atari_root
mcopy -i$(TEMP)/$(SUB)root.img $(TEMP_INITRD) ::initrd.gz
$(if $(GZIPPED),gzip -v9f $(TEMP)/$(SUB)root.img)
-
+
install -m 644 -D $(TEMP)/$(SUB)root.img$(GZIPPED) $(FINAL_IMAGE)
update-manifest $(FINAL_IMAGE) $(MANIFEST-INITRD) $(UDEB_LISTS)
endef
@@ -141,58 +141,58 @@ endef
BVMEBOOT = $(SOME_DEST)/$(EXTRANAME)bvme6000-boot.img$(GZIPPED)
BVMEROOT = $(SOME_DEST)/$(EXTRANAME)bvme6000-root.img$(GZIPPED)
-$(BVMEBOOT): FLOPPY_SIZE = 1440
+$(BVMEBOOT): FLOPPY_SIZE = 1440
$(BVMEBOOT): VMEARCH = bvme
$(BVMEBOOT): SUB = bvme6000-
-$(BVMEBOOT): SUB_KERNEL = $(TEMP)/vmlinuz-$(M68K_KERNEL_BVME6000)
+$(BVMEBOOT): SUB_KERNEL = $(TEMP)/$(KERNELNAME)
$(BVMEBOOT): MANIFEST-INITRD = $(MANIFEST-BOOT-BVME6000)
$(BVMEBOOT): FINAL_IMAGE = $(BVMEBOOT)
-$(BVMEBOOT):
+$(BVMEBOOT):
$(vme_boot)
-$(BVMEROOT): FLOPPY_SIZE = 1440
+$(BVMEROOT): FLOPPY_SIZE = 1440
$(BVMEROOT): SUB = bvme6000-
$(BVMEROOT): MANIFEST-INITRD = $(MANIFEST-ROOT-BVME6000)
$(BVMEROOT): FINAL_IMAGE = $(BVMEROOT)
-$(BVMEROOT):
+$(BVMEROOT):
$(vme_root)
MVME147BOOT = $(SOME_DEST)/$(EXTRANAME)mvme147-boot.img$(GZIPPED)
MVME147ROOT = $(SOME_DEST)/$(EXTRANAME)mvme147-root.img$(GZIPPED)
-$(MVME147BOOT): FLOPPY_SIZE = 1440
+$(MVME147BOOT): FLOPPY_SIZE = 1440
$(MVME147BOOT): VMEARCH = mvme
$(MVME147BOOT): SUB = mvme147-
-$(MVME147BOOT): SUB_KERNEL = $(TEMP)/vmlinuz-$(M68K_KERNEL_MVME147)
+$(MVME147BOOT): SUB_KERNEL = $(TEMP)/$(KERNELNAME)
$(MVME147BOOT): MANIFEST-INITRD = $(MANIFEST-BOOT-MVME147)
$(MVME147BOOT): FINAL_IMAGE = $(MVME147BOOT)
-$(MVME147BOOT):
+$(MVME147BOOT):
$(vme_boot)
-$(MVME147ROOT): FLOPPY_SIZE = 1440
+$(MVME147ROOT): FLOPPY_SIZE = 1440
$(MVME147ROOT): SUB = mvme147-
$(MVME147ROOT): MANIFEST-INITRD = $(MANIFEST-ROOT-MVME147)
$(MVME147ROOT): FINAL_IMAGE = $(MVME147ROOT)
-$(MVME147ROOT):
+$(MVME147ROOT):
$(vme_root)
MVME16XBOOT = $(SOME_DEST)/$(EXTRANAME)mvme16x-boot.img$(GZIPPED)
MVME16XROOT = $(SOME_DEST)/$(EXTRANAME)mvme16x-root.img$(GZIPPED)
-$(MVME16XBOOT): FLOPPY_SIZE = 1440
+$(MVME16XBOOT): FLOPPY_SIZE = 1440
$(MVME16XBOOT): VMEARCH = mvme
$(MVME16XBOOT): SUB = mvme16x-
-$(MVME16XBOOT): SUB_KERNEL = $(TEMP)/vmlinuz-$(M68K_KERNEL_MVME16X)
+$(MVME16XBOOT): SUB_KERNEL = $(TEMP)/$(KERNELNAME)
$(MVME16XBOOT): MANIFEST-INITRD = $(MANIFEST-BOOT-MVME16X)
$(MVME16XBOOT): FINAL_IMAGE = $(MVME16XBOOT)
-$(MVME16XBOOT):
+$(MVME16XBOOT):
$(vme_boot)
-$(MVME16XROOT): FLOPPY_SIZE = 1440
+$(MVME16XROOT): FLOPPY_SIZE = 1440
$(MVME16XROOT): SUB = mvme16x-
$(MVME16XROOT): MANIFEST-INITRD = $(MANIFEST-ROOT-MVME16X)
$(MVME16XROOT): FINAL_IMAGE = $(MVME16XROOT)
-$(MVME16XROOT):
+$(MVME16XROOT):
$(vme_root)
@@ -206,32 +206,32 @@ $(BVMECDROM): EXTRANAME = cdrom/
$(BVMECDROM): FLOPPY_SIZE = 2880
$(BVMECDROM): VMEARCH = bvme
$(BVMECDROM): SUB = bvme6000-cdrom-
-$(BVMECDROM): SUB_KERNEL = $(TEMP)/vmlinuz-$(M68K_KERNEL_BVME6000)
+$(BVMECDROM): SUB_KERNEL = $(TEMP)/$(KERNELNAME)
$(BVMECDROM): MANIFEST-INITRD = $(MANIFEST-CDROM-BVME6000)
$(BVMECDROM): FINAL_IMAGE = $(BVMECDROM)
-$(BVMECDROM):
+$(BVMECDROM):
$(vme_boot)
ATARIBOOT = $(SOME_DEST)/$(EXTRANAME)atari-boot.img$(GZIPPED)
ATARIROOT = $(SOME_DEST)/$(EXTRANAME)atari-root.img$(GZIPPED)
-$(ATARIBOOT): FLOPPY_SIZE = 1440
+$(ATARIBOOT): FLOPPY_SIZE = 1440
$(ATARIBOOT): SUB = atari-
-$(ATARIBOOT): SUB_KERNEL = $(TEMP)/vmlinuz-$(M68K_KERNEL_ATARI)
+$(ATARIBOOT): SUB_KERNEL = $(TEMP)/$(KERNELNAME)
$(ATARIBOOT): MANIFEST-INITRD = $(MANIFEST-BOOT-ATARI)
$(ATARIBOOT): FINAL_IMAGE = $(ATARIBOOT)
$(ATARIBOOT): $(TEMP)/bootstra.tos
$(atari_boot)
-$(ATARIROOT): FLOPPY_SIZE = 1440
+$(ATARIROOT): FLOPPY_SIZE = 1440
$(ATARIROOT): SUB = atari-
$(ATARIROOT): MANIFEST-INITRD = $(MANIFEST-ROOT-ATARI)
$(ATARIROOT): FINAL_IMAGE = $(ATARIROOT)
-$(ATARIROOT):
+$(ATARIROOT):
$(atari_root)
-TARGET = $(TEMP_INITRD) $(ATARIBOOT) $(ATARIROOT)
+TARGET = $(TEMP_INITRD) $(ATARIBOOT) $(ATARIROOT)
# vme boot floppies need root to build, so cannot be built by default
-# $(BVMECDROM) $(BVMEROOT) $(BVMEBOOT) $(MVME147BOOT) $(MVME147ROOT) $(MVME16XBOOT) $(MVME16XROOT)
+# $(BVMECDROM) $(BVMEROOT) $(BVMEBOOT) $(MVME147BOOT) $(MVME147ROOT) $(MVME16XBOOT) $(MVME16XROOT)
diff -pruN 20101020/build/config/m68k/hd-media.cfg 20201202/build/config/m68k/hd-media.cfg
--- 20101020/build/config/m68k/hd-media.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/hd-media.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -4,7 +4,6 @@ TYPE = hd-media
EXTRANAME = hd-media/
-MANIFEST-INITRD = "m68k hd-media root"
+MANIFEST-INITRD = "m68k hd-media root"
TARGET = $(INITRD)
-
diff -pruN 20101020/build/config/m68k/kernels.cfg 20201202/build/config/m68k/kernels.cfg
--- 20101020/build/config/m68k/kernels.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/kernels.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -9,7 +9,6 @@ MANIFEST-KERNEL = "m68k kernel"
include config/m68k/tools.cfg
# kill the keymaps
-EXTRAS =
+EXTRAS =
TARGET = $(KERNEL) $(TOOLS)
-
diff -pruN 20101020/build/config/m68k/nativehd.cfg 20201202/build/config/m68k/nativehd.cfg
--- 20101020/build/config/m68k/nativehd.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/nativehd.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -4,7 +4,6 @@ TYPE = nativehd
EXTRANAME = nativehd/
-MANIFEST-INITRD = "m68k nativehd root"
+MANIFEST-INITRD = "m68k nativehd root"
TARGET = $(INITRD)
-
diff -pruN 20101020/build/config/m68k/netboot.cfg 20201202/build/config/m68k/netboot.cfg
--- 20101020/build/config/m68k/netboot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -29,4 +29,3 @@ $(SOME_DEST)/$(EXTRANAME)tftplilo.mvme:
update-manifest $@ $(MANIFEST-TFTP-M)
TARGET = $(INITRD) $(SOME_DEST)/$(EXTRANAME)tftplilo.conf $(SOME_DEST)/$(EXTRANAME)tftplilo.txt $(SOME_DEST)/$(EXTRANAME)tftplilo.bvme $(SOME_DEST)/$(EXTRANAME)tftplilo.mvme
-
diff -pruN 20101020/build/config/m68k/network-console.cfg 20201202/build/config/m68k/network-console.cfg
--- 20101020/build/config/m68k/network-console.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/network-console.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,6 +1,6 @@
MEDIA_TYPE = netboot image (SSH)
-EXTRANAME = network-console/
+EXTRANAME = network-console/
TARGET = $(INITRD)
PRESEED = boot/m68k/ssh.preseed
TYPE = netboot/network-console
@@ -12,4 +12,3 @@ MANIFEST-INITRD = "initrd for network-co
# echo $(SOME_DEST)/
# install -m 644 -D $< $@
# update-manifest $@ $(MANIFEST-INITRD) $(UDEB_LISTS)
-
diff -pruN 20101020/build/config/m68k/tools.cfg 20201202/build/config/m68k/tools.cfg
--- 20101020/build/config/m68k/tools.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/m68k/tools.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -32,12 +32,12 @@ $(TOOLS_ATARI)/bootstra.tos: $(TEMP)/boo
install -m 644 -D $< $@
update-manifest $@ $(MANIFEST-ATARI-BOOTSTRA)
-$(TOOLS_ATARI)/bootargs: boot/m68k/atari-bootargs-cdrom
- sed -e "s,linux,vmlinuz-$(M68K_KERNEL_ATARI)," $< > $(TEMP)/bootargs
+$(TOOLS_ATARI)/bootargs: boot/m68k/atari-bootargs-cdrom
+ sed -e "s,linux,$(KERNELNAME)," $< > $(TEMP)/bootargs
install -m 644 -D $(TEMP)/bootargs $@
update-manifest $@ $(MANIFEST-ATARI-BOOTARGS)
-$(TOOLS_ATARI)/rawwrite.ttp: $(TOOLS_ATARI_SRC)/rawwrite.ttp.gz
+$(TOOLS_ATARI)/rawwrite.ttp: $(TOOLS_ATARI_SRC)/rawwrite.ttp.gz
gzip -cd $< > $@
update-manifest $@ $(MANIFEST-ATARI-RAWWRITE)
@@ -47,28 +47,28 @@ ATARITOOLS = $(TOOLS_ATARI)/bootstra.tos
# amiga tools
#
-# valid AmigaOS path `/' means `one up' (and `:' means `root'),
+# valid AmigaOS path `/' means `one up' (and `:' means `root'),
# so ../../cdrom/initrd.gz => //cdrom/initrd.gz ???
-STARTINSTALL = "amiboot -d -k //kernels/vmlinuz-$(M68K_KERNEL_AMIGA) -r //cdrom/initrd.gz root=/dev/ram fb=false"
+STARTINSTALL = "amiboot -d -k //kernels/$(KERNELNAME) -r //cdrom/initrd.gz root=/dev/ram fb=false"
-$(TOOLS_AMIGA)/StartInstall:
+$(TOOLS_AMIGA)/StartInstall:
echo $(STARTINSTALL) > $(TEMP)/$(@F)
install -m 644 -D $(TEMP)/$(@F) $@
-$(TOOLS_AMIGA)/StartInstall_CV3D:
+$(TOOLS_AMIGA)/StartInstall_CV3D:
echo $(STARTINSTALL) video=virge:640x480-8 > $(TEMP)/$(@F)
install -m 644 -D $(TEMP)/$(@F) $@
-$(TOOLS_AMIGA)/StartInstall_CV64:
+$(TOOLS_AMIGA)/StartInstall_CV64:
echo $(STARTINSTALL) video=cyber:640x480-8 > $(TEMP)/$(@F)
install -m 644 -D $(TEMP)/$(@F) $@
-$(TOOLS_AMIGA)/StartInstall_clgen:
+$(TOOLS_AMIGA)/StartInstall_clgen:
echo $(STARTINSTALL) video=clgen: > $(TEMP)/$(@F)
install -m 644 -D $(TEMP)/$(@F) $@
-$(TOOLS_AMIGA)/StartInstall_retz3:
+$(TOOLS_AMIGA)/StartInstall_retz3:
echo $(STARTINSTALL) video=retz3:640x480 > $(TEMP)/$(@F)
install -m 644 -D $(TEMP)/$(@F) $@
@@ -108,4 +108,3 @@ endif
TOOLS = $(ATARITOOLS) $(AMIGATOOLS) $(MACTOOLS)
-
diff -pruN 20101020/build/config/m68k.cfg 20201202/build/config/m68k.cfg
--- 20101020/build/config/m68k.cfg 2010-02-27 23:38:36.000000000 +0000
+++ 20201202/build/config/m68k.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,20 +1,18 @@
-MEDIUM_SUPPORTED = cdrom hd-media kernels nativehd #floppy network-console
-
# netboot isn't supported on amiga, atari, or mac, the only subarchs with 2.6 kernels.
# floppy image is too big (and has been for a while)
-M68K_KERNEL_AMIGA = 2.6.29-2-amiga
-M68K_KERNEL_ATARI = 2.6.29-2-atari
-M68K_KERNEL_MAC = 2.6.29-2-mac
-M68K_KERNEL = $(M68K_KERNEL_AMIGA) $(M68K_KERNEL_ATARI) $(M68K_KERNEL_MAC)
+MEDIUM_SUPPORTED = cdrom hd-media kernels nativehd #floppy network-console
-KERNELMAJOR = 2.6
-KERNELVERSION = $(M68K_KERNEL)
-KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
-KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
VERSIONED_SYSTEM_MAP = t
+KERNELMAJOR = 2.6
+KERNELVERSION = $(LINUX_KERNEL_ABI)-m68k
-arch_tree:
+KERNELNAME = vmlinux-${KERNELVERSION}
+
+DEBIAN_RELEASE = unstable
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+
+arch_boot_screens:
+arch_tree:
diff -pruN 20101020/build/config/mips/malta/netboot-2.6.cfg 20201202/build/config/mips/malta/netboot-2.6.cfg
--- 20101020/build/config/mips/malta/netboot-2.6.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/malta/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-MEDIA_TYPE = netboot image
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(INITRD) $(KERNEL)
-TYPE = netboot
-EXTRANAME = $(TYPE)/
-
-MANIFEST-INITRD = "initrd for the MIPS Malta board"
-MANIFEST-KERNEL = "kernel image for the MIPS Malta board"
-
diff -pruN 20101020/build/config/mips/malta/netboot.cfg 20201202/build/config/mips/malta/netboot.cfg
--- 20101020/build/config/mips/malta/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips/malta/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Malta board"
+MANIFEST-KERNEL = "kernel image for the MIPS Malta board"
+
diff -pruN 20101020/build/config/mips/malta.cfg 20201202/build/config/mips/malta.cfg
--- 20101020/build/config/mips/malta.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/malta.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,7 +1,6 @@
-MEDIUM_SUPPORTED = netboot-2.6
+MEDIUM_SUPPORTED = netboot
# The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-4kc-malta
-
-INITRD_FS = initramfs
+KERNELVERSION := $(KERNELVERSION)-4kc-malta
+KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
diff -pruN 20101020/build/config/mips/miniiso.cfg 20201202/build/config/mips/miniiso.cfg
--- 20101020/build/config/mips/miniiso.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/miniiso.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# This is completely meaningless, since the mini-ISO uses prebuilt
-# boot images, but some Makefile magic depends on those definitions.
-KERNELVERSION = $(KERNELMAJOR).$(KERNELMINOR)-r4k-ip22
-KERNELNAME =
-KERNELMAJOR = 2.6
-
-MEDIA_TYPE = CD-ROM
-
-# Hack, hack!
-TARGET =
-EXTRATARGETS = build_r4k-ip22_netboot-2.6 $(MINIISO)
-EXTRANAME = cdrom-
-
-MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
-
-.PHONY: arch_miniiso
-arch_miniiso:
- -rm -rf $(TEMP_CD_TREE)/*
- install -m 644 -D $(BASE_TMP)r4k-ip22_netboot-2.6/boot.img $(TEMP_CD_TREE)/install/r4k-ip22-boot.img
- genisoimage -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
- set -e; \
- ISOVH_BOOTFILES= ; \
- $(foreach SUB,r4k-ip22 , \
- start=$$(isoinfo -i $(TEMP_MINIISO) -lsR |grep -A 10 'Directory listing of /install' |grep $(SUB)-boot.img |awk '{print $$10 * 4}'); \
- size=$$(isoinfo -i $(TEMP_MINIISO) -lsR |grep -A 10 'Directory listing of /install' |grep $(SUB)-boot.img |awk '{print $$5 * 2048}'); \
- ISOVH_BOOTFILES="$$ISOVH_BOOTFILES $(SUB):$$start,$$size";) \
- start=$$(isoinfo -i $(TEMP_MINIISO) -lsR |grep -A 10 'Directory listing of /install' |grep r4k-ip22-boot.img |awk '{print $$10 * 4}'); \
- size=$$(isoinfo -i $(TEMP_MINIISO) -lsR | grep -A 10 'Directory listing of /install' |grep r4k-ip22-boot.img |awk '{print $$5 * 2048}'); \
- ISOVH_BOOTFILES="$$ISOVH_BOOTFILES sashARCS:$$start,$$size"; \
- genisovh $(TEMP_MINIISO) $$ISOVH_BOOTFILES
diff -pruN 20101020/build/config/mips/octeon/netboot.cfg 20201202/build/config/mips/octeon/netboot.cfg
--- 20101020/build/config/mips/octeon/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips/octeon/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Octeon machines"
+MANIFEST-KERNEL = "kernel image for the MIPS Octeon machines"
+
diff -pruN 20101020/build/config/mips/octeon.cfg 20201202/build/config/mips/octeon.cfg
--- 20101020/build/config/mips/octeon.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips/octeon.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,6 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-octeon
+KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinux-$(ver))
+
diff -pruN 20101020/build/config/mips/r4k-ip22/cdrom-2.6.cfg 20201202/build/config/mips/r4k-ip22/cdrom-2.6.cfg
--- 20101020/build/config/mips/r4k-ip22/cdrom-2.6.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/r4k-ip22/cdrom-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(BOOT)
-TYPE = cdrom
-EXTRANAME = $(TYPE)-
-
-MANIFEST-BOOT = "CDROM image for SGI IP22 machines (R4x00 and R5000 CPU)"
-
-# Create a bootable image for the CD.
-.PHONY: arch_boot
-arch_boot:
- tftpboot.sh $(TEMP_KERNEL) /dev/null $(TEMP_INITRD) $(TEMP_BOOT)
diff -pruN 20101020/build/config/mips/r4k-ip22/monolithic.cfg 20201202/build/config/mips/r4k-ip22/monolithic.cfg
--- 20101020/build/config/mips/r4k-ip22/monolithic.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/r4k-ip22/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(BOOT)
-EXTRANAME = $(MEDIUM)-
-
-MANIFEST-BOOT = "monolithic tftp boot image for SGI IP22 machines with R4x00 CPU"
-
-# Create a bootable tftp image.
-.PHONY: arch_boot
-arch_boot:
- tftpboot.sh $(TEMP_KERNEL) /dev/null $(TEMP_INITRD) $(TEMP_BOOT)
diff -pruN 20101020/build/config/mips/r4k-ip22/netboot-2.6.cfg 20201202/build/config/mips/r4k-ip22/netboot-2.6.cfg
--- 20101020/build/config/mips/r4k-ip22/netboot-2.6.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/r4k-ip22/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-MEDIA_TYPE = netboot image
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(BOOT)
-TYPE = netboot
-EXTRANAME = $(TYPE)-
-
-MANIFEST-BOOT = "tftp boot image for SGI IP22 machines (R4x00 and R5000 CPU)"
-
-# Create a bootable tftp image.
-.PHONY: arch_boot
-arch_boot:
- tftpboot.sh $(TEMP_KERNEL) /dev/null $(TEMP_INITRD) $(TEMP_BOOT)
diff -pruN 20101020/build/config/mips/r4k-ip22.cfg 20201202/build/config/mips/r4k-ip22.cfg
--- 20101020/build/config/mips/r4k-ip22.cfg 2009-03-16 00:50:59.000000000 +0000
+++ 20201202/build/config/mips/r4k-ip22.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-MEDIUM_SUPPORTED = cdrom-2.6 netboot-2.6
-MEDIUM_SUPPORTED_EXTRA = monolithic
-
-# The version of the kernel to use.
-KERNELVERSION = $(KERNELMAJOR).$(KERNELMINOR)-r4k-ip22
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-r4k-ip22
-
diff -pruN 20101020/build/config/mips/r5k-ip32/netboot-2.6.cfg 20201202/build/config/mips/r5k-ip32/netboot-2.6.cfg
--- 20101020/build/config/mips/r5k-ip32/netboot-2.6.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/r5k-ip32/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-MEDIA_TYPE = netboot image
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(BOOT)
-TYPE = netboot
-EXTRANAME = $(TYPE)-
-
-MANIFEST-BOOT = "tftp boot image for SGI IP32 (O2) machines (R5000 CPU)"
-
-# Create a bootable tftp image.
-.PHONY: arch_boot
-arch_boot:
- tftpboot.sh $(TEMP_KERNEL) /dev/null $(TEMP_INITRD) $(TEMP_BOOT)
diff -pruN 20101020/build/config/mips/r5k-ip32.cfg 20201202/build/config/mips/r5k-ip32.cfg
--- 20101020/build/config/mips/r5k-ip32.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mips/r5k-ip32.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MEDIUM_SUPPORTED = netboot-2.6
-
-# The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-r5k-ip32
-
diff -pruN 20101020/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg 20201202/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg
--- 20101020/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg 2010-05-22 19:06:14.000000000 +0000
+++ 20201202/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-MEDIA_TYPE = netboot image
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(INITRD) $(KERNEL) $(SOME_DEST)/$(EXTRANAME)sibyl $(SOME_DEST)/$(EXTRANAME)sibyl.conf
-TYPE = netboot
-EXTRANAME = $(TYPE)/
-
-MANIFEST-INITRD = "initrd for the Broadcom BCM91250A (SWARM) evaluation board"
-MANIFEST-KERNEL = "kernel image for the Broadcom BCM91250A (SWARM) evaluation board"
-
-$(SOME_DEST)/$(EXTRANAME)sibyl:
- cp /usr/lib/sibyl/sibyl.bin $@
- update-manifest $@ "SiByl boot loader"
-
-$(SOME_DEST)/$(EXTRANAME)sibyl.conf:
- ramdisk-size-subst $(TEMP_INITRD) < boot/mips/sibyl.conf | \
- bootvars-subst KERNELVERSION "$(KERNELVERSION)" > $@
- update-manifest $@ "SiByl TFTP boot configuration script"
-
diff -pruN 20101020/build/config/mips/sb1-bcm91250a.cfg 20201202/build/config/mips/sb1-bcm91250a.cfg
--- 20101020/build/config/mips/sb1-bcm91250a.cfg 2010-05-22 19:06:14.000000000 +0000
+++ 20201202/build/config/mips/sb1-bcm91250a.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-MEDIUM_SUPPORTED = netboot-2.6
-
-# The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-sb1-bcm91250a
-
-INITRD_FS = initramfs
diff -pruN 20101020/build/config/mips64el/loongson-3/monolithic.cfg 20201202/build/config/mips64el/loongson-3/monolithic.cfg
--- 20101020/build/config/mips64el/loongson-3/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/loongson-3/monolithic.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = boot image
+
+TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) boot.cfg
+TYPE = monolithic
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for Loongson 3A/B systems"
+MANIFEST-KERNEL = "kernel image for Loongson 3A/B systems"
+
diff -pruN 20101020/build/config/mips64el/loongson-3/netboot.cfg 20201202/build/config/mips64el/loongson-3/netboot.cfg
--- 20101020/build/config/mips64el/loongson-3/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/loongson-3/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL) boot.cfg
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for Loongson 3A/B systems"
+MANIFEST-KERNEL = "kernel image for Loongson 3A/B systems"
+
diff -pruN 20101020/build/config/mips64el/loongson-3.cfg 20201202/build/config/mips64el/loongson-3.cfg
--- 20101020/build/config/mips64el/loongson-3.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/loongson-3.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,11 @@
+MEDIUM_SUPPORTED = netboot
+MEDIUM_SUPPORTED_EXTRA = monolithic
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-loongson-3
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinuz-$(ver))
+
+boot.cfg:
+ bootvars-subst KERNELVERSION "$(KERNELVERSION)" \
+ $(SOME_DEST)/$(EXTRANAME)boot.cfg
+ update-manifest $(SOME_DEST)/$(EXTRANAME)boot.cfg "PMON configuration file"
diff -pruN 20101020/build/config/mips64el/malta/netboot.cfg 20201202/build/config/mips64el/malta/netboot.cfg
--- 20101020/build/config/mips64el/malta/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/malta/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Malta board"
+MANIFEST-KERNEL = "kernel image for the MIPS Malta board"
+
diff -pruN 20101020/build/config/mips64el/malta.cfg 20201202/build/config/mips64el/malta.cfg
--- 20101020/build/config/mips64el/malta.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/malta.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,6 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-5kc-malta
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinuz-$(ver))
+
diff -pruN 20101020/build/config/mips64el/octeon/netboot.cfg 20201202/build/config/mips64el/octeon/netboot.cfg
--- 20101020/build/config/mips64el/octeon/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/octeon/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Octeon machines"
+MANIFEST-KERNEL = "kernel image for the MIPS Octeon machines"
+
diff -pruN 20101020/build/config/mips64el/octeon.cfg 20201202/build/config/mips64el/octeon.cfg
--- 20101020/build/config/mips64el/octeon.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el/octeon.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,6 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-octeon
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinux-$(ver))
+
diff -pruN 20101020/build/config/mips64el.cfg 20201202/build/config/mips64el.cfg
--- 20101020/build/config/mips64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mips64el.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,12 @@
+SUBARCH_SUPPORTED = malta loongson-3 octeon
+
+KERNELMAJOR = 2.6
+# Targets for 3.x kernel images will use this version instead.
+KERNELVERSION = $(LINUX_KERNEL_ABI)
+
+INITRD_FS = initramfs
+
+VERSIONED_SYSTEM_MAP = t
+
+arch_boot_screens:
+arch_tree:
diff -pruN 20101020/build/config/mips.cfg 20201202/build/config/mips.cfg
--- 20101020/build/config/mips.cfg 2010-06-07 23:17:20.000000000 +0000
+++ 20201202/build/config/mips.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,15 +1,8 @@
-SUBARCH_SUPPORTED = malta r4k-ip22 r5k-ip32 sb1-bcm91250a miniiso
+SUBARCH_SUPPORTED = malta octeon
-KERNELMAJOR = 2.4
-KERNELMINOR = 27
-# Targets for 2.6 kernel images will use this version instead.
-KERNELVERSION_2.6 = 2.6.32-5
-KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
-KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinux-$(ver))
-KERNELNAME_2.6 = $(foreach ver,${KERNELVERSION_2.6}, vmlinuz-$(ver))
-
-INITRD_FS = cramfs
+KERNELMAJOR = 2.6
+# Targets for 3.x kernel images will use this version instead.
+KERNELVERSION = $(LINUX_KERNEL_ABI)
VERSIONED_SYSTEM_MAP = t
diff -pruN 20101020/build/config/mipsel/cobalt/netboot-2.6/common.cfg 20201202/build/config/mipsel/cobalt/netboot-2.6/common.cfg
--- 20101020/build/config/mipsel/cobalt/netboot-2.6/common.cfg 2009-03-16 00:50:59.000000000 +0000
+++ 20201202/build/config/mipsel/cobalt/netboot-2.6/common.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(KERNEL) $(SOME_DEST)/default.colo $(SOME_DEST)/vmlinux.gz $(SOME_DEST)/vmlinux_RAQ.gz $(SOME_DEST)/vmlinux_raq-2800.gz $(BASE_DEST)$(SUBARCH)/nfsroot.tar.gz
-# this has to be empty so the kernel will be put in the right directory
-EXTRANAME =
-
-MANIFEST-KERNEL = "kernel image for Cobalt machines"
-
-# Add a colo binary plus symlinks
-$(SOME_DEST)/vmlinux.gz:
- cp /boot/vmlinux.gz $@
- update-manifest $@ "Cobalt boot loader CoLo"
- ln -s . $(SOME_DEST)/boot
-
-$(SOME_DEST)/vmlinux_RAQ.gz:
- ln -s vmlinux.gz $@
-
-$(SOME_DEST)/vmlinux_raq-2800.gz:
- ln -s vmlinux.gz $@
-
-# CoLo configuration file for NFS
-$(SOME_DEST)/default.colo:
- bootvars-subst KERNELVERSION "$(KERNELVERSION_2.6)" $@
- update-manifest $@ "Cobalt NFS boot configuration script"
-
-# Create a nfsroot tar file which can easily be extracted (containing all
-# files including proper symlinks).
-$(BASE_DEST)$(SUBARCH)/nfsroot.tar.gz:
- cp -r $(SOME_DEST) $(TEMP)/nfsroot
- (cd $(TEMP) && tar czf - nfsroot) > $@
- update-manifest $@ "tarball containing the Cobalt installer nfsroot"
-
diff -pruN 20101020/build/config/mipsel/cobalt/netboot-2.6/serial.cfg 20201202/build/config/mipsel/cobalt/netboot-2.6/serial.cfg
--- 20101020/build/config/mipsel/cobalt/netboot-2.6/serial.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mipsel/cobalt/netboot-2.6/serial.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-MEDIA_TYPE = netboot image (serial)
-
-EXTRANAME = serial_
-TARGET = $(INITRD)
-
-MANIFEST-INITRD = "initrd for Cobalt machines (serial console)"
-
diff -pruN 20101020/build/config/mipsel/cobalt/netboot-2.6/ssh.cfg 20201202/build/config/mipsel/cobalt/netboot-2.6/ssh.cfg
--- 20101020/build/config/mipsel/cobalt/netboot-2.6/ssh.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mipsel/cobalt/netboot-2.6/ssh.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-MEDIA_TYPE = netboot image (SSH)
-
-EXTRANAME = ssh_
-TARGET = $(INITRD)
-PRESEED = boot/mipsel/cobalt.preseed
-TYPE = netboot/network-console
-
-MANIFEST-INITRD = "initrd for Cobalt machines (SSH)"
-
-#TARGET = move_initrd
-move_initrd: $(INITRD)
- echo $(SOME_DEST)/
- install -m 644 -D $< $@
- update-manifest $@ $(MANIFEST-INITRD) $(UDEB_LISTS)
-
diff -pruN 20101020/build/config/mipsel/cobalt/netboot-2.6.cfg 20201202/build/config/mipsel/cobalt/netboot-2.6.cfg
--- 20101020/build/config/mipsel/cobalt/netboot-2.6.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mipsel/cobalt/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-FLAVOUR_SUPPORTED = serial ssh common
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-MEDIA_TYPE = netboot image
-TYPE = netboot
-EXTRANAME = $(TYPE)/
-
diff -pruN 20101020/build/config/mipsel/cobalt.cfg 20201202/build/config/mipsel/cobalt.cfg
--- 20101020/build/config/mipsel/cobalt.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mipsel/cobalt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-MEDIUM_SUPPORTED = netboot-2.6
-
-# The version of the kernel to use.
-KERNELVERSION = $(KERNELMAJOR).$(KERNELMINOR)-r5k-cobalt
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-r5k-cobalt
-
diff -pruN 20101020/build/config/mipsel/loongson-3/monolithic.cfg 20201202/build/config/mipsel/loongson-3/monolithic.cfg
--- 20101020/build/config/mipsel/loongson-3/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mipsel/loongson-3/monolithic.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = boot image
+
+TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) boot.cfg
+TYPE = monolithic
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for Loongson 3A/B systems"
+MANIFEST-KERNEL = "kernel image for Loongson 3A/B systems"
+
diff -pruN 20101020/build/config/mipsel/loongson-3/netboot.cfg 20201202/build/config/mipsel/loongson-3/netboot.cfg
--- 20101020/build/config/mipsel/loongson-3/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mipsel/loongson-3/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL) boot.cfg
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for Loongson 3A/B systems"
+MANIFEST-KERNEL = "kernel image for Loongson 3A/B systems"
+
diff -pruN 20101020/build/config/mipsel/loongson-3.cfg 20201202/build/config/mipsel/loongson-3.cfg
--- 20101020/build/config/mipsel/loongson-3.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mipsel/loongson-3.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,11 @@
+MEDIUM_SUPPORTED = netboot
+MEDIUM_SUPPORTED_EXTRA = monolithic
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-loongson-3
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinuz-$(ver))
+
+boot.cfg:
+ bootvars-subst KERNELVERSION "$(KERNELVERSION)" \
+ $(SOME_DEST)/$(EXTRANAME)boot.cfg
+ update-manifest $(SOME_DEST)/$(EXTRANAME)boot.cfg "PMON configuration file"
diff -pruN 20101020/build/config/mipsel/malta/netboot-2.6.cfg 20201202/build/config/mipsel/malta/netboot-2.6.cfg
--- 20101020/build/config/mipsel/malta/netboot-2.6.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mipsel/malta/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-MEDIA_TYPE = netboot image
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(INITRD) $(KERNEL)
-TYPE = netboot
-EXTRANAME = $(TYPE)/
-
-MANIFEST-INITRD = "initrd for the MIPS Malta board"
-MANIFEST-KERNEL = "kernel image for the MIPS Malta board"
-
diff -pruN 20101020/build/config/mipsel/malta/netboot.cfg 20201202/build/config/mipsel/malta/netboot.cfg
--- 20101020/build/config/mipsel/malta/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mipsel/malta/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Malta board"
+MANIFEST-KERNEL = "kernel image for the MIPS Malta board"
+
diff -pruN 20101020/build/config/mipsel/malta.cfg 20201202/build/config/mipsel/malta.cfg
--- 20101020/build/config/mipsel/malta.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/mipsel/malta.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,5 +1,6 @@
-MEDIUM_SUPPORTED = netboot-2.6
+MEDIUM_SUPPORTED = netboot
# The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-4kc-malta
+KERNELVERSION := $(KERNELVERSION)-4kc-malta
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinuz-$(ver))
diff -pruN 20101020/build/config/mipsel/octeon/netboot.cfg 20201202/build/config/mipsel/octeon/netboot.cfg
--- 20101020/build/config/mipsel/octeon/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mipsel/octeon/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(INITRD) $(KERNEL)
+TYPE = netboot
+EXTRANAME = $(TYPE)/
+
+MANIFEST-INITRD = "initrd for the MIPS Octeon machines"
+MANIFEST-KERNEL = "kernel image for the MIPS Octeon machines"
+
diff -pruN 20101020/build/config/mipsel/octeon.cfg 20201202/build/config/mipsel/octeon.cfg
--- 20101020/build/config/mipsel/octeon.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/mipsel/octeon.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,6 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+KERNELVERSION := $(KERNELVERSION)-octeon
+KERNELNAME = $(foreach ver,${KERNELVERSION}, vmlinux-$(ver))
+
diff -pruN 20101020/build/config/mipsel/sb1-bcm91250a/netboot-2.6.cfg 20201202/build/config/mipsel/sb1-bcm91250a/netboot-2.6.cfg
--- 20101020/build/config/mipsel/sb1-bcm91250a/netboot-2.6.cfg 2010-05-22 19:06:13.000000000 +0000
+++ 20201202/build/config/mipsel/sb1-bcm91250a/netboot-2.6.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-MEDIA_TYPE = netboot image
-
-KERNELVERSION = $(KERNELVERSION_2.6)
-KERNELMAJOR = 2.6
-
-TARGET = $(INITRD) $(KERNEL) $(SOME_DEST)/$(EXTRANAME)sibyl $(SOME_DEST)/$(EXTRANAME)sibyl.conf
-TYPE = netboot
-EXTRANAME = $(TYPE)/
-
-MANIFEST-INITRD = "initrd for the Broadcom BCM91250A (SWARM) evaluation board"
-MANIFEST-KERNEL = "kernel image for the Broadcom BCM91250A (SWARM) evaluation board"
-
-$(SOME_DEST)/$(EXTRANAME)sibyl:
- cp /usr/lib/sibyl/sibyl.bin $@
- update-manifest $@ "SiByl boot loader"
-
-$(SOME_DEST)/$(EXTRANAME)sibyl.conf:
- ramdisk-size-subst $(TEMP_INITRD) < boot/mips/sibyl.conf | \
- bootvars-subst KERNELVERSION "$(KERNELVERSION)" > $@
- update-manifest $@ "SiByl TFTP boot configuration script"
-
diff -pruN 20101020/build/config/mipsel/sb1-bcm91250a.cfg 20201202/build/config/mipsel/sb1-bcm91250a.cfg
--- 20101020/build/config/mipsel/sb1-bcm91250a.cfg 2010-05-22 19:06:13.000000000 +0000
+++ 20201202/build/config/mipsel/sb1-bcm91250a.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-MEDIUM_SUPPORTED = netboot-2.6
-
-# The version of the kernel to use.
-KERNELVERSION_2.6 := $(KERNELVERSION_2.6)-sb1-bcm91250a
-
-INITRD_FS = initramfs
diff -pruN 20101020/build/config/mipsel.cfg 20201202/build/config/mipsel.cfg
--- 20101020/build/config/mipsel.cfg 2010-05-24 14:52:59.000000000 +0000
+++ 20201202/build/config/mipsel.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,13 +1,8 @@
-SUBARCH_SUPPORTED = cobalt malta sb1-bcm91250a
+SUBARCH_SUPPORTED = malta loongson-3 octeon
-KERNELMAJOR = 2.4
-KERNELMINOR = 27
-# Targets for 2.6 kernel images will use this version instead.
-KERNELVERSION_2.6 = 2.6.32-5
-KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
-KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinux-$(ver))
-KERNELNAME_2.6 = $(foreach ver,${KERNELVERSION_2.6}, vmlinuz-$(ver))
+KERNELMAJOR = 2.6
+# Targets for 3.x kernel images will use this version instead.
+KERNELVERSION = $(LINUX_KERNEL_ABI)
INITRD_FS = initramfs
diff -pruN 20101020/build/config/powerpc/apus/cdrom-apus.cfg 20201202/build/config/powerpc/apus/cdrom-apus.cfg
--- 20101020/build/config/powerpc/apus/cdrom-apus.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/apus/cdrom-apus.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = cdrom/
-
-MANIFEST-BOOT = "CDROM image for most powerpc/apus amiga"
-MANIFEST-INITRD = "initrd for use with powerpc/apus CDROM"
-MANIFEST-KERNEL = "kernel for use with powerpc/apus CDROM"
-
-arch_boot_screens:
diff -pruN 20101020/build/config/powerpc/apus/nativehd.cfg 20201202/build/config/powerpc/apus/nativehd.cfg
--- 20101020/build/config/powerpc/apus/nativehd.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/apus/nativehd.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-MEDIA_TYPE = nativehd
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "Native HD image for most powerpc/apus amiga"
-MANIFEST-INITRD = "initrd for use with powerpc/apus nativehd"
-MANIFEST-KERNEL = "kernel for use with powerpc/apus nativehd"
-
diff -pruN 20101020/build/config/powerpc/apus/netboot-apus.cfg 20201202/build/config/powerpc/apus/netboot-apus.cfg
--- 20101020/build/config/powerpc/apus/netboot-apus.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/apus/netboot-apus.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = netboot/
-
-MANIFEST-BOOT = "netboot image for most powerpc/apus amiga"
-MANIFEST-INITRD = "initrd for use with powerpc/apus netboot"
-MANIFEST-KERNEL = "kernel for use with powerpc/apus netboot"
-
-arch_boot_screens:
diff -pruN 20101020/build/config/powerpc/apus.cfg 20201202/build/config/powerpc/apus.cfg
--- 20101020/build/config/powerpc/apus.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/apus.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIUM_SUPPORTED = nativehd cdrom-apus netboot-apus
-
-# The version of the kernel to use.
-KERNELMAJOR = 2.4
-KERNELVERSION = 2.4.27-apus
-KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
-KERNELNAME = vmlinuz
-INITRD_FS = ext2
diff -pruN 20101020/build/config/powerpc/cdrom.cfg 20201202/build/config/powerpc/cdrom.cfg
--- 20101020/build/config/powerpc/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/powerpc/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -pruN 20101020/build/config/powerpc/netboot.cfg 20201202/build/config/powerpc/netboot.cfg
--- 20101020/build/config/powerpc/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/powerpc/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff -pruN 20101020/build/config/powerpc/powerpc/cdrom.cfg 20201202/build/config/powerpc/powerpc/cdrom.cfg
--- 20101020/build/config/powerpc/powerpc/cdrom.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL) builtin_initrd
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "CDROM image for most PowerPC CPUs"
-MANIFEST-INITRD = "initrd for use with powerpc CDROM"
-MANIFEST-KERNEL = "kernel for use with powerpc CDROM"
diff -pruN 20101020/build/config/powerpc/powerpc/floppy/boot.cfg 20201202/build/config/powerpc/powerpc/floppy/boot.cfg
--- 20101020/build/config/powerpc/powerpc/floppy/boot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/floppy/boot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-DISK_LABEL = "boot floppy"
-TARGET = $(BOOT)
-MANIFEST-BOOT = "boot floppy for network or CD installs"
-
-KERNEL_CMDL = root=0200 load_ramdisk=1 prompt_ramdisk=1 devfs=mount debconf/priority=medium
-# We don't want the initrd to be generated, but we still want the tree.
-TEMP_INITRD =
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE = bootfloppy
-
-# Release info not needed on boot floppy
-OMIT_RELEASE_INFO=1
-
-EXTRAUDEBS=
-TRANSSTATUS=
diff -pruN 20101020/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg 20201202/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg
--- 20101020/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-DISK_LABEL = "boot floppy"
-TARGET = $(BOOT)
-MANIFEST-BOOT = "alternative video=ofonly boot floppy"
-EXTRANAME = ofonly
-
-KERNEL_CMDL = root=0200 load_ramdisk=1 prompt_ramdisk=1 devfs=mount \
- video=ofonly debconf/priority=medium
-# We don't want the initrd to be generated, but we still want the tree.
-TEMP_INITRD =
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE = bootfloppy
-
-# Release info not needed on boot floppy
-OMIT_RELEASE_INFO=1
-
-EXTRAUDEBS=
-TRANSSTATUS=
diff -pruN 20101020/build/config/powerpc/powerpc/floppy/cd-drivers.cfg 20201202/build/config/powerpc/powerpc/floppy/cd-drivers.cfg
--- 20101020/build/config/powerpc/powerpc/floppy/cd-drivers.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/floppy/cd-drivers.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-DISK_LABEL = "CD-ROM drivers floppy"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "CD drivers, including all SCSI drivers"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=cd_drivers
-DRIVER_FOR=floppy
-
-INITRD_FS=cramfs
diff -pruN 20101020/build/config/powerpc/powerpc/floppy/net-drivers.cfg 20201202/build/config/powerpc/powerpc/floppy/net-drivers.cfg
--- 20101020/build/config/powerpc/powerpc/floppy/net-drivers.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/floppy/net-drivers.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-DISK_LABEL = "Network drivers floppy"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "network drivers, including PCMCIA and wireless"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=net_drivers
-DRIVER_FOR=floppy
-
-INITRD_FS=cramfs
diff -pruN 20101020/build/config/powerpc/powerpc/floppy/root.cfg 20201202/build/config/powerpc/powerpc/floppy/root.cfg
--- 20101020/build/config/powerpc/powerpc/floppy/root.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/floppy/root.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-DISK_LABEL = "root floppy"
-
-# Library and font reduction need the dependencies of additional drivers.
-EXTRADRIVERS = $(BASE_TMP)powerpc_floppy_cd-drivers/tree \
- $(BASE_TMP)powerpc_floppy_net-drivers/tree
-EXTRATARGETS = build_powerpc_floppy_cd-drivers \
- build_powerpc_floppy_net-drivers
-TARGET = $(ROOT)
-
-MANIFEST-ROOT = "second floppy for network or CD installs"
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=floppy
-
-# Drop all languages from the floppy to save space. If you need a localised
-# floppy, modify the list below, adding your language(s) in addition to en.
-# for example: DROP_LANG = '(?!en|es|pt_BR)'
-DROP_LANG = '(?!en)'
diff -pruN 20101020/build/config/powerpc/powerpc/floppy.cfg 20201202/build/config/powerpc/powerpc/floppy.cfg
--- 20101020/build/config/powerpc/powerpc/floppy.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/floppy.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-FLAVOUR_SUPPORTED = root net-drivers cd-drivers boot boot-ofonly
-MEDIA_TYPE = floppy
-FLOPPY_SIZE = 1440
-KERNELVERSION = $(BASEVERSION)-powerpc-miboot
-
-# media where images may be written to (via dd).
-WRITE_MEDIA += $(FLAVOUR_SUPPORTED)
-
-$(TEMP_KERNEL).gz: $(TEMP_KERNEL)
- #mkvmlinuz -a miboot -r $(KERNELVERSION) -k $(TEMP_KERNEL) -n -d $(TEMP)/lib -o $(TEMP_KERNEL).gz
- # Let's do it the good old fashioned way.
- gzip -c -9 $(TEMP_KERNEL) >$(TEMP_KERNEL).gz
-
-$(TEMP_BOOT).new: $(TEMP_KERNEL).gz
- dd if=/dev/zero of=$@ bs=1024 count=$(FLOPPY_SIZE)
- hformat -l $(DISK_LABEL) $@
- # miboot it not in the archive yet, but it makes no sense to build the
- # floppies when it is not, and cause a support nightmare, so better
- # not build boot and boot-ofonly for official debian-installer.
- echo DOING MIBOOT; \
- echo device $(TEMP_BOOT).new > $(TEMP)/miboot.conf; \
- echo kernel $(TEMP_KERNEL).gz $(KERNEL_CMDL) >> $(TEMP)/miboot.conf; \
- miboot -c $(TEMP)/miboot.conf; \
- echo MIBOOT DONE;
-
-arch_boot:
- mkdir -p $(dir $(TEMP_BOOT))
- HOME=$(TEMP) $(MAKE) $(TEMP_BOOT).new
- mv $(TEMP_BOOT).new $(TEMP_BOOT)
- rm -f $(TEMP)/.hcwd # clean up after hfsutils
-
-arch_root:
- cp $(TEMP_INITRD) $(TEMP_ROOT)
-
-arch_boot_screens:
diff -pruN 20101020/build/config/powerpc/powerpc/hd-media.cfg 20201202/build/config/powerpc/powerpc/hd-media.cfg
--- 20101020/build/config/powerpc/powerpc/hd-media.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/hd-media.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Not really a floppy, this is a 239 mb image, large enough to put a
-# netinst iso in, and small enough to fit on a mid-range memory stick,
-# such as those advertised as being 256 mb in size.
-FLOPPY_SIZE = 244736
-
-DISK_LABEL = "bootable drive"
-MEDIA_TYPE = bootable drive
-
-GZIPPED = .gz
-EXTRANAME = hd-media/
-
-TARGET = $(KERNEL) $(INITRD) $(BOOT) $(DEST)/yaboot.conf $(DEST)/boot.msg
-
-MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick"
-MANIFEST-INITRD = "for use on USB memory sticks"
-MANIFEST-KERNEL = "for use on USB memory sticks"
-
-arch_boot: hd_media_common
-
-$(DEST)/yaboot: hd_media_common
- cp $(TEMP)/yaboot $@
- update-manifest $@ "Open Firmware boot loader"
-
-$(DEST)/yaboot.conf: hd_media_common
- cp $(TEMP)/yaboot.conf $@
- update-manifest $@ "yaboot configuration file"
-
-$(DEST)/boot.msg: hd_media_common
- cp $(TEMP)/boot.msg $@
- update-manifest $@ "yaboot boot message"
diff -pruN 20101020/build/config/powerpc/powerpc/monolithic.cfg 20201202/build/config/powerpc/powerpc/monolithic.cfg
--- 20101020/build/config/powerpc/powerpc/monolithic.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "initrd"
-MANIFEST-KERNEL = "kernel image"
-MANIFEST-MINIISO = "small bootable CD image for network install"
diff -pruN 20101020/build/config/powerpc/powerpc/netboot.cfg 20201202/build/config/powerpc/powerpc/netboot.cfg
--- 20101020/build/config/powerpc/powerpc/netboot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd netboot_content
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "tftp boot image for most PowerPC CPUs"
-MANIFEST-INITRD = "initrd for use with powerpc netboot"
-MANIFEST-KERNEL = "kernel for use with powerpc netboot"
-MANIFEST-MINIISO = "small bootable CD image for powerpc netboot"
diff -pruN 20101020/build/config/powerpc/powerpc/netboot-gtk.cfg 20201202/build/config/powerpc/powerpc/netboot-gtk.cfg
--- 20101020/build/config/powerpc/powerpc/netboot-gtk.cfg 2010-02-11 20:00:14.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc/netboot-gtk.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TYPE = netboot/gtk
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd
-EXTRANAME = netboot/gtk/
-
-#Only chrp works, so let's not waste bandwidth and disk space with the other images.
-SUBARCHES = chrp
-
-MANIFEST-BOOT = "tftp boot image for most PowerPC CPUs"
-MANIFEST-INITRD = "initrd for use with powerpc netboot"
-MANIFEST-KERNEL = "kernel for use with powerpc netboot"
-
-KEEP_GI_LANGS = 1
-
-# All images that include cdebconf should include symbols needed by these
-# plugins.
-EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/powerpc/powerpc64/cdrom.cfg 20201202/build/config/powerpc/powerpc64/cdrom.cfg
--- 20101020/build/config/powerpc/powerpc64/cdrom.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc64/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL) builtin_initrd
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "CDROM image for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-INITRD = "initrd for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
diff -pruN 20101020/build/config/powerpc/powerpc64/monolithic.cfg 20201202/build/config/powerpc/powerpc64/monolithic.cfg
--- 20101020/build/config/powerpc/powerpc64/monolithic.cfg 2009-03-28 13:07:11.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc64/monolithic.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "initrd for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel image for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-MINIISO = "small bootable CD image for network install on 64bit Power and PowerPC machines (except pre-power5 iSeries)"
diff -pruN 20101020/build/config/powerpc/powerpc64/netboot.cfg 20201202/build/config/powerpc/powerpc64/netboot.cfg
--- 20101020/build/config/powerpc/powerpc64/netboot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc64/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd netboot_content
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "tftp boot image for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-INITRD = "initrd for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-MINIISO = "small bootable CD image for powerpc64 netboot"
diff -pruN 20101020/build/config/powerpc/powerpc64/netboot-gtk.cfg 20201202/build/config/powerpc/powerpc64/netboot-gtk.cfg
--- 20101020/build/config/powerpc/powerpc64/netboot-gtk.cfg 2010-02-11 20:00:14.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc64/netboot-gtk.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TYPE = netboot/gtk
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd
-EXTRANAME = netboot/gtk/
-
-MANIFEST-BOOT = "tftp boot image for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-INITRD = "initrd for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-
-KEEP_GI_LANGS = 1
-
-# All images that include cdebconf should include symbols needed by these
-# plugins.
-EXTRAUDEBS += cdebconf-gtk-entropy
diff -pruN 20101020/build/config/powerpc/powerpc64.cfg 20201202/build/config/powerpc/powerpc64.cfg
--- 20101020/build/config/powerpc/powerpc64.cfg 2010-03-26 12:17:07.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc64.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk
-MEDIUM_SUPPORTED_EXTRA = monolithic
-
-# The version of the kernel to use.
-KERNELVERSION = $(BASEVERSION)-powerpc64
-KERNEL_FLAVOUR = di
-KERNELNAME = vmlinux
-KERNELIMAGEVERSION = $(KERNELVERSION)
-
-SUBARCHES = chrp
-
-cd_content: cd_content_common
-
-netboot_content: netboot_content_common
-
-arch_miniiso: arch_miniiso_common
-
-arch_boot_screens:
-
-arch_boot: arch_boot_initrd
diff -pruN 20101020/build/config/powerpc/powerpc.cfg 20201202/build/config/powerpc/powerpc.cfg
--- 20101020/build/config/powerpc/powerpc.cfg 2010-03-26 12:17:07.000000000 +0000
+++ 20201202/build/config/powerpc/powerpc.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk hd-media # floppy
-MEDIUM_SUPPORTED_EXTRA = monolithic
-
-# The version of the kernel to use.
-KERNELVERSION = $(BASEVERSION)-powerpc
-KERNEL_FLAVOUR = di
-KERNELNAME = vmlinux
-KERNELIMAGEVERSION = $(KERNELVERSION)
-
-SUBARCHES = chrp # coff ppcbug
-
-cd_content: cd_content_common
-
-netboot_content: netboot_content_common
-
-arch_miniiso: arch_miniiso_common
-
-arch_boot_screens:
-
-#arch_boot: arch_boot_initrd
diff -pruN 20101020/build/config/powerpc/prep/cdrom.cfg 20201202/build/config/powerpc/prep/cdrom.cfg
--- 20101020/build/config/powerpc/prep/cdrom.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/prep/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL) builtin_initrd
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "CDROM image for PowerPC prep subarch"
-MANIFEST-INITRD = "initrd for use with powerpc CDROM for prep subarch"
-MANIFEST-KERNEL = "kernel for use with powerpc CDROM for prep subarch"
diff -pruN 20101020/build/config/powerpc/prep/hd-media.cfg 20201202/build/config/powerpc/prep/hd-media.cfg
--- 20101020/build/config/powerpc/prep/hd-media.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/prep/hd-media.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# Not really a floppy, this is a 239 mb image, large enough to put a
-# netinst iso in, and small enough to fit on a mid-range memory stick,
-# such as those advertised as being 256 mb in size.
-FLOPPY_SIZE = 244736
-
-DISK_LABEL = "bootable drive"
-MEDIA_TYPE = bootable drive
-
-GZIPPED = .gz
-EXTRANAME = hd-media/
-
-TARGET = $(KERNEL) $(INITRD) $(BOOT)
-
-MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick"
-MANIFEST-INITRD = "for use on USB memory sticks"
-MANIFEST-KERNEL = "for use on USB memory sticks"
-
-arch_boot: hd_media_common
diff -pruN 20101020/build/config/powerpc/prep/netboot.cfg 20201202/build/config/powerpc/prep/netboot.cfg
--- 20101020/build/config/powerpc/prep/netboot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/prep/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd netboot_content
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "tftp boot image for PowerPC prep subarch"
-MANIFEST-INITRD = "initrd for use with netboot on powerpc prep subarch"
-MANIFEST-KERNEL = "kernel for use with netboot on powerpc prep subarch"
-MANIFEST-MINIISO = "small bootable CD image for netboot on powerpc prep subarch"
diff -pruN 20101020/build/config/powerpc/prep.cfg 20201202/build/config/powerpc/prep.cfg
--- 20101020/build/config/powerpc/prep.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/powerpc/prep.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-MEDIUM_SUPPORTED = cdrom netboot hd-media
-
-# The version of the kernel to use.
-KERNELVERSION = $(BASEVERSION)-prep
-KERNEL_FLAVOUR = di
-KERNELNAME = vmlinux
-KERNELIMAGEVERSION = $(KERNELVERSION)
-
-SUBARCHES = prep
-
-cd_content: cd_content_common
-
-netboot_content: netboot_content_common
-
-arch_miniiso: arch_miniiso_common
-
-arch_boot_screens:
-
-#arch_boot: arch_boot_initrd
diff -pruN 20101020/build/config/powerpc.cfg 20201202/build/config/powerpc.cfg
--- 20101020/build/config/powerpc.cfg 2010-06-26 17:56:00.000000000 +0000
+++ 20201202/build/config/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,97 +1,69 @@
-SUBARCH_SUPPORTED = powerpc powerpc64 # apus prep
+MEDIUM_SUPPORTED = cdrom netboot
KERNELMAJOR = 2.6
-BASEVERSION = 2.6.32-5
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-powerpc
+KERNELNAME = vmlinux
-# create the kernels with builtin initrd.
-builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
- # temporary hack
- case $(KERNELMAJOR) in \
- 2.6) \
- for subarch in $(SUBARCHES); do \
- rm -f $(DEST)/vmlinuz-$$subarch.initrd; \
- mkvmlinuz -v \
- -a $$subarch \
- -r $(KERNELVERSION) \
- -k $(TEMP_KERNEL) \
- -z -i $(TEMP_INITRD) \
- -d $(TEMP)/lib \
- -o $(DEST)/vmlinuz-$$subarch.initrd; \
- done \
- ;; \
- *) \
- echo "Kernel $(KERNELMAJOR) not supported" \
- ;;\
- esac
-
-# cd content for powerpc, includes yaboot for booting
-# apple powerpc (newworld) computers
-cd_content_common:
- mkdir -p $(TEMP_CD_TREE)/$(dir install/$(TYPE))
-
- cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/$(TYPE)-linux
- ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/install/$(TYPE)-initrd.gz
-
- # New-world bootability
- cp -f boot/powerpc/ofboot.b $(TEMP_CD_TREE)/install/
- cp -f /usr/lib/yaboot/yaboot $(TEMP_CD_TREE)/install/
- bootvars-subst MEDIA_TYPE "${MEDIA_TYPE}" \
- DEBIAN_VERSION "${DEBIAN_VERSION}" \
- BUILD_DATE "${BUILD_DATE}" \
- < boot/powerpc/boot.msg > $(TEMP_CD_TREE)/install/boot.msg
- ramdisk-size-subst $(TEMP_INITRD) \
- < boot/powerpc/yaboot.conf \
- | sed 's,\$${TYPE},$(TYPE),g' \
- > $(TEMP_CD_TREE)/install/yaboot.conf
- # CHRP bootability
- mkdir -p $(TEMP_CD_TREE)/etc
- mkdir -p $(TEMP_CD_TREE)/ppc/chrp
- cp -f $(TEMP_CD_TREE)/install/yaboot.conf $(TEMP_CD_TREE)/etc
- cp -f boot/powerpc/bootinfo.txt $(TEMP_CD_TREE)/ppc
-
-# Adds yaboot to netboot dirs.
-netboot_content_common:
- cp -f /usr/lib/yaboot/yaboot $(DEST)
- bootvars-subst MEDIA_TYPE "${MEDIA_TYPE}" \
- DEBIAN_VERSION "${DEBIAN_VERSION}" \
- BUILD_DATE "${BUILD_DATE}" \
- < boot/powerpc/boot.msg > $(DEST)/boot.msg
- ramdisk-size-subst $(TEMP_INITRD) \
- < boot/powerpc/yaboot.conf.netboot \
- | sed 's,\$${TYPE},$(TYPE),g' \
- > $(DEST)/yaboot.conf
-
-# creates a bootable cd image for powerpc
-arch_miniiso_common: cd_content_common
- genisoimage -r -T --netatalk -chrp-boot -hfs -probe -map boot/powerpc/hfs.map -part -no-desktop -hfs-bless $(TEMP_CD_TREE)/install -hfs-volid Debian-Installer/PPC -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
-
-# creates a bootable HFS filesystem, used for USB sticks
-hd_media_common: $(TEMP_KERNEL) $(TEMP_INITRD)
- mkdir -p $(dir $(TEMP_BOOT))
- : | dd of=$(TEMP_BOOT) bs=1024 seek=$(FLOPPY_SIZE)
- HOME=$(TEMP) hformat -l $(DISK_LABEL) $(TEMP_BOOT)
- HOME=$(TEMP) hmount $(TEMP_BOOT)
- HOME=$(TEMP) hcopy -r $(TEMP_KERNEL) :vmlinux
- HOME=$(TEMP) hcopy -r $(TEMP_INITRD) :initrd.gz
- cp -a /usr/lib/yaboot/yaboot $(TEMP)/yaboot # used later
- HOME=$(TEMP) hcopy -r $(TEMP)/yaboot :yaboot
- HOME=$(TEMP) hattrib -c UNIX -t tbxi :yaboot
-
- bootvars-subst MEDIA_TYPE "${MEDIA_TYPE}" \
- DEBIAN_VERSION "${DEBIAN_VERSION}" \
- BUILD_DATE "${BUILD_DATE}" \
- < boot/powerpc/boot.msg > $(TEMP)/boot.msg
- ramdisk-size-subst $(TEMP_INITRD) \
- < boot/powerpc/yaboot.conf.hd-media \
- > $(TEMP)/yaboot.conf
- HOME=$(TEMP) hcopy -r $(TEMP)/boot.msg :boot.msg
- HOME=$(TEMP) hcopy -r $(TEMP)/yaboot.conf :yaboot.conf
-
- HOME=$(TEMP) hattrib -b :
- HOME=$(TEMP) humount
- rm -f $(TEMP)/.hcwd # clean up after hfsutils
+GRUB_CFG_CDROM = boot/powerpc/grub-cdrom.cfg
- $(if $(GZIPPED),gzip -v9f $(TEMP_BOOT))
+DEBIAN_RELEASE = unstable
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+# GRUB modules
+GRUB_MODULES = echo gzio linux minicmd normal
+GRUB_MODULES_CDROM = iso9660
+
+arch_boot_screens:
arch_tree:
+
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/grub/powerpc-ieee1275 \
+ $(TEMP_CD_TREE)/ppc/chrp \
+ $(TEMP_CD_TREE)/install
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
+
+ cp -a /usr/lib/grub/powerpc-ieee1275 $(TEMP_CD_TREE)/boot/grub
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
+
+ cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+ $(TEMP_CD_TREE)/ppc/
+
+ grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+# genisoimage CD info directory, including GRUB and configuration files.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir:
+ rm -rf $(TEMP_CD_INFO_DIR)
+ mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub/powerpc-ieee1275 \
+ $(TEMP_CD_INFO_DIR)/ppc/chrp
+
+ cp -a /usr/lib/grub/powerpc-ieee1275 $(TEMP_CD_INFO_DIR)/boot/grub/
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+ grub-mkimage -O powerpc-ieee1275 -p '()/boot/grub' \
+ -o $(TEMP_CD_INFO_DIR)/boot/grub/powerpc.elf \
+ $(GRUB_MODULES) $(GRUB_MODULES_CDROM)
+ cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+ $(TEMP_CD_INFO_DIR)/ppc/
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
diff -pruN 20101020/build/config/ppc64/cdrom.cfg 20201202/build/config/ppc64/cdrom.cfg
--- 20101020/build/config/ppc64/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/ppc64/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -pruN 20101020/build/config/ppc64/netboot.cfg 20201202/build/config/ppc64/netboot.cfg
--- 20101020/build/config/ppc64/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/ppc64/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff -pruN 20101020/build/config/ppc64.cfg 20201202/build/config/ppc64.cfg
--- 20101020/build/config/ppc64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/ppc64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,69 @@
+MEDIUM_SUPPORTED = cdrom netboot
+
+KERNELMAJOR = 2.6
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-powerpc64
+KERNELNAME = vmlinux
+
+GRUB_CFG_CDROM = boot/powerpc/grub-cdrom.cfg
+
+DEBIAN_RELEASE = unstable
+
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+
+# GRUB modules
+GRUB_MODULES = echo gzio linux minicmd normal
+GRUB_MODULES_CDROM = iso9660
+
+arch_boot_screens:
+arch_tree:
+
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/grub/powerpc-ieee1275 \
+ $(TEMP_CD_TREE)/ppc/chrp \
+ $(TEMP_CD_TREE)/install
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
+
+ cp -a /usr/lib/grub/powerpc-ieee1275 $(TEMP_CD_TREE)/boot/grub
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
+
+ cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+ $(TEMP_CD_TREE)/ppc/
+
+ grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+# genisoimage CD info directory, including GRUB and configuration files.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir:
+ rm -rf $(TEMP_CD_INFO_DIR)
+ mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub/powerpc-ieee1275 \
+ $(TEMP_CD_INFO_DIR)/ppc/chrp
+
+ cp -a /usr/lib/grub/powerpc-ieee1275 $(TEMP_CD_INFO_DIR)/boot/grub/
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+ grub-mkimage -O powerpc-ieee1275 -p '()/boot/grub' \
+ -o $(TEMP_CD_INFO_DIR)/boot/grub/powerpc.elf \
+ $(GRUB_MODULES) $(GRUB_MODULES_CDROM)
+ cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+ $(TEMP_CD_INFO_DIR)/ppc/
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
diff -pruN 20101020/build/config/ppc64el/cdrom.cfg 20201202/build/config/ppc64el/cdrom.cfg
--- 20101020/build/config/ppc64el/cdrom.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/ppc64el/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -pruN 20101020/build/config/ppc64el/netboot.cfg 20201202/build/config/ppc64el/netboot.cfg
--- 20101020/build/config/ppc64el/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/ppc64el/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,8 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff -pruN 20101020/build/config/ppc64el.cfg 20201202/build/config/ppc64el.cfg
--- 20101020/build/config/ppc64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/ppc64el.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,61 @@
+MEDIUM_SUPPORTED = cdrom netboot
+
+KERNELMAJOR = 2.6
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-powerpc64le
+KERNELNAME = vmlinux
+
+GRUB_CFG_CDROM = boot/ppc64el/grub-cdrom.cfg
+
+# GRUB modules
+GRUB_MODULES = echo gzio linux minicmd normal
+GRUB_MODULES_CDROM = iso9660
+
+arch_boot_screens:
+arch_tree:
+
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/grub/powerpc-ieee1275 \
+ $(TEMP_CD_TREE)/ppc/chrp \
+ $(TEMP_CD_TREE)/install
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
+
+ cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+ $(TEMP_CD_TREE)/ppc/
+
+ grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+# genisoimage CD info directory, including GRUB and configuration files.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir:
+ rm -rf $(TEMP_CD_INFO_DIR)
+ mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub/powerpc-ieee1275 \
+ $(TEMP_CD_INFO_DIR)/ppc/chrp
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+ grub-mkimage -O powerpc-ieee1275 -p '()/boot/grub' \
+ -o $(TEMP_CD_INFO_DIR)/boot/grub/powerpc.elf \
+ $(GRUB_MODULES) $(GRUB_MODULES_CDROM)
+ cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+ $(TEMP_CD_INFO_DIR)/ppc/
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
diff -pruN 20101020/build/config/riscv64/netboot.cfg 20201202/build/config/riscv64/netboot.cfg
--- 20101020/build/config/riscv64/netboot.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/riscv64/netboot.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,19 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(KERNEL) $(INITRD) $(NETBOOT_TAR)
+
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_TAR = "Tarball of the tftp/PXE boot directory"
+MANIFEST-KERNEL = "linux kernel"
+MANIFEST-INITRD = "netboot initrd"
+
+.PHONY: arch_netboot_dir
+arch_netboot_dir: $(KERNEL) $(INITRD)
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ mkdir -p $(TEMP_NETBOOT_DIR)/pxelinux.cfg
+ cp $(INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
+ cp boot/$(ARCH)/pxe/menu.cfg $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/
+ cp boot/$(ARCH)/pxe/default-riscv $(TEMP_NETBOOT_DIR)/pxelinux.cfg
diff -pruN 20101020/build/config/riscv64.cfg 20201202/build/config/riscv64.cfg
--- 20101020/build/config/riscv64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/riscv64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,15 @@
+MEDIUM_SUPPORTED = netboot
+
+DEBIAN_RELEASE = unstable
+
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
+
+USE_UNRELEASED = 1
+
+KERNELMAJOR = 2.6
+# The version of the kernel to use.
+KERNELVERSION = $(LINUX_KERNEL_ABI)-riscv64
+KERNELNAME = vmlinux
+
+arch_boot_screens:
+arch_tree:
diff -pruN 20101020/build/config/s390/tape.cfg 20201202/build/config/s390/tape.cfg
--- 20101020/build/config/s390/tape.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/s390/tape.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-MEDIA_TYPE = tape
-TYPE = s390-tape
-
-KERNEL = $(DEST)/kernel.debian
-TARGET = $(KERNEL) $(DEST)/initrd.debian $(DEST)/kernel.debian-nolabel $(DEST)/parmfile.debian
-EXTRANAME = $(MEDIUM)/
-
-KERNELVERSION := $(KERNELVERSION)-tape
-KERNELNAME := $(KERNELNAME)-tape
-
-MANIFEST-KERNEL = "kernel for tape ipl"
-
-$(DEST)/initrd.debian:
- ln -fs ../generic/initrd.debian $@
- update-manifest $@ "initrd" $(UDEB_LISTS)
-
-$(DEST)/kernel.debian-nolabel: $(DEST)/kernel.debian
- (dd bs=1 count=8 && dd bs=1 skip=1 count=0 && printf "\007" && dd) < $< > $@
- update-manifest $@ "kernel for tape ipl - nolabel"
-
-$(TEMP)/kernel.debian: $(TEMP)/vmlinuz-tape
- ln $+ $@
diff -pruN 20101020/build/config/s390.cfg 20201202/build/config/s390.cfg
--- 20101020/build/config/s390.cfg 2010-06-26 17:56:00.000000000 +0000
+++ 20201202/build/config/s390.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,12 +1,10 @@
-MEDIUM_SUPPORTED = generic tape
+MEDIUM_SUPPORTED = generic
KERNEL = $(DEST)/image.debian
KERNELMAJOR = 2.6
-KERNELVERSION = 2.6.32-5-s390x
-KERNEL_FLAVOUR = di
+KERNELVERSION = $(LINUX_KERNEL_ABI)-s390x
KERNELNAME = vmlinuz
-KERNELIMAGEVERSION = $(KERNELVERSION)
$(DEST)/parmfile.debian:
install -m644 boot/s390/parmfile $@
diff -pruN 20101020/build/config/s390x/generic.cfg 20201202/build/config/s390x/generic.cfg
--- 20101020/build/config/s390x/generic.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/s390x/generic.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,16 @@
+MEDIA_TYPE = generic
+
+KERNEL = $(DEST)/kernel.debian
+INITRD = $(DEST)/initrd.debian
+TARGET = $(INITRD) $(KERNEL) $(DEST)/debian.exec $(DEST)/parmfile.debian
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "initrd"
+MANIFEST-KERNEL = "kernel for vmreader ipl"
+
+$(DEST)/debian.exec: boot/s390x/exec
+ install -m644 $^ $@
+ update-manifest $@ "ipl script"
+
+$(TEMP)/kernel.debian: $(TEMP)/vmlinuz
+ ln $+ $@
diff -pruN 20101020/build/config/s390x.cfg 20201202/build/config/s390x.cfg
--- 20101020/build/config/s390x.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/config/s390x.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,19 @@
+MEDIUM_SUPPORTED = generic
+
+KERNEL = $(DEST)/image.debian
+
+KERNELMAJOR = 2.6
+KERNELVERSION = $(LINUX_KERNEL_ABI)-s390x
+KERNELNAME = vmlinuz
+
+$(DEST)/parmfile.debian:
+ install -m644 boot/s390x/parmfile $@
+ update-manifest $@ "parmfile"
+
+DROP_LANG = '(?!en)'
+
+arch_tree:
+ # Avoid loading partman-auto during anna
+ mkdir -p $(TREE)/var/cache/anna
+ echo "partman-auto" >$(TREE)/var/cache/anna/exclude
+ echo "partman-auto-raid" >>$(TREE)/var/cache/anna/exclude
diff -pruN 20101020/build/config/sh4.cfg 20201202/build/config/sh4.cfg
--- 20101020/build/config/sh4.cfg 2010-06-26 17:56:00.000000000 +0000
+++ 20201202/build/config/sh4.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,7 @@
SUBARCH_SUPPORTED = sh7751r sh7785lcr
KERNELMAJOR = 2.6
-KERNELVERSION = 2.6.32-5
-KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
+KERNELVERSION = $(LINUX_KERNEL_ABI)
KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
VERSIONED_SYSTEM_MAP = t
diff -pruN 20101020/build/config/sparc/cdrom.cfg 20201202/build/config/sparc/cdrom.cfg
--- 20101020/build/config/sparc/cdrom.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/sparc/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,8 @@
MEDIA_TYPE = CD-ROM
-TYPE = cdrom
-
-TARGET = $(INITRD) $(KERNEL)
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
EXTRANAME = $(MEDIUM)/
-MANIFEST-INITRD = "initrd for CDROM"
-MANIFEST-KERNEL = "kernel for CDROM"
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -pruN 20101020/build/config/sparc/miniiso.cfg 20201202/build/config/sparc/miniiso.cfg
--- 20101020/build/config/sparc/miniiso.cfg 2009-06-18 13:16:14.000000000 +0000
+++ 20201202/build/config/sparc/miniiso.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-TYPE = netboot
-
-TARGET = $(TEMP_BOOT) $(MINIISO)
-
-MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
-
-.PHONY: arch_miniiso arch_boot_screens arch_boot
-arch_miniiso:
- -rm -rf $(TEMP_CD_TREE)/*
- install -m 644 -D $(TEMP)/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
- install -m 644 -D $(TEMP)/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
- install -m 644 /boot/second.b $(TEMP_CD_TREE)/boot
- install -m 644 $(TEMP_BOOT_SCREENS)/debian.txt $(TEMP_CD_TREE)/boot
- install -m 644 $(TEMP_BOOT_SCREENS)/notsupported.txt $(TEMP_CD_TREE)/boot
- install -m 644 boot/sparc/silo.conf $(TEMP_CD_TREE)/boot
-
- genisoimage -r -J -o $(TEMP_MINIISO) -G /boot/isofs.b -B ... $(TEMP_CD_TREE)
-
-arch_boot_screens:
- -rm -f $(TEMP_BOOT_SCREENS)/*
- mkdir -p $(TEMP_BOOT_SCREENS)
- bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
- DEBIAN_VERSION "$(DEBIAN_VERSION)" \
- BUILD_DATE "$(BUILD_DATE)" \
- < boot/sparc/debian.txt > $(TEMP_BOOT_SCREENS)/debian.txt
- cp boot/sparc/notsupported.txt $(TEMP_BOOT_SCREENS)/notsupported.txt
-
-arch_boot:
diff -pruN 20101020/build/config/sparc/netboot.cfg 20201202/build/config/sparc/netboot.cfg
--- 20101020/build/config/sparc/netboot.cfg 2008-10-27 10:43:21.000000000 +0000
+++ 20201202/build/config/sparc/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,13 +1,8 @@
MEDIA_TYPE = netboot image
-
-TYPE = netboot
-TARGET = $(BOOT)
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
EXTRANAME = $(MEDIUM)/
-MANIFEST-BOOT = "tftp boot image for sparc64"
-
-.PHONY: arch_boot
-arch_boot:
- gzip -c $(TEMP)/System.map-$(KERNELIMAGEVERSION) >$(TEMP)/System.map.gz
- tftpboot.sh $(TEMP_KERNEL) $(TEMP)/System.map.gz $(TEMP_INITRD) $(TEMP_BOOT)
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff -pruN 20101020/build/config/sparc64/cdrom.cfg 20201202/build/config/sparc64/cdrom.cfg
--- 20101020/build/config/sparc64/cdrom.cfg 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/config/sparc64/cdrom.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,8 @@
MEDIA_TYPE = CD-ROM
-TYPE = cdrom
-
-TARGET = $(INITRD) $(KERNEL)
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
EXTRANAME = $(MEDIUM)/
-MANIFEST-INITRD = "initrd for CDROM"
-MANIFEST-KERNEL = "kernel for CDROM"
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -pruN 20101020/build/config/sparc64/miniiso.cfg 20201202/build/config/sparc64/miniiso.cfg
--- 20101020/build/config/sparc64/miniiso.cfg 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/config/sparc64/miniiso.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-TYPE = netboot
-
-TARGET = $(TEMP_BOOT) $(MINIISO)
-
-MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
-
-.PHONY: arch_miniiso arch_boot_screens arch_boot
-arch_miniiso:
- -rm -rf $(TEMP_CD_TREE)/*
- install -m 644 -D $(TEMP)/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
- install -m 644 -D $(TEMP)/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
- install -m 644 /boot/second.b $(TEMP_CD_TREE)/boot
- install -m 644 $(TEMP_BOOT_SCREENS)/debian.txt $(TEMP_CD_TREE)/boot
- install -m 644 $(TEMP_BOOT_SCREENS)/notsupported.txt $(TEMP_CD_TREE)/boot
- install -m 644 boot/sparc/silo.conf $(TEMP_CD_TREE)/boot
-
- genisoimage -r -J -o $(TEMP_MINIISO) -G /boot/isofs.b -B ... $(TEMP_CD_TREE)
-
-arch_boot_screens:
- -rm -f $(TEMP_BOOT_SCREENS)/*
- mkdir -p $(TEMP_BOOT_SCREENS)
- bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
- DEBIAN_VERSION "$(DEBIAN_VERSION)" \
- BUILD_DATE "$(BUILD_DATE)" \
- < boot/sparc/debian.txt > $(TEMP_BOOT_SCREENS)/debian.txt
- cp boot/sparc/notsupported.txt $(TEMP_BOOT_SCREENS)/notsupported.txt
-
-arch_boot:
diff -pruN 20101020/build/config/sparc64/netboot.cfg 20201202/build/config/sparc64/netboot.cfg
--- 20101020/build/config/sparc64/netboot.cfg 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/config/sparc64/netboot.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,13 +1,8 @@
MEDIA_TYPE = netboot image
-
-TYPE = netboot
-TARGET = $(BOOT)
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
EXTRANAME = $(MEDIUM)/
-MANIFEST-BOOT = "tftp boot image for sparc64"
-
-.PHONY: arch_boot
-arch_boot:
- gzip -c $(TEMP)/System.map-$(KERNELIMAGEVERSION) >$(TEMP)/System.map.gz
- tftpboot.sh $(TEMP_KERNEL) $(TEMP)/System.map.gz $(TEMP_INITRD) $(TEMP_BOOT)
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff -pruN 20101020/build/config/sparc64.cfg 20201202/build/config/sparc64.cfg
--- 20101020/build/config/sparc64.cfg 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/config/sparc64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,14 +1,63 @@
-MEDIUM_SUPPORTED = cdrom netboot #miniiso
-
-VERSIONED_SYSTEM_MAP = t
+MEDIUM_SUPPORTED = cdrom netboot
KERNELMAJOR = 2.6
-KERNELVERSION = 2.6.32-5-sparc64
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-sparc64
+KERNELNAME = vmlinux
+
+DEBIAN_RELEASE = unstable
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
-KERNEL_FLAVOUR = di
-KERNELNAME = vmlinuz-${KERNELVERSION}
-KERNELIMAGEVERSION = ${KERNELVERSION}
+GRUB_CFG_CDROM = boot/sparc64/grub-cdrom.cfg
+# GRUB modules
+GRUB_MODULES = echo gzio linux minicmd normal
+GRUB_MODULES_CDROM = iso9660
arch_boot_screens:
arch_tree:
+
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/grub \
+ $(TEMP_CD_TREE)/sparc64 \
+ $(TEMP_CD_TREE)/install
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
+
+ cp -a /usr/lib/grub/sparc64-ieee1275 $(TEMP_CD_TREE)/boot/grub/
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
+
+ grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+# genisoimage CD info directory, including GRUB and configuration files.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir:
+ rm -rf $(TEMP_CD_INFO_DIR)
+ mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub \
+ $(TEMP_CD_INFO_DIR)/sparc64
+
+ cp -a /usr/lib/grub/sparc64-ieee1275 $(TEMP_CD_INFO_DIR)/boot/grub/
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+ grub-mkimage -O sparc64-ieee1275-cdcore -p '()/boot/grub' \
+ -o $(TEMP_CD_INFO_DIR)/boot/grub/core.img \
+ $(GRUB_MODULES) $(GRUB_MODULES_CDROM)
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
diff -pruN 20101020/build/config/sparc.cfg 20201202/build/config/sparc.cfg
--- 20101020/build/config/sparc.cfg 2010-05-24 14:52:24.000000000 +0000
+++ 20201202/build/config/sparc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,14 +1,63 @@
-MEDIUM_SUPPORTED = cdrom netboot miniiso
-
-VERSIONED_SYSTEM_MAP = t
+MEDIUM_SUPPORTED = cdrom netboot
KERNELMAJOR = 2.6
-KERNELVERSION = 2.6.32-5-sparc64
+BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-sparc64
+KERNELNAME = vmlinux
+
+DEBIAN_RELEASE = unstable
+KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
-KERNEL_FLAVOUR = di
-KERNELNAME = vmlinuz-${KERNELVERSION}
-KERNELIMAGEVERSION = ${KERNELVERSION}
+GRUB_CFG_CDROM = boot/sparc/grub-cdrom.cfg
+# GRUB modules
+GRUB_MODULES = echo gzio linux minicmd normal
+GRUB_MODULES_CDROM = iso9660
arch_boot_screens:
arch_tree:
+
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/grub \
+ $(TEMP_CD_TREE)/sparc \
+ $(TEMP_CD_TREE)/install
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
+
+ cp -a /usr/lib/grub/sparc64-ieee1275 $(TEMP_CD_TREE)/boot/grub/
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
+
+ grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+# genisoimage CD info directory, including GRUB and configuration files.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir:
+ rm -rf $(TEMP_CD_INFO_DIR)
+ mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub \
+ $(TEMP_CD_INFO_DIR)/sparc
+
+ cp -a /usr/lib/grub/sparc64-ieee1275 $(TEMP_CD_INFO_DIR)/boot/grub/
+
+ bootvars-subst \
+ KERNEL /install/vmlinux \
+ INITRD /install/initrd.gz \
+ < $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+ grub-mkimage -O sparc64-ieee1275-cdcore -p '()/boot/grub' \
+ -o $(TEMP_CD_INFO_DIR)/boot/grub/core.img \
+ $(GRUB_MODULES) $(GRUB_MODULES_CDROM)
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+ -rm -f $(TEMP_NETBOOT_DIR)
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
diff -pruN 20101020/build/config/x86.cfg 20201202/build/config/x86.cfg
--- 20101020/build/config/x86.cfg 2010-09-16 19:07:00.000000000 +0000
+++ 20201202/build/config/x86.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -11,22 +11,35 @@ DOS_VOLUME_ID = deb00001
DOS_VOLUME_LABEL = "Debian Inst"
# The image to use for a syslinux splash screen.
-SPLASH_PNG=boot/x86/pics/klowner.png
+SPLASH_PNG=boot/x86/pics/futurePrototype.png
+SPLASH_SVG=$(patsubst %.png,%.svg,$(SPLASH_PNG))
# The directory boot screens for syslinux will go in.
BOOT_SCREEN_DIR =
# Location for Xen example configuration.
-XENCFG = $(SOME_DEST)/$(EXTRANAME)xm-debian.cfg
+XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
+
+# The font to load in GRUB
+GRUB_FONT = /usr/share/grub/ascii.pf2
# Create syslinux config.
.PHONY: x86_syslinux
x86_syslinux:
-rm -rf $(TEMP_SYSLINUX)/*
mkdir -p $(TEMP_SYSLINUX)
- TYPE=$(SYSLINUX_CFG) INCLUDE_GTK=$(INITRD_GTK) DESKTOP=$(DESKTOP) \
+ TYPE=$(SYSLINUX_CFG) INCLUDE_GTK=$(INITRD_GTK) IS_PURE_GTK=$(IS_PURE_GTK) \
syslinux-cfgs boot/x86 $(TEMP_SYSLINUX)
+# Extract GRUB EFI files.
+.PHONY: x86_grub_efi
+x86_grub_efi:
+ifeq ($(GRUB_EFI),y)
+ efi-image -o $(TEMP_GRUB_EFI) -g $(GRUB_EFI_PLATFORM) \
+ -e $(GRUB_EFI_NAME) -n $(NETBOOT_PATH) \
+ -s $(EFI_SIGNED)
+endif
+
# Compress binaries to save more space.
# Doesn't really save much since we gzip the image later though.
.PHONY: arch_tree
@@ -43,7 +56,7 @@ arch_boot: x86_syslinux
ifdef UPX
$(UPX) -f -9 $(TEMP_KERNEL) || true
endif
- mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
+ mkfs.msdos --invariant -v -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
# syslinux is used to make the image bootable
syslinux $(SYSLINUX_OPTS) $(TEMP_BOOT)
@@ -59,9 +72,13 @@ endif
mcopy -i$(TEMP_BOOT) $(TEMP)/disk.lbl ::disk.lbl
# syslinux configs
+
+ # Use a non-empty character for beep by default to make sure the menu
+ # is wide enough when beep is enabled.
+ beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
subdirs=""; \
- $(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
+ $(foreach file,$(shell IS_PURE_GTK=$(IS_PURE_GTK) syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \
outfile=$(file); \
if [ "$$subdir" != "." ] && \
@@ -85,7 +102,7 @@ endif
# syslinux help screens
if [ -z "$(OMIT_BOOT_HELP)" ]; then \
set -e; \
- $(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.txt), \
+ $(foreach file,$(sort $(wildcard $(TEMP_BOOT_SCREENS)/*.txt)), \
if [ -e $(file).withgtk ] && [ -n "$(INITRD_GTK)" ]; then \
mcopy -i$(TEMP_BOOT) $(file).withgtk ::`basename $(file)`; \
else \
@@ -95,7 +112,9 @@ endif
fi
if [ "$(SYSLINUX_CFG)" != prompt ]; then \
- mcopy -i$(TEMP_BOOT) /usr/lib/syslinux/vesamenu.c32 ::vesamenu.c32; \
+ mcopy -i$(TEMP_BOOT) /usr/lib/syslinux/modules/bios/vesamenu.c32 ::vesamenu.c32; \
+ mcopy -i$(TEMP_BOOT) /usr/lib/syslinux/modules/bios/libcom32.c32 ::libcom32.c32; \
+ mcopy -i$(TEMP_BOOT) /usr/lib/syslinux/modules/bios/libutil.c32 ::libutil.c32 ; \
if [ -e $(TEMP_BOOT_SCREENS)/splash.png ]; then \
mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/splash.png ::splash.png; \
fi; \
@@ -108,8 +127,8 @@ endif
mcopy -i$(TEMP_BOOT) /usr/share/win32/win32-loader/g2ldr.mbr ::g2ldr.mbr ; \
\
(printf "[installer]\n"; \
+ printf "kernel=linux\n"; \
printf "arch=$(ARCH)\n"; \
- printf "default_desktop=gnome\n"; \
if [ -n "$(INITRD_GTK)" ]; then \
printf "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
printf "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrdg.gz\n"; \
@@ -123,13 +142,7 @@ endif
echo "*** Failed to add win32-loader, probably out of space." >&2) ; \
fi
- $(if $(GZIPPED),gzip -v9f $(TEMP_BOOT))
-
-# A non-bootable image, as used by the root floppy, is just a bare initrd.
-.PHONY: arch_root
-arch_root:
- # Pad the initrd to the floppy size.
- dd if=$(TEMP_INITRD) bs=$(shell expr $(FLOPPY_SIZE) \* 1024) count=1 of=$(TEMP_ROOT) conv=sync
+ $(if $(GZIPPED),gzip -nv9f $(TEMP_BOOT))
# Set up syslinux help screens.
.PHONY: arch_boot_screens
@@ -144,14 +157,18 @@ arch_boot_screens:
< $(SCREEN) > $(TEMP_BOOT_SCREENS)/`basename $(SCREEN)`\
;)
if [ -n "$(SPLASH_PNG)" ]; then \
+ if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
+ rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
+ fi; \
cp $(SPLASH_PNG) $(TEMP_BOOT_SCREENS)/splash.png; \
fi
# isolinux CD info directory, including help screens and an isolinux.cfg.
# Note that the configuration is extensively manipulated by debian-cd to
# support all the available CD/DVD variants.
+# Supply GRUB EFI configuration.
.PHONY: arch_cd_info_dir
-arch_cd_info_dir: x86_syslinux
+arch_cd_info_dir: x86_syslinux x86_grub_efi
-rm -f $(TEMP_CD_INFO_DIR)/*
mkdir -p $(TEMP_CD_INFO_DIR)
@@ -163,8 +180,11 @@ arch_cd_info_dir: x86_syslinux
cp -a $(TEMP_BOOT_SCREENS)/splash.png $(TEMP_CD_INFO_DIR); \
fi
+ # Use a non-empty character for beep by default to make sure the menu
+ # is wide enough when beep is enabled.
+ beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
- $(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
+ $(foreach file,$(shell IS_PURE_GTK=$(IS_PURE_GTK) syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \
outfile=$(file); \
if [ "$$subdir" != "." ]; then \
@@ -180,9 +200,9 @@ arch_cd_info_dir: x86_syslinux
KERNEL /%install%/vmlinuz \
INITRD /%install%/initrd.gz \
INITRD_GTK /%install%/gtk/initrd.gz \
- AMD_KERNEL /%install-amd%/vmlinuz \
- AMD_INITRD /%install-amd%/initrd.gz \
- AMD_INITRD_GTK /%install-amd%/gtk/initrd.gz \
+ X86_KERNEL /%install-x86%/vmlinuz \
+ X86_INITRD /%install-x86%/initrd.gz \
+ X86_INITRD_GTK /%install-x86%/gtk/initrd.gz \
VIDEO_MODE $(VIDEO_MODE) \
VIDEO_MODE_GTK $(VIDEO_MODE_GTK) \
BEEP "$$beep" \
@@ -190,6 +210,19 @@ arch_cd_info_dir: x86_syslinux
> $(TEMP_CD_INFO_DIR)/$$outfile; \
)
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_INFO_DIR)/grub/; \
+ cat boot/x86/grub/grub-efi.cfg \
+ | bootvars-subst KERNEL /%install%/vmlinuz \
+ INITRD /%install%/initrd.gz \
+ > $(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM)/; \
+ fi
+
# win32-loader
if [ -z "$(OMIT_WIN32_LOADER)" ]; then \
cp /usr/share/win32/win32-loader.exe $(TEMP_CD_INFO_DIR)/setup.exe; \
@@ -197,8 +230,8 @@ arch_cd_info_dir: x86_syslinux
cp /usr/share/win32/win32-loader/g2ldr.mbr $(TEMP_CD_INFO_DIR)/g2ldr.mbr; \
\
(printf "[installer]\n"; \
+ printf "kernel=linux\n"; \
printf "arch=$(ARCH)\n"; \
- printf "default_desktop=gnome\n"; \
if [ -n "$(INITRD_GTK)" ]; then \
printf "$(ARCH)/linux=install/vmlinuz\n$(ARCH)/initrd=install/initrd.gz\n"; \
printf "$(ARCH)/gtk/linux=install/vmlinuz\n$(ARCH)/gtk/initrd=install/gtk/initrd.gz\n"; \
@@ -211,11 +244,14 @@ arch_cd_info_dir: x86_syslinux
fi
.PHONY: arch_miniiso
-arch_miniiso: x86_syslinux
+arch_miniiso: x86_syslinux x86_grub_efi
-rm -f $(TEMP_CD_TREE)/*
mkdir -p $(TEMP_CD_TREE)
- cp /usr/lib/syslinux/isolinux.bin $(TEMP_CD_TREE)
- cp /usr/lib/syslinux/vesamenu.c32 $(TEMP_CD_TREE)
+ cp /usr/lib/ISOLINUX/isolinux.bin $(TEMP_CD_TREE)
+ cp /usr/lib/syslinux/modules/bios/vesamenu.c32 $(TEMP_CD_TREE)
+ cp /usr/lib/syslinux/modules/bios/ldlinux.c32 $(TEMP_CD_TREE)
+ cp /usr/lib/syslinux/modules/bios/libcom32.c32 $(TEMP_CD_TREE)
+ cp /usr/lib/syslinux/modules/bios/libutil.c32 $(TEMP_CD_TREE)
$(foreach file,$(wildcard boot/x86/*.txt), \
cat $(file) | \
@@ -231,8 +267,15 @@ arch_miniiso: x86_syslinux
ln -f $(TEMP_KERNEL) $(TEMP_CD_TREE)/linux
ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/initrd.gz
+ mkdir -p $(TEMP_CD_TREE)/.disk
+ echo "Debian GNU/Linux $(DEBIAN_VERSION) $(ARCH) - netboot mini.iso $(BUILD_DATE)"\
+ > $(TEMP_CD_TREE)/.disk/info
+
+ # Use a non-empty character for beep by default to make sure the menu
+ # is wide enough when beep is enabled.
+ beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
- $(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
+ $(foreach file,$(shell IS_PURE_GTK=$(IS_PURE_GTK) syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \
outfile=$(file); \
if [ "$$subdir" != "." ]; then \
@@ -255,6 +298,22 @@ arch_miniiso: x86_syslinux
| todos > $(TEMP_CD_TREE)/$$outfile; \
)
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_CD_TREE)/boot/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_TREE)/boot/grub/; \
+ grub-gencfg \
+ KERNEL /linux \
+ INITRD /initrd.gz \
+ HEADER boot/x86/grub/grub-efi.cfg \
+ -- \
+ $(VIDEO_MODE) \
+ > $(TEMP_CD_TREE)/boot/grub/grub.cfg; \
+ cp -a $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_CD_TREE)/boot/grub/$(GRUB_EFI_PLATFORM)/; \
+ fi
+
# win32-loader
if [ -z "$(OMIT_WIN32_LOADER)" ]; then \
cp /usr/share/win32/win32-loader.exe $(TEMP_CD_TREE)/setup.exe; \
@@ -262,8 +321,8 @@ arch_miniiso: x86_syslinux
cp /usr/share/win32/win32-loader/g2ldr.mbr $(TEMP_CD_TREE)/g2ldr.mbr; \
\
(printf "[installer]\n"; \
+ printf "kernel=linux\n"; \
printf "arch=$(ARCH)\n"; \
- printf "default_desktop=gnome\n"; \
if [ "$(TYPE)" = "netboot/gtk" ]; then \
printf "user_interface=graphical\n"; \
printf "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrd.gz\n"; \
@@ -275,26 +334,40 @@ arch_miniiso: x86_syslinux
| todos > $(TEMP_CD_TREE)/win32-loader.ini; \
fi
- genisoimage -r -J -b isolinux.bin -c boot.cat \
- -no-emul-boot -boot-load-size 4 -boot-info-table \
- -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
+ if [ "$(GRUB_EFI)" = y ]; then \
+ xorriso -as mkisofs -r -J -b isolinux.bin -c boot.cat \
+ -no-emul-boot -boot-load-size 4 -boot-info-table \
+ -eltorito-alt-boot \
+ --efi-boot boot/grub/efi.img -no-emul-boot \
+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
+ else \
+ xorriso -as mkisofs -r -J -b isolinux.bin -c boot.cat \
+ -no-emul-boot -boot-load-size 4 -boot-info-table \
+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
+ fi
geniso_hybrid_plus_firmware_partition $(TEMP_MINIISO)
# Netboot files
.PHONY: arch_netboot_dir
-arch_netboot_dir: x86_syslinux
+arch_netboot_dir: x86_syslinux x86_grub_efi
-rm -f $(TEMP_NETBOOT_DIR)
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
- cp /usr/lib/syslinux/pxelinux.0 $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+ cp /usr/lib/PXELINUX/pxelinux.0 $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/pxelinux.cfg
mkdir -p $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
- cp /usr/lib/syslinux/vesamenu.c32 $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
-
+ cp /usr/lib/syslinux/modules/bios/vesamenu.c32 $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
+ cp /usr/lib/syslinux/modules/bios/ldlinux.c32 $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
+ cp /usr/lib/syslinux/modules/bios/libcom32.c32 $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
+ cp /usr/lib/syslinux/modules/bios/libutil.c32 $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
+
+ # Use a non-empty character for beep by default to make sure the menu
+ # is wide enough when beep is enabled.
+ beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
- $(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
+ $(foreach file,$(shell IS_PURE_GTK=$(IS_PURE_GTK) syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \
outfile=$(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)/$(file); \
if [ "$$subdir" != "." ]; then \
@@ -324,6 +397,9 @@ arch_netboot_dir: x86_syslinux
# dhcp server setups to work without modification.
rm -f $(TEMP_NETBOOT_DIR)/pxelinux.0
ln -sf $(NETBOOT_PATH)/pxelinux.0 $(TEMP_NETBOOT_DIR)/pxelinux.0
+ # This link is required because pxelinux only looks in the tftp root
+ # for this library (it does a PATH search for any others).
+ ln -sf $(BOOT_SCREEN_DIR)ldlinux.c32 $(TEMP_NETBOOT_DIR)/ldlinux.c32
set -e; \
$(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.txt), \
@@ -334,12 +410,28 @@ arch_netboot_dir: x86_syslinux
cp $(SPLASH_PNG) $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)/splash.png; \
fi
+ if [ "$(GRUB_EFI)" = y ]; then \
+ set -e; \
+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_EFI_PLATFORM); \
+ cp -a $(TEMP_GRUB_EFI)/*.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
+ cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
+ cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
+ $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_EFI_PLATFORM)/; \
+ grub-gencfg \
+ KERNEL /$(NETBOOT_PATH)/linux \
+ INITRD /$(NETBOOT_PATH)/initrd.gz \
+ HEADER boot/x86/grub/grub-efi.cfg \
+ -- \
+ $(VIDEO_MODE) \
+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
+ fi
+
.PHONY: xen_config
xen_config:
sed -e "s/@ARCH@/$(ARCH)/g" \
-e "s/@XEN_INSTALL_METHOD@/$(XEN_INSTALL_METHOD)/g" \
-e "s/@DEBIAN_RELEASE@/$(DEBIAN_RELEASE)/g" \
- $(XENCFG)
+ $(XENCFG)
chmod 644 $(XENCFG)
update-manifest $(XENCFG) $(MANIFEST-XENCFG)
diff -pruN 20101020/build/daily-build 20201202/build/daily-build
--- 20101020/build/daily-build 2010-05-22 19:06:19.000000000 +0000
+++ 20201202/build/daily-build 2020-04-09 07:06:18.000000000 +0000
@@ -47,18 +47,23 @@ fi
# Overridable environment variables for building.
if [ -z "$ROOTCMD" ]; then
- ROOTCMD="fakeroot"
+ _ROOTCMD="fakeroot"
+else
+ _ROOTCMD=$ROOTCMD
+ unset ROOTCMD
fi
# Internal environment variables to keep file attributes between targets
# when fakeroot is used.
# As we start with an empty file, we can use -i also on first invocation.
ROOTCMDOPTS=""
-if [ "$ROOTCMD" = fakeroot ]; then
+case "$_ROOTCMD" in
+ *fakeroot*)
FRSAVE="$(mktemp -t d-i_daily-build.XXXXXX)"
trap 'rm -f $FRSAVE' 0 HUP INT QUIT TERM
ROOTCMDOPTS="-i $FRSAVE -s $FRSAVE"
-fi
+ ;;
+esac
LOG_TO_STDOUT=${LOG_TO_STDOUT:-0}
@@ -72,23 +77,29 @@ header () {
echo
}
+do_build_helper () {
+ local t=$1
+ header BUILDING IMAGE FOR $t
+ gitver=$(git show-ref HEAD 2>/dev/null) || true
+ if [ -n "$gitver" ]; then
+ echo "debian-installer git tree version: $gitver"
+ elif [ -d ../.git ]; then
+ githead=$(cat ../.git/refs/heads/master) || true
+ echo "debian-installer git tree head: $githead"
+ fi
+ $_ROOTCMD $ROOTCMDOPTS make $t 2>&1
+}
+
do_build () {
local t=$1
local err=0
- # Commands in these two branches should be the same.
if [ "$LOG_TO_STDOUT" = 1 ]; then
set -o pipefail
- (
- header BUILDING IMAGE FOR $t
- $ROOTCMD $ROOTCMDOPTS make $t 2>&1
- ) | tee -a dest/$t.log || err=$?
+ ROOTCMDOPTS=$ROOTCMDOPTS do_build_helper $t | tee -a dest/$t.log || err=$?
set +o pipefail
else
- (
- header BUILDING IMAGE FOR $t
- $ROOTCMD $ROOTCMDOPTS make $t 2>&1
- ) >> dest/$t.log || err=$?
+ ROOTCMDOPTS=$ROOTCMDOPTS do_build_helper $t >> dest/$t.log || err=$?
fi
return $err
@@ -97,10 +108,10 @@ do_build () {
build () {
# Override $TARGETS with custom makefile targets.
if [ -z "$TARGETS" ]; then
- TARGETS="$($ROOTCMD make all_list | grep '^build')"
+ TARGETS="$($_ROOTCMD make all_list | grep '^build')"
fi
- $ROOTCMD make reallyclean > /dev/null
+ $_ROOTCMD make reallyclean > /dev/null
mkdir dest
touch dest/overview.log
@@ -113,7 +124,7 @@ build () {
echo "building $t failed, see log file dest/$t.log for details" >&2
fi
done
- $ROOTCMD make stats > dest/stats.txt 2>&1 || true
+ $_ROOTCMD make stats > dest/stats.txt 2>&1 || true
make release > /dev/null
}
@@ -156,8 +167,7 @@ trim () {
UPDATED=""
update () {
if [ ! "$UPDATED" ]; then
- (cd ../debian && svn -q up || true)
- svn -q up || true
+ git pull >/dev/null 2>&1 || true
UPDATED=1
fi
}
diff -pruN 20101020/build/Makefile 20201202/build/Makefile
--- 20101020/build/Makefile 2010-10-20 20:56:20.000000000 +0000
+++ 20201202/build/Makefile 2020-11-30 23:08:26.000000000 +0000
@@ -53,8 +53,13 @@
# `-- vmlinuz
#
+# Temporary workaround for #823881:
+export MTOOLS_SKIP_CHECK=1
+
# Add to PATH so dpkg will always work, and so local programs will be found.
PATH := util:$(PATH):/usr/sbin:/sbin
+EATMYDATA = $(shell which eatmydata 2>/dev/null)
+gzip = $(shell which pigz >/dev/null 2>&1 && echo "pigz -n -T" || echo "gzip -n")
# We don't want this to be run each time we re-enter.
ifndef DEB_HOST_ARCH
@@ -62,9 +67,19 @@ DEB_HOST_ARCH = $(shell dpkg-architectur
DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_CPU = $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
DEB_HOST_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-export DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_GNU_CPU DEB_HOST_GNU_SYSTEM
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_GNU_CPU DEB_HOST_GNU_SYSTEM DEB_HOST_MULTIARCH
endif
+define drop_lang
+ @echo "Dropping languages: $(1)"
+ @set -e; \
+ for FILE in $$(find $(TREE)/var/lib/dpkg -name "*.templates"); do \
+ perl -e 'my $$status=0; my $$drop=shift; while (<>) { if (/^[A-Z]/ || /^$$/) { if (/^(Choices|Description|Indices|Default)-($$drop)/ && ! /^Choices-C:/) { $$status = 0 } else { $$status = 1 } } print if ($$status); }' $(1) < $$FILE > temp; \
+ mv temp $$FILE; \
+ done
+endef
+
# We loop over all needed combinations of ARCH, SUBARCH, MEDIUM, FLAVOUR
# via recursive make calls. ARCH is constant, we don't support
# crosscompiling.
@@ -100,6 +115,7 @@ include config/dir
export KEYRING
export KERNELVERSION
export LOCALUDEBDIR
+export SOURCE_DATE_EPOCH
ifneq ($(shell id -u),0)
ROOTCMD ?= fakeroot
@@ -107,7 +123,7 @@ endif
# Useful command sequences
define submake
- $(ROOTCMD) $(MAKE) --no-print-directory
+ $(ROOTCMD) $(MAKE) --no-print-directory -j1
endef
define recurse_once
@@ -123,21 +139,36 @@ define recurse
endef
define mkinitramfs
- (cd $(TREE) && find . | cpio --quiet -o -H newc) >
+ (cd $(TREE) && find . | sort | cpio --reproducible --quiet -o -H newc) >
+endef
+
+define clamp_mtimes
+ find $(1) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
endef
+define normalise_permissions
+ find $(1) -type d -print0 | xargs -0r chmod $(DIR_MODE)
+ find $(1) -not -type d -and -not -type l -print0 | xargs -0r chmod $(FILE_MODE)
+endef
+
+# Limit on mfsroot size. It is determined by NKPT (in $(BASE_DEST)/udeb.list
- rm -f $(BASE_DEST)/MD5SUMS
- cd $(BASE_DEST) && md5sum `find . -type f` > MD5SUMS
+ rm -f $(BASE_DEST)/MD5SUMS $(BASE_DEST)/SHA256SUMS
+ cd $(BASE_DEST) && md5sum `find -L . -type f | sort` > MD5SUMS # XXX remove this
+ cd $(BASE_DEST) && sha256sum `find -L . -type f | sort` > SHA256SUMS
+ # We have just modified files
+ $(clamp_mtimes) $(BASE_DEST)
+ $(normalise_permissions) $(BASE_DEST)
# The general tree target.
$(STAMPS)tree-unpack-$(targetstring)-stamp: $(STAMPS)get_udebs-$(targetstring)-stamp
@@ -304,18 +342,20 @@ ifdef TRANSSTATUS
# Do this first to make possible warnings more visible.
@echo; \
if [ -f "$(TRANSSTATUS)" ]; then \
- olddate=$$(grep "^# Generated on:" $(TRANSSTATUS) | sed "s/.*: //"); \
- if [ "$$olddate" ]; then \
- if [ $$(( $$(date -u "+%s") - \
- $$(date -d "$$olddate" "+%s") \
- )) -gt 1209600 ]; then \
- echo "WARNING: The data in '$(TRANSSTATUS)' is older than 2 weeks."; \
- echo " Should it maybe be updated?"; \
+ if [ "$(USE_PROPOSED_UPDATES)" != 1 ]; then \
+ olddate=$$(grep "^# Generated on:" $(TRANSSTATUS) | sed "s/.*: //"); \
+ if [ "$$olddate" ]; then \
+ if [ $$(( $$(date -u "+%s") - \
+ $$(date -d "$$olddate" "+%s") \
+ )) -gt 1209600 ]; then \
+ echo "WARNING: The data in '$(TRANSSTATUS)' is older than 2 weeks."; \
+ echo " Should it maybe be updated?"; \
+ sleep 15; \
+ fi; \
+ else \
+ echo "WARNING: no timestamp found in $(TRANSSTATUS)."; \
sleep 15; \
fi; \
- else \
- echo "WARNING: no timestamp found in $(TRANSSTATUS)."; \
- sleep 15; \
fi; \
mkdir -p $(TREE)/usr/share/localechooser; \
cp $(TRANSSTATUS) $(TREE)/usr/share/localechooser/translation-status; \
@@ -332,20 +372,34 @@ endif
oldsize=0; oldblocks=0; oldcount=0; for udeb in $(UDEBDIR)/*.udeb ; do \
if [ -f "$$udeb" ]; then \
pkg=`basename $$udeb` ; \
- dpkg $(DPKG_UNPACK_OPTIONS) --log=/dev/null --root=$(TREE) --unpack $$udeb ; \
+ $(EATMYDATA) dpkg $(DPKG_UNPACK_OPTIONS) --path-include='*' --log=/dev/null --root=$(TREE) --unpack $$udeb ; \
newsize=`du -bs $(TREE) | awk '{print $$1}'` ; \
newblocks=`du -s $(TREE) | awk '{print $$1}'` ; \
newcount=`find $(TREE) -type f | wc -l | awk '{print $$1}'` ; \
usedsize=`echo $$newsize - $$oldsize | bc`; \
usedblocks=`echo $$newblocks - $$oldblocks | bc`; \
usedcount=`echo $$newcount - $$oldcount | bc`; \
- version=`dpkg-deb --info $$udeb | grep '^ *Version:' | sed 's/^ *//' | awk '{print $$2}'` ; \
+ version=`dpkg-deb --info $$udeb | sed -n 's/^ Version: //p' | sed 's/+b[0-9]*$$//g'` ; \
+ source=`dpkg-deb --info $$udeb | sed -n 's/^ Source: //p'` ; \
+ if [ -z "$$source" ]; then \
+ source=`dpkg-deb --info $$udeb | awk '/ Package: / { print $$2 }'` ; \
+ source_version="$$source (= $$version)" ; \
+ elif echo "$$source" | grep -qs '^linux-signed'; then \
+ source_version="linux (= $$version)" ; \
+ elif echo "$$source" | grep -qs '(.*)'; then \
+ source_version=`echo $$source|sed 's/(/(= /'`; \
+ else \
+ source_version="$$source (= $$version)" ; \
+ fi ; \
echo " $$usedsize B - $$usedblocks blocks - $$usedcount files from $$pkg (version $$version)" >>$(TEMP)/diskusage.txt;\
+ echo "$$source_version" >>$(TEMP)/built-using.txt;\
oldsize=$$newsize ; \
oldblocks=$$newblocks ; \
oldcount=$$newcount ; \
fi; \
done
+ sort -u < $(TEMP)/built-using.txt > $(TEMP)/built-using.txt.new && \
+ mv $(TEMP)/built-using.txt.new $(TEMP)/built-using.txt
sort -n < $(TEMP)/diskusage.txt > $(TEMP)/diskusage.txt.new && \
mv $(TEMP)/diskusage.txt.new $(TEMP)/diskusage.txt
grep-dctrl -nsPackage,Version,Architecture '' $(TREE)/var/lib/dpkg/status | \
@@ -365,6 +419,15 @@ ifdef EXTRAFILES
done
endif
+ifdef SSL_CERTS
+ # Copy in any SSL certificates.
+ mkdir -p $(TREE)/etc/ssl/certs
+ cp -a $(SSL_CERTS) $(TREE)/etc/ssl/certs/
+ openssl rehash $(TREE)/etc/ssl/certs
+ mkdir -p $(TREE)/usr/lib/ssl
+ ln -nsf ../../../etc/ssl/certs $(TREE)/usr/lib/ssl/certs
+endif
+
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifdef KERNELVERSION
# Set up modules.dep, ensure there is at least one standard dir (kernel
@@ -385,18 +448,10 @@ ifdef KERNELVERSION
fi; \
[ -z "$$sysmap_name" ] || mv $$sysmap_name $(TEMP);)
- # These files depmod makes are used by hotplug, if it's being used;
- # otherwise, we shouldn't need them. Some files aren't even used by
- # hotplug, so never include them.
- if [ -d $(TREE)/etc/udev ] || [ -d $(TREE)/etc/hotplug ]; then \
- find $(TREE)/lib/modules/ -name 'modules*' \
- -not -name modules.dep -not -name modules.alias \
- -not -name 'modules.*map' \
- -not -type d | xargs rm -f; \
- else \
- find $(TREE)/lib/modules/ -name 'modules*' \
- -not -name modules.dep -not -type d | xargs rm -f; \
- fi
+ # These files depmod makes are used by udev.
+ find $(TREE)/lib/modules/ -maxdepth 2 -name 'modules*.bin' \
+ -not -name 'modules.builtin.bin' \
+ -not -type d | while read f; do rm -f $${f%.bin}; done
# These files are used to build special kernel images for some
# subarchitectures. Move them out of the way.
@@ -449,16 +504,18 @@ endif
# Create a dev tree.
mkdir -p $(TREE)/dev
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
# Always needed, in case udev is not mounted on boot.
mknod $(TREE)/dev/console c 5 1
mknod $(TREE)/dev/null c 1 3
+endif
mkdir -p $(EXTRAUDEBSDIR)
mkdir -p $(EXTRAUDEBSDPKGDIR)/info $(EXTRAUDEBSDPKGDIR)/updates
touch $(EXTRAUDEBSDPKGDIR)/status $(EXTRAUDEBSDPKGDIR)/available
ifdef EXTRADRIVERS
- # Unpack the udebs of additional driver disks, so mklibs runs on them too.
+ # Unpack the udebs of additional driver disks, so font reduction runs on them too.
dpkg $(DPKG_UNPACK_OPTIONS) --log=/dev/null --root=$(EXTRAUDEBSDIR) --unpack \
$(wildcard $(foreach dir,$(EXTRADRIVERS),$(dir)/*.udeb))
endif
@@ -469,45 +526,24 @@ ifdef EXTRAUDEBS
$(foreach udeb,$(EXTRAUDEBS),$(UDEBDIR)/$(udeb).udeb)
endif
- # Library reduction. Existing libs from udebs are put in the udeblibs
- # directory and mklibs is made to use those in preference to the
- # system libs.
- rm -rf $(TEMP)/udeblibs
-ifndef ONLY_KLIBC
- mkdir -p $(TEMP)/udeblibs
- -cp -a `find $(EXTRAUDEBSDIR)/lib -name '*.so.*'` $(TEMP)/udeblibs
- -cp -a `find $(TREE)/lib -name '*.so.*'` $(TEMP)/udeblibs
- mkdir -p $(TREE)/lib
- # HACK ALERT: X.Org modules are excluded from the scan as mklibs
- # is unable to find symbols provided by the /usr/bin/Xorg binary
- $(MKLIBS) -L $(TREE)/usr/lib -L $(TEMP)/udeblibs -v -d $(TREE)/lib --root=$(TREE) \
- -L $(TREE)/usr/lib/cdebconf/frontend \
- $(addprefix -l,$(notdir $(wildcard $(TREE)/usr/lib/cdebconf/frontend/*.so))) \
- `find $(TEMP) -type f -a \( -perm +0111 -o -name '*.so' -o -name '*.so.*' \) | \
- grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
-
ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ # Missing in the current libc0.3-udeb
+ # To remove with glibc 2.31
+ cp /lib/i386-gnu/libmachuser* $(TREE)/lib
+ cp /lib/i386-gnu/libhurduser* $(TREE)/lib
# On Hurd the SONAME for the dynamic linker is ld.so.1, but binaries
- # have the ld.so symlink as the interpreter. Ideally mklibs should
- # be copying it along with the libraries.
- ln -s ld.so.1 $(TREE)/lib/ld.so
+ # have the ld.so symlink as the interpreter.
+ # To remove with glibc 2.31
+ ln -sf ld.so.1 $(TREE)/lib/ld.so
- # We need /servers/exec at boot time
+ # We need /servers/exec and startup at boot time
touch $(TREE)/servers/exec
-endif
+ touch $(TREE)/servers/startup
endif
- # Add missing symlinks for libraries
- /sbin/ldconfig -n $(TREE)/lib $(TREE)/usr/lib
-
- # Remove any libraries that are present in both usr/lib and lib,
- # from lib. These were unnecessarily copied in by mklibs, and
- # we want to use the ones in usr/lib instead since they came
- # from udebs. Only libdebconfclient0 has this problem so far.
- set -e; \
- for lib in `find $(TREE)/usr/lib/ -name "lib*" -type f -printf "%f\n" | cut -d . -f 1 | sort | uniq`; do \
- rm -f $(TREE)/lib/$$lib.*; \
- done
+ # HACK ALERT: copy libgcc_s.so.[124] from the host system as
+ # libgcc-s[124] is not packaged as a udeb
+ cp /lib/$(DEB_HOST_MULTIARCH)/libgcc_s.so.[124] $(TREE)/lib
# Reduce status file to contain only the elements we care about.
egrep -i '^((Status|Provides|Depends|Package|Version|Description|installer-menu-item|Description-..):|$$)' \
@@ -522,19 +558,18 @@ endif
echo "Description: debian installation image" >> $(DPKGDIR)/status
echo >> $(DPKGDIR)/status
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ # There is a dependency loop which prevents d-i from being able to
+ # configure these. Since there is actually nothing to do to configure
+ # them, they can as well be just marked installed already.
+ sed -i -e '/Package: hurd-libs/,+1s/install ok unpacked/install ok installed/' $(DPKGDIR)/status
+ sed -i -e '/Package: libparted/,+1s/install ok unpacked/install ok installed/' $(DPKGDIR)/status
+endif
+
ifdef OMIT_DPKG
rm -rf $(DPKGDIR)
endif
-define drop_lang
- @echo "Dropping languages: $(1)"
- @set -e; \
- for FILE in $$(find $(TREE)/var/lib/dpkg -name "*.templates"); do \
- perl -e 'my $$status=0; my $$drop=shift; while (<>) { if (/^[A-Z]/ || /^$$/) { if (/^(Choices|Description|Indices|Default)-($$drop)/ && ! /^Choices-C:/) { $$status = 0 } else { $$status = 1 } } print if ($$status); }' $(1) < $$FILE > temp; \
- mv temp $$FILE; \
- done
-endef
-
ifndef KEEP_GI_LANGS
# It makes no sense to include languages only supported by the
# graphical installer in regular images. This will also ensure
@@ -561,18 +596,20 @@ endif
zcat $(TREE)/usr/share/localechooser/languagelist.data.gz >> $(TEMP)/all.utf; \
fi
-
- # Strip all kernel modules, just in case they haven't already been
- set -e; \
- for module in `find $(TREE)/lib/modules/ -name '*.o' -or -name '*.ko'`; do \
- strip -R .comment -R .note -g $$module || true; \
- done
+ # Run fc-cache if needed, to avoid having to generate UUIDs
+ # at runtime, which can be hard because of missing entropy
+ # (#898468). Beware, fc-cache insists on having a directory
+ # under /usr/local:
+ if [ -e "$(TREE)/etc/fonts" ] || [ -e "$(TREE)/usr/share/fonts" ]; then \
+ mkdir -p "$(TREE)/usr/local/share/fonts"; \
+ fc-cache -s -y "$(TREE)"; \
+ fi
# Remove some unnecessary dpkg files.
set -e; \
for file in `find $(TREE)/var/lib/dpkg/info -name '*.md5sums' -o \
-name '*.postrm' -o -name '*.prerm' -o -name '*.preinst' -o \
- -name '*.list'`; do \
+ -name '*.list' | sort`; do \
if echo $$file | grep -qv '\.list'; then \
echo "** Removing unnecessary control file $$file"; \
fi; \
@@ -583,30 +620,41 @@ endif
# Remove extra udebs now that we're done with them.
rm -rf $(EXTRAUDEBSDIR)
+ # Clamp timestamps to be no later than SOURCE_DATE_EPOCH and normalise
+ # file modes before they get added to media.
+ $(clamp_mtimes) $(TREE)
+ $(normalise_permissions) $(TREE)
+
# Tree target ends here. Whew!
@touch $@
# Get the list of udebs to install.
# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-UDEBS = $(shell set -e; get-packages udeb update >&2; pkg-list $(TYPE) "$(DRIVER_FOR)" $(KERNEL_FLAVOUR) $(KERNELMAJOR) "$(SUBARCH)" $(KERNELIMAGEVERSION)) $(EXTRAS)
+UDEBS = $(shell set -e; get-packages udeb update >&2; pkg-list $(TYPE) "$(DRIVER_FOR)" $(KERNEL_FLAVOUR) $(KERNELMAJOR) "$(SUBARCH)" $(KERNELVERSION)) $(EXTRAS)
# Get all required udebs and put them in UDEBDIR.
$(STAMPS)get_udebs-$(targetstring)-stamp: sources.list.udeb
dh_testroot
@rm -f $@
+
get-packages udeb $(UDEBS)
@touch $@
-# Auto-generate a sources.list.type
+# Auto-generate sources.list.udeb
sources.list.udeb:
@(set -e; \
echo "# This file is automatically generated, edit $@.local instead."; \
- echo "# FIXME: localudebs disabled due #600852"; \
- echo "#deb copy:$(shell pwd)/ $(LOCALUDEBDIR)/"; \
+ echo "deb [trusted=yes] copy:$(shell pwd)/ $(LOCALUDEBDIR)/"; \
if [ "$(MIRROR)x" != "x" ]; then \
echo "deb $(MIRROR) $(USE_UDEBS_FROM) $(UDEB_COMPONENTS)"; \
+ if [ "$(USE_UNRELEASED)" = 1 ]; then \
+ echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \
+ fi \
else \
gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS) $(USE_PROPOSED_UPDATES); \
+ if [ "$(USE_UNRELEASED)" = 1 ]; then \
+ gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" unreleased $(UDEB_COMPONENTS); \
+ fi \
fi) > $@
@if [ -e $@.local ]; then \
echo "Using $@.local:"; \
@@ -649,14 +697,17 @@ $(TREE)/lib/unifont.bdf: $(TEMP)/unifont
# Create a compressed image of the root filesystem.
$(TEMP_INITRD): $(STAMPS)tree-$(targetstring)-stamp arch_tree
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
# Check for lost file attributes
@if [ -e $(TREE)/dev/console ] && \
- ! ls -l $(TREE)/dev/console | grep -q "^c"; then \
+ ! file $(TREE)/dev/console | grep -q "character special"; then \
echo "Error: incorrect file attributes detected in initrd tree."; \
echo "Did you restart a (failed) fakeroot build?"; \
echo "See fakeroot(1) ('-s' and '-i' options) for additional information."; \
+ file $(TREE)/dev/console; \
exit 1; \
fi
+endif
# Only build the font if we have installation-locale
ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -671,28 +722,30 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
fi
endif
+ # We may have modified $(TREE)/lib, so re-clamp and normalise before
+ # placing these files into archives.
+ $(clamp_mtimes) $(TREE)/lib
+ $(normalise_permissions) $(TREE)/lib
+
install -d $(TEMP)
+ set -e; \
case $(INITRD_FS) in \
ext2) \
$(genext2fs) $(TEMP)/initrd; \
$(e2fsck) $(TEMP)/initrd || true; \
- gzip -v9f $(TEMP)/initrd; \
- ;; \
- cramfs) \
- $(mkcramfs) $(TEMP)/initrd; \
- gzip -v9f $(TEMP)/initrd; \
+ $(gzip) -v9f $(TEMP)/initrd; \
;; \
initramfs) \
$(mkinitramfs) $(TEMP)/initrd; \
- gzip -v9f $(TEMP)/initrd; \
+ $(gzip) -v9f $(TEMP)/initrd; \
;; \
jffs2) \
$(mkjffs2) $(TEMP_INITRD); \
;; \
ufs1) \
$(mkfs.ufs1) $(TEMP)/initrd; \
- gzip -v9f $(TEMP)/initrd; \
+ $(gzip) -v9f $(TEMP)/initrd; \
;; \
*) \
echo "Unsupported filesystem type"; \
@@ -730,6 +783,18 @@ $(KERNEL): $(realpath $(dir $(KERNEL))/$
update-manifest $@ $(MANIFEST-KERNEL)
endif
+$(DTBS): $(TEMP_KERNEL)
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)
+ set -ex ; for dtb in $$(find $(TEMP_DTBS)/ -name *.dtb) ; do \
+ dir=$(SOME_DEST)/$(EXTRANAME)$$(dirname $${dtb#$(TEMP_DTBS)/}); \
+ tgt=$$dir/$$(basename $$dtb); \
+ mkdir -p $$dir ; \
+ cp $$dtb $$tgt ; \
+ update-manifest $$tgt "Device Tree Blob: $$(basename $$dtb)";\
+ done
+ cp boot/README.device-tree $@
+ update-manifest $@ "Device Tree Blobs README"
+
# bootable images
$(BOOT): $(TEMP_BOOT)
install -m 644 -D $(TEMP_BOOT)$(GZIPPED) $@
@@ -755,7 +820,7 @@ $(TEMP_MINIISO): $(TEMP_BOOT_SCREENS) ar
# various kinds of information, for use on debian-cd isos
$(DEBIAN_CD_INFO): $(TEMP_BOOT_SCREENS) $(TEMP_CD_INFO_DIR)
- (cd $(TEMP_CD_INFO_DIR); tar czf - .) > $@
+ gen-tarball $(TEMP_CD_INFO_DIR) $@
update-manifest $@ $(MANIFEST-DEBIAN_CD_INFO)
# a directory full of files for netbooting
@@ -774,7 +839,7 @@ $(NETBOOT_TAR): $(TEMP_NETBOOT_DIR)
# Create an version info file.
echo 'Debian version: $(DEBIAN_VERSION)' > $(TEMP_NETBOOT_DIR)/version.info
echo 'Installer build: $(BUILD_DATE)' >> $(TEMP_NETBOOT_DIR)/version.info
- (cd $(TEMP_NETBOOT_DIR); tar czf - .) > $@
+ gen-tarball $(TEMP_NETBOOT_DIR) $@
update-manifest $@ $(MANIFEST-NETBOOT_TAR) $(UDEB_LISTS)
$(TEMP_BOOT_SCREENS): arch_boot_screens
@@ -800,20 +865,18 @@ $(TEMP_EXTRA): $(STAMPS)extra-$(targetst
ext2) \
genext2fs -d $(TREE) -b $(IMAGE_SIZE) -m 0 $@ ; \
$(e2fsck) $@ || true ;; \
- cramfs) \
- $(mkcramfs) $@ ;; \
*) \
echo "Unsupported filesystem type"; \
exit 1 ;; \
esac
- $(if $(GZIPPED),gzip -v9f $(TEMP_EXTRA))
+ $(if $(GZIPPED),$(gzip) -v9f $(TEMP_EXTRA))
$(STAMPS)extra-$(targetstring)-stamp: $(STAMPS)get_udebs-$(targetstring)-stamp
@rm -f $@
mkdir -p $(TREE)
echo -n > $(TEMP)/diskusage.txt
echo -n > $(TEMP_UDEB_LIST)
-
+
set -e; \
for file in $(UDEBS); do \
cp $(UDEBDIR)/$$file* $(TREE) ; \
@@ -839,8 +902,9 @@ $(STAMPS)extra-$(targetstring)-stamp: $(
# Get a list of all the standard priority udebs, excluding kernel stuff.
pkg-lists/standard-udebs:
get-packages udeb update
- grep-dctrl -FPriority -e 'required|standard|important' \
- -sPackage apt.udeb/state/lists/*_Packages* | \
+ grep-dctrl -sPackage -FPriority -e 'required|standard|important' \
+ $(if $(SUBARCH),-a \( -! -FSubarchitecture -r . -o -FSubarchitecture -e '(^| )$(SUBARCH)( |$$)' \)) \
+ apt.udeb/state/lists/*_Packages* | \
grep -v kernel-image | grep -v -- -modules | \
cut -d " " -f 2 > $@
@@ -1014,3 +1078,18 @@ _qemu: $(TARGET)
echo "Sorry, don't know how to handle media type '$(MEDIA_TYPE)'" >&2; \
exit 1; \
esac
+
+# For running a d-i image in a subhurd
+.PHONY: subhurd_%
+subhurd_%:
+ @set -e; \
+ export SUBARCH=; \
+ export FLAVOUR=; \
+ export MEDIUM=$(subst subhurd_,,$@); \
+ $(submake) _subhurd
+
+.PHONY: _subhurd
+_subhurd: $(TEMP_INITRD)
+ settrans -cfga $(BASE_TMP)/rd0 /hurd/storeio -r -T file initrd.gz
+ -boot -I -f rd0=$(BASE_TMP)/rd0 -c "TERM=vt100 root=gunzip:device:rd0" /boot/servers.boot $(BASE_TMP)/rd0
+
diff -pruN 20101020/build/needed-characters/fr.utf 20201202/build/needed-characters/fr.utf
--- 20101020/build/needed-characters/fr.utf 2008-10-27 10:43:17.000000000 +0000
+++ 20201202/build/needed-characters/fr.utf 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,2 @@
- àâéèëêïîôùûüÿçÀÂÉÈËÊÏiÎÔÙÛÜŸÇ°£µ§
+ àâéèëêïîôùûüÿçœÀÂÉÈËÊÏiÎÔÙÛÜŸÇŒ°£µ§
diff -pruN 20101020/build/needed-characters/kab.utf 20201202/build/needed-characters/kab.utf
--- 20101020/build/needed-characters/kab.utf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/kab.utf 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,2 @@
+ εčḍǧḥɣṛṣṭţẓƐČḌǦḤΓƔṚṢṬŢẒ°£µ§
+
diff -pruN 20101020/build/needed-characters/kk.prospective 20201202/build/needed-characters/kk.prospective
--- 20101020/build/needed-characters/kk.prospective 2009-01-22 23:14:31.000000000 +0000
+++ 20201202/build/needed-characters/kk.prospective 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-аәбвгғдеёжзийкқлмнңоөпрстуұүхфһцчшщъыіьэюяАӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХҺЦЧШЩЪİЬЭЮЯ
diff -pruN 20101020/build/needed-characters/kk.utf 20201202/build/needed-characters/kk.utf
--- 20101020/build/needed-characters/kk.utf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/kk.utf 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1 @@
+аәбвгғдеёжзийкқлмнңоөпрстуұүхфһцчшщъыіьэюяАӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХҺЦЧШЩЪİЬЭЮЯ
diff -pruN 20101020/build/needed-characters/oc.utf 20201202/build/needed-characters/oc.utf
--- 20101020/build/needed-characters/oc.utf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/oc.utf 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1 @@
+ áàçéèíïóòúüÁÀÇÉÈÍÏÓÒÚÜ°£µ§
\ No newline at end of file
diff -pruN 20101020/build/needed-characters/os.utf 20201202/build/needed-characters/os.utf
--- 20101020/build/needed-characters/os.utf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/os.utf 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+абвгдежзийклмнопрстуфхцчшщъыьэюяёӕАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧЩЩЪЫЬЭЮЯЁӔ
\ No newline at end of file
diff -pruN 20101020/build/needed-characters/sd.prospective 20201202/build/needed-characters/sd.prospective
--- 20101020/build/needed-characters/sd.prospective 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/sd.prospective 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+؛؟ءآؤئابةتثجحخدذرزسشصضطظعغـفقلمنهوىي٠١٢٣٤٥٦٧٨٩٫٬ٺٻٽپٿڀڃڄچڇڊڌڍڏڙڦکڪگڱڳڻھہ۰۱۲۳۴۵۶۷۽۾‘’‚“”ﭓﭔﭕﭗﭘﭙﭛﭜﭝﭟﭠﭡﭣﭤﭥﭧﭨﭩﭯﭰﭱﭳﭴﭵﭷﭸﭹﭻﭼﭽﭿﮀﮁﮃﮅﮇﮉﮍﮏﮐﮑﮓﮔﮕﮗﮘﮙﮛﮜﮝﮡﮢﮣﮧﮨﮩﮫﮬﮭﺂﺆﺊﺋﺌﺎﺐﺑﺒﺔﺖﺗﺘﺚﺛﺜﺞﺟﺠﺢﺣﺤﺦﺧﺨﺪﺬﺮﺰﺲﺳﺴﺶﺷﺸﺺﺻﺼﺾﺿﻀﻂﻃﻄﻆﻇﻈﻊﻋﻌﻎﻏﻐﻒﻓﻔﻖﻗﻘﻚﻛﻜﻞﻟﻠﻢﻣﻤﻦﻧﻨﻪﻫﻬﻮﻰﻲﻳﻴﻵﻶﻻﻼ
diff -pruN 20101020/build/needed-characters/tg.utf 20201202/build/needed-characters/tg.utf
--- 20101020/build/needed-characters/tg.utf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/tg.utf 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1 @@
+АаБбВвГгҒғДдЕеЁёЖжЗзИиӢӣЙйКкҚқЛлМмНнОоПпРрСсТтУуӮӯФфХхҲҳЧчҶҷШшЪъЭэЮюЯя
diff -pruN 20101020/build/needed-characters/ug.utf 20201202/build/needed-characters/ug.utf
--- 20101020/build/needed-characters/ug.utf 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/needed-characters/ug.utf 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+ئ ﺌ ﺋ ا ﺍ ﺎ ب ﺏ ﺐ ﺒ ﺑ ﺕ ﺖ ﺘ ﺗ ج ﺝ ﺞ ﺠ ﺟ ﺥ ﺦ ﺨ ﺧ د ﺩ ﺪ ر ﺭ ﺮ ﺯ ﺰ س ﺱ ﺲ ﺴ ﺳ ش ﺵ ﺶ ﺸ ﺷ ﻍ ﻎ ﻐ ﻏ ف ﻑ ﻒ ﻔ ﻓ ﻕ ﻖ ﻘ ﻗ ك ﻙ ﻚ ﻜ ﻛ ل ﻝ ﻞ ﻠ ﻟ م ﻡ ﻢ ﻤ ﻣ ﻥ ﻦ ﻨ ﻧ و ﻭ ﻮ ى ﻯ ﻰ ﯩ ﯨﻱ ﻲ ﻴ ﻳ ﭖ ﭗ ﭙ ﭘﭺ ﭻ ﭽ ﭼژ ﮊ ﮋ ڭ ﯓ ﯔ ﯖ ﯕ گ ﮒ ﮓ ﮕ ﮔﮪ ﮫ ﮭ ﮬﯙ ﯚ ۇ ﯗ ﯘ ۈ ﯛ ﯜ ۋ ﯞ ﯟ ې ﯤ ﯥ ﯧ ﯦ ە ﻩ ﻪ ﻼ ﻻ
diff -pruN 20101020/build/pkg-lists/base 20201202/build/pkg-lists/base
--- 20101020/build/pkg-lists/base 2010-02-22 23:08:48.000000000 +0000
+++ 20201202/build/pkg-lists/base 2020-11-30 23:08:26.000000000 +0000
@@ -10,7 +10,6 @@ di-utils-reboot
di-utils-shell
libdebconfclient0-udeb
libdebian-installer4-udeb
-libnss-dns-udeb
lowmemcheck
main-menu
rootskel
@@ -18,9 +17,14 @@ udpkg
rescue-check
env-preseed
pciutils-udeb
+screen-udeb
+wget-udeb
+ca-certificates-udeb
#include "udev"
-# busybox modutils is gone
-module-init-tools-udeb [linux]
+kmod-udeb [linux]
kldutils-udeb [kfreebsd]
+
+# Avoid entropy starvation issues (#923675):
+haveged-udeb [linux]
diff -pruN 20101020/build/pkg-lists/bootfloppy-ng/common 20201202/build/pkg-lists/bootfloppy-ng/common
--- 20101020/build/pkg-lists/bootfloppy-ng/common 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/bootfloppy-ng/common 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# All we can be sure about for this one is the kernel.
-#include "kernel"
diff -pruN 20101020/build/pkg-lists/bootfloppy-ng/i386.cfg 20201202/build/pkg-lists/bootfloppy-ng/i386.cfg
--- 20101020/build/pkg-lists/bootfloppy-ng/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/bootfloppy-ng/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# These udebs (and NOT base) are used to build a special boot floppy that
-# boots up and loads a second floppy.
-# Note that due to space reasons, cdebconf is not on this floppy image.
-# Neither is much else.
-
-rootskel-bootfloppy
-floppy-modules-${kernel:Version}
-
-# The floppy needs to prompt for enter to be hit, even with a USB keyboard.
-# But, usb keyboard support won't fit, so exclude it..
-#input-modules-${kernel:Version}
-
-# USB stuff commented out due to terminal lack of space.
-#
-# Include support for USB floppy drives, and other storage media.
-#usb-storage-modules-${kernel:Version}
-# Only the scsi modules needed for USB storage.
-#scsi-core-modules-${kernel:Version}
-# This is here for just one symbol that the usb-storage module needs.
-# In theory, that symbol could be moved out to its own kernel module,
-# but we have not been tight enough on space yet to need to do that.
-# (Update: Now we have run out of space, but we've still not managed to
-# do it...)
-#ide-core-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/cd_drivers/i386.cfg 20201202/build/pkg-lists/cd_drivers/i386.cfg
--- 20101020/build/pkg-lists/cd_drivers/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cd_drivers/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-ide-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-cdrom-core-modules-${kernel:Version}
-scsi-modules-${kernel:Version}
-scsi-common-modules-${kernel:Version}
-
-# For pcmcia cdroms
-pcmcia-storage-modules-${kernel:Version}
-pcmcia-modules-${kernel:Version}
-pcmciautils-udeb
-
-# These are on the root floppy.
-core-modules-${kernel:Version} -
diff -pruN 20101020/build/pkg-lists/cd_drivers/powerpc.cfg 20201202/build/pkg-lists/cd_drivers/powerpc.cfg
--- 20101020/build/pkg-lists/cd_drivers/powerpc.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cd_drivers/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,8 +1,6 @@
input-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-scsi-common-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}
-#scsi-extra-modules-${kernel:Version}
eject-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/alpha.cfg 20201202/build/pkg-lists/cdrom/alpha.cfg
--- 20101020/build/pkg-lists/cdrom/alpha.cfg 2010-01-11 15:35:40.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/alpha.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,21 +1,21 @@
srm-reader
srm-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-ide-core-modules-${kernel:Version}
+pata-modules-${kernel:Version}
serial-modules-${kernel:Version} ?
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
scsi-core-modules-${kernel:Version}
-# Support for SCSI cdroms on common controllers.
-scsi-common-modules-${kernel:Version}
+# Support for SCSI cdroms.
+scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}
# Added optionally as udeb may not yet be available
sata-modules-${kernel:Version} ?
-
-# This is needed for proper display of utf-8 on systems we can support it on
-fb-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/amd64.cfg 20201202/build/pkg-lists/cdrom/amd64.cfg
--- 20101020/build/pkg-lists/cdrom/amd64.cfg 2010-01-11 15:35:40.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/amd64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,12 +1,11 @@
-console-keymaps-at
-floppy-modules-${kernel:Version}
+console-setup-pc-ekmap
fat-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-ide-core-modules-${kernel:Version}
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
@@ -18,8 +17,9 @@ firewire-core-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
# USB and firewire cdroms both need this.
scsi-core-modules-${kernel:Version}
-# Support for SCSI cdroms on common controllers.
-scsi-common-modules-${kernel:Version}
+# Support for SCSI cdroms.
+scsi-common-modules-${kernel:Version} ?
+scsi-modules-${kernel:Version}
# also support MMC/SD cards
mmc-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/arm64.cfg 20201202/build/pkg-lists/cdrom/arm64.cfg
--- 20101020/build/pkg-lists/cdrom/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/arm64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,24 @@
+fat-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
+cdrom-core-modules-${kernel:Version}
+input-modules-${kernel:Version}
+fb-modules-${kernel:Version}
+console-setup-udeb
+kbd-udeb
+usb-modules-${kernel:Version}
+#serial-modules-${kernel:Version}
+usb-serial-modules-${kernel:Version} ?
+uinput-modules-${kernel:Version} ?
+virtio-modules-${kernel:Version} ?
+
+# Support for usb cdroms
+usb-storage-modules-${kernel:Version}
+# USB and firewire cdroms both need this.
+scsi-core-modules-${kernel:Version}
+# Support for SCSI cdroms.
+scsi-modules-${kernel:Version}
+# Real ATA hardware needs this.
+sata-modules-${kernel:Version}
+
+# also support MMC/SD cards
+mmc-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/armel.cfg 20201202/build/pkg-lists/cdrom/armel.cfg
--- 20101020/build/pkg-lists/cdrom/armel.cfg 2010-01-11 15:35:40.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/armel.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,8 +1,10 @@
-console-keymaps-acorn
-console-keymaps-at
-kbd-chooser
+#console-setup-pc-acorn
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
nic-modules-${kernel:Version} ?
nic-shared-modules-${kernel:Version} ?
+isofs-modules-${kernel:Version} ?
cdrom-core-modules-${kernel:Version} ?
-ide-modules-${kernel:Version} ?
+usb-serial-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/armhf.cfg 20201202/build/pkg-lists/cdrom/armhf.cfg
--- 20101020/build/pkg-lists/cdrom/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/armhf.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,23 @@
+fat-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
+cdrom-core-modules-${kernel:Version}
+input-modules-${kernel:Version}
+console-setup-udeb
+kbd-udeb
+usb-modules-${kernel:Version}
+#serial-modules-${kernel:Version}
+usb-serial-modules-${kernel:Version} ?
+uinput-modules-${kernel:Version} ?
+virtio-modules-${kernel:Version} ?
+
+# Support for usb cdroms
+usb-storage-modules-${kernel:Version}
+# USB and firewire cdroms both need this.
+scsi-core-modules-${kernel:Version}
+# Support for SCSI cdroms.
+scsi-modules-${kernel:Version}
+# Real ATA hardware needs this.
+sata-modules-${kernel:Version}
+
+# also support MMC/SD cards
+mmc-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/grub/arm64.cfg 20201202/build/pkg-lists/cdrom/grub/arm64.cfg
--- 20101020/build/pkg-lists/cdrom/grub/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/arm64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,2 @@
+# This image is based on the regular cdrom image, and gets all the packages
+# from that one too.
diff -pruN 20101020/build/pkg-lists/cdrom/grub/armhf.cfg 20201202/build/pkg-lists/cdrom/grub/armhf.cfg
--- 20101020/build/pkg-lists/cdrom/grub/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/armhf.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,2 @@
+# This image is based on the regular cdrom image, and gets all the packages
+# from that one too.
diff -pruN 20101020/build/pkg-lists/cdrom/grub/common 20201202/build/pkg-lists/cdrom/grub/common
--- 20101020/build/pkg-lists/cdrom/grub/common 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/common 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+# This image is based on the regular cdrom image, and gets all the packages
+# from that one too.
+
diff -pruN 20101020/build/pkg-lists/cdrom/grub/gtk/arm64.cfg 20201202/build/pkg-lists/cdrom/grub/gtk/arm64.cfg
--- 20101020/build/pkg-lists/cdrom/grub/gtk/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/gtk/arm64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,11 @@
+#include "gtk-linux"
+
+#mouse-modules-${kernel:Version}
+event-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
+#speakup-modules-${kernel:Version}
+#sound-modules-${kernel:Version}
+#console-setup-linux-fonts-udeb
+#espeakup-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/grub/gtk/common 20201202/build/pkg-lists/cdrom/grub/gtk/common
--- 20101020/build/pkg-lists/cdrom/grub/gtk/common 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/gtk/common 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+#include "gtk-common"
diff -pruN 20101020/build/pkg-lists/cdrom/grub/gtk/hurd-i386.cfg 20201202/build/pkg-lists/cdrom/grub/gtk/hurd-i386.cfg
--- 20101020/build/pkg-lists/cdrom/grub/gtk/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/gtk/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/grub/gtk/kfreebsd-amd64.cfg 20201202/build/pkg-lists/cdrom/grub/gtk/kfreebsd-amd64.cfg
--- 20101020/build/pkg-lists/cdrom/grub/gtk/kfreebsd-amd64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/gtk/kfreebsd-amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+#include "gtk-kfreebsd"
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/grub/gtk/kfreebsd-i386.cfg 20201202/build/pkg-lists/cdrom/grub/gtk/kfreebsd-i386.cfg
--- 20101020/build/pkg-lists/cdrom/grub/gtk/kfreebsd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/gtk/kfreebsd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+#include "gtk-kfreebsd"
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/grub/hurd-i386.cfg 20201202/build/pkg-lists/cdrom/grub/hurd-i386.cfg
--- 20101020/build/pkg-lists/cdrom/grub/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/grub/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+# This image is based on the regular cdrom image, and gets all the packages
+# from that one too.
+
diff -pruN 20101020/build/pkg-lists/cdrom/hppa.cfg 20201202/build/pkg-lists/cdrom/hppa.cfg
--- 20101020/build/pkg-lists/cdrom/hppa.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/hppa.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,11 +1,15 @@
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
+pata-modules-${kernel:Version}
input-modules-${kernel:Version}
nic-modules-${kernel:Version}
scsi-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
cdebconf-text-udeb
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/hurd-i386.cfg 20201202/build/pkg-lists/cdrom/hurd-i386.cfg
--- 20101020/build/pkg-lists/cdrom/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+# These are broken and/or irrelevant on Hurd for now
+partman-auto-raid -
+partman-ext3 -
+partman-jfs -
+partman-md -
+partman-xfs -
+partman-btrfs -
+
+bogl-bterm-udeb -
+console-setup-udeb
+
+debian-ports-archive-keyring-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/i386.cfg 20201202/build/pkg-lists/cdrom/i386.cfg
--- 20101020/build/pkg-lists/cdrom/i386.cfg 2010-01-11 15:35:40.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,12 +1,11 @@
-console-keymaps-at
-floppy-modules-${kernel:Version}
+console-setup-pc-ekmap
fat-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-ide-core-modules-${kernel:Version}
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
@@ -18,8 +17,9 @@ firewire-core-modules-${kernel:Version}
#usb-storage-modules-${kernel:Version}
# USB and firewire cdroms both need this.
scsi-core-modules-${kernel:Version}
-# Support for SCSI cdroms on common controllers.
-scsi-common-modules-${kernel:Version}
+# Support for SCSI cdroms.
+scsi-common-modules-${kernel:Version} ?
+scsi-modules-${kernel:Version}
# also support MMC/SD cards
mmc-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/ia64.cfg 20201202/build/pkg-lists/cdrom/ia64.cfg
--- 20101020/build/pkg-lists/cdrom/ia64.cfg 2010-03-26 12:17:24.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/ia64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,7 +1,9 @@
efi-reader
cdebconf-text-udeb
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
fat-modules-${kernel:Version}
ide-core-modules-${kernel:Version}
@@ -10,8 +12,11 @@ scsi-modules-${kernel:Version}
input-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
input-modules-${kernel:Version}
+sata-modules-${kernel:Version}
serial-modules-${kernel:Version}
+pata-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/isolinux/amd64.cfg 20201202/build/pkg-lists/cdrom/isolinux/amd64.cfg
--- 20101020/build/pkg-lists/cdrom/isolinux/amd64.cfg 2008-11-18 03:17:33.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/isolinux/amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -9,3 +9,4 @@ sata-modules-${kernel:Version}
pata-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
scsi-modules-${kernel:Version}
+hyperv-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/isolinux/gtk/amd64.cfg 20201202/build/pkg-lists/cdrom/isolinux/gtk/amd64.cfg
--- 20101020/build/pkg-lists/cdrom/isolinux/gtk/amd64.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/isolinux/gtk/amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,8 @@
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
speakup-modules-${kernel:Version}
+sound-modules-${kernel:Version}
+console-setup-linux-fonts-udeb
+espeakup-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/isolinux/gtk/common 20201202/build/pkg-lists/cdrom/isolinux/gtk/common
--- 20101020/build/pkg-lists/cdrom/isolinux/gtk/common 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/isolinux/gtk/common 2020-04-09 07:06:18.000000000 +0000
@@ -1 +1,2 @@
#include "gtk-common"
+#include "gtk-linux"
diff -pruN 20101020/build/pkg-lists/cdrom/isolinux/gtk/i386.cfg 20201202/build/pkg-lists/cdrom/isolinux/gtk/i386.cfg
--- 20101020/build/pkg-lists/cdrom/isolinux/gtk/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/isolinux/gtk/i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,8 @@
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
speakup-modules-${kernel:Version}
+sound-modules-${kernel:Version}
+console-setup-linux-fonts-udeb
+espeakup-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/isolinux/i386.cfg 20201202/build/pkg-lists/cdrom/isolinux/i386.cfg
--- 20101020/build/pkg-lists/cdrom/isolinux/i386.cfg 2008-11-18 03:17:33.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/isolinux/i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -10,3 +10,4 @@ pata-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
scsi-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
+hyperv-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/kfreebsd-amd64.cfg 20201202/build/pkg-lists/cdrom/kfreebsd-amd64.cfg
--- 20101020/build/pkg-lists/cdrom/kfreebsd-amd64.cfg 2010-08-26 23:39:24.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/kfreebsd-amd64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -14,22 +14,19 @@ floppy-modules-${kernel:Version}
mmc-modules-${kernel:Version}
# Support for filesystems
-ext2-modules-${kernel:Version}
-fat-modules-${kernel:Version}
isofs-modules-${kernel:Version}
-ntfs-modules-${kernel:Version}
-reiserfs-modules-${kernel:Version}
-xfs-modules-${kernel:Version}
-zfs-modules-${kernel:Version}
# Keyboard and console
bogl-bterm-udeb -
-console-keymaps-at
-kbd-chooser -
+console-setup-udeb
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
# brltty doesn't have screen reading support on FreeBSD yet
#brltty-udeb
#serial-modules-${kernel:Version}
-# temporary until kernel-wedge and kernel udebs are fixed
+# temporary (see #650437)
nullfs-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/cdrom/kfreebsd-i386.cfg 20201202/build/pkg-lists/cdrom/kfreebsd-i386.cfg
--- 20101020/build/pkg-lists/cdrom/kfreebsd-i386.cfg 2010-08-26 23:39:24.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/kfreebsd-i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -14,22 +14,19 @@ floppy-modules-${kernel:Version}
mmc-modules-${kernel:Version}
# Support for filesystems
-ext2-modules-${kernel:Version}
-fat-modules-${kernel:Version}
isofs-modules-${kernel:Version}
-ntfs-modules-${kernel:Version}
-reiserfs-modules-${kernel:Version}
-xfs-modules-${kernel:Version}
-zfs-modules-${kernel:Version}
# Keyboard and console
bogl-bterm-udeb -
-console-keymaps-at
-kbd-chooser -
+console-setup-udeb
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
# brltty doesn't have screen reading support on FreeBSD yet
#brltty-udeb
#serial-modules-${kernel:Version}
-# temporary until kernel-wedge and kernel udebs are fixed
+# temporary (see #650437)
nullfs-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/cdrom/m68k.cfg 20201202/build/pkg-lists/cdrom/m68k.cfg
--- 20101020/build/pkg-lists/cdrom/m68k.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/m68k.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,13 @@
-#ide-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
+ide-core-modules-${kernel:Version}
+ide-modules-${kernel:Version}
+pata-modules-${kernel:Version}
scsi-modules-${kernel:Version}
isofs-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-amiga
-console-keymaps-atari
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-amiga-ekmap
+console-setup-ataritt-ekmap
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
archdetect
diff -pruN 20101020/build/pkg-lists/cdrom/mips64el.cfg 20201202/build/pkg-lists/cdrom/mips64el.cfg
--- 20101020/build/pkg-lists/cdrom/mips64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/mips64el.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/mips.cfg 20201202/build/pkg-lists/cdrom/mips.cfg
--- 20101020/build/pkg-lists/cdrom/mips.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/mips.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-console-keymaps-at
-kbd-chooser
diff -pruN 20101020/build/pkg-lists/cdrom/mipsel.cfg 20201202/build/pkg-lists/cdrom/mipsel.cfg
--- 20101020/build/pkg-lists/cdrom/mipsel.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/mipsel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1 +1,3 @@
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff -pruN 20101020/build/pkg-lists/cdrom/powerpc.cfg 20201202/build/pkg-lists/cdrom/powerpc.cfg
--- 20101020/build/pkg-lists/cdrom/powerpc.cfg 2010-01-11 15:35:40.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/powerpc.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,29 +1,30 @@
+isofs-modules-${kernel:Version}
+cdrom-core-modules-${kernel:Version}
input-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-usb
-kbd-chooser
-# The following can be removed once unix socket support is compiled
-# in to the kernel.
+pata-modules-${kernel:Version}
+console-setup-pc-ekmap
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
# Currently all built into the kernel.
#input-modules-${kernel:Version}
-#fb-modules-${kernel:Version}
+fb-modules-${kernel:Version} ?
eject-udeb
pcmcia-storage-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
pcmciautils-udeb
-floppy-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
# Support for USB CD-ROMs
usb-storage-modules-${kernel:Version}
-# Support for SCSI CD-ROMs on common controllers.
-scsi-common-modules-${kernel:Version}
+# Support for SCSI CD-ROMs.
+scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}
# IBM Power hypervisor modules, only available on powerpc64.
diff -pruN 20101020/build/pkg-lists/cdrom/ppc64.cfg 20201202/build/pkg-lists/cdrom/ppc64.cfg
--- 20101020/build/pkg-lists/cdrom/ppc64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/ppc64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,32 @@
+isofs-modules-${kernel:Version}
+cdrom-core-modules-${kernel:Version}
+input-modules-${kernel:Version}
+firewire-core-modules-${kernel:Version}
+
+pata-modules-${kernel:Version}
+console-setup-pc-ekmap
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
+usb-modules-${kernel:Version}
+serial-modules-${kernel:Version}
+usb-serial-modules-${kernel:Version} ?
+uinput-modules-${kernel:Version} ?
+# Currently all built into the kernel.
+#input-modules-${kernel:Version}
+fb-modules-${kernel:Version} ?
+eject-udeb
+pcmcia-storage-modules-${kernel:Version}
+pcmcia-modules-${kernel:Version}
+pcmciautils-udeb
+virtio-modules-${kernel:Version} ?
+
+# Support for USB CD-ROMs
+usb-storage-modules-${kernel:Version}
+# Support for SCSI CD-ROMs.
+scsi-common-modules-${kernel:Version} ?
+scsi-modules-${kernel:Version}
+
+# IBM Power hypervisor modules, only available on powerpc64.
+hypervisor-modules-${kernel:Version} ?
+fancontrol-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/ppc64el.cfg 20201202/build/pkg-lists/cdrom/ppc64el.cfg
--- 20101020/build/pkg-lists/cdrom/ppc64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/ppc64el.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,28 @@
+isofs-modules-${kernel:Version}
+cdrom-core-modules-${kernel:Version}
+input-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
+scsi-modules-${kernel:Version}
+usb-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
+
+bogl-bterm-udeb
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
+
+# In case they need to load a driver image.
+mountmedia
+media-retriever
+fat-modules-${kernel:Version}
+usb-storage-modules-${kernel:Version}
+
+# brltty
+brltty-udeb
+serial-modules-${kernel:Version}
+uinput-modules-${kernel:Version} ?
+usb-serial-modules-${kernel:Version} ?
+
+# IBM Power hypervisor modules, only available on powerpc64.
+fancontrol-modules-${kernel:Version} ?
+hypervisor-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/cdrom/sparc64.cfg 20201202/build/pkg-lists/cdrom/sparc64.cfg
--- 20101020/build/pkg-lists/cdrom/sparc64.cfg 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/sparc64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,13 +1,19 @@
nic-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
sparc-utils-udeb
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
-ide-modules-${kernel:Version}
+input-modules-${kernel:Version}
+pata-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
-scsi-common-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
+scsi-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff -pruN 20101020/build/pkg-lists/cdrom/sparc.cfg 20201202/build/pkg-lists/cdrom/sparc.cfg
--- 20101020/build/pkg-lists/cdrom/sparc.cfg 2008-11-18 03:16:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom/sparc.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,13 +1,18 @@
nic-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
sparc-utils-udeb
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
-ide-modules-${kernel:Version}
+input-modules-${kernel:Version}
+pata-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
-scsi-common-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
+scsi-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff -pruN 20101020/build/pkg-lists/cdrom-apus/powerpc.cfg 20201202/build/pkg-lists/cdrom-apus/powerpc.cfg
--- 20101020/build/pkg-lists/cdrom-apus/powerpc.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/cdrom-apus/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,8 +1,7 @@
input-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
scsi-modules-${kernel:Version}
-console-keymaps-amiga
-console-keymaps-at
-console-keymaps-usb
-kbd-chooser
+console-setup-amiga-ekmap
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff -pruN 20101020/build/pkg-lists/device-tree/arm64.cfg 20201202/build/pkg-lists/device-tree/arm64.cfg
--- 20101020/build/pkg-lists/device-tree/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/device-tree/arm64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+# Empty
diff -pruN 20101020/build/pkg-lists/device-tree/armel.cfg 20201202/build/pkg-lists/device-tree/armel.cfg
--- 20101020/build/pkg-lists/device-tree/armel.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/device-tree/armel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+# Empty
diff -pruN 20101020/build/pkg-lists/device-tree/armhf.cfg 20201202/build/pkg-lists/device-tree/armhf.cfg
--- 20101020/build/pkg-lists/device-tree/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/device-tree/armhf.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+# Empty
diff -pruN 20101020/build/pkg-lists/device-tree/common 20201202/build/pkg-lists/device-tree/common
--- 20101020/build/pkg-lists/device-tree/common 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/device-tree/common 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+#include "kernel"
diff -pruN 20101020/build/pkg-lists/exclude 20201202/build/pkg-lists/exclude
--- 20101020/build/pkg-lists/exclude 2009-06-23 16:22:24.000000000 +0000
+++ 20201202/build/pkg-lists/exclude 2020-11-30 23:08:26.000000000 +0000
@@ -2,19 +2,7 @@
# they are currently provided not in udeb form but by the library
# reduction step.
-# libc gets reduced, so using the udeb is not a good idea
-libc0.1 -
-libc0.1-udeb -
-libc0.3 -
-libc0.3-udeb -
-libc6 -
-libc6-udeb -
-libc6.1 -
-libc6.1-udeb -
-# slang is also reduced
-libslang2-udeb -
-# and newt
-libnewt0.52 -
-# some arches and versions of glibc link against libgcc1,
+# some arches and versions of some udebs link against libgcc1 or libgcc-s1,
# it will be pulled in via library reduction
libgcc1 -
+libgcc-s1 -
diff -pruN 20101020/build/pkg-lists/floppy/common 20201202/build/pkg-lists/floppy/common
--- 20101020/build/pkg-lists/floppy/common 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/floppy/common 2020-04-09 07:06:18.000000000 +0000
@@ -14,7 +14,8 @@
localechooser
bogl-bterm-udeb
di-utils-terminfo
-kbd-chooser
+console-setup-udeb
+kbd-udeb
cdebconf-newt-udeb
installation-locale
diff -pruN 20101020/build/pkg-lists/floppy/ia64.cfg 20201202/build/pkg-lists/floppy/ia64.cfg
--- 20101020/build/pkg-lists/floppy/ia64.cfg 2010-02-11 20:00:23.000000000 +0000
+++ 20201202/build/pkg-lists/floppy/ia64.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-efi-reader
-
-# net installation support
-net-retriever
-download-installer
-netcfg
-choose-mirror
-hw-detect
-ethdetect
diff -pruN 20101020/build/pkg-lists/floppy/m68k.cfg 20201202/build/pkg-lists/floppy/m68k.cfg
--- 20101020/build/pkg-lists/floppy/m68k.cfg 2010-02-11 20:00:23.000000000 +0000
+++ 20201202/build/pkg-lists/floppy/m68k.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,4 @@
-console-keymaps-at
+console-setup-pc-ekmap
# net installation support
net-retriever
diff -pruN 20101020/build/pkg-lists/floppy/powerpc.cfg 20201202/build/pkg-lists/floppy/powerpc.cfg
--- 20101020/build/pkg-lists/floppy/powerpc.cfg 2010-01-11 15:35:41.000000000 +0000
+++ 20201202/build/pkg-lists/floppy/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1 @@
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
diff -pruN 20101020/build/pkg-lists/floppy-ng/common 20201202/build/pkg-lists/floppy-ng/common
--- 20101020/build/pkg-lists/floppy-ng/common 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/floppy-ng/common 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# These udebs are needed on a single-floppy system that currently serves two
-# purposes:
-# 1. load the rest of the installer modules from driver floppies
-# 2. get up on the network with just this single floppy (for common network
-# setups)
-# If space becomes tight again, #2 will be relegated to a third floppy..
-
-#include "base"
-# The kernel is not really included on the floppy, on arches that have a
-# separate boot floppy. This is included so it will be in the status file,
-# and so depmod will have a kernel to run against.
-#include "kernel"
-
-localechooser
-bogl-bterm-udeb
-di-utils-terminfo
-kbd-chooser
-cdebconf-newt-udeb
-installation-locale
-
-nano-udeb
-
-# floppy loading support
-load-media
-media-retriever
-
-preseed-common
-initrd-preseed
diff -pruN 20101020/build/pkg-lists/floppy-ng/i386.cfg 20201202/build/pkg-lists/floppy-ng/i386.cfg
--- 20101020/build/pkg-lists/floppy-ng/i386.cfg 2010-01-11 15:35:44.000000000 +0000
+++ 20201202/build/pkg-lists/floppy-ng/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-acpi-modules-${kernel:Version}
-console-keymaps-at
-
-# This is needed for proper display of utf-8.
-fb-modules-${kernel:Version}
-
-mountmedia
-
-usb-modules-${kernel:Version}
-input-modules-${kernel:Version}
-ext2-modules-${kernel:Version}
-
-hw-detect
-
-# too large for this ever-filling floppy
-pciutils-udeb -
diff -pruN 20101020/build/pkg-lists/generic/s390.cfg 20201202/build/pkg-lists/generic/s390.cfg
--- 20101020/build/pkg-lists/generic/s390.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/generic/s390.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -3,6 +3,7 @@ cdebconf-text-udeb
netcfg-static
nic-modules-${kernel:Version}
s390-netdevice
+virtio-modules-${kernel:Version} ?
# workaround
dasd-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/generic/s390x.cfg 20201202/build/pkg-lists/generic/s390x.cfg
--- 20101020/build/pkg-lists/generic/s390x.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/generic/s390x.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,11 @@
+cdebconf-text-udeb
+
+netcfg-static
+nic-modules-${kernel:Version}
+s390-netdevice
+virtio-modules-${kernel:Version} ?
+
+# workaround
+dasd-modules-${kernel:Version}
+
+#include "network-console"
diff -pruN 20101020/build/pkg-lists/gtk-common 20201202/build/pkg-lists/gtk-common
--- 20101020/build/pkg-lists/gtk-common 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/pkg-lists/gtk-common 2020-04-09 07:06:18.000000000 +0000
@@ -1,30 +1,34 @@
# udebs needed for graphical installer
-libnss-files-udeb
rootskel-gtk
cdebconf-gtk-udeb
cdebconf-gtk-terminal
xserver-xorg-core-udeb
-xserver-xorg-input-evdev-udeb
-xserver-xorg-video-fbdev-udeb
gtk2-engines-udeb
-# Use console-setup instead of kbd-chooser
-console-setup-udeb
-console-setup-pc-ekmap
-kbd-chooser -
-console-keymaps-at -
-
# Fonts: see http://wiki.debian.org/DebianInstaller/GUIFonts
-ttf-freefont-udeb
-ttf-farsiweb-udeb
-ttf-cjk-compact-udeb
-ttf-tmuni-udeb
-ttf-dejavu-udeb
-ttf-khmeros-udeb
-ttf-thai-tlwg-udeb
-ttf-tamil-fonts-udeb
-ttf-malayalam-fonts-udeb
-ttf-kannada-fonts-udeb
-ttf-telugu-fonts-udeb
-ttf-sil-abyssinica-udeb
+fonts-android-udeb
+fonts-freefont-udeb
+fonts-farsiweb-udeb
+fonts-tibetan-machine-udeb
+fonts-dejavu-udeb
+fonts-khmeros-udeb
+fonts-thai-tlwg-udeb
+fonts-taml-udeb
+fonts-mlym-udeb
+fonts-knda-udeb
+fonts-telu-udeb
+fonts-sil-abyssinica-udeb
+# For Sinhala
+fonts-noto-hinted-udeb
+fonts-lao-udeb
+fonts-ukij-uyghur-udeb
+fonts-sil-padauk-udeb
+fonts-lohit-guru-udeb
+
+# Graphical accessibility
+libgail18-udeb
+libatk-adaptor-udeb
+
+# Exclude screen support
+screen-udeb -
diff -pruN 20101020/build/pkg-lists/gtk-kfreebsd 20201202/build/pkg-lists/gtk-kfreebsd
--- 20101020/build/pkg-lists/gtk-kfreebsd 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/gtk-kfreebsd 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,7 @@
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
+
+# Exclude screen support
+screen-udeb -
diff -pruN 20101020/build/pkg-lists/gtk-linux 20201202/build/pkg-lists/gtk-linux
--- 20101020/build/pkg-lists/gtk-linux 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/gtk-linux 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,5 @@
+console-setup-pc-ekmap
+fb-modules-${kernel:Version} ?
+
+# Exclude screen support
+screen-udeb -
diff -pruN 20101020/build/pkg-lists/hd-media/amd64.cfg 20201202/build/pkg-lists/hd-media/amd64.cfg
--- 20101020/build/pkg-lists/hd-media/amd64.cfg 2010-01-11 15:35:41.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,14 +1,13 @@
-console-keymaps-at
+console-setup-pc-ekmap
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# full support for all types of hard drives, and usb devices
-ide-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-scsi-common-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}
-scsi-extra-modules-${kernel:Version}
+scsi-extra-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
serial-modules-${kernel:Version}
@@ -25,9 +24,11 @@ cdrom-core-modules-${kernel:Version}
# all the filesystems (feel free to add more!)
fat-modules-${kernel:Version}
-ext2-modules-${kernel:Version}
-ext3-modules-${kernel:Version}
-reiserfs-modules-${kernel:Version}
+ext4-modules-${kernel:Version}
+
+# We want to be able to find the iso in a LVM logical volume too
+md-modules-${kernel:Version}
+lvm2-udeb
# the iso is loop-mounted
loop-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/hd-media/armhf.cfg 20201202/build/pkg-lists/hd-media/armhf.cfg
--- 20101020/build/pkg-lists/hd-media/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/armhf.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,33 @@
+console-setup-pc-ekmap
+
+console-setup-udeb
+kbd-udeb
+bogl-bterm-udeb
+hw-detect
+
+fat-modules-${kernel:Version}
+ext4-modules-${kernel:Version}
+fuse-modules-${kernel:Version}
+isofs-modules-${kernel:Version}
+udf-modules-${kernel:Version}
+
+ata-modules-${kernel:Version}
+sata-modules-${kernel:Version}
+pata-modules-${kernel:Version}
+mmc-modules-${kernel:Version}
+usb-modules-${kernel:Version}
+usb-storage-modules-${kernel:Version}
+scsi-core-modules-${kernel:Version}
+scsi-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
+
+# We want to be able to find the iso in a LVM logical volume too
+md-modules-${kernel:Version}
+lvm2-udeb
+
+loop-modules-${kernel:Version}
+
+input-modules-${kernel:Version} ?
+fb-modules-${kernel:Version} ?
+leds-modules-${kernel:Version} ?
+i2c-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/hd-media/gtk/amd64.cfg 20201202/build/pkg-lists/hd-media/gtk/amd64.cfg
--- 20101020/build/pkg-lists/hd-media/gtk/amd64.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/gtk/amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,10 @@
+#include "gtk-linux"
+
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
speakup-modules-${kernel:Version}
+sound-modules-${kernel:Version}
+console-setup-linux-fonts-udeb
+espeakup-udeb
diff -pruN 20101020/build/pkg-lists/hd-media/gtk/hurd-i386.cfg 20201202/build/pkg-lists/hd-media/gtk/hurd-i386.cfg
--- 20101020/build/pkg-lists/hd-media/gtk/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/gtk/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/hd-media/gtk/i386.cfg 20201202/build/pkg-lists/hd-media/gtk/i386.cfg
--- 20101020/build/pkg-lists/hd-media/gtk/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/gtk/i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,10 @@
+#include "gtk-linux"
+
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
speakup-modules-${kernel:Version}
+sound-modules-${kernel:Version}
+console-setup-linux-fonts-udeb
+espeakup-udeb
diff -pruN 20101020/build/pkg-lists/hd-media/gtk/kfreebsd-amd64.cfg 20201202/build/pkg-lists/hd-media/gtk/kfreebsd-amd64.cfg
--- 20101020/build/pkg-lists/hd-media/gtk/kfreebsd-amd64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/gtk/kfreebsd-amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+#include "gtk-kfreebsd"
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/hd-media/gtk/kfreebsd-i386.cfg 20201202/build/pkg-lists/hd-media/gtk/kfreebsd-i386.cfg
--- 20101020/build/pkg-lists/hd-media/gtk/kfreebsd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/gtk/kfreebsd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+#include "gtk-kfreebsd"
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/hd-media/hurd-i386.cfg 20201202/build/pkg-lists/hd-media/hurd-i386.cfg
--- 20101020/build/pkg-lists/hd-media/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+bogl-bterm-udeb -
diff -pruN 20101020/build/pkg-lists/hd-media/i386.cfg 20201202/build/pkg-lists/hd-media/i386.cfg
--- 20101020/build/pkg-lists/hd-media/i386.cfg 2010-01-11 15:35:41.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,14 +1,13 @@
-console-keymaps-at
+console-setup-pc-ekmap
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# full support for all types of hard drives, and usb devices
-ide-core-modules-${kernel:Version}
-ide-modules-${kernel:Version}
-scsi-common-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}
-scsi-extra-modules-${kernel:Version}
+scsi-extra-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
serial-modules-${kernel:Version}
@@ -25,9 +24,11 @@ cdrom-core-modules-${kernel:Version}
# all the filesystems (feel free to add more!)
fat-modules-${kernel:Version}
-ext2-modules-${kernel:Version}
-ext3-modules-${kernel:Version}
-reiserfs-modules-${kernel:Version}
+ext4-modules-${kernel:Version}
+
+# We want to be able to find the iso in a LVM logical volume too
+md-modules-${kernel:Version}
+lvm2-udeb
# the iso is loop-mounted
loop-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/hd-media/m68k.cfg 20201202/build/pkg-lists/hd-media/m68k.cfg
--- 20101020/build/pkg-lists/hd-media/m68k.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/m68k.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,8 @@
#ide-modules-${kernel:Version}
#scsi-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-amiga
-console-keymaps-atari
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-amiga-ekmap
+console-setup-ataritt-ekmap
+console-setup-udeb
+kbd-udeb
archdetect
diff -pruN 20101020/build/pkg-lists/hd-media/powerpc.cfg 20201202/build/pkg-lists/hd-media/powerpc.cfg
--- 20101020/build/pkg-lists/hd-media/powerpc.cfg 2010-01-11 15:35:41.000000000 +0000
+++ 20201202/build/pkg-lists/hd-media/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,15 +1,13 @@
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
input-modules-${kernel:Version}
-#fb-modules-${kernel:Version}
-kbd-chooser
+fb-modules-${kernel:Version} ?
+console-setup-udeb
+kbd-udeb
# full support for all types of hard drives, and usb devices
-ide-modules-${kernel:Version}
# pulls in cdrom-core-modules on 2.6
-scsi-common-modules-${kernel:Version}
+scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}
-#scsi-extra-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
serial-modules-${kernel:Version}
@@ -20,9 +18,7 @@ sata-modules-${kernel:Version}
# all the filesystems (feel free to add more!)
hfs-modules-${kernel:Version}
fat-modules-${kernel:Version}
-ext2-modules-${kernel:Version}
-ext3-modules-${kernel:Version}
-reiserfs-modules-${kernel:Version}
+ext4-modules-${kernel:Version}
# the iso is loop-mounted
loop-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/monolithic/amd64.cfg 20201202/build/pkg-lists/monolithic/amd64.cfg
--- 20101020/build/pkg-lists/monolithic/amd64.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,8 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
acpi-modules-${kernel:Version}
-# These are broken and/or irrelevant
-partman-ufs -
diff -pruN 20101020/build/pkg-lists/monolithic/hurd-i386.cfg 20201202/build/pkg-lists/monolithic/hurd-i386.cfg
--- 20101020/build/pkg-lists/monolithic/hurd-i386.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/hurd-i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,18 +1,11 @@
# These are broken and/or irrelevant on Hurd for now
-clock-setup -
partman-auto-raid -
partman-ext3 -
partman-jfs -
partman-md -
partman-xfs -
partman-btrfs -
-# FIXME: ufsutils-udeb is uninstallable
-partman-ufs -
+partman-iscsi -
rescue-mode -
-libbsd0-udeb -
-rdate-udeb -
-tzsetup-udeb -
-# Use netcfg-static for now
-netcfg -
-netcfg-static
+console-setup-udeb
diff -pruN 20101020/build/pkg-lists/monolithic/i386.cfg 20201202/build/pkg-lists/monolithic/i386.cfg
--- 20101020/build/pkg-lists/monolithic/i386.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,8 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
acpi-modules-${kernel:Version}
-# These are broken and/or irrelevant
-partman-ufs -
diff -pruN 20101020/build/pkg-lists/monolithic/kfreebsd-amd64.cfg 20201202/build/pkg-lists/monolithic/kfreebsd-amd64.cfg
--- 20101020/build/pkg-lists/monolithic/kfreebsd-amd64.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/kfreebsd-amd64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,3 +1,11 @@
+# Keyboard and console
+bogl-bterm-udeb -
+console-setup-udeb
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
+
# These are irrelevant on GNU/kFreeBSD for now
partman-btrfs -
partman-ext3 -
diff -pruN 20101020/build/pkg-lists/monolithic/kfreebsd-i386.cfg 20201202/build/pkg-lists/monolithic/kfreebsd-i386.cfg
--- 20101020/build/pkg-lists/monolithic/kfreebsd-i386.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/kfreebsd-i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,3 +1,11 @@
+# Keyboard and console
+bogl-bterm-udeb -
+console-setup-udeb
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
+
# These are irrelevant on GNU/kFreeBSD for now
partman-btrfs -
partman-ext3 -
diff -pruN 20101020/build/pkg-lists/monolithic/mips64el.cfg 20201202/build/pkg-lists/monolithic/mips64el.cfg
--- 20101020/build/pkg-lists/monolithic/mips64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/mips64el.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,6 @@
+console-setup-pc-ekmap
+bogl-bterm-udeb
+console-setup-udeb
+kbd-udeb
+pcmciautils-udeb
+
diff -pruN 20101020/build/pkg-lists/monolithic/mipsel.cfg 20201202/build/pkg-lists/monolithic/mipsel.cfg
--- 20101020/build/pkg-lists/monolithic/mipsel.cfg 2010-02-11 20:00:22.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/mipsel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,6 @@
+console-setup-pc-ekmap
bogl-bterm-udeb
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
+
diff -pruN 20101020/build/pkg-lists/monolithic/powerpc.cfg 20201202/build/pkg-lists/monolithic/powerpc.cfg
--- 20101020/build/pkg-lists/monolithic/powerpc.cfg 2010-03-26 12:17:26.000000000 +0000
+++ 20201202/build/pkg-lists/monolithic/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,7 @@
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
eject-udeb
# Used by yaboot-installer
diff -pruN 20101020/build/pkg-lists/nativehd/m68k.cfg 20201202/build/pkg-lists/nativehd/m68k.cfg
--- 20101020/build/pkg-lists/nativehd/m68k.cfg 2010-03-26 12:17:24.000000000 +0000
+++ 20201202/build/pkg-lists/nativehd/m68k.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,8 @@
-console-keymaps-at
-console-keymaps-amiga
-console-keymaps-atari
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-amiga-ekmap
+console-setup-ataritt-ekmap
+console-setup-udeb
+kbd-udeb
nic-shared-modules-${kernel:Version}
file-preseed
network-preseed
diff -pruN 20101020/build/pkg-lists/netboot/alpha.cfg 20201202/build/pkg-lists/netboot/alpha.cfg
--- 20101020/build/pkg-lists/netboot/alpha.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/alpha.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -2,11 +2,13 @@ srm-reader
srm-modules-${kernel:Version}
nic-shared-modules-${kernel:Version}
nic-modules-${kernel:Version}
-nic-extra-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-console-keymaps-at
+wireless-regdb-udeb
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
@@ -18,8 +20,8 @@ media-retriever
fat-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
-# This is needed for proper display of utf-8.
-fb-modules-${kernel:Version}
+# Added optionally as udeb may not yet be available
+virtio-modules-${kernel:Version} ?
# brltty
brltty-udeb
diff -pruN 20101020/build/pkg-lists/netboot/amd64.cfg 20201202/build/pkg-lists/netboot/amd64.cfg
--- 20101020/build/pkg-lists/netboot/amd64.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/amd64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,15 +1,17 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
nic-modules-${kernel:Version}
-nic-extra-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-virtio-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
+hyperv-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
@@ -17,7 +19,6 @@ fb-modules-${kernel:Version}
# In case they need to load a driver image.
mountmedia
media-retriever
-floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
mmc-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/arm64.cfg 20201202/build/pkg-lists/netboot/arm64.cfg
--- 20101020/build/pkg-lists/netboot/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/arm64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,33 @@
+console-setup-pc-ekmap
+
+console-setup-udeb
+kbd-udeb
+bogl-bterm-udeb
+hw-detect
+ethdetect
+netcfg
+
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+nic-wireless-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
+usb-modules-${kernel:Version}
+
+fb-modules-${kernel:Version} ?
+input-modules-${kernel:Version} ?
+
+# In case they need to load a driver image.
+mountmedia
+media-retriever
+fat-modules-${kernel:Version}
+usb-storage-modules-${kernel:Version}
+mmc-modules-${kernel:Version} ?
+
+# brltty
+brltty-udeb
+# serial-modules-${kernel:Version} ?
+usb-serial-modules-${kernel:Version} ?
+uinput-modules-${kernel:Version} ?
+
+#for all targets
diff -pruN 20101020/build/pkg-lists/netboot/armeb.cfg 20201202/build/pkg-lists/netboot/armeb.cfg
--- 20101020/build/pkg-lists/netboot/armeb.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/armeb.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-console-keymaps-at
-
-kbd-chooser
-bogl-bterm-udeb
-hw-detect
-ethdetect
-netcfg
-
-#kernel modules
-
-#for all targets
-
diff -pruN 20101020/build/pkg-lists/netboot/armel/ads.cfg 20201202/build/pkg-lists/netboot/armel/ads.cfg
--- 20101020/build/pkg-lists/netboot/armel/ads.cfg 2009-03-16 00:50:59.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/armel/ads.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# Since no kernel is currently provided in Debian, provide userdevfs so
-# a locally provided monlothic kernel without devfs/udev will work.
-userdevfs
-
-# The ADS kernels don't use udev yet, and won't have important devices if
-# udev is included.
-udev-udeb -
-
-# pcmcia is on most of these boards, although it's more commonly used for
-# compact flash reading / bootloader stuff than for networking
-pcmciautils-udeb
diff -pruN 20101020/build/pkg-lists/netboot/armel/kirkwood.cfg 20201202/build/pkg-lists/netboot/armel/kirkwood.cfg
--- 20101020/build/pkg-lists/netboot/armel/kirkwood.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/armel/kirkwood.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1 +1,3 @@
mmc-modules-${kernel:Version}
+# Required at least for QNAP devices.
+mtd-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/netboot/armel/orion5x.cfg 20201202/build/pkg-lists/netboot/armel/orion5x.cfg
--- 20101020/build/pkg-lists/netboot/armel/orion5x.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/armel/orion5x.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+# To control the LED and beeper on Buffalo devices
+micro-evtd-udeb
+
diff -pruN 20101020/build/pkg-lists/netboot/armel.cfg 20201202/build/pkg-lists/netboot/armel.cfg
--- 20101020/build/pkg-lists/netboot/armel.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/armel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
@@ -10,6 +11,4 @@ nic-modules-${kernel:Version}
fb-modules-${kernel:Version} ?
input-modules-${kernel:Version} ?
-
-#for all targets
-
+usb-serial-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/armhf.cfg 20201202/build/pkg-lists/netboot/armhf.cfg
--- 20101020/build/pkg-lists/netboot/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/armhf.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,25 @@
+console-setup-pc-ekmap
+
+console-setup-udeb
+kbd-udeb
+bogl-bterm-udeb
+hw-detect
+ethdetect
+netcfg
+
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+nic-wireless-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
+
+fb-modules-${kernel:Version} ?
+input-modules-${kernel:Version} ?
+leds-modules-${kernel:Version} ?
+i2c-modules-${kernel:Version}
+
+# Required at least for Netgear ReadyNAS
+mtd-modules-${kernel:Version}
+
+#for all targets
+
diff -pruN 20101020/build/pkg-lists/netboot/common 20201202/build/pkg-lists/netboot/common
--- 20101020/build/pkg-lists/netboot/common 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/common 2020-04-09 07:06:18.000000000 +0000
@@ -14,6 +14,7 @@ di-utils-terminfo
preseed-common
initrd-preseed
network-preseed
+file-preseed
nano-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/amd64.cfg 20201202/build/pkg-lists/netboot/gtk/amd64.cfg
--- 20101020/build/pkg-lists/netboot/gtk/amd64.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,10 @@
+#include "gtk-linux"
+
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
speakup-modules-${kernel:Version}
+sound-modules-${kernel:Version}
+console-setup-linux-fonts-udeb
+espeakup-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/arm64.cfg 20201202/build/pkg-lists/netboot/gtk/arm64.cfg
--- 20101020/build/pkg-lists/netboot/gtk/arm64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/arm64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,11 @@
+#include "gtk-linux"
+
+#mouse-modules-${kernel:Version}
+event-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
+#speakup-modules-${kernel:Version}
+#sound-modules-${kernel:Version}
+#console-setup-linux-fonts-udeb
+#espeakup-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/armel.cfg 20201202/build/pkg-lists/netboot/gtk/armel.cfg
--- 20101020/build/pkg-lists/netboot/gtk/armel.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/armel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,7 +1,12 @@
+#include "gtk-linux"
+
mouse-modules-${kernel:Version}
# The following modules are listed netboot/armel.cfg already but
# only as optional modules. List them again here since they are
# necessary for the gtk flavour to work.
fb-modules-${kernel:Version}
input-modules-${kernel:Version}
+usb-serial-modules-${kernel:Version} ?
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/armhf.cfg 20201202/build/pkg-lists/netboot/gtk/armhf.cfg
--- 20101020/build/pkg-lists/netboot/gtk/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/armhf.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,11 @@
+#include "gtk-linux"
+
+# mouse-modules-${kernel:Version}
+# The following modules are listed netboot/armhf.cfg already but
+# only as optional modules. List them again here since they are
+# necessary for the gtk flavour to work.
+fb-modules-${kernel:Version}
+input-modules-${kernel:Version}
+
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/hurd-i386.cfg 20201202/build/pkg-lists/netboot/gtk/hurd-i386.cfg
--- 20101020/build/pkg-lists/netboot/gtk/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/i386.cfg 20201202/build/pkg-lists/netboot/gtk/i386.cfg
--- 20101020/build/pkg-lists/netboot/gtk/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,2 +1,10 @@
+#include "gtk-linux"
+
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+
speakup-modules-${kernel:Version}
+sound-modules-${kernel:Version}
+console-setup-linux-fonts-udeb
+espeakup-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/kfreebsd-amd64.cfg 20201202/build/pkg-lists/netboot/gtk/kfreebsd-amd64.cfg
--- 20101020/build/pkg-lists/netboot/gtk/kfreebsd-amd64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/kfreebsd-amd64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+#include "gtk-kfreebsd"
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/kfreebsd-i386.cfg 20201202/build/pkg-lists/netboot/gtk/kfreebsd-i386.cfg
--- 20101020/build/pkg-lists/netboot/gtk/kfreebsd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/kfreebsd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+#include "gtk-kfreebsd"
+xserver-xorg-input-kbd-udeb
+xserver-xorg-input-mouse-udeb
+xserver-xorg-video-vesa-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/powerpc.cfg 20201202/build/pkg-lists/netboot/gtk/powerpc.cfg
--- 20101020/build/pkg-lists/netboot/gtk/powerpc.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1 +1,5 @@
+#include "gtk-linux"
+
mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
diff -pruN 20101020/build/pkg-lists/netboot/gtk/ppc64.cfg 20201202/build/pkg-lists/netboot/gtk/ppc64.cfg
--- 20101020/build/pkg-lists/netboot/gtk/ppc64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/gtk/ppc64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,5 @@
+#include "gtk-linux"
+
+mouse-modules-${kernel:Version}
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
diff -pruN 20101020/build/pkg-lists/netboot/hppa.cfg 20201202/build/pkg-lists/netboot/hppa.cfg
--- 20101020/build/pkg-lists/netboot/hppa.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/hppa.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,12 @@
input-modules-${kernel:Version}
nic-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
-console-keymaps-at
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff -pruN 20101020/build/pkg-lists/netboot/hurd-i386.cfg 20201202/build/pkg-lists/netboot/hurd-i386.cfg
--- 20101020/build/pkg-lists/netboot/hurd-i386.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/hurd-i386.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,12 @@
+# These are broken and/or irrelevant on Hurd for now
+partman-auto-raid -
+partman-ext3 -
+partman-jfs -
+partman-md -
+partman-xfs -
+partman-btrfs -
+
+netdde-udeb
+console-setup-udeb
+
+debian-ports-archive-keyring-udeb
diff -pruN 20101020/build/pkg-lists/netboot/i386.cfg 20201202/build/pkg-lists/netboot/i386.cfg
--- 20101020/build/pkg-lists/netboot/i386.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,15 +1,17 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
nic-modules-${kernel:Version}
-nic-extra-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-virtio-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
+hyperv-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
@@ -17,7 +19,6 @@ fb-modules-${kernel:Version}
# In case they need to load a driver image.
mountmedia
media-retriever
-floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
mmc-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/ia64.cfg 20201202/build/pkg-lists/netboot/ia64.cfg
--- 20101020/build/pkg-lists/netboot/ia64.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/ia64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,13 @@
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
efi-reader
-console-keymaps-at
+console-setup-pc-ekmap
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff -pruN 20101020/build/pkg-lists/netboot/kfreebsd-amd64.cfg 20201202/build/pkg-lists/netboot/kfreebsd-amd64.cfg
--- 20101020/build/pkg-lists/netboot/kfreebsd-amd64.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/kfreebsd-amd64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -11,7 +11,7 @@ media-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
mmc-modules-${kernel:Version}
-ntfs-modules-${kernel:Version}
+ntfs-modules-${kernel:Version} ?
# Hardware detection
hw-detect
@@ -20,8 +20,11 @@ netcfg
# Keyboard and console
bogl-bterm-udeb -
-console-keymaps-at
-kbd-chooser -
+console-setup-udeb
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
# brltty doesn't have screen reading support on FreeBSD yet
#brltty-udeb
diff -pruN 20101020/build/pkg-lists/netboot/kfreebsd-i386.cfg 20201202/build/pkg-lists/netboot/kfreebsd-i386.cfg
--- 20101020/build/pkg-lists/netboot/kfreebsd-i386.cfg 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/kfreebsd-i386.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -11,7 +11,7 @@ media-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
mmc-modules-${kernel:Version}
-ntfs-modules-${kernel:Version}
+ntfs-modules-${kernel:Version} ?
# Hardware detection
hw-detect
@@ -20,8 +20,11 @@ netcfg
# Keyboard and console
bogl-bterm-udeb -
-console-keymaps-at
-kbd-chooser -
+console-setup-udeb
+console-setup-pc-ekbd
+console-setup-freebsd-charmaps-udeb
+debian-ports-archive-keyring-udeb
+kbdcontrol-udeb
# brltty doesn't have screen reading support on FreeBSD yet
#brltty-udeb
diff -pruN 20101020/build/pkg-lists/netboot/m68k.cfg 20201202/build/pkg-lists/netboot/m68k.cfg
--- 20101020/build/pkg-lists/netboot/m68k.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/m68k.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,5 +1,7 @@
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff -pruN 20101020/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg 20201202/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg
--- 20101020/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg 2010-05-22 19:06:18.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-usb-modules-${kernel:Version}
-input-modules-${kernel:Version}
-fb-modules-${kernel:Version}
-console-keymaps-usb
diff -pruN 20101020/build/pkg-lists/netboot/mips64el/loongson-3.cfg 20201202/build/pkg-lists/netboot/mips64el/loongson-3.cfg
--- 20101020/build/pkg-lists/netboot/mips64el/loongson-3.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mips64el/loongson-3.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,2 @@
+fb-modules-${kernel:Version}
+input-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/netboot/mips64el.cfg 20201202/build/pkg-lists/netboot/mips64el.cfg
--- 20101020/build/pkg-lists/netboot/mips64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mips64el.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,14 @@
+console-setup-udeb
+kbd-udeb
+
+console-setup-pc-ekmap
+bogl-bterm-udeb
+hw-detect
+ethdetect
+netcfg
+
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+nic-wireless-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/mips.cfg 20201202/build/pkg-lists/netboot/mips.cfg
--- 20101020/build/pkg-lists/netboot/mips.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mips.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,7 +1,14 @@
-console-keymaps-at
+console-setup-udeb
+kbd-udeb
-kbd-chooser
+console-setup-pc-ekmap
bogl-bterm-udeb
hw-detect
ethdetect
netcfg
+
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+nic-wireless-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/mipsel/bcm947xx.cfg 20201202/build/pkg-lists/netboot/mipsel/bcm947xx.cfg
--- 20101020/build/pkg-lists/netboot/mipsel/bcm947xx.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mipsel/bcm947xx.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-minix-modules-${kernel:Version}
-oldsys-preesed
diff -pruN 20101020/build/pkg-lists/netboot/mipsel/cobalt.cfg 20201202/build/pkg-lists/netboot/mipsel/cobalt.cfg
--- 20101020/build/pkg-lists/netboot/mipsel/cobalt.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mipsel/cobalt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# To show things on the LCD
-colo-udeb
diff -pruN 20101020/build/pkg-lists/netboot/mipsel/loongson-3.cfg 20201202/build/pkg-lists/netboot/mipsel/loongson-3.cfg
--- 20101020/build/pkg-lists/netboot/mipsel/loongson-3.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mipsel/loongson-3.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,2 @@
+fb-modules-${kernel:Version}
+input-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg 20201202/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg
--- 20101020/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg 2010-05-22 19:06:18.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-usb-modules-${kernel:Version}
-input-modules-${kernel:Version}
-fb-modules-${kernel:Version}
-console-keymaps-usb
diff -pruN 20101020/build/pkg-lists/netboot/mipsel.cfg 20201202/build/pkg-lists/netboot/mipsel.cfg
--- 20101020/build/pkg-lists/netboot/mipsel.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/mipsel.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -1,7 +1,14 @@
-kbd-chooser
+console-setup-udeb
+kbd-udeb
+
+console-setup-pc-ekmap
bogl-bterm-udeb
hw-detect
ethdetect
netcfg
-console-keymaps-at
+nic-modules-${kernel:Version}
+nic-usb-modules-${kernel:Version}
+nic-wireless-modules-${kernel:Version}
+wireless-regdb-udeb
+virtio-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/network-console/armel/iop32x.cfg 20201202/build/pkg-lists/netboot/network-console/armel/iop32x.cfg
--- 20101020/build/pkg-lists/netboot/network-console/armel/iop32x.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/armel/iop32x.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-oldsys-preseed
-# Various NIC modules
-nic-usb-modules-${kernel:Version}
-# Needed by oldsys-preseed on the Thecus N2100
-jffs2-modules-${kernel:Version}
-# To control the beeper on the Thecus N2100
-event-modules-${kernel:Version}
-beep-udeb
diff -pruN 20101020/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg 20201202/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg
--- 20101020/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-oldsys-preseed
-# devio is required by oldsys-preseed on NSLU2
-devio-udeb
-# To control the beeper
-beeper-modules-${kernel:Version}
-beep-udeb
-# In case people want to use a USB NIC instead of the IXP4xx Ethernet
-# driver that requires proprietary microcode.
-nic-usb-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg 20201202/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg
--- 20101020/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,8 +1,9 @@
oldsys-preseed
# sata and ext2/ext3 modules are needed by oldsys-preseed to read the disk
sata-modules-${kernel:Version}
-ext2-modules-${kernel:Version}
-ext3-modules-${kernel:Version}
+ext4-modules-${kernel:Version}
# To control the LED and beeper on QNAP devices
event-modules-${kernel:Version}
qcontrol-udeb
+# LED modules for LaCie devices
+leds-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/netboot/network-console/armel/orion5x.cfg 20201202/build/pkg-lists/netboot/network-console/armel/orion5x.cfg
--- 20101020/build/pkg-lists/netboot/network-console/armel/orion5x.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/armel/orion5x.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,14 +1,10 @@
oldsys-preseed
# sata and ext2/ext3 modules are needed by oldsys-preseed to read the disk
sata-modules-${kernel:Version}
-ext2-modules-${kernel:Version}
-ext3-modules-${kernel:Version}
-# needed by oldsys-preseed on the D-Link DNS-323
-minix-modules-${kernel:Version}
+ext4-modules-${kernel:Version}
# needed by oldsys-preseed on the Kurobox Pro
jffs2-modules-${kernel:Version}
-# To control the LED and beeper on QNAP devices
-event-modules-${kernel:Version}
-qcontrol-udeb
# To control the LED and beeper on Buffalo devices
micro-evtd-udeb
+# Exclude usb-modules explicitly to work around bug in util/pkg-list (#809300)
+usb-modules-${kernel:Version} -
diff -pruN 20101020/build/pkg-lists/netboot/network-console/armel.cfg 20201202/build/pkg-lists/netboot/network-console/armel.cfg
--- 20101020/build/pkg-lists/netboot/network-console/armel.cfg 2010-07-26 21:25:32.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/armel.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,3 +1,4 @@
# Exclude framebuffer related modules that are listed in netboot/armel.cfg
fb-modules-${kernel:Version} -
input-modules-${kernel:Version} -
+usb-serial-modules-${kernel:Version} -
diff -pruN 20101020/build/pkg-lists/netboot/network-console/armhf.cfg 20201202/build/pkg-lists/netboot/network-console/armhf.cfg
--- 20101020/build/pkg-lists/netboot/network-console/armhf.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/armhf.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+# Exclude framebuffer related modules that are listed in netboot/armhf.cfg
+fb-modules-${kernel:Version} -
+input-modules-${kernel:Version} -
diff -pruN 20101020/build/pkg-lists/netboot/network-console/common 20201202/build/pkg-lists/netboot/network-console/common
--- 20101020/build/pkg-lists/netboot/network-console/common 2010-03-26 12:17:29.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/common 2020-04-09 07:06:18.000000000 +0000
@@ -3,7 +3,8 @@
# Remove localechooser so it will be pulled in via the network once the
# user has logged in via SSH and can actually respond to questions.
localechooser -
-# Also remove kbd-chooser as it's not relevant for this type of install
+# Also remove console-setup as it's not relevant for this type of install
# (and the devices for which it's used).
-kbd-chooser -
-console-keymaps-at -
+console-setup-udeb -
+kbd-udeb -
+console-setup-pc-ekmap -
diff -pruN 20101020/build/pkg-lists/netboot/network-console/mips64el.cfg 20201202/build/pkg-lists/netboot/network-console/mips64el.cfg
--- 20101020/build/pkg-lists/netboot/network-console/mips64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/mips64el.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1 @@
+# netboot/mipsel.cfg gets included and we need no additions
diff -pruN 20101020/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg 20201202/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg
--- 20101020/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg 2010-02-11 20:00:25.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-pwgen-udeb
diff -pruN 20101020/build/pkg-lists/netboot/powerpc.cfg 20201202/build/pkg-lists/netboot/powerpc.cfg
--- 20101020/build/pkg-lists/netboot/powerpc.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,19 +1,19 @@
input-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
nic-modules-${kernel:Version}
-nic-extra-modules-${kernel:Version}
nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
mountmedia
media-retriever
usb-storage-modules-${kernel:Version}
pcmciautils-udeb
-floppy-modules-${kernel:Version}
-#fb-modules-${kernel:Version}
+fb-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff -pruN 20101020/build/pkg-lists/netboot/ppc64.cfg 20201202/build/pkg-lists/netboot/ppc64.cfg
--- 20101020/build/pkg-lists/netboot/ppc64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/ppc64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,30 @@
+input-modules-${kernel:Version}
+console-setup-pc-ekmap
+nic-modules-${kernel:Version}
+nic-pcmcia-modules-${kernel:Version}
+pcmcia-modules-${kernel:Version}
+mountmedia
+media-retriever
+usb-storage-modules-${kernel:Version}
+pcmciautils-udeb
+fb-modules-${kernel:Version} ?
+usb-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
+
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
+bogl-bterm-udeb
+hw-detect
+ethdetect
+netcfg
+
+# brltty
+brltty-udeb
+serial-modules-${kernel:Version}
+usb-serial-modules-${kernel:Version} ?
+uinput-modules-${kernel:Version} ?
+
+# IBM Power hypervisor modules, only available on powerpc64.
+hypervisor-modules-${kernel:Version} ?
+fancontrol-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/ppc64el.cfg 20201202/build/pkg-lists/netboot/ppc64el.cfg
--- 20101020/build/pkg-lists/netboot/ppc64el.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/ppc64el.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,29 @@
+input-modules-${kernel:Version}
+nic-modules-${kernel:Version}
+usb-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
+
+bogl-bterm-udeb
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
+
+# In case they need to load a driver image.
+mountmedia
+media-retriever
+fat-modules-${kernel:Version}
+usb-storage-modules-${kernel:Version}
+
+ethdetect
+hw-detect
+netcfg
+
+# brltty
+brltty-udeb
+serial-modules-${kernel:Version}
+uinput-modules-${kernel:Version} ?
+usb-serial-modules-${kernel:Version} ?
+
+# IBM Power hypervisor modules, only available on powerpc64.
+fancontrol-modules-${kernel:Version} ?
+hypervisor-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/riscv64.cfg 20201202/build/pkg-lists/netboot/riscv64.cfg
--- 20101020/build/pkg-lists/netboot/riscv64.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/riscv64.cfg 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,4 @@
+debian-ports-archive-keyring-udeb
+virtio-modules-${kernel:Version} ?
+nic-modules-${kernel:Version}
+scsi-modules-${kernel:Version}
diff -pruN 20101020/build/pkg-lists/netboot/s390.cfg 20201202/build/pkg-lists/netboot/s390.cfg
--- 20101020/build/pkg-lists/netboot/s390.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/s390.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,3 +1,4 @@
netcfg-static
nic-modules-${kernel:Version}
s390-netdevice
+virtio-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/s390x.cfg 20201202/build/pkg-lists/netboot/s390x.cfg
--- 20101020/build/pkg-lists/netboot/s390x.cfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/s390x.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,4 @@
+netcfg-static
+nic-modules-${kernel:Version}
+s390-netdevice
+virtio-modules-${kernel:Version} ?
diff -pruN 20101020/build/pkg-lists/netboot/sh4.cfg 20201202/build/pkg-lists/netboot/sh4.cfg
--- 20101020/build/pkg-lists/netboot/sh4.cfg 2010-06-02 19:02:01.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/sh4.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,14 +1,14 @@
-ext2-modules-${kernel:Version}
ext4-modules-${kernel:Version}
md-modules-${kernel:Version}
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
bogl-bterm-udeb
-console-keymaps-usb
+console-setup-pc-ekmap
ethdetect
hw-detect
-kbd-chooser
+console-setup-udeb
+kbd-udeb
netcfg
# In case they need to load a driver image.
diff -pruN 20101020/build/pkg-lists/netboot/sparc64.cfg 20201202/build/pkg-lists/netboot/sparc64.cfg
--- 20101020/build/pkg-lists/netboot/sparc64.cfg 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/sparc64.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,15 @@
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
sparc-utils-udeb
netcfg
+input-modules-${kernel:Version}
nic-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
# In case they need to load a driver image
@@ -14,4 +18,4 @@ media-retriever
usb-storage-modules-${kernel:Version}
fat-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff -pruN 20101020/build/pkg-lists/netboot/sparc.cfg 20201202/build/pkg-lists/netboot/sparc.cfg
--- 20101020/build/pkg-lists/netboot/sparc.cfg 2010-03-26 12:17:35.000000000 +0000
+++ 20201202/build/pkg-lists/netboot/sparc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,11 +1,15 @@
-kbd-chooser
+console-setup-udeb
+debian-ports-archive-keyring-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
sparc-utils-udeb
netcfg
+input-modules-${kernel:Version}
nic-modules-${kernel:Version}
+virtio-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
# In case they need to load a driver image
@@ -14,4 +18,4 @@ media-retriever
usb-storage-modules-${kernel:Version}
fat-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff -pruN 20101020/build/pkg-lists/netboot-apus/powerpc.cfg 20201202/build/pkg-lists/netboot-apus/powerpc.cfg
--- 20101020/build/pkg-lists/netboot-apus/powerpc.cfg 2010-03-26 12:17:24.000000000 +0000
+++ 20201202/build/pkg-lists/netboot-apus/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -1,9 +1,10 @@
input-modules-${kernel:Version}
-console-keymaps-amiga
+console-setup-amiga-ekmap
nic-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff -pruN 20101020/build/pkg-lists/net_drivers/powerpc.cfg 20201202/build/pkg-lists/net_drivers/powerpc.cfg
--- 20101020/build/pkg-lists/net_drivers/powerpc.cfg 2010-02-11 20:00:21.000000000 +0000
+++ 20201202/build/pkg-lists/net_drivers/powerpc.cfg 2020-04-09 07:06:18.000000000 +0000
@@ -7,7 +7,6 @@ hw-detect
ethdetect
nic-shared-modules-${kernel:Version}
-#nic-extra-modules-${kernel:Version}
ipv6-modules-${kernel:Version}
# Floppies are largely for OldWorld systems, which either don't have PCMCIA
diff -pruN 20101020/build/pkg-lists/net_drivers-1/common 20201202/build/pkg-lists/net_drivers-1/common
--- 20101020/build/pkg-lists/net_drivers-1/common 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/net_drivers-1/common 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-network-preseed
diff -pruN 20101020/build/pkg-lists/net_drivers-1/i386.cfg 20201202/build/pkg-lists/net_drivers-1/i386.cfg
--- 20101020/build/pkg-lists/net_drivers-1/i386.cfg 2010-02-11 20:00:21.000000000 +0000
+++ 20201202/build/pkg-lists/net_drivers-1/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-nic-modules-${kernel:Version}
-
-# These are on the root floppy.
-core-modules-${kernel:Version} -
-
-ipv6-modules-${kernel:Version}
-plip-modules-${kernel:Version}
-
-# net installation support
-net-retriever
-download-installer
-netcfg
-choose-mirror
-ethdetect
diff -pruN 20101020/build/pkg-lists/net_drivers-2/i386.cfg 20201202/build/pkg-lists/net_drivers-2/i386.cfg
--- 20101020/build/pkg-lists/net_drivers-2/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/net_drivers-2/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-nic-wireless-modules-${kernel:Version}
-nic-pcmcia-modules-${kernel:Version}
-pcmcia-modules-${kernel:Version}
-pcmciautils-udeb
-nic-usb-modules-${kernel:Version}
-# The core usb modules are detected and loaded by the boot floppy,
-# so ignore any dependencies on them.
-# (Commented out since that's not currently true.)
-#usb-modules-${kernel:Version} -
-
-# modules already loaded by the net-drivers floppy
-crc-modules-${kernel:Version} -
-firmware-modules-${kernel:Version} -
-nic-shared-modules-${kernel:Version} -
-core-modules-${kernel:Version} -
diff -pruN 20101020/build/pkg-lists/net_drivers-3/i386.cfg 20201202/build/pkg-lists/net_drivers-3/i386.cfg
--- 20101020/build/pkg-lists/net_drivers-3/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/net_drivers-3/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-nic-extra-modules-${kernel:Version}
-
-# modules already loaded by the net-drivers floppy
-crc-modules-${kernel:Version} -
-firmware-modules-${kernel:Version} -
-nic-shared-modules-${kernel:Version} -
-core-modules-${kernel:Version} -
diff -pruN 20101020/build/pkg-lists/network-console 20201202/build/pkg-lists/network-console
--- 20101020/build/pkg-lists/network-console 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/network-console 2020-04-09 07:06:18.000000000 +0000
@@ -1,4 +1,3 @@
openssh-server-udeb
-libnss-files-udeb
network-console
diff -pruN 20101020/build/pkg-lists/speakup/common 20201202/build/pkg-lists/speakup/common
--- 20101020/build/pkg-lists/speakup/common 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/speakup/common 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# These udebs (and NOT base) are used to build a special boot floppy that
-# boots up and loads a second floppy.
-# Note that due to space reasons, cdebconf is not on this floppy image.
-# Neither is much else.
-rootskel-bootfloppy
-busybox-floppy-udeb
-#include "kernel"
diff -pruN 20101020/build/pkg-lists/speakup/i386.cfg 20201202/build/pkg-lists/speakup/i386.cfg
--- 20101020/build/pkg-lists/speakup/i386.cfg 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/pkg-lists/speakup/i386.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-floppy-modules-${kernel:Version}
-fat-modules-${kernel:Version}
-# Include support for USB floppy drives, and other storage media.
-usb-modules-${kernel:Version}
-# XXX usb floppy support is disabled due to lack of space
-#usb-storage-modules-${kernel:Version}
-# The floppy needs to prompt for enter to be hit, even with a USB keyboard.
-input-modules-${kernel:Version}
-# Only the scsi modules needed for USB storage.
-#scsi-core-modules-${kernel:Version}
-# This is here for just one symbol that the usb-storage module needs.
-# In theory, that symbol could be moved out to its own kernel module,
-# but we have not been tight enough on space yet to need to do that.
-#ide-core-modules-${kernel:Version}
-# The initrd is loop mounted.
-loop-modules-${kernel:Version}
diff -pruN 20101020/build/README 20201202/build/README
--- 20101020/build/README 2010-02-22 01:34:48.000000000 +0000
+++ 20201202/build/README 2020-11-30 23:08:26.000000000 +0000
@@ -1,13 +1,13 @@
The files in this directory are used to build the Debian installer.
Basically it consists of downloading udebs, unpacking them, applying some
-magic (library reduction etc.) and building an image.
+magic (font reduction etc.) and building an image.
Warning: The build system for the installer is often tightly bound to the
version of Debian for which it is targeted. If you are using stable, use
"apt-get source debian-installer" to get a version of the installer that
will build on your system. If you are using testing or unstable, check out
a copy of the installer using the command
-"svn co svn://svn.d-i.alioth.debian.org/svn/d-i/trunk/installer"
+"git clone https://salsa.debian.org/installer-team/debian-installer.git"
Recipe:
- Install the build-dependencies on the host system
@@ -16,7 +16,8 @@ Recipe:
sources.list is taken as a template for sources.list.udeb.
- Run "make" to get a list of available targets.
- Build an image using one of the build_ targets (build_netboot,
- all_build, etc).
+ all_build, etc). You may want to set the USE_UDEBS_FROM variable,
+ documented below.
- Look in dest/ for the completed images.
Note that this does not create full debian ISO images; that is left to the
@@ -48,8 +49,7 @@ A more detailed overview of how the inst
subarchitecture there (/.cfg). All of these files can
have #include lines to include files from pkg-lists. Also,
${kernel:Version} in these files is replaced with the kernel version,
- as set in the KERNELIMAGEVERSION variable (plus the KERNEL_FLAVOUR
- variable).
+ as set in the KERNELVERSION variable (plus the KERNEL_FLAVOUR variable).
* Anything listed in pkg-lists/local and pkg-lists/*/local is included in
the image that is built. This is to provide an easy way to add extra
udebs to a test image.
@@ -76,8 +76,6 @@ A more detailed overview of how the inst
* If you have some udebs that are not available on your mirror yet,
you can drop them in 'localudebs/' and they will be used.
* dpkg is used to unpack the udebs into the build directory.
-* A customized set of reduced libraries is generated to correspond to the
- udebs that were installed.
* Some boot images have associated "driver" disks. These disks just get
udebs put on them.
* The final images are put in the dest/ directory.
@@ -150,7 +148,6 @@ SUBARCH_SUPPORTED = r4k-ip22 r5k-ip22 sb
KERNELMAJOR = 2.4
KERNELMINOR = 25
KERNEL_FLAVOUR = di
-KERNELIMAGEVERSION = $(KERNELVERSION)
KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinux-$(ver))
VERSIONED_SYSTEM_MAP = t
@@ -198,13 +195,6 @@ KERNELMAJOR
KERNELVERSION
The version of the kernel .udeb package, like "2.4.26-r4k-ip22"
-KERNEL_FLAVOUR
- The flavour of the kernel .udeb package. This has nothing to do with
- FLAVOUR. It has always a value of "di" these days.
-
-KERNELIMAGEVERSION
- The version part of the kernel image's name.
-
KERNELNAME
The full name of the kernel image. If you build an EXTRA target (e.g.
for a driver floppy), this variable has to be empty.
@@ -282,6 +272,14 @@ TEMP_POWERPC_INITRD
Other useful variables for configuration snippets:
+LINUX_KERNEL_ABI
+ The first part of the kernel version, e.g. 3.14-2. Used as the
+ default base/suffix for KERNELVERSION (i.e. $(LINUX_KERNEL_ABI)-amd64).
+
+KERNEL_FLAVOUR
+ The flavour of the kernel .udeb package. This has nothing to do with
+ FLAVOUR. It has always a value of "di" these days.
+
SUBARCH_SUPPORTED_EXTRA
MEDIUM_SUPPORTED_EXTRA
FLAVOUR_SUPPORTED_EXTRA
@@ -352,7 +350,8 @@ DEBIAN_VERSION
USE_UDEBS_FROM
Normally the codename of the release to use for the build. Defaults to
- unstable for daily builds.
+ unstable for daily builds. Set from debian/rules when building through
+ dpkg-buildpackage.
Included in /etc/udebs-source in most initrds.
USE_PROPOSED_UPDATES
@@ -375,17 +374,9 @@ SYSLINUX_CFG (x86 only)
- prompt: non-graphical syslinux configuration allowing installation of
only a default desktop environment
- standard: as prompt, but graphical menu (using vesamenu)
- - all-desktop: as standard, but also includes options to install alternative
- desktop environments
- template: the available files are merely copied; the actual configuration
is created by debian-cd
-DESKTOP (x86 only)
- Allows to specify that a specific desktop environment should be installed
- when that option is selected in pkgsel. Modifies the syslinux configuration.
- Ignored unless SYSLINUX_CFG is set to 'prompt' or 'standard'; the default
- (gnome) does not need to be specified.
-
BOOTMENU_BEEP
Set to y to produce a beep when the boot menu is ready to accept commands
(e.g. extra kernel parameters, etc.)
@@ -398,8 +389,7 @@ GZIPPED
EXTRADRIVERS
This variable points to the directories where additional driver
.udebs reside. This causes these .udebs to be considered in the font
- and library reduction steps, so the characters and library symbols needed
- for them are kept.
+ reduction step, so the characters needed for them are kept.
EXTRATARGETS
Additional targets which are run before the ones in TARGET. This is
@@ -408,9 +398,7 @@ EXTRATARGETS
EXTRAUDEBS
This variable points to additional udebs that should be considered by the
- library reduction step. cdebconf plugins should be listed here so the
- symbols they will need are available on the initrd (since cdebconf runs
- using the initrd libc, its plugins do too)
+ font reduction step.
DRIVER_FOR
The variable indicates that the image is just a driver image for some
@@ -425,11 +413,12 @@ SYSLINUX_OPTS
Additional syslinux options.
SPLASH_RLE
+SPLASH_PNG
The syslinux splash screen file.
INITRD_FS
The filesystem to use for initrds, needs to be built into the kernel.
- ext2, cramfs, initramfs, or jffs2.
+ ext2, initramfs, or jffs2.
MKFS_JFFS2
If using jffs2 for the INITRD_FS, you will need to set this variable to
@@ -468,6 +457,10 @@ EXTRAS
EXTRAFILES
Add additional files to the target image.
+SSL_CERTS
+ Add SSL certificates to the target image. For this to be useful, you will
+ also need to supply d-i with GNU wget.
+
MIRROR
The mirror to get .deb and .udeb packages from. Defaults to the same
as the host machine uses.
diff -pruN 20101020/build/TODO 20201202/build/TODO
--- 20101020/build/TODO 2008-10-27 10:43:23.000000000 +0000
+++ 20201202/build/TODO 2020-04-09 07:06:18.000000000 +0000
@@ -1,17 +1,5 @@
* Use debian-archive-keyring-udeb
-* Add disk labels to non-i386 floppys.
-* The busybox in the bootfloppy can be linked with uclibc and/or statically
- to make it smaller. Only init uses it, so it doesn't really matter. This
- could save up to 200k on the boot floppy. But first someone needs to add
- code to install uclibc or a uclibc udeb.
* The apt download fails if the dpkg status file of the build system is
in an inconsistent state. It could be overridden to use another status
file, but that file would have to claim that all dependencies of the
udebs it's downloading were met. Hmm.
-* Change mklibs to not pull in libraries from the build system, and only
- act on libraries in the tree; those libraries would then be provided by
- udebs; this would be cleaner in several ways (and it's why e.g. anna
- depends on libc-udeb already).
-* Convert the driver floppies to use FAT filesystem, not ext2, on i386.
- Makes it easier for third parties to throw additional udebs on.
-* Cache the upxed kernel, to avoid re-upxing it over and over.
diff -pruN 20101020/build/translation-status 20201202/build/translation-status
--- 20101020/build/translation-status 2010-09-13 02:15:57.000000000 +0000
+++ 20201202/build/translation-status 2020-12-02 13:30:02.000000000 +0000
@@ -1,71 +1,82 @@
# Installer translation status generated by the script:
# scripts/l10n/calc-release-status
# This file should be updated before every official release.
-# Generated on: Sat, 11 Sep 2010 20:07:19 +0000
+# Generated on: Wed, 02 Dec 2020 12:01:23 +0000
#
-am: 3 P
-ar: 5 F
-ast: 4 M
-be: 4 M
+am: 2 P
+ar: 2 M
+ast: 2 M
+be: 2 M
bg: 5 F
-bn: 4 M
-bs: 4 M
-ca: 4 M
-cs: 4 M
-da: 4 M
-de: 4 M
-dz: 4 M
-el: 4 M
-eo: 4 M
-es: 5 F
-et: 4 M
-eu: 4 M
-fa: 4 M
-fi: 5 F
+bn: 2 P
+bo: 2 P
+bs: 2 P
+ca: 2 M
+cs: 5 F
+cy: 2 M
+da: 2 M
+de: 5 F
+dz: 2 P
+el: 5 F
+eo: 5 F
+es: 2 M
+et: 2 M
+eu: 2 M
+fa: 2 M
+fi: 2 M
fr: 5 F
-ga: 4 M
-gl: 4 M
-gu: 4 M
-he: 4 M
-hi: 4 M
-hr: 4 M
-hu: 4 M
+ga: 2 M
+gl: 2 M
+gu: 2 M
+he: 5 F
+hi: 2 M
+hr: 5 F
+hu: 2 M
hy: 2 L
-id: 4 M
-it: 4 M
-ja: 4 M
-ka: 4 M
-kk: 4 M
-km: 4 M
-ko: 4 M
-ku: 2 M
-lt: 4 M
-lv: 4 M
-mk: 3 M
-ml: 3 M
-mr: 4 M
+id: 5 F
+is: 2 M
+it: 2 M
+ja: 2 M
+ka: 2 P
+kab: 5 F
+kk: 2 M
+km: 2 P
+kn: 2 M
+ko: 2 M
+ku: 2 P
+lo: 2 P
+lt: 2 M
+lv: 2 M
+mk: 2 P
+ml: 2 M
+mr: 2 M
nb: 5 F
-ne: 3 M
-nl: 4 M
-nn: 4 M
-pa: 4 M
-pl: 4 M
+ne: 2 P
+nl: 5 F
+nn: 2 P
+oc: 3 M
+pa: 5 F
+pl: 2 M
pt: 5 F
-pt_BR: 4 M
-ro: 5 F
-ru: 5 F
+pt_BR: 5 F
+ro: 2 M
+ru: 2 M
se: 2 L
-sk: 4 M
-sl: 4 M
-sq: 3 M
-sr: 2 P
+si: 2 P
+sk: 2 M
+sl: 2 M
+sq: 2 M
+sr: 2 M
+sr@latin: 2 L
sv: 5 F
-ta: 3 M
-te: 2 P
-th: 5 F
-tl: 2 M
-tr: 4 M
-uk: 4 M
-vi: 4 M
-zh_CN: 4 M
-zh_TW: 4 M
+ta: 2 M
+te: 2 M
+tg: 2 M
+th: 2 M
+tl: 2 P
+tr: 2 M
+ug: 2 M
+uk: 2 M
+vi: 2 M
+zh_CN: 2 M
+zh_TW: 2 M
diff -pruN 20101020/build/util/arm/ss4000e/mkfwimage.sh 20201202/build/util/arm/ss4000e/mkfwimage.sh
--- 20101020/build/util/arm/ss4000e/mkfwimage.sh 2009-09-12 14:13:37.000000000 +0000
+++ 20201202/build/util/arm/ss4000e/mkfwimage.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-INPUT=$1
-OUTPUT=$2
-
-if [ -z "$OUTPUT" ] || [ -z "$INPUT" ]; then
- echo "Usage: $0 " >&2
- exit 1
-fi
-
-printf 'FALCONSTOR@EP219\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\08\0\0\0\0\0\0\09.9-b999\0\0\0\0\0\0\0\0fs-bc\0\0\0\0\0\0\0\0\0\0\0' > $OUTPUT.tmp
-cat $INPUT >> $OUTPUT.tmp
-MD5=$(md5sum $OUTPUT.tmp | awk -F' ' '{print $1}')
-(printf $MD5; cat $OUTPUT.tmp) > $OUTPUT
-rm $OUTPUT.tmp
diff -pruN 20101020/build/util/arm/ss4000e/up.sh 20201202/build/util/arm/ss4000e/up.sh
--- 20101020/build/util/arm/ss4000e/up.sh 2009-07-18 14:05:54.000000000 +0000
+++ 20201202/build/util/arm/ss4000e/up.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Writing zImage to flash:" > /sysroot/var/log/upgrade.log
-/fs/writeflash -z /sysroot/zImage > /sysroot/var/log/upgrade.log 2>&1
-echo "Writing initrd to flash:" > /sysroot/var/log/upgrade.log
-/fs/writeflash -r /sysroot/initrd.gz > /sysroot/var/log/upgrade.log 2>&1
diff -pruN 20101020/build/util/arm/thecus/pad 20201202/build/util/arm/thecus/pad
--- 20101020/build/util/arm/thecus/pad 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/util/arm/thecus/pad 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2006 Martin Michlmayr
-
-# We need to properly pad the file that is to be encrypted with openssl
-# and then call openssl with the -nopad option. Otherwise openssl will
-# pad the image in a way that the des utility used by the Thecus firmware
-# will not recognize the padding and the gunzip call will fail with an
-# "unexpected end of file" error because of trailing data.
-
-# We first need to get the modulus of 8 of the file and then pad it the
-# file is a multiple of 8. Thereby, the last value of the padding bytes
-# has to indicate the modulus.
-
-FILE=$1
-
-size=$(wc -c $FILE | awk '{print $1}')
-mod=$(($size % 8))
-pad=$((8 - $mod - 1))
-
-if [ $pad -gt 0 ]; then
- perl -e "print pack("c$pad", 0)" >> $FILE
-fi
-perl -e "print pack("c", $mod)" >> $FILE
-
diff -pruN 20101020/build/util/arm/thecus/up.sh 20201202/build/util/arm/thecus/up.sh
--- 20101020/build/util/arm/thecus/up.sh 2008-10-27 10:43:22.000000000 +0000
+++ 20201202/build/util/arm/thecus/up.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2006 Martin Michlmayr
-
-# This code is covered by the GNU General Public License.
-
-# See installer/doc/devel/hardware/arm/thecus/firmware for an explanation
-# of the upgrade process on Thecus machines.
-
-
-info() {
- echo "$@" > /tmp/upgrade/message
-}
-
-debug() {
- echo "$@" > /tmp/upgrade/debug
-}
-
-# Note: the firmware upgrade script looks for the string "fail" in the
-# error message, so make sure this passed to the error function.
-error() {
- info "$@"
- debug "$@"
- rm -f /var/lock/upgrade.lock
- exit 1
-}
-
-mtddev() {
- grep "$1" /proc/mtd | cut -d: -f 1 | sed 's/mtd/\/dev\/mtd/'
-}
-
-mtddevblock() {
- grep "$1" /proc/mtd | cut -d: -f 1 | sed 's/mtd/\/dev\/mtdblock/'
-}
-
-
-
-lockfile /var/lock/upgrade.lock
-
-cd /tmp/upgrade
-
-# If hw_status is 0 the machine is being reset to "factory default". In
-# our case, this means that we don't check whether the machine name
-# matches /app/manifest.txt.
-HW_STATUS=$(redboot_config get /dev/mtdblock4 hw_status)
-if [ $HW_STATUS -ne 1 ]; then
- product=$(grep "^type" /app/manifest.txt | cut -f 2)
- case $product in
- # N2100 and compatible machines
- n2100 | all6500 | Mbox)
- info "N2100 compatible machine $product found"
- ;;
- # N4100 and compatible machines
- n4100 | all6400 | PlatinumNAS)
- info "N4100 compatible machine $product found"
- ;;
- # Unknown
- *)
- error "Machine detection of $product: fail"
- ;;
- esac
-fi
-
-if [ ! -e /proc/mtd ]; then
- error "Finding /proc/mtd: fail"
-fi
-mtdramdisk=$(mtddevblock ramdisk)
-mtdkernel=$(mtddev kernel)
-if [ -z "$mtdramdisk" ]; then
- error "Finding mtd ramdisk: fail"
-fi
-if [ -z "$mtdkernel" ]; then
- error "Finding mtd kernel: fail"
-fi
-
-info "Writing installer ramdisk... please wait..."
-ifile=initrd
-size=$(grep "ramdisk" /proc/mtd | cut -d " " -f 2)
-size=$(printf "%d" 0x$size)
-isize=$(wc -c $ifile | cut -d " " -f 1)
-pad=$(expr $size - $isize)
-(
- cat $ifile
- dd if=/dev/zero bs=$pad count=1 2>/dev/null
-) > $mtdramdisk
-if [ $? -ne 0 ]; then
- error "Upgrading ramdisk: fail"
-fi
-
-info "Writing installer kernel... please wait..."
-fcp vmlinuz $mtdkernel
-if [ $? -ne 0 ]; then
- error "Upgrading kernel: fail"
-fi
-
-echo "Buzzer 0" > /proc/thecus_io
-sleep 1
-echo "Buzzer 1" > /proc/thecus_io
-# The firmware upgrade script looks for the following string. If it cannot
-# find it, it won't terminate.
-info "success"
-rm -f /var/lock/upgrade.lock
-
-exit 0
-
diff -pruN 20101020/build/util/bootvars-subst 20201202/build/util/bootvars-subst
--- 20101020/build/util/bootvars-subst 2008-10-27 10:43:23.000000000 +0000
+++ 20201202/build/util/bootvars-subst 2020-04-09 07:06:18.000000000 +0000
@@ -10,8 +10,8 @@ while (@ARGV) {
}
while (<>) {
- s/\${BOOTPROMPT}\n?$//g; # special case
- s/\${([a-zA-Z0-9_]+)}/$subst{$1}/g;
+ s/\$\{BOOTPROMPT\}\n?$//g; # special case
+ s/\$\{([a-zA-Z0-9_]+)\}/$subst{$1}/g;
print;
}
diff -pruN 20101020/build/util/efi-image 20201202/build/util/efi-image
--- 20101020/build/util/efi-image 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/efi-image 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,223 @@
+#! /bin/sh
+set -e
+
+# Copyright (C) 2010, 2011 Canonical Ltd.
+# (C) 2019-2020 Steve McIntyre <93sam@debian.org>
+# Author: Colin Watson
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Make an EFI boot image.
+
+usage () {
+ echo "usage: $0 [OPTIONS]"
+ echo "Options:"
+ echo "-o Set the output directory. Must be specified."
+ echo "-g Set the grub platform name. Must be specified."
+ echo "-e Set the EFI platform name. Must be specified."
+ echo "-n Set the netboot prefix for Grub. Must be specified."
+ echo "-s Whether to set up for EFI Secure Boot. Must be specified."
+ echo "-d Set the input directory for DTB files to be included. Optional."
+}
+
+outdir=""
+platform=""
+efi_name=""
+netboot_prefix=""
+efi_signed=""
+dtb_dir=""
+
+while getopts ":o:g:e:n:s:d:" o; do
+ case "${o}" in
+ o)
+ outdir="${OPTARG}"
+ ;;
+ g)
+ platform="${OPTARG}"
+ ;;
+ e)
+ efi_name="${OPTARG}"
+ ;;
+ n)
+ netboot_prefix="${OPTARG}"
+ ;;
+ s)
+ efi_signed="${OPTARG}"
+ ;;
+ d)
+ dtb_dir="${OPTARG}"
+ ;;
+ esac
+done
+shift $((OPTIND-1))
+
+# Validate inputs
+if [ "$outdir"x = ""x ] || [ "$platform"x = ""x ] || \
+ [ "$efi_name"x = ""x ] || [ "$netboot_prefix"x = ""x ] || \
+ [ "$efi_signed"x = ""x ]; then
+ usage
+ exit 1
+fi
+
+memdisk_img=
+workdir=
+
+cleanup () {
+ [ -z "$memdisk_img" ] || rm -f "$memdisk_img"
+ [ -z "$workdir" ] || rm -rf "$workdir"
+}
+trap cleanup EXIT HUP INT QUIT TERM
+
+copy_files_into_image () {
+ mmd -i "$outdir/efi.img" ::efi
+ mmd -i "$outdir/efi.img" ::efi/boot
+ mcopy -i "$outdir/efi.img" "$workdir/boot$efi_name.efi" \
+ "::efi/boot/boot$efi_name.efi"
+
+ if [ $efi_signed = y ]; then
+ # In this case, also add the grub binary
+ mcopy -i "$outdir/efi.img" "$workdir/grub$efi_name.efi" \
+ "::efi/boot/grub$efi_name.efi"
+
+ # And finally the skeleton grub.cfg - the signed grub
+ # binaries will have prefix set to "/EFI/debian", so
+ # put this there to redirect to the correct location.
+ mmd -i "$outdir/efi.img" ::efi/debian
+ mcopy -i "$outdir/efi.img" "$workdir/boot/grub/grub.cfg" \
+ "::efi/debian/grub.cfg"
+ fi
+
+ # Copy in any DTB files we might have/want
+ if [ "$dtb_dir"x != ""x ]; then
+ mmd -i "$outdir/efi.img" ::dtb
+ mcopy -s -i "$outdir/efi.img" "$dtb_dir/." ::dtb
+ fi
+}
+
+count_free_clusters () {
+ image=$1
+ clusters_free=$(fsck.msdos -v $1 | \
+ awk '
+ /files.*cluster/ {
+ used_free=$4
+ split(used_free, sizes, "/")
+ print (sizes[2] - sizes[1])
+ }
+ ')
+ echo $clusters_free
+}
+
+rm -rf "$outdir"
+mkdir -p "$outdir"
+
+memdisk_img="$(mktemp efi-image.XXXXXX)"
+workdir="$(mktemp -d efi-image.XXXXXX)"
+
+# Skeleton configuration file which finds the real boot disk.
+mkdir -p "$workdir/boot/grub"
+cat >"$workdir/boot/grub/grub.cfg" <"$outdir/boot/grub/$platform/grub.cfg"
+
+if [ $efi_signed = y ]; then
+ # Just copy existing shim and Grub binaries into place.
+ # First, the binaries we use for disc or CD boot.
+ echo "$0: Using pre-signed grub-efi and shim binaries for $efi_name"
+ cp /usr/lib/shim/shim$efi_name.efi.signed \
+ $workdir/boot$efi_name.efi
+ cp /usr/lib/grub/$platform-signed/grub$efi_name.efi.signed \
+ $workdir/grub$efi_name.efi
+
+ # Now the binaries for netboot. These are *not* actually used
+ # in generating the image here, but will be picked up later on
+ # in the d-i build and copied into the output netboot
+ # tree. Hence the different output directory.
+ cp /usr/lib/shim/shim$efi_name.efi.signed \
+ $outdir/bootnet$efi_name.efi
+ # Copy the pre-built signed grub-netboot binary that is
+ # configured just for d-i, with the right prefix baked in
+ # (debian-installer/$arch/grub)". We can't change the prefix,
+ # hence the special build. (See #928750)
+ cp /usr/lib/grub/$platform-signed/grubnet$efi_name-installer.efi.signed \
+ $outdir/grub$efi_name.efi
+else
+ # Build the core image for disc/CD boot
+ echo "$0: Building non-signed grub-efi binaries for $efi_name"
+ find "$workdir" -newermt "@$SOURCE_DATE_EPOCH" -print0 \
+ | xargs -0r touch --no-dereference --date="@$SOURCE_DATE_EPOCH"
+ (cd "$workdir"; find boot -print0 | LC_ALL=C sort -z | tar --null -T - -cf -) >"$memdisk_img"
+ grub-mkimage -O "$platform" -m "$memdisk_img" \
+ -o "$workdir/boot$efi_name.efi" -p '(memdisk)/boot/grub' \
+ search iso9660 configfile normal memdisk tar part_msdos part_gpt fat
+
+ # Now the image for netboot. This is *not* used to generate
+ # the image here, but will be picked up later on in the d-i
+ # build and copied into the output netboot tree. Hence the
+ # different output directory.
+ grub-mkimage -O "$platform" \
+ -o "$outdir/bootnet$efi_name.efi" -p "$netboot_prefix/grub" \
+ search configfile normal efinet tftp net
+fi
+
+# Stuff it into a FAT filesystem, making it as small as
+# possible. Count up the sizes of all the files and directories we need to fit in there.
+#
+# 32KiB headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.
+size=0
+block_size=1024
+for file in $(find $workdir $dtb_dir -type f -name *.efi -o -name grub.cfg -o -name *.dtb); do
+ this_size=$(( ($(stat -c %s $file) / $block_size + 1 + 32 + 31) / 32 * 32 ))
+ size=$(($size + $this_size))
+done
+for dir in $(find $workdir $dtb_dir -type d); do
+ size=$(($size + 1)) # Is 1 block enough for each directory?
+done
+
+# Specify a deterministic volume ID; we use DOS_VOLUME_ID here for
+# consistency.
+echo "$0: Running first pass of mkfs.msdos with size $size blocks"
+mkfs.msdos --invariant -v -i deb00001 -C "$outdir/efi.img" $size
+copy_files_into_image
+
+# The worst-case calculations above are potentially giving
+# significantly too-large EFI filesystems. Stop guessing. Look at what
+# we have using fsck.msdos, then recalculate directly how much we've
+# used and try again with a more accurate size.
+cluster_size=$(fsck.msdos -v "$outdir/efi.img" | awk '/bytes per cluster/ {print $1}')
+cluster_blocks=$(($cluster_size / $block_size))
+clusters_free=$(count_free_clusters "$outdir/efi.img")
+
+echo "$0: First pass has $clusters_free free clusters"
+# Add a little bit of free space, 32kB for luck?
+size=$(($size + 32 - ($cluster_blocks * $clusters_free)))
+
+echo "$0: Running second pass of mkfs.msdos with size $size blocks"
+rm -f "$outdir/efi.img"
+mkfs.msdos --invariant -v -i deb00001 -C "$outdir/efi.img" $size
+copy_files_into_image
+clusters_free=$(count_free_clusters "$outdir/efi.img")
+echo "$0: Second pass has $clusters_free free clusters"
+grub-cpmodules "$outdir" "$platform"
+
+exit 0
diff -pruN 20101020/build/util/gen-hd-image 20201202/build/util/gen-hd-image
--- 20101020/build/util/gen-hd-image 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/gen-hd-image 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,393 @@
+#!/bin/sh
+#
+# gen-hd-image V1.01
+# Copyright 2014,2015 by Karsten Merker
+#
+# This file is dual-licensed. It is provided under (at your option)
+# either the terms of the GPL2+ or the terms of the X11 license as
+# described below. Note that this dual licensing only applies to this
+# file, and not this project as a whole.
+#
+# License options:
+#
+# - Option "GPL2+":
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# On Debian systems, the full text of the GPL version 2 is
+# available in the file /usr/share/common-licenses/GPL-2.
+#
+# - or, alternatively, option "X11":
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+set -e
+
+PATH="${PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
+export PATH
+
+FSTYPE="fat32"
+PARTID="0x0c"
+FATSIZE="32"
+BUILDTYPE="complete"
+SOURCEDIR="."
+PARTOFFSET="2048"
+DEFAULT_IMAGESIZE="976560" # default d-i FLOPPY_SIZE for hd-media images
+IMAGESIZE="${DEFAULT_IMAGESIZE}"
+COMPRESS="none"
+COMPRESS_OPTS=""
+VERBOSITY="0"
+PREREQUISITES="fmt sfdisk"
+PREREQUISITES_MISSING=""
+
+log()
+{
+ if [ "${VERBOSITY}" -gt 0 ]; then
+ echo "$(basename $0): $1"
+ fi
+}
+
+error()
+{
+ echo "$(basename $0): $1" 1>&2
+}
+
+clean_tempfiles()
+{
+ # Only try to delete what was worked on:
+ if [ -n "${TEMP_FS_IMAGEFILE}" ]; then rm -f "${TEMP_FS_IMAGEFILE}"; fi
+ if [ -n "${TEMP_HD_IMAGEFILE}" ]; then rm -f "${TEMP_HD_IMAGEFILE}"; fi
+}
+
+check_prerequisites()
+{
+ for TOOL in $1
+ do
+ which >/dev/null ${TOOL}
+ if [ ! "$?" -eq 0 ]; then
+ PREREQUISITES_MISSING="${PREREQUISITES_MISSING}${TOOL} "
+ fi
+ done
+ if [ -n "${PREREQUISITES_MISSING}" ]; then
+ error "ERROR: The following programs are unavailable, but required"
+ error "ERROR: for the selected options: ${PREREQUISITES_MISSING}"
+ error "ERROR: Exiting."
+ exit 1
+ fi
+}
+
+usage()
+{
+ fmt -w 75 -s </dev/null if=/dev/zero bs=1k of="${TEMP_HD_IMAGEFILE}" seek=$((${IMAGESIZE}-1)) count=1
+ while [ "$#" -ge "2" ]
+ do
+ if [ -n "$1" ]; then
+ BOOTLOADER_IMAGE="$1"
+ BOOTLOADER_OFFSET="$2"
+ log "Installing ${BOOTLOADER_IMAGE} at sector ${BOOTLOADER_OFFSET} ..."
+ dd 2>/dev/null if="${BOOTLOADER_IMAGE}" of="${TEMP_HD_IMAGEFILE}" bs=512 seek="${BOOTLOADER_OFFSET}" conv=notrunc
+ fi
+ shift 2
+ done
+ if [ "$#" -eq 1 ]; then
+ error "ERROR: Firmware/bootloader image name or offset missing. Exiting."
+ clean_tempfiles
+ exit 1
+ fi
+ sfdisk --force -u S "${TEMP_HD_IMAGEFILE}" 1>/dev/null 2>/dev/null </dev/null if=/dev/zero bs=1k of="${TEMP_FS_IMAGEFILE}" seek=$((${TEMP_FS_IMAGESIZE}-1)) count=1
+ case "${FSTYPE}" in
+ fat16|fat32)
+ mkfs.msdos -v -F "${FATSIZE}" "${TEMP_FS_IMAGEFILE}" "${TEMP_FS_IMAGESIZE}"
+ mcopy -s -i "${TEMP_FS_IMAGEFILE}" ${SOURCEDIR}// ::
+ # The trailing // is necessary to make mcopy copy the contents
+ # of ${SOURCEDIR} but not ${SOURCEDIR} itself. Using ${SOURCEDIR}/*
+ # would omit dotfiles and ${SOURCEDIR}/. does not work with mcopy.
+ ;;
+ ext2)
+ genext2fs -z -U -d "${SOURCEDIR}" -b "${TEMP_FS_IMAGESIZE}" "${TEMP_FS_IMAGEFILE}"
+ ;;
+ esac
+ ;;
+esac
+
+case "${BUILDTYPE}" in
+ firmware)
+ dd 2>/dev/null if="${TEMP_HD_IMAGEFILE}" bs=512 count="${PARTOFFSET}" of="${IMAGEFILE}"
+ ;;
+ complete)
+ dd 2>/dev/null if="${TEMP_HD_IMAGEFILE}" bs=512 count="${PARTOFFSET}" of="${IMAGEFILE}"
+ cat "${TEMP_FS_IMAGEFILE}" >> "${IMAGEFILE}"
+ ;;
+ partition)
+ mv "${TEMP_FS_IMAGEFILE}" "${IMAGEFILE}"
+ chmod +r "${IMAGEFILE}"
+ ;;
+esac
+
+if [ ! "${COMPRESS}" = "none" ];
+then
+ log "Compressing image ..."
+ "${COMPRESS}" ${COMPRESS_OPTS} -f "${IMAGEFILE}"
+fi
+
+clean_tempfiles
+
+log "Image finished."
+
+exit 0
diff -pruN 20101020/build/util/geniso_hybrid_plus_firmware_partition 20201202/build/util/geniso_hybrid_plus_firmware_partition
--- 20101020/build/util/geniso_hybrid_plus_firmware_partition 2010-09-16 19:07:07.000000000 +0000
+++ 20201202/build/util/geniso_hybrid_plus_firmware_partition 2020-04-09 07:06:18.000000000 +0000
@@ -19,7 +19,11 @@ fi
set -e
-isohybrid "$iso"
+# isohybrid's defaults, but let's insure against future changes.
+heads=64
+sectors=32
+
+isohybrid -h "$heads" -s "$sectors" -u "$iso"
# Make the firmware volume.
tmpdir="$(mktemp -d)"
@@ -33,30 +37,25 @@ mkfs.msdos -n "$firmware_volume_name" -C
cat "$firmware_volume_file" >> "$iso"
rm -r "$tmpdir"
+cylinders="$(($(stat -c %s "$iso") / $heads / $sectors))"
+
# Now adjust the partition table of the hybrid iso.
# It has a first partition which is the iso; add a second partition for the
# firmware volume.
(
-# Go into extended menu and set cylinders to 32.
-# This is the same number of cylinders (currently) used by isohybrid.
-echo x
-echo c
-echo 32
-echo r
-
# Make new partition #2
echo n
echo p
-echo 2
-echo
-echo +"$firmware_volume_size_M"M
+echo 3
+echo # use default start sector
+echo # use default end sector
# Pedantically, set partition type to 1: FAT 16
echo t
-echo 2
+echo 3
echo 1
# Done!
echo w
-) | fdisk "$iso"
+) | fdisk -C "$cylinders" -H "$heads" -S "$sectors" "$iso"
diff -pruN 20101020/build/util/gen-sources.list.udeb 20201202/build/util/gen-sources.list.udeb
--- 20101020/build/util/gen-sources.list.udeb 2010-10-20 15:56:38.000000000 +0000
+++ 20201202/build/util/gen-sources.list.udeb 2020-11-30 23:08:26.000000000 +0000
@@ -36,7 +36,8 @@ get_mirrors() {
[ -s $file ] || continue
grep '^deb[[:space:]]' $file | \
grep -v '^deb[[:space:]]\+cdrom:' | \
- grep -v '\(security.debian.org\|volatile.debian.\(net\|org\)\)' | \
+ sed 's,^deb[[:space:]]\+\[[^]]*\][[:space:]]\+,deb ,' | \
+ grep -v 'security.debian.org' | \
grep '[[:space:]]main' | \
awk '{print $1 " " $2}' | \
sed 's,^deb file,deb copy,' | \
@@ -44,8 +45,20 @@ get_mirrors() {
done
}
+# Cache the apt configuration dump, with only the needed namespace
+APT_CONFIG=$(apt-config dump | grep '^Dir::Etc')
+
+# Get the system apt directory
+APT_DIR_ETC=$(echo "$APT_CONFIG" | sed -n -e 's/^Dir::Etc *\"\(.*\)\";$/\1/p')
+
+# Fetch APT's sources.list
+APT_SOURCELIST=$(echo "$APT_CONFIG" | sed -n -e 's/^Dir::Etc::sourcelist *\"\(.*\)\";$/\1/p')
+
+# Fetch APT' sources.list.d
+APT_SOURCEPARTS=$(echo "$APT_CONFIG" | sed -n -e 's/^Dir::Etc::sourceparts *\"\(.*\)\";$/\1/p')
+
# Also use mirrors defined in files in $SOURCES_LIST.d/
-MIRRORS="$(get_mirrors $SOURCES_LIST $SOURCES_LIST.d/*)"
+MIRRORS="$(get_mirrors $SOURCES_LIST /$APT_DIR_ETC/$APT_SOURCELIST /$APT_DIR_ETC/$APT_SOURCEPARTS/*)"
if ! which 'wget' >/dev/null; then
echo "ERROR: the command wget is not available; please install it" >&2
@@ -61,6 +74,11 @@ for mirror in $MIRRORS; do
# We should also check that d-i is available, but that's more complex.
# Settle for just checking the suite/codename for now.
if echo "$mirror" | grep -Eq "^deb (f|ht)tp"; then
+ # Switch to snapshot.debian.org if requested:
+ if [ -n "$SNAPSHOT_TS" ]; then
+ mirror="deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/$SNAPSHOT_TS/"
+ echo "INFO: using snapshot.debian.org with timestamp: $SNAPSHOT_TS" >&2
+ fi
if test_url $tmirror/dists/$SUITE/Release; then
echo "$mirror $SUITE $UDEB_COMPONENTS"
else
@@ -73,6 +91,9 @@ for mirror in $MIRRORS; do
fi
else
echo "$mirror $SUITE $UDEB_COMPONENTS"
+ if [ "$USE_PROPOSED_UPDATES" = 1 ]; then
+ echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
+ fi
fi
done | perl -ne 'print unless $seen{$_}; $seen{$_}=1'
diff -pruN 20101020/build/util/gen-tarball 20201202/build/util/gen-tarball
--- 20101020/build/util/gen-tarball 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/gen-tarball 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Helper script to generate a tarball from a directory, with
+# particular attention to giving reproducible output.
+#
+# Note: if output_file is not an absolute path, it will be assumed
+# relative to the current working directory, not source_directory.
+
+set -e
+
+SOURCE_DIR="$1"
+OUTPUT_FILE="$2"
+
+if [ -z "$SOURCE_DIR" ] || [ -z "$OUTPUT_FILE" ]; then
+ echo "usage: $0 source_directory output_file"
+ exit 1
+fi
+
+# Clamp timestamps to be no later than SOURCE_DATE_EPOCH, if defined in
+# the environment. Typically it is the time of the most recent entry in
+# debian/changelog
+if [ -n "$SOURCE_DATE_EPOCH" ]; then
+ # See https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
+ find "$SOURCE_DIR" -newermt "@$SOURCE_DATE_EPOCH" -print0 | xargs -0r touch --no-dereference --date="@$SOURCE_DATE_EPOCH"
+fi
+
+# Create tarball with files sorted in a stable order, see
+# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs
+# and without timestamp in the gzip header, see
+# https://wiki.debian.org/ReproducibleBuilds/TimestampsInGzipHeaders
+(
+ gzip=$(which pigz >/dev/null 2>&1 && echo "pigz -9 -n -T" || echo "gzip -9 -n")
+ cd "$SOURCE_DIR" && find . -print0 | LC_ALL=C sort -z | tar --no-recursion --null -T - -I "$gzip" -cvf -
+) > "$OUTPUT_FILE"
diff -pruN 20101020/build/util/get-packages 20201202/build/util/get-packages
--- 20101020/build/util/get-packages 2010-09-04 22:16:15.000000000 +0000
+++ 20201202/build/util/get-packages 2020-11-30 23:08:26.000000000 +0000
@@ -69,49 +69,56 @@ cat $LOCALUDEBDIR/Packages | gzip > $LOC
if [ -s $LOCALUDEBDIR/Packages ]; then
echo "*" >&2
echo "* Warning: Building with localudebs." >&2
- echo "* Secure apt validation will be disabled for this build." >&2
echo "* This build should not be used for official purposes." >&2
echo "*" >&2
- SECOPTS="--allow-unauthenticated"
fi
# All these options make apt read the right sources list, and use APTDIR for
# everything so it need not run as root.
-APT_GET="apt-get --assume-yes \
- -o Dir::Etc::sourcelist=`pwd`/$LIST \
- -o Dir::Etc::sourceparts=/dev/null \
- -o Dir::Etc::Preferences=`pwd`/preferences.$TYPE.local \
- -o Dir::State=`pwd`/$APTDIR/state \
- -o Debug::NoLocking=true \
- -o Debug::pkgDepCache::AutoInstall=true \
- -o Dir::Cache=`pwd`/$APTDIR/cache \
- -o Acquire::Retries=3 \
- -o APT::Install-Recommends=false
- -o Apt::Architecture=`dpkg-architecture -qDEB_HOST_ARCH` \
- -o Dir::Etc::trusted="$KEYRING" \
- $SECOPTS"
+export APT_CONFIG="$APTDIR/apt.conf"
+PWD="$(pwd)"
+
+mkdir -p $APTDIR
+cat > "$APT_CONFIG" < $APTDIR/state/status
-if [ "$TYPE" = "deb" ]; then
- APT_GET="$APT_GET -o Dir::State::Status=`pwd`/$APTDIR/state/status"
-else
+if [ "$TYPE" != "deb" ]; then
# Prime status file with a few system libraries that don't
# currently have udebs, or which udebs still depend on for various
# reasons.
echo -n > $APTDIR/state/status
- # Some archs have libc6, others have libc6.1. libgcc1 is not used
- # on all architectures.
- for i in libc0.1 libc0.3 libc6 libc6.1 libnewt0.52 libgcc1; do
+ # libgcc1 and libgcc-s1 are not used on all architectures.
+ # NOTE: Please keep the edos udeb checker in sync with this list:
+ for i in libgcc1:$DEB_HOST_ARCH libgcc-s1:$DEB_HOST_ARCH; do
if dpkg -s $i >/dev/null 2>&1; then
dpkg -s $i | grep -v Depends: >> $APTDIR/state/status
echo >> $APTDIR/state/status
fi
done
- APT_GET="$APT_GET -o Dir::State::Status=`pwd`/$APTDIR/state/status"
fi
# Update package lists and autoclean cache.
@@ -151,7 +158,7 @@ if [ "$KERNELVERSION" ]; then
for KV in $KERNELVERSION; do
KV_COND="${KV_COND:+$KV_COND }-o -XFKernel-Version $KV"
done
- grep-dctrl -! -rFKernel-Version . $KV_COND "$packages" > "$packages.tmp"
+ grep-dctrl -! -rFKernel-Version . $KV_COND "$packages" > "$packages.tmp" || true
ln "$packages" "$packages.orig"
mv "$packages.tmp" "$packages"
done
diff -pruN 20101020/build/util/grub-cpmodules 20201202/build/util/grub-cpmodules
--- 20101020/build/util/grub-cpmodules 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/grub-cpmodules 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,55 @@
+#! /bin/sh
+set -e
+
+# Copyright (C) 2010, 2011 Canonical Ltd.
+# Author: Colin Watson
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Copy GRUB modules.
+
+# TODO: take the modules list as parameter, and only include the needed modules, using moddeps.lst to get dependencies
+
+if [ -z "$1" ] || [ -z "$2" ]; then
+ echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM"
+ exit 1
+fi
+
+outdir="$1"
+platform="$2"
+
+# Copy over GRUB modules, except for those already built in.
+cp -a "/usr/lib/grub/$platform"/*.lst "$outdir/boot/grub/$platform/"
+for x in "/usr/lib/grub/$platform"/*.mod; do
+ # TODO: Some of these exclusions are based on knowledge of module
+ # dependencies. It would be nice to have a way to read the module
+ # list directly out of the image.
+ case $(basename "$x" .mod) in
+ configfile|fshelp|iso9660|memdisk|search|search_fs_file|search_fs_uuid|search_label|tar)
+ # included in boot image
+ ;;
+ affs|afs|afs_be|befs|befs_be|minix|nilfs2|sfs|zfs|zfsinfo)
+ # unnecessary filesystem modules
+ ;;
+ example_functional_test|functional_test|hello)
+ # other cruft
+ ;;
+ *)
+ cp -a "$x" "$outdir/boot/grub/$platform/"
+ ;;
+ esac
+done
+
+exit 0
diff -pruN 20101020/build/util/grub-gencfg 20201202/build/util/grub-gencfg
--- 20101020/build/util/grub-gencfg 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/grub-gencfg 2020-11-30 04:40:24.000000000 +0000
@@ -0,0 +1,256 @@
+#!/usr/bin/perl
+
+# Invoke as:
+#
+# ./gen-grub-cfg KEY1 VAL1 KEY2 VAL2 ... -- COMMAND LINE
+#
+# Keys are:
+# KERNEL Normal kernel to use (required)
+# INITRD Normal initrd to use (required)
+# INITRD_GTK Graphical installer initrd (optional)
+#
+# KERNEL32 Alternative kernel for optional 32-bit entries
+# INITRD32 Alternative initrd for optional 32-bit entries
+# INITRD32_GTK Alternative graphical initrd for optional 32-bit entries
+#
+# THEME_PATH Path (in boot env) where themes are kept
+# HEADER Local path to file cat include as a header
+#
+# At least KERNEL and INITRD must be given.
+#
+# Unsupported:
+# DEBIAN_VERSION
+# BUILD_DATE
+#
+# TODO: Theme generation from template
+#
+# When invoked as:
+#
+# ./gen-grub-cfg \
+# KERNEL "/%install%/vmlinuz" \
+# KERNEL32 "/%install-x86%/vmlinuz" \
+# INITRD "/%install%/initrd.gz" \
+# INITRD32 "/%install-x86%/initrd.gz" \
+# INITRD_GTK "/%install%/gtk/initrd.gz" \
+# INITRD32_GTK "/%install-x86%/gtk/initrd.gz" \
+# THEME_PATH "/boot/grub/theme/" \
+# HEADER "build/boot/x86/grub/grub-efi.cfg" \
+# -- vga=788
+#
+# Will reproduce something similar to
+# debian-testing-amd64-netinst.iso::/boot/grub/grub.cfg weekly build
+# circa 2014-09-27.
+
+use warnings;
+use strict;
+
+my %VARS;
+
+while (@ARGV) {
+ my $key=shift;
+ last if $key eq "--";
+
+ my $value=shift;
+ $VARS{$key}=$value;
+}
+
+my @OPTS = @ARGV;
+
+die "No kernel?" unless $VARS{KERNEL};
+die "No initrd?" unless $VARS{INITRD};
+
+my $graphical = defined $VARS{INITRD_GTK};
+my $thirtytwo = defined $VARS{KERNEL32} && defined $VARS{INITRD32}
+ && (!$graphical || defined $VARS{INITRD32_GTK});
+my $themed = defined $VARS{THEME_PATH};
+
+my @menu_number = (1);
+
+sub print_indented ($)
+{
+ my ($text) = @_;
+ foreach ( split "\n", $text ) {
+ my $i = 1;
+ print " " while ( $i++ < $#menu_number );
+ print "$_";
+ print "\n";
+ }
+}
+
+sub menu_theme ()
+{
+ my $name = join "-", @menu_number;
+}
+sub print_set_theme ($)
+{
+ my ($theme) = @_;
+ return unless $themed;
+
+ print_indented("set theme=$VARS{THEME_PATH}$theme\n");
+}
+
+sub start_submenu ($;%)
+{
+ my ($title,%xattr) = @_;
+
+ $xattr{Hotkey} ||= 0;
+ $xattr{Dark} ||= 0;
+
+ my $hotkey = "";
+ $hotkey = " --hotkey=".$xattr{Hotkey}
+ if $xattr{Hotkey};
+
+ print_indented("submenu$hotkey '$title' {\n");
+
+ my $theme = menu_theme();
+ push @menu_number, 1;
+
+ if ($xattr{Dark})
+ {
+ print_indented("set menu_color_normal=white/black\n");
+ print_indented("set menu_color_highlight=yellow/black\n");
+ print_indented("set color_normal=white/black\n");
+ print_indented("set color_highlight=yellow/black\n");
+ print_indented("background_image\n");
+ }
+ else
+ {
+ print_indented("set menu_color_normal=cyan/blue\n");
+ print_indented("set menu_color_highlight=white/blue\n");
+ }
+ print_set_theme($theme);
+ print_indented("set gfxpayload=keep\n");
+}
+sub end_submenu ()
+{
+ pop @menu_number;
+ $menu_number[$#menu_number]++;
+ print_indented("}\n");
+}
+
+sub menuentry ($;%)
+{
+ my ($title,%xattr) = @_;
+
+ $xattr{ThirtyTwo} ||= 0;
+ $xattr{Graphical} ||= 0;
+
+ $xattr{Hotkey} ||= 0;
+
+ $xattr{Expert} ||= 0;
+ $xattr{Auto} ||= 0;
+ $xattr{Rescue} ||= 0;
+ $xattr{Speech} ||= 0;
+ $xattr{Dark} ||= 0;
+
+ $xattr{Quiet} = !$xattr{Expert} unless defined $xattr{Quiet};
+
+ return if $xattr{Graphical} && !$graphical;
+ return if $xattr{ThirtyTwo} && !$thirtytwo;
+
+ die "automated expert?" if $xattr{Expert} && $xattr{Auto};
+
+ my $kernel = $xattr{ThirtyTwo} ? $VARS{KERNEL32} : $VARS{KERNEL};
+ my $initrd = $xattr{Graphical} ? $VARS{INITRD_GTK} : $VARS{INITRD};
+ $initrd = $xattr{Graphical} ? $VARS{INITRD32_GTK} : $VARS{INITRD32}
+ if $xattr{ThirtyTwo};
+
+ die "no kernel" unless $kernel;
+ die "no initrd" unless $initrd;
+
+ my @cmdline;
+ # Ordering here is to allow diffing against previous versions of this file.
+ push @cmdline, "desktop=$xattr{Desktop}" if $xattr{Desktop};
+ push @cmdline, "priority=low" if $xattr{Expert};
+ push @cmdline, ("auto=true", "priority=critical") if $xattr{Auto};
+ push @cmdline, @OPTS;
+ push @cmdline, "rescue/enable=true" if $xattr{Rescue};
+ push @cmdline, "speakup.synth=soft" if $xattr{Speech};
+ push @cmdline, "theme=dark" if $xattr{Dark};
+ push @cmdline, "---";
+ push @cmdline, "quiet" if $xattr{Quiet};
+
+ my $cmdline = join(" ", @cmdline);
+
+ my $hotkey = "";
+ $hotkey = " --hotkey=".$xattr{Hotkey}
+ if $xattr{Hotkey};
+
+ print_indented (< or die "write header: $!";
+ close(HEADER) or die "close header: $!";
+}
+
+print_set_theme(menu_theme());
+push @menu_number, 1;
+
+menuentry("Install");
+menuentry("Graphical install", Graphical => 1);
+
+start_submenu("Advanced options ...", Hotkey => 'a'); {
+ menuentry("... Graphical expert install", Graphical => 1, Expert => 1);
+ menuentry("... Graphical rescue mode", Graphical => 1, Rescue => 1);
+ menuentry("... Graphical automated install", Graphical => 1, Auto => 1);
+ menuentry("... Expert install", Expert => 1);
+ menuentry("... Rescue mode", Rescue => 1);
+ menuentry("... Automated install", Auto => 1);
+ menuentry("... Expert install with speech synthesis", Expert => 1, Speech => 1, Hotkey => 'x');
+ menuentry("... Rescue mode with speech synthesis", Rescue => 1, Speech => 1, Hotkey => 'r');
+ menuentry("... Automated install with speech synthesis", Auto => 1, Speech => 1, Hotkey => 'a');
+
+ start_submenu("... Desktop environment menu ..."); {
+
+ foreach ( ["GNOME", "gnome"], ["KDE Plasma", "kde"], ["LXDE", "lxde"] ) {
+ my ($desktop,$opt) = @{$_};
+
+ my $one = sub { my ($title, %xargs) = @_;
+ $xargs{Desktop} = $opt;
+ menuentry($title, %xargs);
+ };
+ start_submenu("... $desktop desktop boot menu ..."); {
+ $one->("... Install");
+ $one->("... Graphical install", Graphical => 1);
+
+ start_submenu("... $desktop advanced options ..."); {
+ $one->("... Graphical expert install", Graphical => 1, Expert => 1);
+ $one->("... Graphical automated install", Graphical => 1, Auto => 1);
+ $one->("... Expert install", Expert => 1);
+ $one->("... Automated install", Auto => 1);
+ $one->("... Expert install with speech synthesis", Expert => 1, Speech => 1, Hotkey => 'x');
+ $one->("... Automated install with speech synthesis", Auto => 1, Speech => 1, Hotkey => 'a');
+ } end_submenu(); # $desktop advanced
+
+ $one->("... Install with speech synthesis", Graphical => 1, Speech => 1, Hotkey => 's');
+ $one->("... 32 bit speech install", ThirtyTwo => 1, Graphical => 1, Speech => 1)
+ if $thirtytwo;
+ } end_submenu(); # $desktop submenu
+ } # Desktop loop
+ } end_submenu(); # Desktop submenu
+} end_submenu(); # Advanced
+
+start_submenu("Dark theme option...", Hotkey => 'd', Dark => 1); {
+ menuentry("... Install", Dark => 1);
+ menuentry("... Graphical install", Graphical => 1, Dark => 1);
+
+ start_submenu("... Advanced options ...", Hotkey => 'a', Dark => 1); {
+ menuentry("... Graphical expert install", Graphical => 1, Expert => 1, Dark => 1);
+ menuentry("... Graphical rescue mode", Graphical => 1, Rescue => 1, Dark => 1);
+ menuentry("... Graphical automated install", Graphical => 1, Auto => 1, Dark => 1);
+ menuentry("... Expert install", Expert => 1, Dark => 1);
+ menuentry("... Rescue mode", Rescue => 1, Dark => 1);
+ menuentry("... Automated install", Auto => 1, Dark => 1);
+ } end_submenu(); # Advanced visually-impaired
+} end_submenu(); # Visually-impaired
+
+menuentry('Install with speech synthesis', Graphical => $graphical, Speech => 1, Hotkey => 's')
diff -pruN 20101020/build/util/pkg-list 20201202/build/util/pkg-list
--- 20101020/build/util/pkg-list 2009-09-29 22:57:23.000000000 +0000
+++ 20201202/build/util/pkg-list 2020-04-09 07:06:18.000000000 +0000
@@ -234,10 +234,10 @@ sub getlists {
next unless length;
# normal kernel version substitution
- if (/\${kernel:Version}/) {
+ if (/\$\{kernel:Version\}/) {
foreach my $v (@kernel_versions) {
my $l=$_;
- $l=~s/\${kernel:Version}/$v-$kernel_flavour/g;
+ $l=~s/\$\{kernel:Version\}/$v-$kernel_flavour/g;
collectpackage($l, \%collect, \%exclude, \@postponed);
}
next; # move on to the next line
diff -pruN 20101020/build/util/syslinux-cfgs 20201202/build/util/syslinux-cfgs
--- 20101020/build/util/syslinux-cfgs 2010-01-11 15:35:44.000000000 +0000
+++ 20201202/build/util/syslinux-cfgs 2020-04-09 07:06:18.000000000 +0000
@@ -5,7 +5,7 @@ set -e
# If called with two arguments (source and destination dir), the script will
# create a syslinux configuration; if called with only one argument, it will
# list the files for the created configuration.
-# The variables TYPE, DESKTOP and INCLUDE_GTK - which determine the contents
+# The variables TYPE and INCLUDE_GTK - which determine the contents
# of the created syslinux configuration - should be set in the environment.
# See also the x86_syslinux target in build/config/x86.cfg and the
@@ -19,7 +19,15 @@ DST="$2"
if [ -z "$DST" ]; then
# Only list config files
cd "$SRC"
- find . -type f | sed "s:\./::"
+ # spk.cfg is only meant for the netboot-gtk image which has the gtk
+ # initrd at the root instead of gtk/
+ if [ "$IS_PURE_GTK" = 1 ]
+ then
+ FILTER=
+ else
+ FILTER="! -name spk.cfg ! -name adspk.cfg ! -name rqspk.cfg"
+ fi
+ find . -type f $FILTER | LC_ALL=C sort | sed "s:\./::"
exit 0
elif [ ! -d "$DST" ]; then
exit 1
@@ -28,72 +36,41 @@ fi
# Create config for default desktop environment
create_standard_config() {
cp "$SRC"/syslinux.cfg "$SRC"/menu.cfg "$SRC"/stdmenu.cfg \
- "$SRC"/prompt.cfg "$SRC"/exithelp.cfg "$DST"/
- cp "$SRC"/{,ad,rq}txt.cfg "$DST"/
+ "$SRC"/drkmenu.cfg "$SRC"/prompt.cfg "$SRC"/exithelp.cfg "$DST"/
+ cp "$SRC"/{,ad,rq}{txt,drk}.cfg "$DST"/
if [ -n "$INCLUDE_GTK" ]; then
- cp "$SRC"/{ad,rq,}gtk.cfg "$DST"/
+ cp "$SRC"/{ad,rq,}{,spk,drk}gtk.cfg "$DST"/
+ fi
+ if [ "$IS_PURE_GTK" = 1 ]; then
+ cp "$SRC"/{,ad,rq}spk.cfg "$DST"/
fi
-}
-
-# Add config for alternative desktop environments
-add_desktop_configs() {
- local desktop title
-
- cp "$SRC"/dtmenu.cfg "$DST"/
-
- for desktop in kde xfce lxde; do
- mkdir "$DST"/$desktop
-
- cp "$SRC"/desktop/menu.cfg "$SRC"/desktop/prompt.cfg \
- "$SRC"/desktop/prmenu.cfg "$DST"/$desktop/
- cp "$SRC"/{,ad}txt.cfg "$DST"/$desktop/
- cp "$SRC"/desktop/{,ad}txtdt.cfg "$DST"/$desktop/
- if [ -n "$INCLUDE_GTK" ]; then
- cp "$SRC"/{,ad}gtk.cfg "$DST"/$desktop/
- cp "$SRC"/desktop/{,ad}gtkdt.cfg "$DST"/$desktop/
- fi
-
- case $desktop in
- kde) title=KDE ;;
- xfce) title=Xfce ;;
- lxde) title=LXDE ;;
- esac
- sed -i "s/%desktop%/$desktop/
- s/%dt-name%/$title/" "$DST"/$desktop/*.cfg
- done
}
case $TYPE in
template)
cp -r "$SRC"/*.cfg "$DST"/
- mkdir "$DST"/desktop
- cp -r "$SRC"/desktop/*.cfg "$DST"/desktop/
if [ -z "$INCLUDE_GTK" ]; then
- rm -f "$DST"/*gtk.cfg "$DST"/desktop/*{gtk,ag}dt.cfg
+ rm -f "$DST"/*gtk.cfg
+ fi
+ if [ "$IS_PURE_GTK" != 1 ]; then
+ rm -f "$DST"/*spk.cfg
fi
exit 0
;;
prompt)
cp "$SRC"/prompt.cfg "$DST"/syslinux.cfg
cp "$SRC"/menu.cfg "$DST"/
- cp "$SRC"/{,ad,rq}txt.cfg "$DST"/
+ cp "$SRC"/{,ad,rq}{txt,drk}.cfg "$DST"/
+ if [ "$IS_PURE_GTK" = 1 ]; then
+ cp "$SRC"/{,ad,rq}spk.cfg "$DST"/
+ fi
;;
standard)
create_standard_config
;;
- all-desktop)
- create_standard_config
- add_desktop_configs
- ;;
*)
exit 1
;;
esac
-# Set the default desktop environment, or remove if not applicable
-if ([ "$TYPE" = prompt ] || [ "$TYPE" = standard ]) && \
- [ -n "$DESKTOP" ]; then
- sed -i "s/%desktop%/$DESKTOP/" "$DST"/*.cfg
-else
- sed -i "s/desktop=%desktop% //" "$DST"/*.cfg
-fi
+sed -i "s/desktop=%desktop% //" "$DST"/*.cfg
diff -pruN 20101020/build/util/tftpboot.sh 20201202/build/util/tftpboot.sh
--- 20101020/build/util/tftpboot.sh 2008-10-27 10:43:23.000000000 +0000
+++ 20201202/build/util/tftpboot.sh 2020-04-09 07:06:18.000000000 +0000
@@ -59,7 +59,7 @@ gzip -cdq $sysmap > $tmp || true
# append rootimage to the kernel
case "$arch" in
- sparc)
+ sparc | sparc64)
elftoaout -o $tftpimage $tftpimage.tmp
# Piggyback appends the ramdisk to the a.out image in-place
piggyback64 $tftpimage $tmp $rootimage
diff -pruN 20101020/build/util/write-built-using 20201202/build/util/write-built-using
--- 20101020/build/util/write-built-using 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/write-built-using 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo -n "initrd:Built-Using=" >> debian/debian-installer.substvars
+cat build/tmp/*/built-using.txt \
+ | sort -u \
+ | tr "\n" "," \
+ | sed 's/,/, /g;s/, $//g' >> debian/debian-installer.substvars
+echo >> debian/debian-installer.substvars
+
+EXTRA_PACKAGES="bf-utf-source syslinux u-boot-imx u-boot-omap u-boot-sunxi u-boot-rockchip arm-trusted-firmware
+grub-efi-amd64-signed grub-efi-ia32-signed grub-efi-arm64-signed grub-common"
+echo -n "extra:Built-Using=" >> debian/debian-installer.substvars
+for package in $EXTRA_PACKAGES; do
+ if dpkg-query -f '${db:Status-Status}' -W $package 2>/dev/null | grep -q ^installed$; then
+ dpkg-query -f '${source:Package} (= ${source:Version}), ' -W $package 2>/dev/null
+ dpkg-query -f '${Built-Using}, ' -W $package 2>/dev/null
+ else
+ echo "INFO: $package not installed, not added to Built-Using" >&2
+ fi
+done >> debian/debian-installer.substvars
+echo >> debian/debian-installer.substvars
diff -pruN 20101020/build/util/x86-image 20201202/build/util/x86-image
--- 20101020/build/util/x86-image 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/x86-image 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,57 @@
+#! /bin/sh
+set -e
+
+# Copyright (C) 2010, 2011 Canonical Ltd.
+# Author: Colin Watson
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Make an x86 boot image.
+
+if [ -z "$1" ] || [ -z "$2" ]; then
+ echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME"
+ exit 1
+fi
+
+outdir="$1"
+platform="$2"
+efi_name="$3"
+
+memdisk_img=
+workdir=
+
+cleanup () {
+ [ -z "$memdisk_img" ] || rm -f "$memdisk_img"
+ [ -z "$workdir" ] || rm -rf "$workdir"
+}
+trap cleanup EXIT HUP INT QUIT TERM
+
+rm -rf "$outdir"
+mkdir -p "$outdir"
+
+memdisk_img="$(mktemp x86-image.XXXXXX)"
+workdir="$(mktemp -d x86-image.XXXXXX)"
+
+mkdir -p "$outdir/boot/grub/$platform"
+
+# Build the core image.
+grub-mkimage -p '/boot/grub' -O "$platform" -o "$workdir/core.img" iso9660 biosdisk
+
+cat "/usr/lib/grub/$platform/cdboot.img" "$workdir/core.img" > "$outdir/boot/grub/grub_eltorito"
+cat "/usr/lib/grub/$platform/boot.img" "$workdir/core.img" > "$outdir/boot/grub/grub_embed"
+
+grub-cpmodules "$outdir" "$platform"
+
+exit 0
diff -pruN 20101020/build/util/xen/build_modules 20201202/build/util/xen/build_modules
--- 20101020/build/util/xen/build_modules 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/build/util/xen/build_modules 2020-04-09 07:06:18.000000000 +0000
@@ -0,0 +1,88 @@
+#!/bin/bash
+# Assemble several modules into one single Xen domU payload
+OUTPUT=$1
+shift
+NBMODS=$(($# / 2))
+if [ -z "$OUTPUT" -o "$#" = 0 -o $(($NBMODS * 2)) != "$#" ]
+then
+ echo "usage: $0 output mod1 \"arg1_0 arg1_1 arg1_2...\" mod2 \"arg2_0 arg2_1 arg2_2...\""
+ exit 1
+fi
+
+echo "$NBMODS modules"
+
+# each module header is 4*4 bytes
+HEAD=$(($NBMODS * 16))
+# default to align to 4K pages
+ALIGN=4096
+
+NEW=$OUTPUT.new
+
+DD="dd of=$NEW bs=1 status=noxfer"
+# start from empty file
+$DD if=/dev/zero count=0 2> /dev/null
+DD="$DD conv=notrunc"
+
+number32_le() {
+ N=$1
+
+ for i in `seq 1 4`; do
+ TOPRINT=$((N % 256))
+ echo -en '\0'`printf %o $TOPRINT`
+ N=$((N / 256))
+ done
+}
+
+CUR_HEAD=0
+CUR=$ALIGN
+while [ "$#" -gt 0 ]
+do
+ echo "$1 $2"
+
+ # Write module
+ MOD_LEN=`stat -L -c%s "$1"`
+ MOD_USED=$(( ( ( $MOD_LEN + $ALIGN - 1 ) / $ALIGN ) * $ALIGN ))
+ printf "%#010x(%#010x) at %#010x\n" $MOD_LEN $MOD_USED $CUR
+
+ $DD bs=$ALIGN if="$1" seek=$(($CUR / $ALIGN)) 2> /dev/null
+
+ # Module start
+ number32_le $CUR | $DD seek=$CUR_HEAD 2> /dev/null
+ CUR_HEAD=$((CUR_HEAD + 4))
+ # Module end
+ number32_le $((CUR + $MOD_LEN)) | $DD seek=$CUR_HEAD 2> /dev/null
+ CUR_HEAD=$((CUR_HEAD + 4))
+
+ CUR=$(($CUR + $MOD_USED))
+
+ # Write string
+ STR=`echo "$2"`
+ STR_LEN=${#STR}
+ STR_USED=$(( ( ( $STR_LEN + 1 + $ALIGN - 1 ) / $ALIGN ) * $ALIGN ))
+ printf "cmdline %#010x(%#010x) at %#010x\n" $STR_LEN $STR_USED $CUR
+
+ echo "$2" | $DD seek=$CUR 2> /dev/null
+
+ # String start
+ number32_le $CUR | $DD seek=$CUR_HEAD 2> /dev/null
+ CUR_HEAD=$((CUR_HEAD + 4))
+
+ CUR=$(($CUR + $STR_USED))
+
+ # Padding
+ CUR_HEAD=$((CUR_HEAD + 4))
+
+ shift
+ shift
+done
+
+# Make sure to have a NULL entry
+CUR_HEAD=$((CUR_HEAD + 4))
+
+if [ $CUR_HEAD -gt $ALIGN ]
+then
+ echo "$CUR_HEAD > $ALIGN: Too many modules or too big command lines"
+ exit 3
+fi
+
+mv "$NEW" "$OUTPUT"
diff -pruN 20101020/debian/changelog 20201202/debian/changelog
--- 20101020/debian/changelog 2010-10-20 20:56:41.000000000 +0000
+++ 20201202/debian/changelog 2020-12-02 13:30:20.000000000 +0000
@@ -1,8 +1,1999 @@
+debian-installer (20201202) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI to 5.9.0-3
+ * Drop fontconfig tweaks introduced in version 20170828 (See: #873462):
+ - Full hinting support was removed upstream, in pango 1.44.
+ - Forcing truetype:interpreter-version=35 through FREETYPE_PROPERTIES
+ now leads to arguably worse rendering than with default settings.
+ * With or without the aforementioned changes, the rendering looks much
+ worse than it used to (until Debian Installer Bullseye Alpha 3), due
+ to a behavioral change in pango. Since it affects default fonts, and
+ not only in the installer's context, one might have hoped for a fix
+ at some point but that doesn't seem to be happening. We might try to
+ use different fonts to try and dodge this issue… Until then, here
+ are some pointers to bugtracker entries:
+ - https://bugs.debian.org/956612
+ - https://gitlab.gnome.org/GNOME/pango/-/issues/404
+ - https://github.com/harfbuzz/harfbuzz/issues/1892
+ * Convert doc/devel/anna-install.txt to UTF-8.
+ * Clean whitespaces in doc/i18n/ChangeLog, making it UTF-8.
+ * Update translation-status for the release.
+
+ [ Vagrant Cascadian ]
+ * Update Firefly-RK3288 image for new u-boot version.
+ * [arm64] Add support for firefly-rk3399, pinebook-pro-rk3399,
+ rockpro64-rk3399, rock64-rk3328 and rock-pi-4-rk3399 to u-boot images
+ and netboot SD card images.
+ * [arm64] Make all netboot sdcard images start at offset 32768, for
+ compatibility with rockchip platforms.
+
+ [ Lubomir Rintel ]
+ * Add OLPC XO-1.75 laptop support. Closes: #949306
+
+ [ Aurelien Jarno ]
+ * Drop build-dependency on libgcc1. It has been renamed and it is not
+ needed since r62791.
+ * Add libgcc-s1 to the fake packages list as it doesn't have an udeb just
+ like libgcc1. Remove libc* and libnewt0.52 from that list.
+ * Install kmod-udeb instead of libkmod2-udeb now that the library and the
+ binaires are properly packaged in different udebs.
+ * Remove the mklibs library reduction pass. Add a hack to copy
+ libgcc_s.so.[124] from the host filesystem as it is not done anymore by
+ mklibs. This needs to be replaced by a proper udeb.
+ * Add explicit build-depends on fdisk on arm64, amd64 and i386 now that
+ util-linux doesn't depends on it anymore.
+
+ [ Wookey, Steve McIntyre, Alper Nebi Yasak ]
+ * Enable gtk build for arm64
+
+ [ Domenico Andreoli ]
+ * Add support for NanoPi NEO Air. Closes: #928863
+
+ [ Holger Wansing]
+ * d-i i18n guide: update for util-linux's eject overtaking.
+ * Add Occitan as new language for the installer (thanks to Quentin PAGÈS).
+
+ [ Steve McIntyre ]
+ * Tweaks for efi-image:
+ + Improve sizing calculation to reduce wasted space
+ + Include DTB files in the ESP for armhf and arm64 systems. Should
+ make U-Boot based systems work better when booting via UEFI
+ * Fix build failures related to #940056 "fakeroot does not fake
+ statx()". Don't use "ls" to check if /dev/console is a character
+ device, instead use "file". Thanks to JH Chatenet for helping to
+ debug this.
+
+ [ Samuel Thibault ]
+ * Copy over libmach/hurduser, until the fixed glibc is installed.
+ * Fix monolithic hurd build by excluding more packages.
+
+ [ Jessica Clarke ]
+ * kfreebsd: Update to use debian-ports-archive-keyring.
+ * kfreebsd: Don't try to build build_cdrom_gtk on kfreebsd-i386.
+
+ [ Julien Cristau ]
+ * Add grub2 to built-using (closes: #968998).
+
+ [ Ben Hutchings ]
+ * Add wireless-regdb-udeb to Linux builds that include nic-wireless-modules
+
+ [ Alper Nebi Yasak ]
+ * Include a /gtk/initrd.gz in graphical arm mini.iso builds
+ * Include fb-modules in non-gtk arm64 cdrom builds as well
+ * Build concatenateable images for arm64 netboot-gtk
+
+ [ John Paul Adrian Glaubitz ]
+ * powerpc: Add cdrom-core-modules and isofs-modules to cdrom pkg-lists
+ * ppc64: Add cdrom-core-modules and isofs-modules to cdrom pkg-lists
+
+ -- Cyril Brulebois Wed, 02 Dec 2020 14:30:20 +0100
+
+debian-installer (20200314) unstable; urgency=medium
+
+ [ John Paul Adrian Glaubitz ]
+ * hppa: Strip -smp suffix from 64-bit kernel version string.
+
+ [ YunQiang Su ]
+ * Switch from vmlinux to vmlinuz for mips* except on Octeon.
+
+ [ Raphaël Hertzog ]
+ * Make write-built-using more robust.
+
+ [ Vagrant Cascadian ]
+ * Update Firefly-RK3288 image for new u-boot version.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI to 5.4.0-4
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Sat, 14 Mar 2020 08:16:10 +0100
+
+debian-installer (20191129) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * hurd-i386: Set USE_UNRELEASED to 1.
+ * gen-sources.list.udeb: Allow to have several spaces around [] qualifiers in
+ sources.list entries.
+ * build/boot/x86: Restore 'd' shortcut for the dark theme. 'c' can obviously
+ not work in grub (Closes: #935545).
+ * build/util/grub-gencfg: Set gfxpayload=keep in submenus too, to fix
+ unreadable fonts on hidpi displays in netboot images booted with EFI.
+ (See: #935546)
+ * Add hurd-i386 EFI support.
+
+ [ Karsten Merker ]
+ * riscv64: Include nic-modules and scsi-modules for virtio targets
+ such as the qemu riscv64 "virt" machine. In recent kernel versions
+ the virtio-modules udeb has been removed and the various virtio
+ modules have been included in other module udebs (virtio_blk is now
+ in scsi-modules and virtio_net is now in nic-modules).
+ * riscv64: Create a netboot tarball.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI from 4.19.0-5 to 5.3.0-2
+ * Target bullseye.
+ * Not updating translation-status on purpose.
+
+ [ Martin Michlmayr ]
+ * Remove images for QNAP TS-11x/TS-21x/HS-21x, QNAP TS-41x/TS-42x
+ and HP Media Vault mv2120 due to size problems with the Linux
+ kernel.
+
+ [ John Paul Adrian Glaubitz ]
+ * Always force USE_PROPOSED_UPDATES=0 for Debian Ports architectures.
+
+ [ Andreas B. Mundt ]
+ * ARM: sunxi: Add support for Olimex A20-OLinuXino-Lime2-eMMC.
+
+ [ Holger Wansing ]
+ * Remove trailing whitespaces from changelog, control and rules file, to
+ fix lintian tag.
+
+ [ Osamu Aoki ]
+ * partman-doc: Convert to DocBook XML 4.5 (Closes: #907970)
+
+ [ Steve McIntyre ]
+ * Tweak mini.iso generation on arm so EFI netboot will work.
+
+ -- Cyril Brulebois Fri, 29 Nov 2019 08:50:51 +0100
+
+debian-installer (20190702) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Rebuild to pick up the last changes for D-I Buster RC 3.
+
+ [ John Paul Adrian Glaubitz ]
+ * ia64: Add grub stub configuration file grub-efi.cfg.
+ * sparc: Remove VERSIONED_SYSTEM_MAP from config file.
+ * sparc64: Remove VERSIONED_SYSTEM_MAP from config file.
+
+ -- Cyril Brulebois Tue, 02 Jul 2019 00:39:57 +0200
+
+debian-installer (20190623) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Add haveged-udeb [linux] to the pkg-lists/base, so that entropy
+ starvation issues can be avoided (Closes: #923675). To be used
+ by S50entropy-source in rootskel.
+ * Bump Linux kernel ABI from 4.19.0-4 to 4.19.0-5
+ * Drop volatile.debian.{net,org} exclusion from gen-sources.list.udeb,
+ they went away with Squeeze(!).
+ * Update translation-status for the release.
+
+ [ Samuel Thibault ]
+ * Make hurd-i386 use debian-ports keyring and include
+ debian-ports-archive-keyring-udeb.
+ * Add œŒ glyphs for the french translation.
+ * Make hurd and kfreebsd boot menu use new theme.
+ * Update size limits.
+ * Relabel "dark theme" entry to "accessible high contrast" entry
+ (Closes: #930569)
+
+ [ John Paul Adrian Glaubitz ]
+ * alpha: Add pata-modules to cdrom package list.
+ * ia64: Add sata-modules to cdrom package list.
+ * ia64: Switch bootloader from elilo to grub-efi-ia64.
+ * powerpc: Switch bootloader from yaboot to grub-ieee1275.
+ * ppc64: Switch bootloader from yaboot to grub-ieee1275.
+ * sh4: Set KERNELVERSION to LINUX_KERNEL_ABI.
+ * sparc: Strip KERNELVERSION suffix from KERNELNAME.
+ * sparc: Switch bootloader from silo to grub-ieee1275.
+ * sparc64: Strip KERNELVERSION suffix from KERNELNAME.
+ * sparc64: Switch bootloader from silo to grub-ieee1275.
+
+ [ Vagrant Cascadian ]
+ * [arm64] Add u-boot images for a64-olinuxino, orangepi_zero_plus2 and
+ teres_i.
+ * [arm64] Update Build-Depends to u-boot-sunxi (>= 2019.01+dfsg-5).
+ * [armhf] Compress u-boot images with "gzip -n" to avoid embedding
+ timestamps which cause reproducibility issues.
+
+ [ Domenico Andreoli ]
+ * Add support for NanoPi NEO2
+
+ [ Vagrant Cascadian ]
+ * [arm64] Add support for netboot SD-card-images.
+
+ [ Steve McIntyre ]
+ * Add Build-Depends on shim-signed and grub-efi-ARCH-signed for
+ amd64/i386/arm64
+ * Use the signed shim and grub for all 3 arches for EFI images
+ * efi-image: use an extra command-line arg to track if we should be
+ using signed grub and shim etc.
+
+ -- Cyril Brulebois Sun, 23 Jun 2019 21:53:21 +0200
+
+debian-installer (20190410) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Bump debhelper build-dep and compat from 7 to 11. Finally!
+ * Fix “build-depends-on-1-revision build-depends u-boot-rockchip”,
+ thanks to lintian.
+ * Set dpkg source format explicitly as both dpkg-source and lintian
+ are being excessively noisy.
+ * Drop source.lintian-overrides: the only override was about the
+ e2fsprogs build-dependency when it was still “Essential: yes”; as
+ anticipated it's now only “Priority: required”.
+ * Bump Standards-Version from 3.9.5 to 4.3.0; no changes required, with
+ the usual exception regarding network access.
+ * Review and merge Chris Lamb's work making d-i build reproducibly
+ (Closes: #900918), with many thanks! Remaining issues seem related to
+ fontconfig's cache and xorriso calls.
+ * gen-tarball: specify the complete gzip command through a tar option
+ instead of using the now-deprecated GZIP environment variable.
+ * gen-tarball: use pigz if available, reducing build time.
+ * Bump Linux kernel ABI from 4.19.0-1 to 4.19.0-4
+ * Update translation-status for the release.
+
+ [ Chris Lamb ]
+ * Set BUILD_DATE based on SOURCE_DATE_EPOCH, rather than the other way
+ around.
+ * Ensure the GRUB memdisk images do not vary on filesystem ordering.
+ * Ensure the GRUB memdisk images do not vary on filesystem timestamps.
+ * Ensure that generated EFI images have a determinstic FAT volume ID.
+ * When generating CPIO archives (initramfs, etc), ensure they are
+ reproducible.
+ * build/Makefile: Add a clamp_mtimes utility to avoid DRY violations.
+ * 'clamp' the mtimes of various files before they are added to archives
+ or media.
+ * Specify --invariant to mkfs.fat(8) to ensure deterministic filesystem
+ timestamps.
+ * Increase the BUILD_DATE resolution to include the seconds component.
+ * Clamp mtimes of the final build results in the destination directory.
+ * Ensure that running the 'release' target does not alter the mtimes
+ under dest/.
+ * debian/control: Document that #900409 and #900410 are required for a
+ reproducible build.
+ * Ensure build is reproducible regardless of the user's
+ umask(2). (Closes: #920631)
+ * Ensure build is reproducible regardless of the underlying filesystem
+ ordering. (Closes: #920676)
+
+ [ John Paul Adrian Glaubitz ]
+ * config: Set DEBIAN_RELEASE to unstable for all architectures
+ in Debian Ports. (Closes: #920353)
+ * pkg-lists: Add debian-ports-archive-keyring-udeb package for all
+ architectures in Debian Ports for cdrom and netboot images.
+
+ [ Holger Wansing ]
+ * Add dark theme shortcut (Closes: #820911)
+
+ [ Samuel Thibault ]
+ * Rework dark theme shortcut.
+ * Introduce dark menu theme.
+ * Fix loading background image on netboot grub.
+
+ [ Ben Hutchings ]
+ * armel: Delete unused package list for ixp4xx (Closes: #921951)
+
+ [ Vagrant Cascadian ]
+ * [armhf] Add images for Novena.
+ * Update versioned Build-Depends on u-boot-imx.
+ * [armhf] Add images for BananaPiM2Berry. Thanks to Lucas Nussbaum.
+ * Update versioned Build-Depends on u-boot-sunxi.
+
+ [ Steve McIntyre ]
+ * Switch to using buster artwork for the splash screen
+
+ -- Cyril Brulebois Wed, 10 Apr 2019 20:55:32 +0200
+
+debian-installer (20190118) unstable; urgency=medium
+
+ [ Vagrant Cascadian ]
+ * [arm64] Use arm-trusted-firmware instead of atf-allwinner to build
+ pine64_plus and pinebook images.
+
+ [ John Paul Adrian Glaubitz ]
+ * alpha: Clean up formatting of build configuration file.
+ * alpha: Remove fb-modules from cdrom and netboot package lists.
+ * hppa: Clean up formatting of build configuration file.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI from 4.18.0-3 to 4.19.0-1
+ * Update translation-status for the release.
+
+ [ Vagrant Cascadian ]
+ * [armhf] Re-enable Firefly-RK3288 image.
+ * [armhf] Update Build-Depends for u-boot-rockchip.
+ * Add u-boot-rockchip to Built-Using.
+
+ -- Cyril Brulebois Fri, 18 Jan 2019 21:43:12 +0100
+
+debian-installer (20181206) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Update translation-status post-release.
+ * Bump Linux kernel ABI from 4.16.0-2 to 4.18.0-3
+ * Update translation-status for the release.
+
+ [ Andreas B. Mundt ]
+ * Make netboot.tar.gz archive structure for armhf identical to all other
+ architectures: Add top level directory ./ and a version.info file to
+ the archive (closes: #902020).
+
+ [ Raphaël Hertzog ]
+ * Replace ttf-freefont-udeb by fonts-freefont-udeb as the former has been
+ removed from unstable (and thus testing).
+
+ [ John Paul Adrian Glaubitz ]
+ * Add missing build dependency on debian-ports-archive-keyring for alpha,
+ hppa, ia64, m68k, powerpc, powerpcspe, ppc64, riscv64 and x32.
+ * ia64: Set KEYRING to debian-ports in build configuration.
+ * powerpc: Set KEYRING to debian-ports in build configuration.
+ * ppc64: Set KEYRING to debian-ports in build configuration.
+
+ [ Philip Hands ]
+ * fix a couple of remaining alioth references.
+
+ [ Karsten Merker ]
+ * Add basic riscv64 support.
+
+ [ Samuel Thibault ]
+ * Keep grub resolution in EFI boot, to avoid tiny fonts (closes: #910227).
+
+ [ Vagrant Cascadian ]
+ * [armhf] Remove Firefly-RK3288 image, as u-boot fails to boot due to
+ #898520.
+ * Remove u-boot-rockchip from Built-Using, as no targets use it.
+
+ [ Holger Wansing]
+ * Fix not-working F10 key function in help pages of boot screen.
+
+ [ Luigi Toscano ]
+ * Change some references of "KDE" into "KDE Plasma". Closes Salsa MR !4.
+
+ [ Vagrant Cascadian ]
+ * [arm64] Add u-boot image for pinebook.
+ * [armhf] Add image for Sinovoip_BPI_M3. Thanks to Bernhard.
+
+ [ YunQiang Su ]
+ * [mips*el/loongson-3] add input modules to netboot image (Closes: #911664).
+
+ [ Vagrant Cascadian ]
+ * [armel] Disable OpenRD targets, no longer present in u-boot.
+
+ -- Cyril Brulebois Wed, 05 Dec 2018 17:47:54 +0000
+
+debian-installer (20180610) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI from 4.13.0-1 to 4.16.0-2
+ * Replace c_rehash with openssl rehash (Closes: #895074). That should only
+ affect builds with SSL_CERTS enabled; regular HTTPS support comes from
+ ca-certificates anyway.
+ * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
+ * Set Acquire::Languages to none since translations aren't needed.
+ * Avoid warnings regarding missing /etc/apt/{apt.conf.d,preferences.d}
+ by setting their respective apt config variables to /dev/null.
+ * Duplicate Apt::Architecture into Apt::Architectures because of course
+ apt has two options, the latter getting foreign architectures if not
+ specified, even if the former is.
+ * Run fc-cache when /etc/fonts or /usr/share/fonts exist, to avoid
+ having to generate UUIDs at runtime, which can be hard because of
+ missing entropy (Closes: #898468).
+ * Add fontconfig to Build-Depends accordingly.
+
+ [ Paul Tagliamonte ]
+ * Add support for the NanoPiNeo
+
+ [ Aurelien Jarno ]
+ * Drop the build-depends on libnewt0.52, the library now provides an udeb.
+
+ [ Vagrant Cascadian ]
+ * [arm64] Generate u-boot media for pine64_plus:
+ - Add Build-Depends on u-boot-sunxi, atf-allwinner, u-boot-tools and
+ device-tree-compiler.
+ - Add atf-allwinner to Built-Using.
+ * [armhf] netboot: Enable grub-efi mini.iso.
+
+ [ John Paul Adrian Glaubitz ]
+ * hppa: Use compressed kernel image by default.
+ * sparc64: Use xz compression for initrd during netboot image build.
+
+ [ Paul Wise ]
+ * Switch get-packages from setting apt-get options through the command
+ line to writing a configuration file referred to by APT_CONFIG. The
+ latter should ensure a stricter separation from the system config.
+
+ [ Samuel Thibault ]
+ * Do not create /dev/console and /dev/null on hurd-any, they are initialized
+ at runtime.
+
+ [ Vagrant Cascadian ]
+ * [armhf] Add support for Cubietruck_plus.
+
+ -- Cyril Brulebois Sun, 10 Jun 2018 23:48:13 +0200
+
+debian-installer (20171204) unstable; urgency=medium
+
+ [ John Paul Adrian Glaubitz ]
+ * m68k: Add pata-modules to cdrom package list.
+ * m68k: Add ide-core-modules and ide-modules to cdrom package list.
+ * m68k: Use uncompressed kernel image by default.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI from 4.12.0-1 to 4.12.0-2.
+ * Add support for SNAPSHOT_TS to use a specific timestamp of the Debian
+ archive on snapshot.debian.org instead of the detected mirror; disable
+ Valid-Until check when this is requested, since signatures are likely
+ expired. Most useful for bisecting when a specific regression was
+ introduced. (See: #872598)
+ * Update translation-status for the release.
+
+ [ Karsten Merker ]
+ * Bump Linux kernel ABI from 4.12.0-2 to 4.13.0-1
+
+ [ Raphaël Hertzog ]
+ * Update the hd-media image to include udebs required to detect
+ LVM logical volumes too (so that we can find the ISO in logical
+ volumes too). Closes: #868852
+
+ -- Cyril Brulebois Mon, 04 Dec 2017 08:25:55 +0100
+
+debian-installer (20170828) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel ABI from 4.9.0-3 to 4.11.0-2.
+ * Update translation-status for the release.
+ * Adjust fontconfig's hinting and freetype's interpreter version to keep
+ the original rendering in the graphical installer for the time being
+ (See: #873462).
+ * Update build/config/common and debian/rules to perform release builds
+ against buster now that stretch has been released.
+
+ [ Martin Michlmayr ]
+ * Drop orion5x-qnap image.
+ * Remove NSLU2 related build dependencies.
+
+ [ Vagrant Cascadian ]
+ * [armhf] Fix build of Firefly-RK3288 images with recent u-boot
+ versions. (Closes: #870615)
+
+ [ Aurelien Jarno ]
+ * debian/control: do not build-depends on -pic libraries, that is not
+ needed anymore since the switch to mklibs-copy.
+
+ [ Karsten Merker ]
+ * Add a build-dependency on "fdisk | util-linux (<< 2.29.2-3~)" for armhf.
+ util/gen-hd-image uses sfdisk when creating SD card images for
+ armhf systems, and starting with util-linux 2.29.2-3 it is split out
+ from util-linux into a separate, non-essential "fdisk" package:
+ https://lists.debian.org/debian-devel-announce/2017/08/msg00005.html
+ (Closes: #872091)
+ * Bump the Linux kernel ABI from 4.11.0-2 to 4.12.0-1.
+
+ -- Cyril Brulebois Mon, 28 Aug 2017 03:02:44 +0000
+
+debian-installer (20170615) unstable; urgency=medium
+
+ [ Karsten Merker ]
+ * Include the i2c-modules udeb in the armhf netboot and hd-media builds.
+ (Closes: #864536, #864457, #856111)
+
+ -- Cyril Brulebois Thu, 15 Jun 2017 10:34:17 +0200
+
+debian-installer (20170608) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Add “set -e” statement to build/util/gen-hd-image so as to catch any
+ issues. In particular, the “Disk full” emitted for some images like
+ A10-OLinuXino-Lime (See: #864260).
+ * Adapt clean_tempfiles accordingly, since the previous compound
+ statements would fail under “set -e” with an undefined/empty variable.
+
+ [ Karsten Merker ]
+ * armhf: Increase the armhf SD card image sizes due to an
+ increased d-i binary size. (Closes: #864260).
+
+ -- Cyril Brulebois Thu, 08 Jun 2017 12:56:57 +0000
+
+debian-installer (20170525) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * Fix showing the advanced speech entries.
+ * Move the advanced speech entries into a submenu, so that text entries have
+ shortcuts too, for people with a Braille device for instance.
+ * Fix spurious 32bit speech entry on multiarch.
+ * Rename IS_GTK to IS_PURE_GTK to make it clearer.
+ * Add missing speech entries on a gtk-only cdrom image
+
+ [ John Paul Adrian Glaubitz ]
+ * m68k: Change configuration to use the common m68k kernel image.
+ * m68k: Change KERNELMAJOR to 2.6.
+ * m68k: Clean up formatting of all configuration files.
+
+ [ Roger Shimizu ]
+ * armel/orion5x: Use DTB instead of legacy devio device ID for
+ Buffalo Linkstation LiveV3 (LS-CHL). DTB for this device is
+ supported since debian kernel 4.9.10-1.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel version from 4.9.0-2 to 4.9.0-3.
+ * Update translation-status for the release.
+
+ [ Martin Michlmayr ]
+ * Re-enable u-boot images for OpenRD.
+
+ -- Cyril Brulebois Thu, 25 May 2017 12:21:30 +0200
+
+debian-installer (20170407) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * Update minimum disk size value
+ * hurd-i386:
+ - Add missing trailing / to EXTRANAME.
+ - Fix path for mini-gtk case.
+ * i386: Add missing IS_GTK variable definition, needed for speech synthesis
+ menu item.
+ * EFI grub menu: set advanced graphical items first, as in syslinux.
+ * Add speech-enabled entries for expert, rescue, and automated install. Set
+ the shortcuts on them.
+
+ [ Cyril Brulebois ]
+ * Add support for the unreleased suite, used by non-released ports to
+ carry packages or changes which don't really belong to the Debian
+ archive. Set USE_UNRELEASED=1 and USE_UDEBS_FROM=unstable when not
+ building for a release architecture, based on a patch by James
+ Clarke (Closes: #852215).
+ * Add fb-modules to the following configurations, per YunQiang Su's
+ request (Closes: #854553):
+ - pkg-lists/netboot/mips64el/loongson-3.cfg
+ - pkg-lists/netboot/mipsel/loongson-3.cfg
+ * Bump Linux kernel version from 4.9.0-1 to 4.9.0-2.
+ * Update translation-status for the release.
+
+ [ James Clarke ]
+ * Add missing build dependency on palo on hppa (Closes: #852260).
+
+ [ Steven Chamberlain ]
+ * Increase kfreebsd-amd64 MFSROOT to 78 MiB to make space for the new
+ udebs that enabled HTTPS.
+
+ [ Helge Deller ]
+ * hppa: Add virtio modules to cdrom/netboot images
+
+ [ Frederic Bonnard ]
+ * powerpc: Add virtio modules to cdrom/netboot images (Closes: #767487)
+
+ [ Mark Cave-Ayland ]
+ * sparc64: Add virtio modules to cdrom image
+
+ [ John Paul Adrian Glaubitz ]
+ * powerpc: Remove useless kernel version check in builtin_initrd.
+ * ppc64: Clone boot configuration files from powerpc.
+ * ppc64: Add config support based on powerpc config.
+ * ppc64: Clone cdrom pkg-lists from powerpc.
+ * ppc64: Clone netboot pkg-lists from powerpc.
+ * ppc64: Clone netboot-gtk pkg-lists from powerpc.
+ * ppc64: Add yaboot to Build-Depends.
+ * ppc64: Add mkvmlinuz to Build-Depends.
+ * sparc64: Run elftoaout and piggyback when creating netboot images.
+
+ -- Cyril Brulebois Fri, 07 Apr 2017 21:08:13 +0200
+
+debian-installer (20170127) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel version from 4.8.0-2 to 4.9.0-1.
+ * Update translation-status for the release.
+
+ [ Martin Michlmayr ]
+ * Drop armel/versatile flavour since kernel support was removed.
+
+ [ Aurelien Jarno ]
+ * Also copy *.so files in udeblibs (Closes: #851790).
+ * mips*: install all NIC modules in the netboot initrd.
+
+ -- Cyril Brulebois Fri, 27 Jan 2017 23:23:37 +0100
+
+debian-installer (20170112) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel version from 4.7.0-1 to 4.8.0-1.
+ * Add “set -e;” before while loops in a few arm* config files
+ to make sure errors are reported (Closes: #843916).
+ * Revert the following workaround after changes in grub2 2.02~beta3:
+ config/kfreebsd.cfg: Put xorriso's -J flag after “--” to work around
+ grub-mkrescue's change in option handling (See: #741656).
+ * Exclude libssl1.1-udeb as well for qnap, wget will likely depend on
+ it later on.
+ * Update translation-status for the release.
+
+ [ Adam Conrad ]
+ * build/util/efi-image: Fix up FAT filesystem size calculation:
+ - We appear to need 32k headroom, not 24k; this was masked
+ by rounding errors and blind luck until grub grew 1.5kB.
+ - Break out the magic headroom number into 32+31 to match
+ the comment and make the arithmetic more obvious to read.
+ - Round file sizes up, not down, so we don't break in future.
+
+ [ Martin Michlmayr ]
+ * Disable u-boot images for OpenRD because they've been removed
+ (see #837629).
+ * Exclude wpasupplicant-udeb on orion5x-qnap because it brings in
+ libcrypto1.1-udeb.
+
+ [ Aurélien COUDERC ]
+ * Update theme to Soft Waves by Juliette Belin.
+
+ [ Christian Perrier ]
+ * Replace fonts-lklug-sinhala by fonts-noto-hinted-udeb for Sinhala.
+ Closes: #837926
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel version from 4.8.0-1 to 4.8.0-2.
+
+ [ Philipp Kern ]
+ * Add https support to the installer. (Closes: #842040)
+
+ [ Philip Hands ]
+ * pkg-lists/gtk-common: ttf-dejavu-udeb is now called fonts-dejavu-udeb
+
+ [ Samuel Thibault ]
+ * Bump gnumach kernel version.
+
+ -- Cyril Brulebois Thu, 12 Jan 2017 11:08:53 +0100
+
+debian-installer (20161031) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * x86-image: Fix -p parameter value.
+
+ [ Cyril Brulebois ]
+ * Fix Built-Using generation: the Source field of a binary package can
+ contain a version between parentheses. So let's use that if it's
+ present, instead of picking the binary version in all cases. This
+ should fix the REJECT from ftp-master due to unknown packages.
+ * Since linux code comes from src:linux (instead of src:linux-signed),
+ add a test on the latter to use linux and the package's version in
+ this specific case. That won't account for a possible linux binNMU,
+ but that should be enough for most cases. We might implement looking
+ up Built-Using inside udebs, and get such a field added for
+ kernel-image packages, to get the right linux source version.
+
+ -- Cyril Brulebois Mon, 31 Oct 2016 17:07:06 +0100
+
+debian-installer (20161027) unstable; urgency=medium
+
+ [ Roger Shimizu ]
+ * Add generic GNU/screen support, except gtk installer.
+ So screen is started by default except running in gtk mode.
+
+ [ Martin Michlmayr ]
+ * Exclude dependency of screen-udeb on orion5x image.
+ * Reduce size of orion5x image for QNAP to fit in flash:
+ - Split orion5x into orion5x and orion5x-qnap. This is based on
+ work done by Roger Shimizu.
+ - Exclude the text frontend.
+ * HP mv2120: Move kernel load address higher (see #809611 for
+ background).
+ * Add firmware.none.img on armhf (hd-media and netboot) to allow the
+ creation of generic SD cards.
+
+ [ Adam Conrad ]
+ * build/Makefile: Don't strip modules; this removes sigs (LP: #1604441)
+
+ [ Aurelien Jarno ]
+ * Install stretch instead of sid on mips64el now that it is
+ debootstrappable.
+
+ [ Samuel Thibault ]
+ * Add gail and atk udebs for graphical accessibility.
+ * x86-image: Pass -p parameter to grub-mkimage which now requires it.
+
+ [ Steven Chamberlain ]
+ * Increase kfreebsd-amd64 MFSROOT to 74 MiB to allow for the new udebs
+
+ [ Vagrant Cascadian ]
+ * Update u-boot targets for BeagleBoard-X15 and Firefly-RK3288 to use
+ files without the -dtb suffix, which was obsoleted in u-boot 2016.09.
+ * Add support for the orangepi_plus.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel version from 4.6.0-1 to 4.7.0-1.
+ * Update translation-status for the release.
+
+ [ dann frazier ]
+ * arm64: cdrom: Configure GRUB to load the gzio module, adding support
+ for compressed kernels (LP: #1632473).
+
+ -- Cyril Brulebois Thu, 27 Oct 2016 22:09:07 +0200
+
+debian-installer (20160630) unstable; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Make version build-deps use -1~ version suffixes instead of -1 to
+ make lintian happy (build-depends-on-1-revision tag)
+ * Bump Linux kernel version from 4.5.0-2 to 4.6.0-1
+ * Update translation-status for the release.
+
+ [ Aurelien Jarno ]
+ * Add mipsel octeon images.
+ * Drop mipsel cobalt support.
+ * Add mips64el support.
+ * Drop mipsel/loongson-2e and mipsel/loongson-2f images.
+
+ [ Samuel Thibault ]
+ * Produce two beeps when booted with grub instead of one, so the user knows
+ he has to use the grub way to edit entries.
+ * Bump gnumach version to 1.7.
+
+ [ Roger Shimizu ]
+ * ARM: orion5x: Add a few Linkstation devices to netboot target.
+ Those devices are still in network-console target.
+ * ARM: orion5x: Change initrd to XZ compression for all orion5x-based
+ Linkstation devices.
+
+ [ Steven Chamberlain ]
+ * Bump kfreebsd (kernel) version to 10.3.
+
+ [ Martin Michlmayr ]
+ * Use XZ compression for QNAP on Kirkwood due to size restrictions.
+ * Mark fb-modules as required for armhf's netboot-gtk flavour.
+ * Add u-boot config script for Seagate Personal Cloud and Seagate NAS.
+
+ -- Cyril Brulebois Thu, 30 Jun 2016 00:56:34 +0200
+
+debian-installer (20160516) unstable; urgency=low
+
+ [ Martin Michlmayr ]
+ * Provide u-boot images for OpenRD.
+ * Remove mipsel/bcm947xx config file.
+ * Use gpgv1.4-udeb for orion5x network-console so the ramdisk fits
+ in flash on QNAP TS-x09 devices.
+ * Update QNAP TS-x09 kernel address to the new value used by
+ flash-kernel (see #809476).
+ * Bump Linux kernel version from 4.3.0-1 to 4.4.0-1
+ * Use new marvell kernel flavour for orion5x and kirkwood
+ * Include mtd-modules in kirkwood images.
+ * Include mtd-modules in armhf netboot images.
+ * Provide kernel and ramdisk for kirkwood netboot.
+ * Fix syntax error in doc internals build script. Thanks to
+ Josh Gadeken (Closes: #817073)
+ * Add kernel/initrd manifest information for armhf.
+ * Generate image for Seagate Personal Cloud and Seagate NAS.
+
+ [ Samuel Thibault ]
+ * config/hurd.cfg: Set ROOTCMD to fakeroot-tcp.
+ * hurd: Use exec.static instead of ld.so to start exec. This avoids libc
+ version synchronization issues.
+
+ [ Colin Watson ]
+ * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
+
+ [ Roger Shimizu ]
+ * ARM: orion5x: Fix typo in lspro-config-debian script
+ * ARM: orion5x: add device tree support for armel/orion5x
+ * ARM: add/update a few Buffalo Linkstation support on
+ armel/orion5x
+ - Linkstation LS-WTGL
+ - Linkstation Mini (LS-WSGL)
+ - Linkstation Pro/Live (LS-GL)
+ armel/kirkwood
+ - Linkstation LS-QVL
+ - Linkstation LS-VL
+ - Linkstation LS-WSXL
+ - Linkstation LS-WVL
+ - Linkstation LS-WXL
+ * ARM: update kernel/initrd address for various Buffalo Linkstation
+ to be consistent with flash-kernel
+ * ARM: orion5x: share (symbolic link) the initrd for all Linkstation series
+ * ARM: orion5x: unify model name of Linkstation with kirkwood based ones
+ * ARM: orion5x: rename lspro-config-debian script to
+ linkstation-config-debian
+ * ARM: kirkwood: apply linkstation-config-debian script to all Linkstation
+ devices
+
+ [ Vagrant Cascadian ]
+ * Add support for Firefly-RK3288.
+ * Add u-boot-rockchip to the "built-using" package list.
+ * Add support for BeagleBoard-X15.
+
+ [ Karsten Merker ]
+ * ARM: sunxi: Add support for the Olimex A20-SOM-EVB.
+
+ [ Adam Conrad ]
+ * Drop references to libnss-files-udeb and libnss-dns-udeb, they're now
+ provided by libc-udeb, as of glibc 2.22-5.
+
+ [ Aurelien Jarno ]
+ * Stop excluding libc{0.1,0.3,6,6.1} as we now use mklibs-copy for the
+ reduction pass. This avoids dropping libnss libraries and also avoids a
+ useless download of this udeb during the installation.
+ * Drop build-dependency on glibc-pic.
+ * armhf: drop the compat ld.so symlink, all binaries in testing now use the
+ correct one.
+
+ [ Cyril Brulebois ]
+ * Bump Linux kernel version from 4.4.0-1 to 4.5.0-2
+ * efi-image: Make the mkfs.msdos call verbose; this might help track
+ regressions or strange behaviours with new dosfstools upstream
+ releases (See: #823881).
+ * gen-hd-image: Make the mkfs.msdos call verbose.
+ * x86.cfg: Make the mkfs.msdos call verbose.
+ * build/Makefile: Export MTOOLS_SKIP_CHECK=1 before running mmd and
+ mcopy commands to work around an apparent regression in dosfstools
+ 4.0-1 (See: #823881). Confirmed by Steve to produce an image that
+ boots OK.
+ * Update translation-status for the release.
+
+ [ Steven Chamberlain ]
+ * Handle error creating initramfs (Closes: #821249)
+ * Increase kfreebsd-amd64 MFSROOT to 72 MiB to allow for larger udebs
+
+ [ Steve McIntyre ]
+ * Add sata-modules for arm64 - some machines do have SATA CD
+
+ -- Cyril Brulebois Mon, 16 May 2016 15:00:21 +0200
+
+debian-installer (20160106) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * Fix missing speech entry in netboot mini.iso:
+ - build/util/syslinux-cfgs: Make the list-only behavior include spk.cfg file
+ when IS_GTK is 1.
+ - build/config/x86.cfg: Set IS_GTK when calling syslinux-cfgs to get the
+ list.
+ * config/hurd.cfg: Save a few megabytes on initrd to manage to boot with only
+ 128MiB, only to tell user-who-didn't-read-README to boot with more memory.
+
+ [ Cyril Brulebois ]
+ * Switch d-i.debian.org URIs from http to https.
+
+ [ Martin Michlmayr ]
+ * Provide u-boot images for plug computers.
+
+ [ Steven Chamberlain ]
+ * On kfreebsd, use the new makefs -T parameter to clamp mfsroot
+ timestamps to a reproducible maximum value; raise Build-Depends: on
+ makefs to version (>= 20100306-5+kbsd8u1~).
+
+ -- Cyril Brulebois Wed, 06 Jan 2016 06:00:19 +0100
+
+debian-installer (20160101) unstable; urgency=medium
+
+ [ Karsten Merker ]
+ * Provide u-boot and SD-card images for the LinkSprite pcDuino.
+
+ [ Cyril Brulebois ]
+ * Adjust p-u support to handle file:// instead of (f|ht)tp:// only,
+ thanks to Łukasz Stelmach for both the report and the patch
+ (Closes: #803711).
+
+ [ Samuel Thibault ]
+ * Bump hurd kernel version.
+ * Prevent spurious speech synthesis boot entry.
+
+ [ Vagrant Cascadian ]
+ * bootscr.mainline_common: Prefer newer u-boot distro_bootpart variable.
+
+ [ Cyril Brulebois ]
+ * Cherry-pick the following changes by Steven Chamberlain from the
+ jessie-kfreebsd branch.
+ * build/Makefile: Rename GZIP into gzip, and pass an extra -T to pigz
+ (it needs both -n and -T to behave as gzip's -n).
+ * build/config/x86.cfg: Also pass -n to gzip.
+ * Bump linux kernel version from 4.2.0-1 to 4.3.0-1
+ * Replace the module-init-tools build-dep with a kmod one since the
+ transitional package got dropped in kmod/22-1.
+ * Apply patch from gregor herrmann to fix new warnings with perl 5.22
+ (Closes: #808875). Thanks!
+ * Update copyright years on the F10 help screen.
+ * Update translation-status for the release.
+
+ [ Steven Chamberlain ]
+ * Improve reproducibility of debian-installer netboot images
+ (Closes: #805321):
+ * Add a new utility build/util/gen-tarball to make reproducible
+ tarballs, and use it for:
+ - netboot.tar.gz
+ - debian-cd_info.tar.gz
+ - the overall debian-installer-images tar.gz file.
+ * Inhibit gzip timestamp in initrd.gz
+ * Ensure SOURCE_DATE_EPOCH is exported throughout the build system,
+ define it if unset, or fall back to 'now' if build/Makefile is
+ directly invoked.
+
+ [ Steve McIntyre ]
+ * Add the part_gpt module into the core grub image to make it easier
+ for users doing slightly different things with our images; include
+ support for GPT partition tables as well as msdos (Closes: #789600).
+
+ [ Ben Hutchings ]
+ * Include leds-modules on armhf if available
+ * Update i386 config to use 686 kernel flavour instead of 586
+
+ [ Martin Michlmayr ]
+ * Update docs to reflect that Package-Type and Installer-Menu-Item
+ are official fields nowadays (Closes: #807716).
+ * Remove minix-modules from the orion5x network-console image since
+ it was only required by the D-Link DNS-323, a device that's no longer
+ supported.
+ * Exclude usb-serial-modules from the armel network-console image
+ since it's not useful there (Closes: #809301).
+ * Exclude usb-modules explicitly on armel/orion5x network-console
+ to work around a bug in util/pkg-list.
+ * Stop including sata and ext2/ext3 modules on the armel/orion5x
+ network-console image due to size limitations on QNAP TS-x09.
+ * Drop the file extension from the initrd for QNAP devices.
+ * Re-introduce installer images for QNAP TS-x09.
+ * Recognize /dev/disk1_1 and /dev/ls_disk1_1 as boot devices
+ on Linkstation. Thanks Roger Shimizu (Closes: 722735).
+
+ [ John Paul Adrian Glaubitz ]
+ * Set KERNELVERSION for sparc64 to $(LINUX_KERNEL_ABI)-sparc64.
+ * Set KEYRING to debian-ports on sparc64.
+ * Add silo to Build-Depends on sparc64.
+ * Fix typo (problimatic -> problematic) in silo comment.
+ * Clone boot configuration files from sparc for sparc64.
+
+ -- Cyril Brulebois Fri, 01 Jan 2016 18:46:41 +0100
+
+debian-installer (20151023) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * Restore actually-used non-gtk speech synthesis entries
+ - Otherwise netboot/gtk/mini.iso (which is gtk only) does not contain the
+ speech entry.
+ - Avoid including them on non-gtk netboot image, though.
+
+ [ Cyril Brulebois ]
+ * Bump linux kernel version from 4.1.0-2 to 4.2.0-1
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Fri, 23 Oct 2015 12:54:34 +0200
+
+debian-installer (20150911) unstable; urgency=medium
+
+ * Bump linux kernel version from 4.1.0-1 to 4.1.0-2
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Fri, 11 Sep 2015 00:58:26 +0200
+
+debian-installer (20150828) unstable; urgency=medium
+
+ [ Didier Raboud ]
+ * In the syslinux menu tree:
+ - Add syslinux machinery to use ifcpu64.c32 on multi-arch CDs, for CPU
+ 64-bit capability detection
+ - Swap one-key shortcuts to let them access the graphical variants
+ - Add the correct one-key shortcuts to 32-bit variant
+ - Replace (32 bits) prefix mentions by the correct "32-bit" in parentheses
+ - Shorten the 32-bits menu label to use the i386 Debian architecture name,
+ to make the whole label short enough
+ - Shorten the 32-bit Graphical automated install entry label
+ - Drop unused non-gtk speech synthesis entries
+
+ [ Samuel Thibault ]
+ * Add beep to UEFI x86 boot menu (Closes: #796591).
+ * Add 's' shortcut for speech to UEFI x86 boot menu.
+
+ [ Aurelien Jarno ]
+ * Drop r4k-ip22, r5k-ip32 and sb1-bcm91250a images on mips.
+ * Drop sb1-bcm91250a images on mipsel.
+
+ [ Cyril Brulebois ]
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Fri, 28 Aug 2015 09:07:40 +0200
+
+debian-installer (20150813) unstable; urgency=medium
+
+ [ Didier Raboud ]
+ * Add missing 32bits rescue menu entries in multiarch 'Advanced
+ options' menu (Closes: #793118)
+
+ [ Samuel Thibault ]
+ * Bump gnumach kernel version to 1.5.
+
+ [ Cyril Brulebois ]
+ * Bump linux kernel version from 4.0.0-2 to 4.1.0-1
+ * Replace ttf-cjk-compact-udeb with fonts-android-udeb, thanks to
+ Kenshi Muto for the input on the CJK front and for the patch!
+ (Closes: #794432).
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Thu, 13 Aug 2015 11:48:12 +0200
+
+debian-installer (20150718) unstable; urgency=medium
+
+ [ Didier Raboud ]
+ * jessie is released! The next target is stretch; update those files
+ accordingly:
+ - build/boot/x86/xen/debian.cfg
+ - build/config/common
+ - doc/devel/internals/building.xml
+ - debian/rules
+ * In the syslinux menu tree:
+ - Drop default64 statements that have not been working since Squeeze
+ - Reorder alternatives to put the gtk option first
+ - Default to graphical install, reorder and rephrase the help texts
+ (Closes: #485586)
+ - Swap amd64 and i386 to let the first be the norm, and the latter be the
+ special case, rename labels
+ * Bump linux kernel version from 3.16.0-4 to 4.0.0-1
+
+ [ Steven Chamberlain]
+ * Slightly reduce kfreebsd-amd64 MFSROOT to 68 MiB, reducing total
+ memory requirement to 160 MiB and leaving about 4 MiB safety margin.
+ (Closes: #783773)
+ * For kfreebsd, override /etc/default-release to unstable, and use
+ jessie-kfreebsd as the default stable release, as used by
+ choose-mirror.
+
+ [ Aurelien Jarno ]
+ * Use mklibs-copy instead of mklibs, as discussed on the mailing list.
+
+ [ Martin Michlmayr ]
+ * Append DTB for SheevaPlug, SheevaPlug eSATA and GuruPlug. (Closes:
+ #785588)
+ * Add image for Seagate DockStar.
+ * Drop kirkwood/netboot-gtk image since it's never been used.
+ * Append DTB for OpenRD Base, Client and Ultimate.
+ * Append DTB for LaCie NAS devices.
+ * Remove D-Link DNS-323 / Conceptronic CH3SNAS image since this device
+ is no longer supported in the Debian kernel due do size limitations.
+ * Append DTB for QNAP NAS devices.
+ * Determine the CPU variant on QNAP NAS devices in order to use the
+ right DTB.
+
+ [ Cyril Brulebois ]
+ * Adjust u-boot-image-config, thanks to Vagrant Cascadian
+ (Closes: #786369):
+ - MX6_Cubox-i is now upstream, under a different name, with support
+ for hummingboard-i1 and hummingboard-i2ex.
+ - Wandboard now supports all three variants (Solo, Dual-Lite, and
+ Quad), instead of just the Quad one.
+ - PandaBoard: use u-boot.img instead of u-boot.bin
+ * Bump linux kernel version from 4.0.0-1 to 4.0.0-2
+ * Update partman-auto-raid-recipe.txt to mention support for ,
+ thanks to partman-md and partman-auto-raid patches by Philipp Hahn
+ (See: #790941).
+ * Drop all build-dep bits that are specific to ia64, as this architecture has
+ been discontinued for a while. This notably removes the reference to elilo
+ (Closes: #768427).
+ * Update translation-status for the release.
+ * Mention documentation in short description, fixing description-is-pkg-name
+ lintian tag and reflecting the current contents of the .deb package.
+
+ [ Ian Campbell ]
+ * Adjust build to handle DTBs in subdirectories, currently the case on arm64
+ (Closes: #786882).
+
+ -- Cyril Brulebois Sat, 18 Jul 2015 07:53:17 +0200
+
+debian-installer (20150422) unstable; urgency=medium
+
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Wed, 22 Apr 2015 21:41:38 +0200
+
+debian-installer (20150418) unstable; urgency=medium
+
+ [ Karsten Merker ]
+ * Add util/gen-hd-image (a script to create partitioned harddisk images
+ from a directory and optionally install a bootloader into the image).
+ * Add SD-card image build support for hd-media builds on armhf.
+ * Add SD-card image and tftpboot tarball build support for netboot builds
+ on armhf.
+ * Add u-boot-imx, u-boot-omap and u-boot-sunxi to the "built-using"
+ package list.
+ * util/gen-hd-image: set proper permissions for the generated partition
+ image.
+ * Add a symlink boot.scr.uimg -> debian-installer/armhf/tftpboot.scr
+ in the armhf netboot.tar.gz to support network autoboot with modern
+ u-boot versions.
+ * Provide u-boot and SD-card images for the Olimex A20-OLinuXino-MICRO
+ and for the LinkSprite pcDuino3 (support for both has been added
+ in u-boot 2014.10+dfsg1-5).
+
+ [ Ben Hutchings ]
+ * Include fb-modules on powerpc if available (Closes: #782059).
+
+ [ Cyril Brulebois ]
+ * Restore shortcuts (install, installspk, expert, menu, etc.) on help
+ screens by restoring the menu.cfg include which was probably dropped
+ accidentally (Closes: #764154, #781853, #781992), as pointed out by
+ Vaclav Ovsik. Thanks!
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Sat, 18 Apr 2015 11:39:37 +0200
+
+debian-installer (20150324) unstable; urgency=medium
+
+ [ Didier Raboud ]
+ * Correct typo and joy images paths in debian/copyright
+ * Use APT `apt-config dump`s result to determine where to find the
+ system's sources.list (Closes: #775136)
+
+ [ Raphaël Hertzog ]
+ * Bump Build-Depends on dns323-firmware-tools to require version
+ 0.7.3-1 because d-i uses options that are not supported in the wheezy
+ version of the package.
+
+ [ Karsten Merker ]
+ * Add boot/arm/u-boot-image-config (a list of u-boot components and their
+ offsets on disk, needed to create bootable images for arm-based systems).
+ * Provide u-boot binaries for armhf systems without u-boot in flash.
+ * Add a workaround for the console baudrate mismatch on some i.MX6-based
+ systems in boot/arm/bootscr.mainline_common.
+
+ [ Helge Deller ]
+ * alpha: Switch to KERNELVERSION
+ * alpha,hppa: add debian-ports gpg keyring
+
+ [ Michael Walle ]
+ * Add support for the Buffalo Linkstation LS-CHLv2/LS-XHL (Closes: #744716).
+
+ [ Cyril Brulebois ]
+ * Extend write-built-using to also generate the ${extra:Built-Using}
+ substvar, making it possible to track packages mentioned in the
+ EXTRA_PACKAGES variable (currently set to "bf-utf-source syslinux").
+ Thanks to Ansgar Burchardt for the reports (Closes: #696418, #700026).
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Tue, 24 Mar 2015 03:25:12 +0100
+
+debian-installer (20150107) unstable; urgency=medium
+
+ [ Karsten Merker ]
+ * Add hd-media support for the armhf platform.
+
+ [ Aurelien Jarno ]
+ * Add scsi-modules to the cdrom flavour on ppc64el to be able to access
+ the CD-ROM drive.
+
+ [ Steven Chamberlain ]
+ * Update kfreebsd (kernel) BASEVERSION to 10.1-0
+
+ [ Ian Campbell ]
+ * Add grub.cfg to x86 netboot mini.iso for use on EFI systems
+ (Closes: #762618).
+ * Use --- as options separator for all Linux command lines. (Closes: #764675)
+ * Provide a PXE bootable grub.efi in the netboot flavour for amd64 and arm64.
+
+ [ Cyril Brulebois ]
+ * Bump linux kernel version from 3.16-2 to 3.16.0-4.
+ * Update (linux) i386 config to pull 586 packages instead of 486 ones,
+ since the minimal requirements on i386 (consistency!) have been bumped.
+ * Update translation-status for the release.
+
+ [ Samuel Thibault ]
+ * Update documentation of required minimum disk size.
+ * hurd: Also create /servers/startup
+
+ [ Didier Raboud ]
+ * Add Lines boot pictures for x86 Linux, Hurd and kFreeBSD; also make
+ these default, add their copyright information in debian/copyright
+
+ -- Cyril Brulebois Wed, 07 Jan 2015 04:25:52 +0100
+
+debian-installer (20141002) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * Add speech synthesis entries in alternate desktop boot menus.
+ * Add keyboard shortcut for Advanced options menu.
+
+ [ Ian Campbell ]
+ * Depend on mklibs >= 0.1.40 for ARM EABI fixes relating to the handling
+ of__aeabi_* symbols (Closes: #758581).
+ * Switch to installing Jessie by default on ARM64.
+ * Build netboot mini.iso on ARM64.
+ * Build cdrom flavour for ARM64.
+
+ [ Cyril Brulebois ]
+ * Deal with even more incompatible changes on the syslinux side by
+ adding a syslinux-utils build-dep (Closes: #751731), no thanks to its
+ maintainer as far as cooperation is concerned (See: #751724, #759189).
+ * Bump linux kernel version from 3.14-2 to 3.16-2.
+ * Drop code snippet meant to ensure every checkout would get an updated
+ sources.list.udeb (with [trusted=yes]), since that was meant to be
+ temporary, and that was almost 2 years ago.
+ * Replace ttf-kannada-fonts-udeb with fonts-knda-udeb.
+ * Specify -j1 for the submake definition in build/Makefile; that's what
+ happens anyway, and warnings go away accordingly.
+ * Add fonts-lohit-guru-udeb to gtk images, fixing rendering for Punjabi
+ (Closes: #761573).
+ * Apply patch from Ron and Chris Kuehl to fix lib location and search
+ path for syslinux >= 5. Some constraints include having ldlinux.c32
+ in the tftp root, and being able to find some support libraries
+ thanks to a defined path (Closes: #756275). Many thanks!
+ * Update translation-status for the release.
+
+ [ Frederic Bonnard / Aurelien Jarno ]
+ * Add ppc64el support installing sid (Closes: #754093).
+
+ [ Steven Chamberlain ]
+ * On kfreebsd and hurd, which use GRUB for PXE booting, request two
+ additional modules in the grub-mkimage step: (Closes: #759686)
+ - tftp: required since GRUB 2.02 otherwise PXE boot will crash/hang
+ - gfxterm_background: required since GRUB 2.02 for the boot splash
+ image functionality to be available
+ - raise the grub-pc (and indirectly grub-common) build dependency to
+ >= 2.02~beta2~ on these architectures, because module
+ gfxterm_background did not exist in GRUB 2.00
+ - raise the xorriso build dependency to >= 1.3.2-1~ on these
+ architectures, for compatibility with grub-mkrescue in GRUB 2.02
+
+ [ Joey Hess ]
+ * Remove desktop selection from syslinux; now available in tasksel.
+ * remove desktop=xfce preseeding on kfreebsd-* and hurd, since tasksel
+ 3.27 knows about architecture-specific defaults (Closes: #762614).
+
+ [ Ben Hutchings ]
+ * Keep Linux modules.builtin file in the initrd.
+ * Update new-kernel-checklist.txt for the last few years' changes.
+
+ -- Cyril Brulebois Thu, 02 Oct 2014 08:21:25 +0200
+
+debian-installer (20140802) unstable; urgency=low
+
+ [ Cyril Brulebois ]
+ * debian/rules: Introduce build-{arch,indep} targets, depending on
+ build-stamp, and depended upon by build.
+ * debian/control: Bump Standards-Version to 3.9.5, no further changes
+ required.
+ * Remove Otavio from Uploaders, with many thanks for his past work.
+ * Bump linux kernel version from 3.13-1 to 3.14-1.
+ * Adjust and apply patch from Daniel Baumann to deal with incompatible
+ changes in syslinux 6 (Closes: #746743):
+ - Bump syslinux-common versioned build-dep to >= 3:6
+ - Add isolinux and pxelinux build-deps.
+ - x86.cfg: Adjust paths to isolinux.bin and pxelinux.0
+ - x86.cfg: Adjust path to vesamenu.c32 and add its new dependencies
+ (libcom32.c32, libutil.c32, and also ldlinux.c32).
+ * Exclude .gitignore files in the dh_installdocs call to avoid spurious
+ files when building from a git checkout.
+ * Disable translation-status check when proposed-updates is enabled.
+ This file isn't going to be updated during stable's lifecycle, so
+ avoid pointless warning and sleeping.
+ * Update translation-status for the release.
+
+ [ Samuel Thibault ]
+ * Add a separate Hurd boot option for CJK support in pseudo-graphical mode, so
+ the default can use 720x400 resolution, instead of using 640x400 which is
+ not supported by some screens...
+ * Pre-configure hurd-libs and libparted.
+ * Increase room for udebs on hurd.
+ * Remove bogl-bterm-udeb on hurd.
+
+ [ Martin Michlmayr ]
+ * Add support for QNAP HS-210. Thanks to Kevin Woldt for the patch.
+
+ [ Ian Campbell ]
+ * Move armmp subarch to toplevel armhf.
+ * Ship DTB files for netboot on armhf and armel/kirkwood.
+ * Drop version suffix from armhf kernel.
+
+ [ Robert Millan ]
+ * Remove kfreebsd-9 and switch to kfreebsd-10 as default (and only)
+ option. (Closes: #743292)
+
+ [ Philipe Muškovac ]
+ * Use -perm /0111 in Makefile as + is deprecated. Closes: #752009
+
+ [ Colin Watson ]
+ * Remove mention of partman's ability to create file systems, check file
+ systems, and copy data between partitions, since those all rely on
+ libparted's filesystem-handling code which is being removed.
+
+ [ Bastien ROUCARIÈS ]
+ * Support for DNS-320. (Closes: #751716)
+
+ [ Ian Campbell ]
+ * Bump linux kernel version from 3.14-1 to 3.14-2.
+
+ [ Aurelien Jarno ]
+ * Remove fb-modules udebs on mips*/sb1-bcm91250a.
+ * Add MIPSEL Loongson 3 images.
+
+ -- Cyril Brulebois Sat, 02 Aug 2014 02:59:35 +0200
+
+debian-installer (20140316) unstable; urgency=medium
+
+ [ Colin Watson ]
+ * Add SSL_CERTS variable, which can be used to build images with embedded
+ SSL certificates with c_rehash run over them so that OpenSSL can see
+ them (LP: #833994).
+
+ [ Cyril Brulebois ]
+ * build/Makefile: Use $(GZIP) instead of gzip, and prefer pigz over
+ gzip if it's available, which can give a nice speed-up.
+ * Update boot config/screens for the default desktop change (GNOME → Xfce)
+ in tasksel 3.19 (Closes: #738602).
+ * Update copyright years in boot screens.
+ * Bump linux kernel version from 3.12-1 to 3.13-1.
+ * build/config/{amd64,i386}.cfg: Remove old "video=vesa:ywrap,mtrr" option
+ from VIDEO_MODE_GTK (See: #395040). DirectFB apparently needed those at
+ some point. Let's see whether letting the kernel do its job just works.
+ * build/Makefile: Add “| sort” after some find calls, to reduce entropy
+ and notably to make build logs more easily post-processable.
+ * build/Makefile: Move the drop_lang definition to the top of the file to
+ deal with incompatible changes in make 3.82 leading to the following
+ error: “recipe commences before first target” (Closes: #720719).
+ * build/README: Mention USE_UDEBS_FROM in the recipe at the top, and add a
+ pointer to debian/rules in its documentation (Closes: #653513).
+ * Remove iop32x flavour on armel since support has been dropped from the
+ linux package (in 3.13-1~exp1).
+ * config/kfreebsd.cfg: Put xorriso's -J flag after “--” to work around
+ grub-mkrescue's change in option handling (See: #741656).
+ * Update translation-status for the release.
+
+ [ Robert Millan ]
+ * Enable kfreebsd-10 builds.
+ * Bump kfreebsd-10 from unstable ABI to 10.0-1.
+
+ [ Samuel Thibault ]
+ * Upgrade hurd kernel to 1.4
+ * Add usb key boot support for kfreebsd & hurd images. This needs another
+ grub image, grub_embed, which has to be very small. Add x86-image script,
+ similar to efi-image script, with factorized grub-cpmodules part, to build
+ minimal grub images with iso9660 and biosdisk support, and put GRUB modules
+ on the ISO image. grub.cfg thus now has to explicitly load modules.
+ * Also build initrd for hurd Xen target.
+ * Add base infrastructure for kfreebsd Xen images.
+
+ [ Didier Raboud ]
+ * Add a comment documenting the need to keep the video modes in sync
+ between d-i and win32-loader
+
+ -- Cyril Brulebois Sun, 16 Mar 2014 13:45:22 +0100
+
+debian-installer (20140208) unstable; urgency=low
+
+ [ Martin Michlmayr ]
+ * Remove Cobalt images.
+
+ [ Cyril Brulebois ]
+ * Bump linux kernel version from 3.11-2 to 3.12-1.
+ * Update hppa config (for debian-ports), thanks to Helge Deller
+ for the patch (Closes: #736966).
+ * Update translation-status for the release.
+
+ [ Aurelien Jarno ]
+ * Add MIPS Octeon images.
+ * Add MIPSEL Loongson 2E images.
+
+ [ Steven Chamberlain ]
+ * Remove gPXE workaround on kfreebsd and hurd (fixed already in
+ GRUB 2.00 as #635877)
+
+ -- Cyril Brulebois Sat, 08 Feb 2014 19:27:33 +0300
+
+debian-installer (20131211) unstable; urgency=low
+
+ [ Ian Campbell ]
+ * Remove mx5 and vexpress flavours from armhf, they are covered by armmp.
+
+ [ Cyril Brulebois ]
+ * Bump linux kernel version from 3.10-3 to 3.11-2.
+ * Out of ext{2,3,4}-modules, only keep ext4-modules since it provides
+ support for all of those starting with 3.11. Use ext4 as well where
+ only ext2 and ext3 were listed.
+ * Update translation-status for the release.
+
+ -- Cyril Brulebois Wed, 11 Dec 2013 21:51:10 +0100
+
+debian-installer (20131014) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * Fix boot beep.
+ * Add hd-media target for hurd-i386.
+ * Update lowmem and minimum disk figures in x86 boot help
+ (Closes: #709436).
+
+ [ Cyril Brulebois ]
+ * wheezy is released! The next target is jessie.
+ * Update those files accordingly:
+ - build/boot/x86/xen/debian.cfg
+ - build/config/common
+ - doc/devel/internals/building.xml
+ - debian/rules
+ * Those need a deeper look:
+ - doc/i18n/languages.xml
+ - doc/i18n/languages.xsl
+ * Bump linux kernel version from 3.2.0-4 to 3.10-3.
+ * Set DEBIAN_VERSION to just '8'.
+ * Drop doc/devel/kerntabl since it doesn't seem either up-to-date
+ or helpful.
+ * Add doc/devel/internals/maintenance.xml to document a few
+ things:
+ - Updating to a new Linux kernel version
+ - Dropping a deprecated filesystem
+ * Drop floppy-modules from Linux build configs, since support was
+ removed in Linux 3.10:
+ - build/pkg-lists/cdrom/amd64.cfg
+ - build/pkg-lists/cdrom/i386.cfg
+ - build/pkg-lists/cdrom/powerpc.cfg
+ - build/pkg-lists/netboot/amd64.cfg
+ - build/pkg-lists/netboot/i386.cfg
+ - build/pkg-lists/netboot/powerpc.cfg
+ * Use eatmydata when apt-get installing udebs during the build, if
+ it's available.
+ * Update translation-status.
+
+ [ Philipp Kern ]
+ * s390(x): Remove the tape image flavour (no longer supported by
+ the kernel).
+
+ [ Steve McIntyre ]
+ * Fix GRUB EFI prefix in efi-image to work properly with GRUB
+ 2.00. Patch stolen^Wborrowed from Colin in Ubuntu's d-i code.
+
+ [ Martin Michlmayr ]
+ * Recognize QNAP TS-12x, TS-22x and TS-42x devices.
+
+ [ Christian Perrier ]
+ * Remove partman-reiserfs and partman-ufs from packages' lists as
+ modules for these filesystems are no longer provided by the kernel
+ packages
+ * Drop "support" for ads, that has indeed never been really supported
+ * Drop nic-extra-modules that is no longer generated by the kernel
+ source package:
+ - netboot/i386.cfg
+ - netboot/alpha.cfg
+ - netboot/powerpc.cfg
+ - netboot/amd64.cfg
+ - net_drivers/powerpc.cfg (was commented there)
+ * Add list of neeed characters for Tajik
+
+ [ Robert Millan ]
+ * Bump kFreeBSD ABI from 9.0-2 to 9.2-1.
+ * Remove kFreeBSD 8.x support.
+ * Add kFreeBSD 10.x support.
+
+ [ Steven Chamberlain ]
+ * Drop pxecmd module on arches using grub2pxe:
+ - build/config/hurd.cfg
+ - build/config/kfreebsd.cfg
+ - The pxecmd module only provided pxe_unload, which was not used
+ anyway, and is now implemented by GRUB 2.00 in the pxe module.
+
+ [ Ian Campbell ]
+ * Add armmp flavour to armhf.
+
+ -- Cyril Brulebois Mon, 14 Oct 2013 03:02:17 +0200
+
+debian-installer (20130430) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Include virtio-modules in sparc and sparc64 netboot images (Closes: #704672).
+
+ -- Cyril Brulebois Tue, 30 Apr 2013 23:10:12 +0200
+
+debian-installer (20130415) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Include nic-modules in armhf/vexpress netboot image.
+
+ -- Cyril Brulebois Mon, 15 Apr 2013 20:35:44 +0200
+
+debian-installer (20130412) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * internal.xml: Point at the repository README instead of duplicating
+ checkout information.
+
+ [ Ben Hutchings ]
+ * Include {ata,mtd,pata,sata}-modules in mx5 netboot image (Closes: #675017)
+ * Replace nic-modules with nic-{usb,wireless}-modules in armhf netboot
+ images (Closes: #705118)
+
+ [ Cyril Brulebois ]
+ * Amend previous changelog entry to mention that the added vexpress
+ image is a netboot one.
+
+ -- Cyril Brulebois Fri, 12 Apr 2013 17:39:04 +0200
+
+debian-installer (20130409) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Build a netboot vexpress image on armhf.
+
+ [ Christian Perrier ]
+ * Update translation-status, computed with a fixed calc-release-status
+ script.
+
+ [ Cyril Brulebois ]
+ * For reference, build against linux 3.2.41-2.
+
+ -- Cyril Brulebois Tue, 09 Apr 2013 16:45:49 +0200
+
+debian-installer (20130211) unstable; urgency=low
+
+ [ Joey Hess ]
+ * When building with localudebs, only disable secure apt checking for that
+ repository, while keeping it working for network repositories,
+ by using [trusted=yes] in sources.list.udeb. Closes: #696168
+
+ [ Wouter Verhelst ]
+ * Bring m68k back from the dead:
+ - Use current kernel versions.
+ - Point to debian-ports.org for now.
+ - s/atari-ekmap/ataritt-ekmap/, since the former packages don't exist.
+
+ [ Cyril Brulebois ]
+ * Apply patch from Steven Chamberlain (thanks!) to fix PXE configuration
+ on kfreebsd-* for the netboot-9 images: build/config/kfreebsd.cfg is
+ now responsible for generating proper entries based on the
+ build/boot/kfreebsd/grub-kfreebsd-pxe.cfg template. Closes: #696780
+ * Update translation-status for d-i wheezy rc1.
+
+ [ Steven Chamberlain ]
+ * Decrease kfreebsd-amd64's MFSROOT_LIMIT to 72MiB, to allow 128MiB-memory
+ installation (Closes: #696786).
+
+ [ Steve McIntyre ]
+ * Tweak EFI video setup at boot time:
+ - Try 800x600 as the default EFI video mode, some machines don't do
+ 640x480
+
+ -- Cyril Brulebois Mon, 11 Feb 2013 22:26:19 +0100
+
+debian-installer (20121114) unstable; urgency=low
+
+ [ Philipp Kern ]
+ * Update to 3.2.0-4 linux ABI.
+
+ [ Samuel Thibault ]
+ * Reduce "1GiB key" images to just below 1GB.
+
+ [ Cyril Brulebois ]
+ * Apply patch from Arnaud Patard to include Hyper-V linux kernel udebs
+ on cdrom and netboot images for am64 and i386 (Closes: #690978). This
+ is needed after a kernel change on the ata_piix side (cd006086fa in
+ mainline).
+
+ -- Cyril Brulebois Wed, 14 Nov 2012 14:56:37 +0100
+
+debian-installer (20120930) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * Drop outdated documentation about brltty.
+ * Add console-setup-linux-fonts-udeb to speakup-enabled images
+ (closes: #684473).
+ * Document that new languages need to specify a console-setup font name to
+ be loaded.
+ * Pull netdde-udeb instead of nic-modules on hurd-i386, the former providing
+ the latter does not seem enough.
+
+ [ Cyril Brulebois ]
+ * Apply patch from Paul Tagliamonte, updating the Joy pictures to use
+ the correct brand; the Debian logo is now DFSG free.
+ * When SPLASH_PNG is set, search for a matching SPLASH_SVG; if it's
+ found, call rsvg-convert to generate the PNG file. Clean those on
+ reallyclean. Add librsvg2-bin build-dep for rsvg-convert, restricted
+ to any-{amd64,i386} (splash is used on x86, kfreebsd, and hurd).
+ * Remove build/boot/{x86,kfreebsd,hurd}/pics/joy-hurd.png accordingly.
+ * Fix broken kfreebsd-9 CD gtk install menuentry (add gtk/), thanks to
+ Steven Chamberlain (Closes: #686858).
+ * Bump MFSROOT_LIMIT from 64m to 128m for kfreebsd-amd64, thanks to Steven
+ Chamberlain (Closes: #686861).
+ * Add myself to Uploaders.
+
+ [ Aurelien Jarno ]
+ * Install wheezy by default instead of sid on armhf and s390x.
+
+ [ Steve McIntyre ]
+ * Add EFI support:
+ - Add code to create bootable EFI images.
+ - Add definitions for amd64 and i386 (disabled for the latter).
+ - Add grub-efi.cfg
+ - Add build-deps: grub-efi-{amd64,i386}-bin, grub-common, xorriso.
+
+ -- Cyril Brulebois Sun, 30 Sep 2012 06:33:54 +0200
+
+debian-installer (20120828) unstable; urgency=low
+
+ [ Cyril Brulebois ]
+ * Team upload.
+
+ [ Robert Millan ]
+ * Bump kFreeBSD ABI.
+
+ [ Julien Cristau ]
+ * Switch from module-init-tools-udeb to libkmod2-udeb (closes: #683790)
+ * Don't remove modules.{dep,alias}.bin from /lib/modules/*, without them
+ kmod doesn't load any module. Instead remove the non-.bin files, which
+ aren't necessary. Thanks to Didier Raboud for the report and help.
+
+ [ Didier Raboud ]
+ * Fix typo in the fix for the kfreebsd empty line in Grub.
+ (Closes: #680850)
+
+ [ Ian Campbell ]
+ * Add netboot images for kirkwood/dreamplug platform.
+
+ [ Samuel Thibault ]
+ * Fix gnu-mach-color terminfo into mach-gnu-color.
+
+ -- Cyril Brulebois Tue, 28 Aug 2012 09:44:42 +0200
+
+debian-installer (20120712) unstable; urgency=low
+
+ [ Cyril Brulebois ]
+ * Team upload.
+
+ [ Julien Cristau ]
+ * Update to 3.2.0-3 linux ABI.
+ * Follow symlinks when generating checksum files, so the guruplug paths are
+ included. Thanks, Didier Raboud.
+
+ [ Didier Raboud ]
+ * Switch the boot backgrounds to the Wheezy joy theme.
+
+ [ Steven Chamberlain ]
+ * Fix the place of the kfreebsd empty line in Grub (Closes: #680850).
+
+ [ Samuel Thibault ]
+ * Add console-setup-udeb to hurd-i386.
+
+ -- Cyril Brulebois Thu, 12 Jul 2012 14:23:12 +0200
+
+debian-installer (20120626) unstable; urgency=low
+
+ [ Cyril Brulebois ]
+ * Team upload.
+ * Fix FTBFS when some foreign packages are installed in a
+ multiarch-enabled environment (Closes: #678943): use arch-qualified
+ package names when calling “dpkg -s” when a multiarch-aware dpkg is
+ detected.
+
+ [ Christian Perrier ]
+ * Add fonts-sil-padauk-udeb to gtk-common to support Burmese
+ Closes: #672635
+
+ [ Simon Guinot ]
+ * Include LED modules for LaCie devices in armel builds
+ Closes: #673132
+
+ [ Samuel Thibault ]
+ * Increase hurd-i386 monolithic root size, to fix hang during template
+ loading.
+ * Enable clock-setup on hurd-i386.
+ * Add gzio module to hurd-i386 grub.
+ * Remove useless mention of rescue-mode package in cdrom and netinst
+ hurd-i386 pkglists.
+ * Add net-modules to netboot hurd-i386 pkglist.
+
+ [ Joey Hess ]
+ * Adjust syslinux boot menu to not overlap with debian logo.
+
+ [ Robert Millan ]
+ * When more than one kfreebsd version is available, make kfreebsd-9
+ the default boot option.
+
+ -- Cyril Brulebois Tue, 26 Jun 2012 13:42:43 +0200
+
+debian-installer (20120508) unstable; urgency=low
+
+ [ Adam Conrad ]
+ * Call mklibs with a hardcoded --ldlib in armhf.cfg, so we get a
+ deterministic result in our linker search, and then add the
+ symlink from the old linker path in build/Makefile (LP: #984007)
+
+ -- Colin Watson Tue, 08 May 2012 16:29:40 +0100
+
+debian-installer (20120507) unstable; urgency=low
+
+ [ Cyril Brulebois ]
+ * Team upload.
+ * Add lintian override for e2fsprogs in Build-Depends.
+ * Add “Depends: ${misc:Depends}” to please lintian.
+ * Bump Standards-Version to 3.9.3 (no changes needed).
+
+ [ Joey Hess ]
+ * Increase hd-media size to target 1 gb USB key. The i386 netinst iso
+ is now too large to fit on a 256 mb key. Closes: #666090
+
+ [ Robert Millan ]
+ * Update to kFreeBSD 8.3.
+ * Fix console setup on monolithic/kfreebsd-*.cfg.
+
+ [ Samuel Thibault ]
+ * Add rescue entry to hurd-i386 boot menu.
+
+ [ Hector Oron ]
+ * Generate image for LaCie Kirkwood NASes.
+ Thanks Simon Guinot for patch. Closes: #670530
+
+ [ Martin Michlmayr ]
+ * Remove incomplete HP t5325 images.
+
+ -- Cyril Brulebois Mon, 07 May 2012 00:52:34 +0200
+
+debian-installer (20120327) unstable; urgency=low
+
+ [ Jurij Smakov ]
+ * Add pata-modules to cdrom config for sparc and sparc64.
+ Closes: #610906.
+ * Use xz compression for initrd during netboot image build for sparc
+ to get it down to acceptable size (otherwise it does not boot).
+
+ [ Samuel Thibault ]
+ * Add netboot hurd-i386 package list.
+ * Do not enable the Hurd console by default.
+ * Stick gnumach kernel versioning to Debian style.
+ * Add hurd-i386 Xen and gtk netboot image support
+ * Hack hurd-i386 netboot image size to have some room for downloaded udebs.
+ * Enable netcfg on hurd-i386, now having working DHCP support.
+ * Add hurd-i386 cdrom and pxe support, inspired from kfreebsd.
+ * Add sub-hurd d-i testing target.
+ * Move gtk-common's xserver-xorg-input-evdev-udeb and
+ xserver-xorg-video-fbdev-udeb to arch-specific packages. Use
+ xserver-xorg-input-kbd-udeb, xserver-xorg-input-mouse-udeb and
+ xserver-xorg-video-vesa-udeb for kfreebsd-i386,
+ kfreebsd-amd64 and hurd-i386.
+ * Add sound-modules and espeakup-udeb to i386 and amd64 gtk images.
+ * Add software speech synthesis as last x86 menu choice with an 's' shortcut.
+ * Widen x86 menu.
+ * Set default desktop to xfce on hurd-i386.
+ * Fix "extras" option in build/boot/x86/xen/debian.cfg. Closes: #637460.
+ Thanks Gedalya for the report.
+ * Rename amdspkgtk.cfg x86 menu item into amdspgtk.cfg to fit 8+3 oldiness.
+ * Add usb-serial-modules to armel images.
+ * Expand libbogl-dev dependency to !linux-any, as it is now available
+ everywhere for the font reduction tool.
+ * Include console-setup-pc-ekmap on Linux gtk images only. Include
+ console-setup-pc-ekbd and console-setup-freebsd-charmaps-udeb instead on
+ kFreeBSD gtk images (Closes: #600229).
+
+ [ Joey Hess ]
+ * Initial changes to target wheezy.
+
+ [ Christian Perrier ]
+ * Add needed characters for Uyghur
+ * Add needed characters for Ossetian
+ * Add needed characters for Sindhi
+ * No longer Build-Depend on palo (no longer used and
+ will allow removing palo from unstable)
+ * Add fonts-ukij-uyghur-udeb to graphical installer to
+ properly support Uyghur language
+ * Add file-preseed to netboot images. Closes: #621769
+ * Rename ttf-farsiweb-udeb to fonts-farsiweb-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Rename ttf-khmeros-udeb to fonts-khmeros-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Rename ttf-sil-abyssinica-udeb to fonts-sil-abyssinica-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Rename ttf-lao-udeb to fonts-lao-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Rename ttf-sinhala-lklug-udeb to fonts-lklug-sinhala-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Rename ttf-tmuni-udeb to fonts-tibetan-machine-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Rename ttf-thai-tlwg-udeb to fonts-thai-tlwg-udeb in
+ pkg-lists/gtk-common after package rename because of new
+ fonts packages policy
+ * Remplace ttf-malayalam-fonts-udeb by fonts-mlym-udeb
+ * Remplace ttf-tamil-fonts-udeb by fonts-taml-udeb
+ * Remplace ttf-telugu-fonts-udeb by fonts-telu-udeb
+
+ [ Otavio Salvador ]
+ * Update Linux kernel to 2.6.38 (ABI 2). Closes: #617943
+
+ [ Martin Michlmayr ]
+ * qnap-flash-debian: recognize QNAP TS-x12 devices.
+ * Add Buffalo Linkstation Live V3 and Mini.
+ * lspro-config-debian: Exit if the firmware version cannot be
+ determined. Thanks John Bytheway. Closes: #609476
+ * Remove support for Linksys NSLU2.
+ * Remove support for QNAP TS-x09.
+
+ [ Colin Watson ]
+ * Document Breaks as a disallowed control field.
+ * Skip the option field in sources.list lines, if present.
+ * Add gzio to GRUB_MODULES on kfreebsd, since the kernel is compressed.
+ Closes: #618320
+ * Add mipsel/loongson-2f images.
+ * When building for a subarchitecture, don't include udebs for other
+ subarchitectures in standard-udebs.
+ * Document move of /dev/.udev/firmware-missing to
+ /run/udev/firmware-missing in hw-detect 1.87.
+ * Handle udebs installing libraries into /usr/lib/$(DEB_HOST_MULTIARCH).
+ * Don't emit spurious errors if there are no files in $(EXTRAUDEBSDIR)/lib
+ or no files in $(TREE)/lib.
+ * Don't fail when one of the entries in sources.list.udeb has an empty
+ Packages file.
+
+ [ Joey Hess ]
+ * Work around binutils breakage (#623710) that broke mklibs,
+ by using mklibs-copy.
+ Of course this means larger images, and should be reverted ASAP.
+ * Revert use of mklibs-copy, as breakage seems fixed (tested on i386 and
+ amd64). Closes: #624144
+ * Let fdisk choose end sector for piggyback partition. Closes: #642183
+
+ [ Aurelien Jarno ]
+ * Add virtio udebs on s390/generic and s390/netboot.
+ * Update kFreeBSD kernel to 8.2 (ABI 1).
+ * Install unstable on s390x.
+
+ [ Robert Millan ]
+ * Enable netboot-gtk flavor on kfreebsd-amd64. Closes: #596596
+ * control: Use "any" architecture wildcards where possible.
+ * Set default desktop to xfce on kfreebsd-any.
+
+ [ Didier Raboud ]
+ * Include win32-loader's setup.exe on kfreebsd.
+
+ [ dann frazier ]
+ * Add pata-modules to cdrom config for ia64. Closes: #622187.
+
+ [ Otavio Salvador ]
+ * i386 (xen): use 686-pae flavour
+ * Switch Linux kernel to 2.6.39 (ABI 2).
+
+ [ Joey Hess ]
+ * Apply internal documentation typo and wording fix patch from
+ Karl Goetz. Closes: #633606
+
+ [ Otavio Salvador ]
+ * Update Linux kernel to 3.0.0-1
+ * Output information of all used udebs into the debian-installer
+ binary package for usage by the archive tool
+
+ [ Samuel Thibault ]
+ * Mention kernel type in any-x86 boot menu.
+ * Add ld.so.1 in the boot directory on hurd-any.
+
+ [ Hector Oron ]
+ * [armel] Add support for Linkstation Mini.
+ Thanks Benjamin Cama. (Closes: #637339)
+ * [armhf/mx5] Add initial support for armhf/mx5 devices.
+ * Rename uboot-mkimage build dependency to u-boot-tools.
+ - Add armhf to the list.
+
+ [ Philipp Kern ]
+ * Add support for s390x.
+ * Update Linux kernel to 3.0.0-2. (Hence using udebs from linux-2.6.)
+
+ [ Otavio Salvador ]
+ * Update kernel version to use to 3.1.0-1.
+
+ [ Robert Millan ]
+ * Remove filesystem modules (except isofs and nullfs) from cdrom image in
+ kfreebsd-* (their udebs are now available in the CD-ROM).
+ * Enable kfreebsd-9 builds.
+ * Remove `vfs.root.mountfrom' setting (not necessary with current kFreeBSD
+ versions).
+
+ [ Joey Hess ]
+ * Add SHA256SUMS file like MD5SUMS file. (See #622941)
+ * Switch from spacefun back to the generic (klowner) boot image.
+ Closes: #650979
+
+ [ Robert Millan ]
+ * Enable gtk in kfreebsd-amd64 cdrom builds.
+ * Remove unnecessary "cd" variable from grub.cfg.
+ * Detect GTK+ images on GNU/kFreeBSD and add them to GRUB menu when
+ present.
+ * Misc grub.cfg fixes:
+ - Pass menuentry information using parameters instead of variables.
+ Thanks Steven Chamberlain.
+ - Pre-load test.mod. (Closes: #651641)
+ - Make GRUB 1.99 a build requirement (introduced in previous commits).
+
+ [ Samuel Thibault ]
+ * Use grub functions to factorize grub boot.
+ * Include kbdcontrol-udeb by hand on kfreebsd gtk images, as pkg-list is not
+ able to choose it among the alternative dependencies.
+
+ [ Joey Hess ]
+ * Remove unused pkg-list files and configuration for i386 floppys.
+
+ [ Samuel Thibault ]
+ * Use console-setup on kfreebsd text images.
+
+ [ Jurij Smakov ]
+ * Update kernel version to 3.2.0-1.
+
+ [ Samuel Thibault ]
+ * Replace kbd-chooser with console-setup-udeb+kbd-udeb, and
+ console-keymaps-* with console-setup-*-ekmap (Closes: #610524).
+
+ [ Bastian Blank ]
+ * mips: Use initramfs.
+ * Remove unused cramfs support.
+
+ [ Joey Hess ]
+ * Add ext4-modules to hd-media initrds. Closes: #661620
+
+ [ Otavio Salvador ]
+ * Update to 3.2.0-2 ABI.
+
+ [ Julien Cristau ]
+ * Drop ide-modules and ide-core-modules from all images except
+ cdrom/{ia64,hppa}.
+ * Use linux-any instead of a long moving list of archs for the m-i-t
+ build-dependency.
+
+ [ Samuel Thibault ]
+ * Switch mach console-based hurd-i386 installer to gnu-mach-color TERM.
+
+ [ Otavio Salvador ]
+ * Refactor code that generates the 'Built-Using' data.
+ * Drop binNMU suffix from Built-Using version.
+
+ -- Otavio Salvador Tue, 27 Mar 2012 09:21:45 -0300
+
+debian-installer (20110106) unstable; urgency=low
+
+ * Use SpaceFun theme. Closes #603554.
+ * Update Linux kernel to 2.6.32-29.
+
+ -- Otavio Salvador Thu, 06 Jan 2011 09:37:41 -0200
+
+debian-installer (20101127) unstable; urgency=low
+
+ [ Christian Perrier ]
+ * Add pata-modules to powerpc builds to properly support
+ YDL Powerstation. Thanks to Milan Kupcevic. Closes: #603893
+ * Add ttf-lao-udeb to graphical installer to properly support the Lao
+ language
+
+ -- Otavio Salvador Sat, 27 Nov 2010 15:18:28 -0200
+
+debian-installer (20101121) unstable; urgency=low
+
+ [ Otavio Salvador ]
+ * Enable localudebs usage again since #600852 has been fixed.
+ * Add VCS-Browser field to debian.control. Closes: #601908
+
+ [ Martin Michlmayr ]
+ * LS Pro: /boot can be ext3 too. Thanks Ryan Tandy.
+
+ [ Otavio Salvador ]
+ * Update Linux kernel udebs for 2.6.32-27.
+ * sparc/sparc64: put input-modules into initrd. Closes: #602740
+
+ [ Colin Watson ]
+ * geniso_hybrid_plus_firmware_partition: Cope if the disk size exceeds
+ 32MB. (The previous code seems to have misunderstood isohybrid's
+ defaults slightly, but we now just specify the full CHS geometry
+ explicitly in case anything changes in the future.)
+
+ [ Christian Perrier ]
+ * Add ttf-sinhala-lklug-udeb to graphical installer to properly
+ support the Sinhala language
+
+ [ Otavio Salvador ]
+ * Document SPLASH_PNG variable for build configuration.
+
+ -- Otavio Salvador Sun, 21 Nov 2010 15:53:25 -0200
+
debian-installer (20101020) unstable; urgency=low
[ Joey Hess ]
* Run isohybrid on i386 and amd64 miniiso, which allows it to be written
- directly to and booted from a USB stick.
+ directly to and booted from a USB stick.
[ Samuel Thibault ]
* Explicitly set timeout to -1 in grub configurations, to make it easy to
@@ -45,10 +2036,10 @@ debian-installer (20100911) unstable; ur
[ Aurelien Jarno ]
* Build-depends on debian-ports-archive-keyring on architectures
hosted on debian-ports.org (sh4, sparc64).
- * Build-depends on module-init-tools on sh4 and sparc64 as on other
+ * Build-depends on module-init-tools on sh4 and sparc64 as on other
Linux architectures.
* Switch kfreebsd-amd64 and kfreebsd-i386 to 8.1 kernel.
- * Don't try to build unifont.bdf on GNU/kFreeBSD as the console already
+ * Don't try to build unifont.bdf on GNU/kFreeBSD as the console already
has basic font support for level 1 and bogl-bterm is not available.
* Build-depends on xorriso on kfreebsd-amd64, kfreebsd-i386 and hurd-i386.
* Add support to generate cdrom images on GNU/kFreeBSD.
@@ -80,7 +2071,7 @@ debian-installer (20100911) unstable; ur
Closes: #593208
[ Joey Hess ]
- * Use Dir::Etc::trusted rather than Apt::GPGV::TrustedKeyring,
+ * Use Dir::Etc::trusted rather than Apt::GPGV::TrustedKeyring,
to work with apt 0.8.0.
-- Otavio Salvador Sat, 11 Sep 2010 11:15:37 -0300
@@ -219,7 +2210,7 @@ debian-installer (20100122) unstable; ur
* Drop no longer needed versioned build dependency on dpkg.
[ Aurelien Jarno ]
- * Build GNU/kFreeBSD images using grub-mkrescue instead of grub-image,
+ * Build GNU/kFreeBSD images using grub-mkrescue instead of grub-image,
using patch from Robert Millan.
[ Samuel Thibault ]
@@ -529,7 +2520,7 @@ debian-installer (20081027) unstable; ur
[ Bastian Blank ]
* Move s390 to 2.6.26-1.
-
+
[ Stephen R. Marenka ]
* Move m68k to 2.6.26-1.
* Add modules to cdrom.
@@ -2576,9 +4567,9 @@ debian-installer (20040424) unstable; ur
debian-installer (20040422) unstable; urgency=low
* Bdale Garbee
- - add a new MISC target to the build Makefile, which makes it easy to
- deliver a set of additional files to the target directory. use it to
- deliver the bootloader and config file (elilo.efi and elilo.conf) for
+ - add a new MISC target to the build Makefile, which makes it easy to
+ deliver a set of additional files to the target directory. use it to
+ deliver the bootloader and config file (elilo.efi and elilo.conf) for
ia64 netboot.
- add ia64 netboot instructions to the manual
* Martin Michlmayr
@@ -2731,7 +4722,7 @@ debian-installer (20040403) unstable; ur
- Enable autobuilding on arm.
* Joey Hess
- Fix alpha netboot to use discover1-udeb, to avoid build failure.
-
+
-- Joey Hess Wed, 31 Mar 2004 16:43:13 -0500
debian-installer (20040402) unstable; urgency=low
@@ -2834,7 +4825,7 @@ debian-installer (20040325) unstable; ur
* Joey Hess
- Try to add manifest info for hppa.
* Vincent Sanders
- - Add support for pkg-lists to have kernel module packages on selected
+ - Add support for pkg-lists to have kernel module packages on selected
targets.
- change ARM netboot target to use this functionality
- add several more ARM configurations
@@ -2949,7 +4940,7 @@ debian-installer (20040313) unstable; ur
- sparc: rearrange some of the kernel handling.
* Bastian Blank
- Add cdebconf-text-udeb on s390.
- - Move hw-detect and bogl-bterm-udeb from common to i386, m68k, mips for
+ - Move hw-detect and bogl-bterm-udeb from common to i386, m68k, mips for
demo.
* Several updated translations in udebs.
@@ -3054,7 +5045,7 @@ debian-installer (20040301) unstable; ur
- Removed the xfs flavoured cdrom, since 2.4.25 will have xfs standard.
- Add m68k as an arch in the control file.
* Joshua Kwan
- - Fixed broken sparc32_netboot build. Same fix as the one for
+ - Fixed broken sparc32_netboot build. Same fix as the one for
sparc64_netboot.
-- Joey Hess Sat, 28 Feb 2004 14:56:38 -0500
@@ -3164,7 +5155,7 @@ debian-installer (20040209) unstable; ur
- Make all the syslinux help screens leave graphics mode when displayed.
- Hack syslinux.txt so it all fits on one line, the same line as the boot:
prompt.
- - Add ${BOOTPROMPT} expansion to bootscreen-subst, to make it easy
+ - Add ${BOOTPROMPT} expansion to bootscreen-subst, to make it easy
to make the last line in a syslinux screen not have a newline at EOF
on the image, while still being easily editable.
- Switch cdroms from load-installer to load-cdrom. This is to work around
@@ -3262,7 +5253,7 @@ debian-installer (20031223) unstable; ur
via -F and delete it when done. This is to support building on systems
running 2.6.
- Remove ide modules stuff from net drivers floppy. I don't know why it
- was there, but its deps were not met and this could cause ugly messages
+ was there, but its deps were not met and this could cause ugly messages
during install.
- Remove the same ide modules from i386 netboot.
- Document the bootkbd boot parameter in syslinux f7.txt.
diff -pruN 20101020/debian/compat 20201202/debian/compat
--- 20101020/debian/compat 2010-01-22 19:28:45.000000000 +0000
+++ 20201202/debian/compat 2020-07-26 06:38:45.000000000 +0000
@@ -1 +1 @@
-7
+11
diff -pruN 20101020/debian/control 20201202/debian/control
--- 20101020/debian/control 2010-09-16 19:07:07.000000000 +0000
+++ 20201202/debian/control 2020-11-30 23:08:26.000000000 +0000
@@ -2,172 +2,169 @@ Source: debian-installer
Section: devel
Priority: optional
Maintainer: Debian Install System Team
-Uploaders: Frans Pop , Otavio Salvador
-Standards-Version: 3.8.3
-Vcs-Svn: svn://svn.debian.org/d-i/trunk/installer
-Build-Conflicts: libnewt-pic [mipsel]
-# NOTE: Do not edit the next line by hand. See comment below.
-Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, debian-archive-keyring (>= 2006.11.22), dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools [i386 ia64 m68k amd64], cpio, devio [armeb armel], slugimage (>= 0.10+r58-6) [armeb armel], dns323-firmware-tools [armel], uboot-mkimage [armel], syslinux (>= 2:4.02) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [armeb armel], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386], module-init-tools [i386 armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl [armel], win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386], makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386], debian-ports-archive-keyring [sh4 sparc64]
-# This package has the worst Build-Depends in Debian, so it deserves some
-# explanation. Note that this comment can also be used to generate a
-# Build-Depends line, by running the debian/genbuilddeps program.
-# So put each build dep on its own line, prefixed by " - " and to
-# comment out a build dep, start the line with two hashes. And don't edit
-# the Build-Depends line above by hand.
-#
+Uploaders: Cyril Brulebois
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/installer-team/debian-installer.git
+Vcs-Browser: https://salsa.debian.org/installer-team/debian-installer
+Build-Depends:
# Base build dependencies:
-# - debhelper (>= 7.0.0)
+ debhelper (>= 11),
# Of course.
-# - apt
+ apt (>= 0.8.16),
# Used for downloading udebs.
-# - apt-utils
+ apt-utils,
# apt-ftparchive is used for including localudebs.
-# - gnupg
+ gnupg,
# New versions of apt need gnupg for security checks.
-# - debian-archive-keyring (>= 2006.11.22)
+ debian-archive-keyring (>= 2006.11.22),
# To provide the archive key for security checks.
-# - dctrl-tools
+ dctrl-tools,
# Various manipulations of the udeb Packages files.
-# - wget
+ wget,
# Used to test validity of mirrors.
-# - bc
+ bc,
# Used for some image size calculations.
-# - debiandoc-sgml
-# partman's manual is in debiandoc.
-# - xsltproc
-# - docbook-xml
-# - docbook-xsl
-# The d-i internals manual is in DocBook XML.
-# - libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+ xsltproc,
+ docbook-xml,
+ docbook-xsl,
+# The d-i partman-doc and internals manual is in DocBook XML 4.x.
+ libbogl-dev,
# For bdftobogl used in font reduction.
-#
-# Library build dependencies:
-# - glibc-pic
-# For library reduction.
-# - libslang2-pic (>= 2.0.6-4)
-# Make dependency versioned temporarily to make sure we avoid #392942
-# - libnewt-pic (>= 0.52.2-11.3) [!mipsel]
-# Rather than use slang and newt udebs, reduced versions of
-# the libraries are put onto images to save space.
-# - libnewt-dev (>= 0.52.2-11.3) [mipsel]
-# On mipsel, we can't use libnewt-pic right now due to bug
-# #329733. See also Build-Conflicts above.
-# - libgcc1 [i386 amd64]
-# On x86 we need to include /lib/libgcc_s.so.1 in g-i initrds to
-# work around #373253 until upstream can remove pthread_cancel()
-# On i386
-# calls in directfb. For now, this is done by setting EXTRAFILES.
+ libgcc-s1 [!hppa !m68k], libgcc-s2 [m68k], libgcc-s4 [hppa],
+# The GCC support library is copied to the to the installation
+# image. This is a hack and needs to be replaced by a proper
+# udeb.
#
# Filesystem tools:
-# - cramfsprogs [powerpc ia64 mips mipsel armeb armel]
-# For arches that use cramfs initrds.
-# - genext2fs (>= 1.3-7.1)
+ genext2fs (>= 1.3-7.1),
# For creating ext2 filesystems without being root.
# 1.3-7.1 fixes issues on several arches.
-# - e2fsprogs
+ e2fsprogs,
# genext2fs doesn't produce perfect filesystems, so we fsck
# them.
# Lintian: Yes, we know it's essential. We prefer not to
# count on it remaining so.
-# - mklibs (>= 0.1.25)
-# We use mklibs for library reduction.
-# - genisoimage [!s390 !s390x]
+ genisoimage [!s390 !s390x],
# For making mini isos.
-# - genromfs [sparc sparc64]
+ genromfs [sparc sparc64],
# Used for creating sparc floppies (which are not built by
# default.)
-# - hfsutils [powerpc]
-# For making bootable HFS USB sticks for powerpc.
-# - dosfstools [i386 ia64 m68k amd64]
+ dosfstools [hurd-i386 i386 ia64 m68k amd64 armhf arm64],
# For creating FAT filesystems with mkfs.msdos.
# Of course i386/amd64 use this for floppies, CDs etc.
-# ia64 uses it for floppies (?)
# m68k uses it for atari floppies
-# - cpio
-# For creating initramfs images.
-# - devio [armeb armel]
+# armhf uses it for building bootable SD card images
+ cpio (>= 2.11+dfsg-6),
+# For creating (reproducible) initramfs images.
+ xz-utils,
+# For compressing initramfs images.
+ devio [armeb armel],
# Tool to read and write from block devices, used to byteswap
# kernels and add nslu2 boot magic.
-# - slugimage (>= 0.10+r58-6) [armeb armel]
-# For building nslu2 firmware images.
-# - dns323-firmware-tools [armel]
-# For building firmware images for the D-Link DNS-323.
-# - uboot-mkimage [armel]
+ dns323-firmware-tools (>= 0.7.3-1~) [armel],
+# For building firmware images for the D-Link DNS-32(0|3).
+ u-boot-tools [armel armhf arm64],
# For creating u-boot images
#
# Boot loaders:
# On many arches boot loaders are copied onto or ran on the boot
# images in one way or another. There's a reason our mailing list is
# still called debian-boot..
-# - syslinux (>= 2:4.02) [i386 amd64]
+ syslinux [i386 amd64],
+ syslinux-utils [i386 amd64],
+ isolinux [i386 amd64],
+ pxelinux [i386 amd64],
+ syslinux-common (>= 3:6) [i386 amd64],
# With isohybrid.
-# - palo [hppa]
-# - elilo [ia64]
-# - yaboot [powerpc]
-# For all our powerpc boot needs. Well, not really.
-# - aboot (>= 0.9b-2) [alpha]
+ aboot (>= 0.9b-2) [alpha],
# A previous version didn't have netabootwrap.
-# - silo [sparc]
-# Using silo is problimatic since it needs to run as root,
-# so images that need it are not built by default, but we
-# include it for completeness.
-# - sparc-utils [sparc sparc64]
+ palo [hppa],
+# Bootloader for hppa machines, to make netboot images.
+ sparc-utils [sparc sparc64],
# For elftoaout and piggyback, to make netboot images.
-# - genisovh [mips]
-# Makes mini iso images bootable on SGI MIPSen.
-# - tip22 [mips]
-# Piggyback netboot images.
-# - colo [mipsel]
-# For booting Cobalt machines.
-# - sibyl [mips mipsel]
-# For booting the SWARM board.
-# - atari-bootstrap [m68k]
+ atari-bootstrap [m68k],
# Booting and other tools for Atari systems.
-# - vmelilo [m68k]
-# - m68k-vme-tftplilo [m68k]
+ vmelilo [m68k],
+ m68k-vme-tftplilo [m68k],
# For VME machines, although it doesn't yet support running
# as non-root, the install will try to use it and fall back
# to a warning when it fails.
-# - amiboot [m68k]
+ amiboot [m68k],
# Bootloader for m68k/amiga machines.
-# - emile [m68k]
-# - emile-bootblocks [m68k]
+ emile [m68k],
+ emile-bootblocks [m68k],
# Bootloader for m68k/mac machines.
-# - apex-nslu2 [armeb armel]
-# 2nd stage bootloader for Linksys NSLU2.
+ shim-signed [amd64 i386 arm64],
+ grub-efi-amd64-signed [amd64],
+ grub-efi-ia32-signed [i386],
+ grub-efi-arm64-signed [arm64],
+# Signed bootloader components for UEFI Secure Boot
+ grub-efi-arm64-bin [arm64],
+ grub-efi-ia32-bin [hurd-i386 i386],
+ grub-efi-ia64-bin [ia64],
+ grub-efi-arm-bin [armhf],
+ grub-common [amd64 arm64 i386], xorriso,
+# Used to make EFI bootable images
+ grub-ieee1275-bin [powerpc ppc64 ppc64el sparc sparc64],
+# IEEE1275 bootloader support.
+ u-boot-imx (>= 2019.01+dfsg-3) [armhf],
+ u-boot-omap (>= 2016.09~rc1) [armhf],
+ u-boot-sunxi (>= 2019.07+dfsg-1) [armhf],
+ u-boot-sunxi (>= 2019.01+dfsg-6) [arm64],
+ u-boot-rockchip (>= 2020.04+dfsg-1~) [armhf],
+ u-boot-rockchip (>= 2020.04+dfsg-2~) [arm64],
+# U-boot binaries for armhf systems without u-boot in flash memory
+ arm-trusted-firmware [arm64],
+ device-tree-compiler [arm64],
+# arm-trusted-firmware for allwinner, used in combination with
+# u-boot-sunxi to produce bootable arm64 images.
+ u-boot (>= 2016.01+dfsg1-1~) [armel],
+# U-boot binaries for armel systems
+#
# Architecture specific build dependencies:
-# - tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
+ tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
# For todos, used on files that need to be accessible from
# DOS.
-# - mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386]
+ mtools [i386 ia64 m68k amd64 armhf arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386],
# mcopy is used to put files onto FAT filesystems w/o
-# mounting them.
+# mounting them. Note that patches from #900409 and #900410
+# are required for a reproducible build (available since
+# 4.0.18-2.1).
#
-# - module-init-tools [i386 armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64]
-# depmod for 2.6 kernels on the arches that support 2.6.
+ kmod [linux-any],
+# depmod.
#
-# - bf-utf-source [!s390 !s390x]
+ bf-utf-source [!s390 !s390x],
# Contains the unicode font we use. Not a udeb since we
# perform font reduction at build time.
-# - mkvmlinuz [powerpc]
-# Used to make powerpc images that can boot direct from
-# firmware w/o using a boot loader.
-# - openssl [armel]
+ openssl,
# Used to encrypt a firmware image so an ARM based device
-# (Thecus N2100) will accept it.
-# - win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386]
+# (Thecus N2100) will accept it. Also useful on other
+# architectures if SSL_CERTS has been set locally.
+ win32-loader (>= 0.7.2) [i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386],
# Alternative boot method for win32 platforms.
-# - makefs [kfreebsd-i386 kfreebsd-amd64]
+ makefs (>= 20100306-5+kbsd8u1~) [kfreebsd-any],
# Used to create an UFS1 filesystem from a directory tree.
-# - grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386]
+ grub-pc (>= 2.02~beta2~) [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
# Used as the CD-ROM's bootloader
-# - xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386]
+ xorriso (>= 1.3.2-1~) [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
# Used by grub-pc to create the CD-ROM images
-# - debian-ports-archive-keyring [sh4 sparc64]
+ debian-ports-archive-keyring [alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32],
# Used for architectures hosted on debian-ports.org
+ librsvg2-bin [any-amd64 any-i386],
+# Used to convert splash SVG to splash PNG during build
+ fdisk [amd64 arm64 armhf i386],
+# sfdisk is used by util/gen-hd-image when creating SD card
+# images for arm64 and armhf systems.
+# fdisk is used is used by util/geniso_hybrid_plus_firmware_partition
+# when creating ISO hybrid images on amd64 and i386 systems.
+ fontconfig,
+# Used to generate a font cache through fc-cache, for gtk flavours
Package: debian-installer
Architecture: any
-Description: Debian installer
+Built-Using: ${initrd:Built-Using}, ${extra:Built-Using}
+Depends: ${misc:Depends}
+Description: Debian Installer documentation
This package currently only contains some documentation for the Debian
installer. We welcome suggestions about what else to put in it.
diff -pruN 20101020/debian/copyright 20201202/debian/copyright
--- 20101020/debian/copyright 2010-01-11 15:35:36.000000000 +0000
+++ 20201202/debian/copyright 2020-06-25 21:49:40.000000000 +0000
@@ -17,3 +17,31 @@ The open use Debian logo is used in some
1999 Software in the Public Interest. This logo or a modified version may be
used by anyone to refer to the Debian project, but does not indicate
endorsement by the project. http://www.debian.org/logos/
+
+The joy theme images (list of files below) have been designed from the
+joy theme (© 2012 Adrien Aubourg, GPLv2) but use the klowner layout and
+a rebuilt-from-scratch "debian" word.
+
+ build/boot/hurd/pics/joy-hurd.svg
+ build/boot/kfreebsd/pics/joy-kbsd.svg
+ build/boot/x86/pics/joy.svg
+
+The Lines theme images (list of files below) have been designed from the
+Lines theme (© 2014 Juliette Taka BELIN, GPLv2+) but use the klowner
+layout.
+
+ build/boot/hurd/pics/lines-hurd.svg
+ build/boot/kfreebsd/pics/lines-kbsd.svg
+ build/boot/x86/pics/lines.svg
+
+The Soft Waves theme images (list of files below) are © 2016 Juliette Taka
+BELIN, GPLv2+.
+
+ build/boot/hurd/pics/softwaves-hurd.svg
+ build/boot/kfreebsd/pics/softwaves-kbsd.svg
+ build/boot/x86/pics/softwaves.svg
+
+The gen-hd-image tool, used to build bootable partitioned disk images, is
+Copyright 2014,2015 Karsten Merker and is dual-licensed.
+It is provided under the terms of the GNU GPL version 2 or any later
+version, or alternatively under the terms of the X11 license.
diff -pruN 20101020/debian/genbuilddeps 20201202/debian/genbuilddeps
--- 20101020/debian/genbuilddeps 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/debian/genbuilddeps 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-# Generate build deps line from comments in the control file and replace
-# the current build deps line in the control file with it.
-
-my $control;
-if (-e "debian/control") {
- $control="debian/control";
-}
-elsif (-e "control") {
- $control="control";
-}
-else {
- die "cannot find control file";
-}
-
-my @builddeps;
-my @lines;
-open (IN, $control) || die "read $control: $!";
-while () {
- push @lines, $_;
- chomp;
- if (/^#\s+-\s+(.*)$/) {
- push @builddeps, $1;
- }
-}
-close IN;
-
-my $builddeps=join(", ", @builddeps);
-open (OUT, ">$control.tmp") || die "write $control.tmp: $!";
-foreach (@lines) {
- s/^(Build-Depends:\s+)(.*)/$1$builddeps/;
- print OUT || die "print: $!";
-}
-close OUT || die "close: $!";
-rename("$control.tmp", "$control")
- || die "rename $control.tmp to $control: $!";
diff -pruN 20101020/debian/rules 20201202/debian/rules
--- 20101020/debian/rules 2010-01-22 19:28:45.000000000 +0000
+++ 20201202/debian/rules 2020-11-30 23:08:26.000000000 +0000
@@ -3,23 +3,36 @@
ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
VERSION=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
DATE=$(shell echo $(VERSION) | cut -d '.' -f 1)
+SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s)
SUITE=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Distribution: | cut -d ' ' -f 2)
+
+# Daily builds vs. uploads to unstable:
ifeq (${SUITE},UNRELEASED)
USE_UDEBS_FROM=unstable
TRANSSTATUS=
BOOTMENU_BEEP=n
else
-USE_UDEBS_FROM=squeeze
+USE_UDEBS_FROM=bullseye
USE_PROPOSED_UPDATES=0
TRANSSTATUS=translation-status
BOOTMENU_BEEP=y
endif
+# Adjust for non-released ports if needed:
+RELEASE_ARCHES=amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
+ifeq (,$(filter $(ARCH), $(RELEASE_ARCHES)))
+USE_UNRELEASED=1
+USE_UDEBS_FROM=unstable
+USE_PROPOSED_UPDATES=0
+endif
+
ARCHIVEDIR=debian/tmp/installer-$(ARCH)
DESTDIR=$(ARCHIVEDIR)/$(DATE)
IMAGEDIR=$(DESTDIR)/images
TARNAME=debian-installer-images_$(VERSION)_$(ARCH).tar.gz
+export SOURCE_DATE_EPOCH
+
clean:
dh_testdir
dh_testroot
@@ -33,9 +46,13 @@ build-images:
$(MAKE) -C build all_build stats release \
USE_UDEBS_FROM=$(USE_UDEBS_FROM) BUILD_DATE=$(DATE) \
USE_PROPOSED_UPDATES=$(USE_PROPOSED_UPDATES) \
+ USE_UNRELEASED=$(USE_UNRELEASED) \
TRANSSTATUS=$(TRANSSTATUS) BOOTMENU_BEEP=$(BOOTMENU_BEEP)
-
-build: build-stamp
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
build-stamp:
rm -f $@
$(MAKE) -C doc/devel/internals
@@ -47,28 +64,31 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
+
debian/rules build-images
install -d $(IMAGEDIR)
cp -a build/dest/* $(IMAGEDIR)
ln -s $(DATE) $(ARCHIVEDIR)/current
-binary-arch: install
+binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs doc/* -X Makefile -X build.sh -X .xsl \
- -X internals.xml -X partman-doc.sgml
+ -X internals.xml -X partman-doc.dbk -X .gitignore
dh_compress
dh_fixperms
+
+ ./build/util/write-built-using
+
dh_gencontrol
dh_md5sums
dh_builddeb
- cd debian/tmp && tar czvf ../../../$(TARNAME) .
+ ./build/util/gen-tarball debian/tmp ../$(TARNAME)
dpkg-distaddfile $(TARNAME) raw-installer -
binary-indep:
-binary: binary-indep binary-arch
-.PHONY: build build-images clean binary-indep binary-arch binary install
+binary: binary-indep binary-arch
+.PHONY: build build-images clean binary-indep binary-arch binary install
diff -pruN 20101020/debian/source/format 20201202/debian/source/format
--- 20101020/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/debian/source/format 2020-07-26 06:38:45.000000000 +0000
@@ -0,0 +1 @@
+1.0
diff -pruN 20101020/doc/brltty.txt 20201202/doc/brltty.txt
--- 20101020/doc/brltty.txt 2008-10-27 10:43:30.000000000 +0000
+++ 20201202/doc/brltty.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-Braille display support for d-i:
---------------------------------
-
-There is a special floppy netinst flavour for braille users, called 'access'.
-
-To activate Braille display support during the installation,
-you need to pass a boot parameter to the boot loader. Here is the format:
-
-brltty=driver-code,device,text-table
-
-driver-code: A two-letter code which identifies the display model being in use.
- See brltty documentation for a complete list.
-device: The device where the display is connected at. If tts/0, this
- field can be left blank since that is the default.
-text-table: The braille translation table to be used. Default is the
- us table. Examples might be de, fr, it, ru ...
-
-Example:
-
-For a PowerBraille display on tts/1 with a german braille translation table:
-brltty=ts,tts/1,de
-
-For a HandyTech display on tts/0 with russian translation table:
-brltty=ht,,ru
-
-For a Papenmeier Display on tts/0 with the default translation table:
-brltty=pm
-
- -- Mario Lang
-
diff -pruN 20101020/doc/devel/anna-install.txt 20201202/doc/devel/anna-install.txt
--- 20101020/doc/devel/anna-install.txt 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/devel/anna-install.txt 2020-11-30 23:08:26.000000000 +0000
@@ -6,7 +6,7 @@ Subject: Re: r41007 - in trunk/packages/
Date: Fri, 29 Sep 2006 11:39:41 -0400
User-Agent: Mutt/1.5.13 (2006-08-11)
-David Hrdeman wrote:
+David Härdeman wrote:
> On a related note, Max indicated that it seems that anna-install *does*
> return an error if it fails to install dependencies, so it seems that most
> of the fixes that I committed to partman-crypto (except calling depmod)
diff -pruN 20101020/doc/devel/available-hooks.txt 20201202/doc/devel/available-hooks.txt
--- 20101020/doc/devel/available-hooks.txt 2010-02-11 20:00:40.000000000 +0000
+++ 20201202/doc/devel/available-hooks.txt 2020-07-26 06:38:45.000000000 +0000
@@ -2,4 +2,4 @@ The overview of the currently assigned m
the "D-I Internals" document.
See installer/doc/devel/internals/available-hooks.xml, or
-http://d-i.alioth.debian.org/doc/internals/.
+https://salsa.debian.org/installer-team/debian-installer/tree/master/doc/devel/internals/
diff -pruN 20101020/doc/devel/hardware/arm/glantank/info/cpuinfo 20201202/doc/devel/hardware/arm/glantank/info/cpuinfo
--- 20101020/doc/devel/hardware/arm/glantank/info/cpuinfo 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/glantank/info/cpuinfo 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Processor : XScale-80219 rev 0 (v5l)
-BogoMIPS : 398.95
-Features : swp half fastmult edsp
-CPU implementer : 0x69
-CPU architecture: 5TE
-CPU variant : 0x0
-CPU part : 0x2e2
-CPU revision : 0
-Cache type : undefined 5
-Cache clean : undefined 5
-Cache lockdown : undefined 5
-Cache format : Harvard
-I size : 32768
-I assoc : 32
-I line length : 32
-I sets : 32
-D size : 32768
-D assoc : 32
-D line length : 32
-D sets : 32
-
-Hardware : GLAN Tank
-Revision : 0000
-Serial : 0000000000000000
diff -pruN 20101020/doc/devel/hardware/arm/glantank/info/lspci 20201202/doc/devel/hardware/arm/glantank/info/lspci
--- 20101020/doc/devel/hardware/arm/glantank/info/lspci 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/glantank/info/lspci 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-00:01.0 Ethernet controller: Intel Corporation 82541GI/PI Gigabit Ethernet Controller (rev 05)
-00:02.0 Mass storage controller: Artop Electronic Corp ATP865 (rev 10)
-00:03.0 USB Controller: NEC Corporation USB (rev 43)
-00:03.1 USB Controller: NEC Corporation USB (rev 43)
-00:03.2 USB Controller: NEC Corporation USB 2.0 (rev 04)
diff -pruN 20101020/doc/devel/hardware/arm/glantank/info/lspci-v 20201202/doc/devel/hardware/arm/glantank/info/lspci-v
--- 20101020/doc/devel/hardware/arm/glantank/info/lspci-v 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/glantank/info/lspci-v 1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-00:01.0 Ethernet controller: Intel Corporation 82541GI/PI Gigabit Ethernet Controller (rev 05)
- Subsystem: I-O Data Device, Inc. Unknown device d02a
- Flags: bus master, 66MHz, medium devsel, latency 0, IRQ 27
- Memory at 80000000 (64-bit, non-prefetchable) [size=128K]
- Memory at 80020000 (64-bit, non-prefetchable) [size=64K]
- I/O ports at 90000080 [size=64]
- [virtual] Expansion ROM at 80030000 [disabled] [size=64K]
- Capabilities: [dc] Power Management version 2
- Capabilities: [e4] PCI-X non-bridge device
-
-00:02.0 Mass storage controller: Artop Electronic Corp ATP865 (rev 10)
- Subsystem: Artop Electronic Corp ATP865
- Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 28
- I/O ports at 900000c0 [size=8]
- I/O ports at 900000d0 [size=4]
- I/O ports at 900000c8 [size=8]
- I/O ports at 900000d4 [size=4]
- I/O ports at 90000000 [size=128]
- Memory at 80050000 (32-bit, non-prefetchable) [size=4K]
- Expansion ROM at 80040000 [size=64K]
- Capabilities: [58] Power Management version 2
-
-00:03.0 USB Controller: NEC Corporation USB (rev 43) (prog-if 10 [OHCI])
- Subsystem: NEC Corporation Hama USB 2.0 CardBus
- Flags: bus master, medium devsel, latency 8, IRQ 29
- Memory at 80051000 (32-bit, non-prefetchable) [size=4K]
- Capabilities: [40] Power Management version 2
-
-00:03.1 USB Controller: NEC Corporation USB (rev 43) (prog-if 10 [OHCI])
- Subsystem: NEC Corporation Hama USB 2.0 CardBus
- Flags: bus master, medium devsel, latency 8, IRQ 29
- Memory at 80052000 (32-bit, non-prefetchable) [size=4K]
- Capabilities: [40] Power Management version 2
-
-00:03.2 USB Controller: NEC Corporation USB 2.0 (rev 04) (prog-if 20 [EHCI])
- Subsystem: NEC Corporation USB 2.0
- Flags: bus master, medium devsel, latency 68, IRQ 29
- Memory at 80053000 (32-bit, non-prefetchable) [size=256]
- Capabilities: [40] Power Management version 2
-
diff -pruN 20101020/doc/devel/hardware/arm/glantank/README 20201202/doc/devel/hardware/arm/glantank/README
--- 20101020/doc/devel/hardware/arm/glantank/README 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/glantank/README 1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-The GLAN Tank is a NAS device with a 400 MHz IOP chip, 2 IDE slots, 128 MB
-RAM, 4 USB ports and 1 GBit Ethernet. Other devices from IO-Data, in
-particular the HDL-Gxxx, HDL-GWxxx, and HDL-GZxxx series, are very similar
-and should be supported too.
-
-The GLAN Tank only has 0.5 MB flash which contains a version of RedBoot
-that can read a kernel and initrd from IDE disk. It starts the following
-commands:
-
-RedBoot> load hda1:/initrd -r -v -b 0x00800000 -m disk
-RedBoot> load hda1:/zImage -r -v -b 0x00012000 -m disk
-RedBoot> exec -c "root=/dev/hda2 initrd=0xa0800000,8M rw console=ttyS0,115200 mem=128M@0xa0000000"
-
-There are a number of implications for debian-intaller. First of all,
-given that there's no network support or similar in RedBoot, the initial
-kernel and ramdisk to start d-i have to be put on an IDE manually as
-"zImage" and "initrd" (on hda1). Secondly, because of the cmd line, d-i
-has to use an initramfs. An initrd (ext2, cramfs) will not work because
-while it will load the initrd it will then try to access root (/dev/hda2)
-and fail. d-i can only be started by using an initramfs. Finally, it
-also means that this machine needs a /boot partition on hda1 and / on
-hda2.
-
diff -pruN 20101020/doc/devel/hardware/arm/kurobox-pro/README 20201202/doc/devel/hardware/arm/kurobox-pro/README
--- 20101020/doc/devel/hardware/arm/kurobox-pro/README 2008-11-29 11:10:56.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/kurobox-pro/README 2020-06-25 21:49:40.000000000 +0000
@@ -67,6 +67,3 @@ debian-installer: we support installatio
via the serial console. In the case of SSH, the password is either
preseeded or the default password 'install' is used.
-Upstream contact:
- Byron Bradley (kernel)
- Lennert Buytenhek (kernel)
diff -pruN 20101020/doc/devel/hardware/arm/n2100/firmware 20201202/doc/devel/hardware/arm/n2100/firmware
--- 20101020/doc/devel/hardware/arm/n2100/firmware 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/firmware 1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-Thecus ships their firmware as a file ending with .bin that is encrypted
-with DES. They use the "des" utility and use a string as the key. Kurt
-Roeckx found out that you can convert this string to a proper OpenSSL
-key with DES_string_to_key.
-
-The key is:
- n2100 (7A9816A4C275D557) for the Thecus N2100 and derivates
- n4100 (2A8A312F46D5D64C) for the Thecus N4100 and derivates
- n4100pro (76B3EC2FBA49707F) for the Thecus N4100+ and derivates
-
-You can decrypt a firmware image this way:
-
- openssl enc -d -des -in n2100upgrade.2.1.01.bin -out firmware.tar.gz \
- -K 7A9816A4C275D557 -iv 0 -nosalt -nopad
-
-You can encrypt it using:
-
- openssl enc -e -des -in firmware.tar.gz -out n2100.bin \
- -K 7A9816A4C275D557 -iv 0 -nosalt
-
-When you unpack this file, you get a directory called "upgrade" in which a
-number of files are put. Most notably, you need two files:
-
- - upgrade/up.sh
-
- This is a shell script which is started by the upgrade CGI script,
- /img/htdocs/adm/setupdfw.html
-
- - upgrade/version
-
- This contains the version of the firmware, e.g. 2.1.00. I think it
- needs to have 3 dot-separated numbers, and letters at the end of the
- last number are stripped off.
-
-The upgrade process:
-
-/img/htdocs/adm/setupdfw.html will decrypt the .bin firmware image, unpack
-it into /upgrade and then run /upgrade/up.sh. This shell script can then
-basically do whatever it wants; e.g. the official firmware image only
-upgrades RedBoot if your current firmware version is older than a specific
-version. For Debian, we basically just need to flash the ramdisk and the
-kernel.
-
-While up.sh is running, /img/htdocs/adm/setupdfw.html will show a progress
-bar. It will also scan the file /tmp/upgrade/message and look for the
-strings "fail" or "success". Only once such a string is found will the
-upgrade process terminate.
-
-The up.sh script should at the beginning create the lock file
-/var/lock/upgrade.lock and remove it at the end. Since the web upgrade
-says that the upgrade progress will finish with a beep, the up.sh should
-ideally run the following commands towards the end:
-
- echo "Buzzer 0" > /proc/thecus_io
- sleep 1
- echo "Buzzer 1" > /proc/thecus_io
-
-
-Information and tools:
-
-The file /app/manifest.txt contains information about the machine, e.g.
-
-type n2100
-producer THECUS
-
-In general, /app contains the configuration data. For example,
-/app/cfg/conf.db is a SQLite database of the configuration data ("sqlite
-/app/cfg/conf.db 'select * from conf'" will show all entries).
-
-There is a tool /sbin/fcp to write something to flash (e.g. "/sbin/fcp -v
-ramdisk.arm /dev/mtd1") but "cat" will work as well.
-
-
-Known manifest files:
-
-n2100 compatible machines:
-
-type n2100
-producer THECUS
-
-type all6500
-producer ALLNET
-
-type Mbox
-producer Evesham
-
-
-n4100 compatible machines:
-
-type n4100
-producer THECUS
-
-type all6400
-producer ALLNET
-
-type PlatinumNAS v1.0
-producer Micronet
-
diff -pruN 20101020/doc/devel/hardware/arm/n2100/info/cpuinfo 20201202/doc/devel/hardware/arm/n2100/info/cpuinfo
--- 20101020/doc/devel/hardware/arm/n2100/info/cpuinfo 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/info/cpuinfo 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Processor : XScale-80219 rev 0 (v5l)
-BogoMIPS : 593.10
-Features : swp half fastmult edsp
-CPU implementer : 0x69
-CPU architecture: 5TE
-CPU variant : 0x0
-CPU part : 0x2e3
-CPU revision : 0
-Cache type : undefined 5
-Cache clean : undefined 5
-Cache lockdown : undefined 5
-Cache format : Harvard
-I size : 32768
-I assoc : 32
-I line length : 32
-I sets : 32
-D size : 32768
-D assoc : 32
-D line length : 32
-D sets : 32
-
-Hardware : Thecus N2100
-Revision : 0000
-Serial : 0000000000000000
diff -pruN 20101020/doc/devel/hardware/arm/n2100/info/dmesg 20201202/doc/devel/hardware/arm/n2100/info/dmesg
--- 20101020/doc/devel/hardware/arm/n2100/info/dmesg 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/info/dmesg 1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-Linux version 2.6.23-1-iop32x (Debian 2.6.23-1~experimental.1) (maks@debian.org) (gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)) #1 Wed Nov 28 10:03:45 UTC 2007
-CPU: XScale-80219 [69052e30] revision 0 (ARMv5TE), cr=0000397f
-Machine: Thecus N2100
-Memory policy: ECC disabled, Data cache writeback
-On node 0 totalpages: 131072
- DMA zone: 1024 pages used for memmap
- DMA zone: 0 pages reserved
- DMA zone: 130048 pages, LIFO batch:31
- Normal zone: 0 pages used for memmap
- Movable zone: 0 pages used for memmap
-CPU0: D VIVT undefined 5 cache
-CPU0: I cache: 32768 bytes, associativity 32, 32 byte lines, 32 sets
-CPU0: D cache: 32768 bytes, associativity 32, 32 byte lines, 32 sets
-Built 1 zonelists in Zone order. Total pages: 130048
-Kernel command line: console=ttyS0,115200 root=/dev/ram0 initrd=0xa0800000,42M mem=512M@0xa0000000
-PID hash table entries: 2048 (order: 11, 8192 bytes)
-Console: colour dummy device 80x30
-Dentry cache hash table entries: 65536 (order: 6, 262144 bytes)
-Inode-cache hash table entries: 32768 (order: 5, 131072 bytes)
-Memory: 512MB = 512MB total
-Memory: 473984KB available (2400K code, 212K data, 100K init)
-Calibrating delay loop... 593.10 BogoMIPS (lpj=2965504)
-Security Framework v1.0.0 initialized
-SELinux: Disabled at boot.
-Capability LSM initialized
-Mount-cache hash table entries: 512
-CPU: Testing write buffer coherency: ok
-NET: Registered protocol family 16
-PCI: bus0: Fast back to back transfers disabled
-NET: Registered protocol family 2
-IP route cache hash table entries: 16384 (order: 4, 65536 bytes)
-TCP established hash table entries: 65536 (order: 7, 524288 bytes)
-TCP bind hash table entries: 65536 (order: 6, 262144 bytes)
-TCP: Hash tables configured (established 65536 bind 65536)
-TCP reno registered
-checking if image is initramfs... it is
-Freeing initrd memory: 43008K
-NetWinder Floating Point Emulator V0.97 (double precision)
-audit: initializing netlink socket (disabled)
-audit(7.870:1): initialized
-VFS: Disk quotas dquot_6.5.1
-Dquot-cache hash table entries: 1024 (order 0, 4096 bytes)
-JFFS2 version 2.2. (NAND) © 2001-2006 Red Hat, Inc.
-async_tx: api initialized (async)
-io scheduler noop registered
-io scheduler anticipatory registered
-io scheduler deadline registered
-io scheduler cfq registered (default)
-Serial: 8250/16550 driver $Revision: 1.90 $ 2 ports, IRQ sharing disabled
-serial8250.0: ttyS0 at MMIO 0xfe800000 (irq = 0) is a 16550A
-console [ttyS0] enabled
-RAMDISK driver initialized: 16 RAM disks of 8192K size 1024 blocksize
-physmap platform flash device: 01000000 at f0000000
-physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank
- Intel/Sharp Extended Query Table at 0x0031
-Using buffer write method
-cfi_cmdset_0001: Erase suspend on write enabled
-erase region 0: offset=0x0,size=0x20000,blocks=128
-request_module: runaway loop modprobe net-pf-1
-cmdlinepart partition parsing not available
-Searching for RedBoot partition table in physmap-flash.0 at offset 0xfe0000
-6 RedBoot partitions found on MTD device physmap-flash.0
-Creating 6 MTD partitions on "physmap-flash.0":
-0x00000000-0x00040000 : "RedBoot"
-0x00040000-0x00d40000 : "ramdisk"
-0x00d40000-0x00ea0000 : "kernel"
-0x00ea0000-0x00fc0000 : "user"
-0x00fc0000-0x00fc1000 : "RedBoot config"
-mtd: partition "RedBoot config" doesn't end on an erase block -- force read-only
-0x00fe0000-0x01000000 : "FIS directory"
-mice: PS/2 mouse device common for all mice
-i2c /dev entries driver
-rtc-rs5c372 0-0032: rs5c372b found, 24hr, driver version 0.5
-rtc-rs5c372 0-0032: rtc core: registered rtc-rs5c372 as rtc0
-iop-adma iop-adma.0: Intel(R) IOP: ( cpy intr )
-iop-adma iop-adma.1: Intel(R) IOP: ( cpy intr )
-NET: Registered protocol family 26
-TCP bic registered
-NET: Registered protocol family 1
-NET: Registered protocol family 17
-XScale DSP coprocessor detected.
-rtc-rs5c372 0-0032: setting the system clock to 2007-11-28 10:36:57 (1196246217)
-Freeing init memory: 100K
-r8169 Gigabit Ethernet driver 2.2LK-NAPI loaded
-eth0: RTL8169sb/8110sb at 0xe085c200, 00:14:fd:10:33:8e, XID 10000000 IRQ 27
-r8169 Gigabit Ethernet driver 2.2LK-NAPI loaded
-eth1: RTL8169sb/8110sb at 0xe085e300, 00:14:fd:10:33:8f, XID 10000000 IRQ 30
-SCSI subsystem initialized
-usbcore: registered new interface driver usbfs
-usbcore: registered new interface driver hub
-usbcore: registered new device driver usb
-Initializing USB Mass Storage driver...
-usbcore: registered new interface driver usb-storage
-USB Mass Storage support registered.
-libata version 2.21 loaded.
-sata_sil 0000:00:03.0: version 2.3
-sata_sil 0000:00:03.0: Applying R_ERR on DMA activate FIS errata fix
-scsi0 : sata_sil
-scsi1 : sata_sil
-ata1: SATA max UDMA/100 cmd 0xe0860080 ctl 0xe086008a bmdma 0xe0860000 irq 29
-ata2: SATA max UDMA/100 cmd 0xe08600c0 ctl 0xe08600ca bmdma 0xe0860008 irq 29
-ata1: SATA link down (SStatus 0 SControl 310)
-ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 310)
-ata2.00: ATA-7: Maxtor 6V300F0, VA111900, max UDMA/133
-ata2.00: 586114704 sectors, multi 0: LBA48 NCQ (depth 0/32)
-ata2.00: configured for UDMA/100
-scsi 1:0:0:0: Direct-Access ATA Maxtor 6V300F0 VA11 PQ: 0 ANSI: 5
-sd 1:0:0:0: [sda] 586114704 512-byte hardware sectors (300091 MB)
-sd 1:0:0:0: [sda] Write Protect is off
-sd 1:0:0:0: [sda] Mode Sense: 00 3a 00 00
-sd 1:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
-sd 1:0:0:0: [sda] 586114704 512-byte hardware sectors (300091 MB)
-sd 1:0:0:0: [sda] Write Protect is off
-sd 1:0:0:0: [sda] Mode Sense: 00 3a 00 00
-sd 1:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
- sda: sda1 sda2 sda3 < sda5 sda6 >
-sd 1:0:0:0: [sda] Attached SCSI disk
-kjournald starting. Commit interval 5 seconds
-EXT3-fs: mounted filesystem with ordered data mode.
-ehci_hcd 0000:00:04.2: EHCI Host Controller
-ehci_hcd 0000:00:04.2: new USB bus registered, assigned bus number 1
-ehci_hcd 0000:00:04.2: irq 29, io mem 0x800a0400
-ehci_hcd 0000:00:04.2: USB 2.0 started, EHCI 1.00, driver 10 Dec 2004
-usb usb1: configuration #1 chosen from 1 choice
-hub 1-0:1.0: USB hub found
-hub 1-0:1.0: 4 ports detected
-USB Universal Host Controller Interface driver v3.0
-uhci_hcd 0000:00:04.0: UHCI Host Controller
-uhci_hcd 0000:00:04.0: new USB bus registered, assigned bus number 2
-uhci_hcd 0000:00:04.0: irq 28, io base 0x90000800
-usb usb2: configuration #1 chosen from 1 choice
-hub 2-0:1.0: USB hub found
-hub 2-0:1.0: 2 ports detected
-uhci_hcd 0000:00:04.1: UHCI Host Controller
-uhci_hcd 0000:00:04.1: new USB bus registered, assigned bus number 3
-uhci_hcd 0000:00:04.1: irq 27, io base 0x90000820
-usb usb3: configuration #1 chosen from 1 choice
-hub 3-0:1.0: USB hub found
-hub 3-0:1.0: 2 ports detected
-Adding 1518100k swap on /dev/sda5. Priority:-1 extents:1 across:1518100k
-EXT3 FS on sda2, internal journal
-loop: module loaded
-device-mapper: ioctl: 4.11.0-ioctl (2006-10-12) initialised: dm-devel@redhat.com
-kjournald starting. Commit interval 5 seconds
-EXT3 FS on sda1, internal journal
-EXT3-fs: mounted filesystem with ordered data mode.
-kjournald starting. Commit interval 5 seconds
-EXT3-fs warning: maximal mount count reached, running e2fsck is recommended
-EXT3 FS on sda6, internal journal
-EXT3-fs: mounted filesystem with ordered data mode.
-r8169: eth0: link up
-NET: Registered protocol family 10
-lo: Disabled Privacy Extensions
-r8169: eth0: link up
-Installing knfsd (copyright (C) 1996 okir@monad.swb.de).
-NFSD: Using /var/lib/nfs/v4recovery as the NFSv4 state recovery directory
-NFSD: starting 90-second grace period
-eth0: no IPv6 routers present
diff -pruN 20101020/doc/devel/hardware/arm/n2100/info/lspci 20201202/doc/devel/hardware/arm/n2100/info/lspci
--- 20101020/doc/devel/hardware/arm/n2100/info/lspci 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/info/lspci 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-00:01.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL-8169 Gigabit Ethernet (rev 10)
-00:02.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL-8169 Gigabit Ethernet (rev 10)
-00:03.0 Mass storage controller: Silicon Image, Inc. SiI 3512 [SATALink/SATARaid] Serial ATA Controller (rev 01)
-00:04.0 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 61)
-00:04.1 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 61)
-00:04.2 USB Controller: VIA Technologies, Inc. USB 2.0 (rev 63)
diff -pruN 20101020/doc/devel/hardware/arm/n2100/info/lspci-v 20201202/doc/devel/hardware/arm/n2100/info/lspci-v
--- 20101020/doc/devel/hardware/arm/n2100/info/lspci-v 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/info/lspci-v 1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-00:01.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL-8169 Gigabit Ethernet (rev 10)
- Subsystem: Realtek Semiconductor Co., Ltd. RTL-8169 Gigabit Ethernet
- Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 27
- I/O ports at 90000000 [size=256]
- Memory at 800a0200 (32-bit, non-prefetchable) [size=256]
- Expansion ROM at 80080000 [disabled] [size=64K]
- Capabilities: [dc] Power Management version 2
- Capabilities: [60] Vital Product Data
-
-00:02.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL-8169 Gigabit Ethernet (rev 10)
- Subsystem: Realtek Semiconductor Co., Ltd. RTL-8169 Gigabit Ethernet
- Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 30
- I/O ports at 90000400 [size=256]
- Memory at 800a0300 (32-bit, non-prefetchable) [size=256]
- Expansion ROM at 80090000 [disabled] [size=64K]
- Capabilities: [dc] Power Management version 2
- Capabilities: [60] Vital Product Data
-
-00:03.0 Mass storage controller: Silicon Image, Inc. SiI 3512 [SATALink/SATARaid] Serial ATA Controller (rev 01)
- Subsystem: Silicon Image, Inc. SiI 3512 SATALink Controller
- Flags: bus master, 66MHz, medium devsel, latency 0, IRQ 29
- I/O ports at 90000850 [size=8]
- I/O ports at 90000860 [size=4]
- I/O ports at 90000858 [size=8]
- I/O ports at 90000864 [size=4]
- I/O ports at 90000840 [size=16]
- Memory at 800a0000 (32-bit, non-prefetchable) [size=512]
- [virtual] Expansion ROM at 80000000 [disabled] [size=512K]
- Capabilities: [60] Power Management version 2
-
-00:04.0 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 61) (prog-if 00 [UHCI])
- Subsystem: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller
- Flags: bus master, medium devsel, latency 22, IRQ 28
- I/O ports at 90000800 [size=32]
- Capabilities: [80] Power Management version 2
-
-00:04.1 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 61) (prog-if 00 [UHCI])
- Subsystem: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller
- Flags: bus master, medium devsel, latency 22, IRQ 27
- I/O ports at 90000820 [size=32]
- Capabilities: [80] Power Management version 2
-
-00:04.2 USB Controller: VIA Technologies, Inc. USB 2.0 (rev 63) (prog-if 20 [EHCI])
- Subsystem: VIA Technologies, Inc. USB 2.0
- Flags: bus master, medium devsel, latency 22, IRQ 29
- Memory at 800a0400 (32-bit, non-prefetchable) [size=256]
- Capabilities: [80] Power Management version 2
-
diff -pruN 20101020/doc/devel/hardware/arm/n2100/info/mtd 20201202/doc/devel/hardware/arm/n2100/info/mtd
--- 20101020/doc/devel/hardware/arm/n2100/info/mtd 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/info/mtd 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-dev: size erasesize name
-mtd0: 00040000 00020000 "RedBoot"
-mtd1: 00d00000 00020000 "ramdisk"
-mtd2: 00160000 00020000 "kernel"
-mtd3: 00120000 00020000 "user"
-mtd4: 00001000 00020000 "RedBoot config"
-mtd5: 00020000 00020000 "FIS directory"
diff -pruN 20101020/doc/devel/hardware/arm/n2100/README 20201202/doc/devel/hardware/arm/n2100/README
--- 20101020/doc/devel/hardware/arm/n2100/README 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/n2100/README 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-Thecus N2100
-
-The N2100 has two SATA ports (sata_sil), two Ethernet ports (r8169),
-16 MB flash, and one DDR2 memory slot.
-
-The boot loader passes root=/dev/ram0 to the kernel so flash-kernel
-contains code to overwrite this kernel parmeter.
-
diff -pruN 20101020/doc/devel/hardware/arm/nas100d/README 20201202/doc/devel/hardware/arm/nas100d/README
--- 20101020/doc/devel/hardware/arm/nas100d/README 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/nas100d/README 1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-The Iomega NAS 100d is a small ARM based gadget which has one
-Ethernet, two USB ports, an internal IDE hard drive and an internal
-Atheros WiFi card. It is much like the Linksys NSLU2, except that it
-has the internal hard drive, the wireless interface, and also has
-twice the FLASH and twice the RAM compared to the NSLU2. It shares
-the NSLU2 user community at http://www.nslu2-linux.org/
-
-The firmware is based on RedBoot but unlike the NSLU2 there is no
-bootloader upgrade mode, so for the initial flash of Debian firmware
-you need to either use the stock firmware web upgrade facility
-(preferred, and requires no hardware modifications), or you need to
-have a serial port (soldering holes for a normal RS232 interface are
-on the board) and transfer the firmware via the bootloader serial
-download functionality. The RedBoot on the NAS100d has full FIS table
-functionality, allowing you to create and delete FIS partitions via
-the bootloader serial console. There is 2 MB of space in the 'kernel'
-partition, 6MB of space in the 'filesystem' partition, and 6MB of
-space in the 'usr' partition.
-
-However, the stock RedBoot does not pass the machine ID for the
-NAS100d kernel. Since we want to use a generic ixp4xx kernel, we've
-worked around this limitation by using a 2nd boot loader, APEX. We
-put APEX in an unused part of the flash and tell RedBoot to boot from
-APEX instead of booting the kernel directly. Effectively, this means
-that there is:
- - A partition for APEX
- - A partition for the kernel
- - A partition for the initrd
-
-A description of the NAS100d's flash layout can be found at
-http://www.nslu2-linux.org/wiki/NAS100d/FisList
-
-There is also a problem with Ethernet: the ixp4xx chip has built-in
-Ethernet but requires a microcode. Up until recently, there was only a
-driver from Intel, but now a GPLed driver that is aiming for mainline
-inclusion is available. It's still not clear how to handle the microcode
-but at the moment unofficial images with it are distribution from
-nslu2-firmware.net
-
-Apart from this, the NAS100d is pretty easy to support.
-
diff -pruN 20101020/doc/devel/hardware/arm/nslu2/README 20201202/doc/devel/hardware/arm/nslu2/README
--- 20101020/doc/devel/hardware/arm/nslu2/README 2009-02-15 20:29:53.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/nslu2/README 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-The Linksys NSLU2 is a small ARM based gadget which has one Ethernet and
-two USB ports. The idea is to connect an external hard driver through USB
-and use the device as a small server. It's very popular because you can
-get it for under $100. There is a large user community at
-http://www.nslu2-linux.org/
-
-The firmware is based on RedBoot but there is also functionality which
-allows you to put the device into upgrade mode and then upgrade the
-firmware via the network. There's a utility in Debian called upslug2 which
-can do this. Even though the NSLU2 is based on RedBoot, there are some
-restrictions we need to work around. Instead of using the FIS table to
-locate the kernel and initrd, specific values of their locations are
-hard coded. In practice, this means that there is only 1 MB of space for
-the kernel because the initrd starts 1 MB after the kernel.
-
-Since we want to use a generic ixp4xx kernel, we've worked around this
-limitation by using a 2nd boot loader, APEX. We put APEX in flash at the
-point where RedBoot loads the 'kernel' from and then we split the kernel in
-two parts - this is because NSLU2's RedBoot expects to find a specific
-header at the start of the initrd and the kernel will use this space now.
-Effectively, this means that there is:
- - A partition for APEX
- - A partition for the kernel: the kernel is split in two and each parts
- have a header
- - A partition for the initrd
-
-A description of the NSLU2's flash layout can be found at
-http://www.nslu2-linux.org/wiki/Info/BootFlash
-
-There is also a problem with Ethernet: the ixp4xx chip has built-in
-Ethernet but requires a microcode. The network driver is included in
-the mainline kernel and the microcode can be found in non-free.
-
-Apart from this, the NSLU2 is pretty easy to support.
-
diff -pruN 20101020/doc/devel/hardware/arm/ss4000-e/firmware 20201202/doc/devel/hardware/arm/ss4000-e/firmware
--- 20101020/doc/devel/hardware/arm/ss4000-e/firmware 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/arm/ss4000-e/firmware 1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-The Intel SS4000-E is based on a firmware developed by FalconStor Software.
-It contains a standard Redboot, Linux kernel and ramdisk and some
-proprietary software from FalconStore. The firmware upgrade is shipped as
-a .pkg file.
-
-The Intel SS4000-E has 32 MB flash with the following layout:
-
-0x00000000-0x00040000 : "RedBoot"
-0x00040000-0x00060000 : "log"
-0x00060000-0x000a0000 : "rammode"
-0x000a0000-0x000c0000 : "naskey"
-0x000c0000-0x002c0000 : "zImage"
-0x002c0000-0x006c0000 : "ramdisk.gz"
-0x006c0000-0x01f40000 : "vendor"
-0x01f40000-0x01fc0000 : "wmdata"
-0x01fc0000-0x01fc1000 : "RedBoot config"
-0x01fe0000-0x02000000 : "FIS directory"
-
- - zImage is the Linux kernel
- - ramdisk.gz the Linu ramdisk
- - vendor contains a copy of the .pkg file
- - wmdata: is the "OEM images", which is put in /sysroot/usr/local/ipstor/
- This appears to be FalconStor's proprietary software
-
-Note that not all devices supported by FalconStor have 32 MB flash, so the
-upgrade scripts check whether "vendor" exists in flash before writing the
-.pkg file there.
-
-
-The .pkg file
--------------
-
-The .pkg file contains a header and then a gziped tar file which is
-unpacked in /sysroot.
-
-The header consists of:
-
-32 byte: md5sum of the remaining file
-32 byte: identification string, starting with "FALCONSTOR@" and then
- followed by the machine identification, e.g. EP219
-8 byte: length of header in KB
-16 byte: firmware version number (e.g. 1.1-b214)
-16 byte: firmware version string (e.g. fs-bc)
-
-The upgrade script, /usr/local/wwwadmin/upgrade_firmware, takes the .pkg
-file, checks the md5sum and then unpacks the gziped tar file into /sysroot.
-
-The script is passed two arguments:
-
-UPGRADE_PKG=$1
-UPGRADE_TYPE=$2
-
-The first is the location of the .pkg file, the second the type of the
-upgrade. We have 4 known types:
-
- UPDATE_FLASH DISK PKG_FLASH ZIMAGE_RAMDISK···
- 0 Y n n # load from flash
- 1 Y Y Y # upgrade from web
- 2 n Y Y # load from file
- 3 n Y Y # version different
-
-Explanation:
-DISK: some files on the hard drive are updated - not relevant for Debian
-PKG_FLASH: the .pkg file is written to the "vendor" flash partition
-ZIMAGE_RAMDISK: the zImage and ramdisk are written to flash
-
-Another representation of this information:
-
- 0 Upgrade disk
- Load From Flash(initialization) => disk
- 1 Upgrade disk
- Upgrade from Web => disk, zImage/ramdisk.gz, pkg
- 2 Upgrade flash only
- Load from file to flash => zImage/ramdisk.gz, pkg
- 3 Upgrade flash only
- Version different => zImage/ramdisk.gz, pkg
-
-After unpacking the .pkg file, the upgrade_firmware script will run
-/sysroot/upgrade.sh. This program is started in the following way:
- ${UPGRADE_PROG} ${UPGRADE_PKG} ${UPGRADE_TYPE} >> ${UPGRADE_LOG}
-which means that
- a) the same parameters are passed as to upgrade_firmware
- b) we can use "echo" for logging. The log file is
- /sysroot/var/log/upgrade.log
-
-The .pkg file needs to contain at least the following files:
-
- ./etc/version
- in this format: fs-bc - 1.1-b214
-
- ./upgrade.sh
- called by upgrade_firmware to do the upgrade
-
-We can make use of /fs/writeflash to write to flash. It accepts the
-following arguments:
- %s [-z|-r|-p|-w] [file]
- where -z:zImage, -r:ramdisk.gz, -p:package, -w:wmdata
-
-Notes about the original firmware:
-
-For some reason, the original firmware unpacks the .pkg file again, puts
-the zImage and ramdisk.gz into /tmp and then flashes it. However, given
-that upgrade_firmware unpacks the .pkg file into /sysroot, we can simply
-use the file from there, e.g. from /sysroot/images/
-
diff -pruN 20101020/doc/devel/hardware/mipsel/cobalt/info/cpuinfo 20201202/doc/devel/hardware/mipsel/cobalt/info/cpuinfo
--- 20101020/doc/devel/hardware/mipsel/cobalt/info/cpuinfo 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/mipsel/cobalt/info/cpuinfo 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-system type : Cobalt Qube2
-processor : 0
-cpu model : Nevada V10.0 FPU V10.0
-BogoMIPS : 249.85
-byteorder : little endian
-wait instruction : yes
-microsecond timers : yes
-tlb_entries : 48
-extra interrupt vector : yes
-hardware watchpoint : no
-VCED exceptions : not available
-VCEI exceptions : not available
diff -pruN 20101020/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.4 20201202/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.4
--- 20101020/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.4 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.4 1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-CPU revision is: 000028a0
-FPU revision is: 000028a0
-Primary instruction cache 32kB, physically tagged, 2-way, linesize 32 bytes.
-Primary data cache 32kB 2-way, linesize 32 bytes.
-Linux version 2.4.27-r5k-cobalt (root@rem) (gcc version 3.3.6 (Debian 1:3.3.6-10)) #1 Fri Oct 7 20:47:17 UTC 2005
-Cobalt Board ID: 5
-ttyS00 at iomem 0xbc800000 (irq = 7) is a ST16650V2
-Attempt to register invalid minor number with devfs (0:0).
-Attempt to register invalid minor number with devfs (0:0).
-Determined physical RAM map:
- memory: 08000000 @ 00000000 (usable)
-On node 0 totalpages: 32768
-zone(0): 32768 pages.
-zone(1): 0 pages.
-zone(2): 0 pages.
-Kernel command line: root=/dev/hda2 console=ttyS0,115200
-Calibrating delay loop... 249.85 BogoMIPS
-Memory: 126940k/131072k available (1609k kernel code, 4132k reserved, 256k data, 92k init, 0k highmem)
-Dentry cache hash table entries: 16384 (order: 5, 131072 bytes)
-Inode cache hash table entries: 8192 (order: 4, 65536 bytes)
-Mount cache hash table entries: 512 (order: 0, 4096 bytes)
-Buffer cache hash table entries: 8192 (order: 3, 32768 bytes)
-Page-cache hash table entries: 32768 (order: 5, 131072 bytes)
-Checking for 'wait' instruction... available.
-POSIX conformance testing by UNIFIX
-PCI: Probing PCI hardware
-Activating ISA DMA hang workarounds.
-Linux NET4.0 for Linux 2.4
-Based upon Swansea University Computer Society NET3.039
-Initializing RT netlink socket
-Starting kswapd
-Journalled Block Device driver loaded
-devfs: v1.12c (20020818) Richard Gooch (rgooch@atnf.csiro.au)
-devfs: boot_options: 0x0
-pty: 256 Unix98 ptys configured
-Cobalt LCD Driver v2.10
-Serial driver version 5.05c (2001-07-08) with MANY_PORTS SHARE_IRQ SERIAL_PCI enabled
-ttyS00 at 0xbc800000 (irq = 7) is a ST16650V2
-rtc: Digital UNIX epoch (1952) detected
-Real Time Clock Driver v1.10f
-RAMDISK driver initialized: 16 RAM disks of 8192K size 1024 blocksize
-Linux Tulip driver version 0.9.15-pre12 (Aug 9, 2002)
-PCI: Enabling device 00:07.0 (0045 -> 0047)
-tulip0: Old format EEPROM on 'Cobalt Microserver' board. Using substitute media control info.
-tulip0: EEPROM default media type Autosense.
-tulip0: Index #0 - Media MII (#11) described by a 21142 MII PHY (3) block.
-tulip0: MII transceiver #1 config 1000 status 7809 advertising 01e1.
-eth0: Digital DS21143 Tulip rev 65 at 0x100000, 00:10:E0:00:BE:5E, IRQ 4.
-PCI: Enabling device 00:0c.0 (0005 -> 0007)
-tulip1: Old format EEPROM on 'Cobalt Microserver' board. Using substitute media control info.
-tulip1: EEPROM default media type Autosense.
-tulip1: Index #0 - Media MII (#11) described by a 21142 MII PHY (3) block.
-tulip1: MII transceiver #1 config 1000 status 7809 advertising 01e1.
-eth1: Digital DS21143 Tulip rev 65 at 0x101000, 00:10:E0:00:C5:7A, IRQ 13.
-Uniform Multi-Platform E-IDE driver Revision: 7.00beta4-2.4
-ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx
-VP_IDE: IDE controller at PCI slot 00:09.1
-VP_IDE: chipset revision 6
-VP_IDE: not 100% native mode: will probe irqs later
-ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx
-VP_IDE: VIA vt82c586a (rev 27) IDE UDMA33 controller on pci00:09.1
- ide0: BM-DMA at 0xcc00-0xcc07, BIOS settings: hda:pio, hdb:pio
- ide1: BM-DMA at 0xcc08-0xcc0f, BIOS settings: hdc:pio, hdd:pio
-hda: QUANTUM FIREBALLlct08 04, ATA DISK drive
-ide0 at 0x1f0-0x1f7,0x3f6 on irq 14
-hda: attached ide-disk driver.
-hda: 8421840 sectors (4312 MB) w/418KiB Cache, CHS=8912/15/63
-Partition check:
- /dev/ide/host0/bus0/target0/lun0: [PTBL] [524/255/63] p1 p2 p3 < p5 p6 >
-usb.c: registered new driver usbdevfs
-usb.c: registered new driver hub
-Initializing Cryptographic API
-NET4: Linux TCP/IP 1.0 for NET4.0
-IP: routing cache hash table of 1024 buckets, 8Kbytes
-TCP: Hash tables configured (established 8192 bind 16384)
-NET4: Unix domain sockets 1.0/SMP for Linux NET4.0.
-kjournald starting. Commit interval 5 seconds
-EXT3-fs: mounted filesystem with ordered data mode.
-VFS: Mounted root (ext3 filesystem) readonly.
-Freeing unused kernel memory: 92k freed
-Adding Swap: 176672k swap-space (priority -1)
-EXT3 FS 2.4-0.9.19, 19 August 2002 on ide0(3,2), internal journal
-kjournald starting. Commit interval 5 seconds
-EXT3 FS 2.4-0.9.19, 19 August 2002 on ide0(3,6), internal journal
-EXT3-fs: mounted filesystem with ordered data mode.
-usb-uhci.c: $Revision: 1.275 $ time 21:00:30 Oct 7 2005
-usb-uhci.c: High bandwidth mode enabled
-PCI: Enabling device 00:09.2 (0000 -> 0001)
-usb-uhci.c: found UHCI device with no IRQ assigned. check BIOS settings!
-usb-uhci.c: v1.275:USB Universal Host Controller Interface driver
-uhci.c: USB Universal Host Controller Interface driver v1.1
-uhci.c: found UHCI device with no IRQ assigned. check BIOS settings!
-uhci.c: USB Universal Host Controller Interface driver v1.1
-uhci.c: found UHCI device with no IRQ assigned. check BIOS settings!
-usb-uhci.c: $Revision: 1.275 $ time 21:00:30 Oct 7 2005
-usb-uhci.c: High bandwidth mode enabled
-usb-uhci.c: found UHCI device with no IRQ assigned. check BIOS settings!
-usb-uhci.c: v1.275:USB Universal Host Controller Interface driver
-eth0: Setting full-duplex based on MII#1 link partner capability of 45e1.
diff -pruN 20101020/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.6 20201202/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.6
--- 20101020/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.6 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/mipsel/cobalt/info/dmesg-2.6 1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-Linux version 2.6.15-1-r5k-cobalt (Debian 2.6.15-3+mips5) (tbm@cyrius.com) (gcc version 4.0.3 20051201 (prerelease) (Debian 4.0.2-5)) #2 Fri Feb 3 02:40:43 UTC 2006
-CPU revision is: 000028a0
-FPU revision is: 000028a0
-Cobalt board ID: 5
-Determined physical RAM map:
- memory: 0000000008000000 @ 0000000000000000 (usable)
-On node 0 totalpages: 32768
- DMA zone: 32768 pages, LIFO batch:7
- DMA32 zone: 0 pages, LIFO batch:0
- Normal zone: 0 pages, LIFO batch:0
- HighMem zone: 0 pages, LIFO batch:0
-Built 1 zonelists
-Kernel command line: root=/dev/hda2 console=ttyS0,115200
-Primary instruction cache 32kB, physically tagged, 2-way, linesize 32 bytes.
-Primary data cache 32kB, 2-way, linesize 32 bytes.
-Synthesized TLB refill handler (32 instructions).
-Synthesized TLB load handler fastpath (46 instructions).
-Synthesized TLB store handler fastpath (46 instructions).
-Synthesized TLB modify handler fastpath (45 instructions).
-PID hash table entries: 1024 (order: 10, 32768 bytes)
-Dentry cache hash table entries: 32768 (order: 6, 262144 bytes)
-Inode-cache hash table entries: 16384 (order: 5, 131072 bytes)
-Memory: 124812k/131072k available (2387k kernel code, 6112k reserved, 596k data, 160k init, 0k highmem)
-Calibrating delay loop... 248.32 BogoMIPS (lpj=124160)
-Security Framework v1.0.0 initialized
-SELinux: Initializing.
-SELinux: Starting in permissive mode
-Mount-cache hash table entries: 256
-Checking for 'wait' instruction... available.
-Checking for the multiply/shift bug... no.
-Checking for the daddi bug... no.
-Checking for the daddiu bug... no.
-NET: Registered protocol family 16
-Galileo: fixed bridge class
-Galileo: revision 17
-VFS: Disk quotas dquot_6.5.1
-Dquot-cache hash table entries: 512 (order 0, 4096 bytes)
-Initializing Cryptographic API
-io scheduler noop registered
-io scheduler anticipatory registered
-io scheduler deadline registered
-io scheduler cfq registered
-Activating ISA DMA hang workarounds.
-PCI: Enabling device 0000:00:09.2 (0000 -> 0001)
-rtc: Digital UNIX epoch (1952) detected
-Real Time Clock Driver v1.12a
-Cobalt LCD Driver v2.10
-Serial: 8250/16550 driver $Revision: 1.90 $ 1 ports, IRQ sharing disabled
-serial8250: ttyS0 at I/O 0xc800000 (irq = 21) is a ST16650V2
-RAMDISK driver initialized: 16 RAM disks of 8192K size 1024 blocksize
-Linux Tulip driver version 1.1.13 (December 15, 2004)
-PCI: Enabling device 0000:00:07.0 (0045 -> 0047)
-tulip0: MII transceiver #1 config 1000 status 782d advertising 01e1.
-eth0: Digital DS21143 Tulip rev 65 at 9000000012080000, 00:10:E0:00:BE:5E, IRQ 19.
-PCI: Enabling device 0000:00:0c.0 (0005 -> 0007)
-tulip1: MII transceiver #1 config 1000 status 7809 advertising 01e1.
-eth1: Digital DS21143 Tulip rev 65 at 9000000012080400, 00:10:E0:00:C5:7A, IRQ 20.
-Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2
-ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx
-VP_IDE: IDE controller at PCI slot 0000:00:09.1
-VP_IDE: chipset revision 6
-VP_IDE: not 100% native mode: will probe irqs later
-VP_IDE: VIA vt82c586a (rev 27) IDE UDMA33 controller on pci0000:00:09.1
- ide0: BM-DMA at 0x1420-0x1427, BIOS settings: hda:pio, hdb:pio
- ide1: BM-DMA at 0x1428-0x142f, BIOS settings: hdc:pio, hdd:pio
-Probing IDE interface ide0...
-hda: QUANTUM FIREBALLlct08 04, ATA DISK drive
-ide0 at 0x1f0-0x1f7,0x3f6 on irq 14
-Probing IDE interface ide1...
-Probing IDE interface ide1...
-hda: max request size: 128KiB
-hda: 8421840 sectors (4311 MB) w/418KiB Cache, CHS=8912/15/63
-hda: cache flushes not supported
- hda: hda1 hda2 hda3 < hda5 hda6 >
-NET: Registered protocol family 2
-IP route cache hash table entries: 2048 (order: 2, 16384 bytes)
-TCP established hash table entries: 8192 (order: 4, 65536 bytes)
-TCP bind hash table entries: 8192 (order: 4, 65536 bytes)
-TCP: Hash tables configured (established 8192 bind 8192)
-TCP reno registered
-TCP bic registered
-NET: Registered protocol family 1
-kjournald starting. Commit interval 5 seconds
-EXT3-fs: mounted filesystem with ordered data mode.
-VFS: Mounted root (ext3 filesystem) readonly.
-Freeing unused kernel memory: 160k freed
-Adding 176672k swap on /dev/hda5. Priority:-1 extents:1 across:176672k
-EXT3 FS on hda2, internal journal
-kjournald starting. Commit interval 5 seconds
-EXT3 FS on hda6, internal journal
-EXT3-fs: mounted filesystem with ordered data mode.
-usbcore: registered new driver usbfs
-usbcore: registered new driver hub
-USB Universal Host Controller Interface driver v2.3
-uhci_hcd 0000:00:09.2: Found HC with no IRQ. Check BIOS/PCI 0000:00:09.2 setup!
-uhci_hcd 0000:00:09.2: init 0000:00:09.2 fail, -19
-ohci_hcd: 2005 April 22 USB 1.1 'Open' Host Controller (OHCI) Driver (PCI)
-eth0: CSR0 01a04800
-NET: Registered protocol family 17
-eth0: Setting full-duplex based on MII#1 link partner capability of 45e1.
-NET: Registered protocol family 10
-lo: Disabled Privacy Extensions
-IPv6 over IPv4 tunneling driver
-eth0: no IPv6 routers present
diff -pruN 20101020/doc/devel/hardware/mipsel/cobalt/info/lspci 20201202/doc/devel/hardware/mipsel/cobalt/info/lspci
--- 20101020/doc/devel/hardware/mipsel/cobalt/info/lspci 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/mipsel/cobalt/info/lspci 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-0000:00:00.0 Memory controller: Marvell Technology Group Ltd.: Unknown device 4146 (rev 11)
-0000:00:07.0 Ethernet controller: Digital Equipment Corporation DECchip 21142/43 (rev 41)
-0000:00:09.0 ISA bridge: VIA Technologies, Inc. VT82C586/A/B PCI-to-ISA [Apollo VP] (rev 27)
-0000:00:09.1 IDE interface: VIA Technologies, Inc. VT82C586A/B/VT82C686/A/B/VT823x/A/C PIPC Bus Master IDE (rev 06)
-0000:00:09.2 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 02)
-0000:00:0c.0 Ethernet controller: Digital Equipment Corporation DECchip 21142/43 (rev 41)
diff -pruN 20101020/doc/devel/hardware/mipsel/cobalt/README 20201202/doc/devel/hardware/mipsel/cobalt/README
--- 20101020/doc/devel/hardware/mipsel/cobalt/README 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/hardware/mipsel/cobalt/README 1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-MIPS based Cobalt machines are a variety of quite similar machines, all no
-longer in production but still quite popular. There were i386 based Cobalt
-machines later, but these have virtually nothing in common with the MIPS
-based ones and are not supported.
-
-There are the following machines:
-
- - Cobalt Qube 2700 (aka Qube 1): has no serial console
- - Cobalt RaQ1
- - Cobalt Qube 2 (aka Qube 2800), also rebranded as "Gateway Qube"
- - Cobalt RaQ2
- - Cobalt RaQ2+: two network interfaces
- - Cobalt CacheRaQ: a RaQ2 with two IDE interfaces
-
-Basically, the RaQ1, Qube 2, RaQ2 (and RaQ2 and CacheRaQ, which are really
-just variations) are the same from the point of view of debian-installer.
-The only difference is the Qube 2700 because it doesn't have a serial
-console.
-
-All MIPS based Cobalt machines have:
- - a MIPS CPU (MHz can vary, but the same kernel works on all)
- - at least one network interface
- - Standard IDE drive
- - A LCD that is 2x16 (plus some buttons)
- - Fairly non-standard EDO RAM (needs 3.3V)
- - A USB chip, but it's not actually exported (i.e. no connectors)
-
-Cobalt firmware:
-
-The original Cobalt firmware has several restrictions. For example, it can
-only boot from a partition that is ext2 revision 0 (i.e. the old ext2 type).
-Furthermore, there's a restriction on the size of the kernel it can load.
-Fortunately, Peter Horton wrote a replacement boot loader, known as CoLo
-(Cobalt Loader). Even though you could in theory overwrite the firmware
-with CoLo, we don't do this: instead, we use the firmware to load CoLo
-(i.e. chain mode) and then use CoLo to load the kernel (and possibly an
-initrd). This means that the only real restriction left is that the /boot
-partition has to be ext2 rev 0 so the firmware can load CoLo.
-
-The firmware will usually look for a file called vmlinux.gz, so that's what
-we call CoLo. Apparently, there are variations of the firmware which look
-for another filename, so we also create symlinks for vmlinux_RAQ.gz and
-vmlinux_raq-2800.gz.
-
-The firmware also supports booting via the network. You can activate that
-by pressing the left and right cursor button at the same time (it'll say
-"Network booting"). The firmware will then load vmlinux.gz via NFS -
-however, note that the firmware does not care about the NFS path you set.
-It will *always* load /nfsroot/vmlinux.gz. There's no way around this.
-FHS violation, yeah, but the company no longer exists, so who do you sue?
-
-CoLo:
-
-CoLo is a fairly nice bootloader. It reads a config file from
-/boot/default.colo. There is good documentation. The "colo" package also
-includes a number of tools, for example to put stuff on the LCD. One note
-regarding the LCD: while it is 2x16, only 2x14 can be displayed in menus
-because the cursor will take one character on each side.
-
-debian-installer: we support installations via SSH (the default) as well
-as via the serial console. In the case of SSH, a password is either
-pre-seeded, or a random one is generated and displayed on the LCD.
-
-Upstream contact:
- Peter Horton (CoLo and kernel)
- Yoichi Yuasa (kernel)
-
diff -pruN 20101020/doc/devel/historic/docbook/kernel-policy.html 20201202/doc/devel/historic/docbook/kernel-policy.html
--- 20101020/doc/devel/historic/docbook/kernel-policy.html 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/historic/docbook/kernel-policy.html 2020-11-30 23:08:26.000000000 +0000
@@ -51,7 +51,7 @@
Abstract
Any new upstream linux kernel version needs a new package name.
Note
- binary packages may include a extra version part for binary
+ binary packages may include an extra version part for binary
incompatible changes
Gerneral use Kernel Images
The general use Kernel Images are out of the scope of this document.
diff -pruN 20101020/doc/devel/historic/docbook/kernel-policy.xml 20201202/doc/devel/historic/docbook/kernel-policy.xml
--- 20101020/doc/devel/historic/docbook/kernel-policy.xml 2008-10-27 10:43:24.000000000 +0000
+++ 20201202/doc/devel/historic/docbook/kernel-policy.xml 2020-11-30 23:08:26.000000000 +0000
@@ -120,7 +120,7 @@
-->
- binary packages may include a extra version part for binary
+ binary packages may include an extra version part for binary
incompatible changes
diff -pruN 20101020/doc/devel/historic/porting-to-2.6.txt 20201202/doc/devel/historic/porting-to-2.6.txt
--- 20101020/doc/devel/historic/porting-to-2.6.txt 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/historic/porting-to-2.6.txt 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,43 @@
+Porting debian-installer to 2.6 for your architecture
+=====================================================
+
+This is a fairly haphazard collection of notes on what you need to do to
+port d-i to 2.6 for your architecture.
+
+Kernels and build system
+------------------------
+
+ * Create packages/linux-kernel-di--2.6/ with
+ appropriate sets of module udebs. There are plenty of examples to borrow
+ from here.
+
+ * Create 2.6.cfg files in installer/build/config/ for each target you want
+ to ship with 2.6. You'll need to set at least KERNELVERSION,
+ KERNELMAJOR, and EXTRANAME. i386 has good examples here. Use
+ FLAVOUR_SUPPORTED in the parent config file to get 2.6.cfg to be
+ included in the build system.
+
+ * If your kernels don't have ext2 built-in (some 2.6 ones don't), set
+ INITRD_FS = cramfs (or INITRD_FS = initramfs to live on the bleeding
+ edge).
+
+ * Add your architecture to the module-init-tools build-dependency list in
+ installer/debian/control.
+
+ * If you need different packages in your initrd on 2.6 versus 2.4 which
+ aren't already handled by the build system, use [2.4] and [2.6]
+ qualifiers (see installer/build/README).
+
+Other packages
+--------------
+
+ * Make any necessary changes to packages/rootskel/debian/templates-arch.
+
+ * Make packages/base-installer/debian/postinst install an appropriate 2.6
+ kernel when d-i is running with 2.6 itself.
+
+ * You may need to make some changes to hardware detection in
+ packages/hw-detect/.
+
+ * You may need to tweak packages/usb-discover/usb-discover, particularly
+ if you're using a different kernel version from other architectures.
diff -pruN 20101020/doc/devel/installation-reports.txt 20201202/doc/devel/installation-reports.txt
--- 20101020/doc/devel/installation-reports.txt 2009-11-27 22:09:09.000000000 +0000
+++ 20201202/doc/devel/installation-reports.txt 2020-06-25 21:49:40.000000000 +0000
@@ -184,10 +184,13 @@ information about the internals of d-i t
reports.
A good place to start is by reading the d-i TODO list, in d-i's subversion
-repository. This command will check out the whole d-i tree, which will be
+repository. These commands will check out the whole d-i tree, which will be
useful in other ways too:
svn co svn://svn.debian.org/svn/d-i/trunk d-i
+ cd d-i
+ sed -i -e 's/+ssh//' .mrconfig
+ mr -p checkout
Then look in installer/doc/TODO to see some of our most pressing and largest
problems. More known problems with the beta releases are documented on the
diff -pruN 20101020/doc/devel/internals/available-hooks.xml 20201202/doc/devel/internals/available-hooks.xml
--- 20101020/doc/devel/internals/available-hooks.xml 2010-02-11 20:00:39.000000000 +0000
+++ 20201202/doc/devel/internals/available-hooks.xml 2020-06-25 21:49:40.000000000 +0000
@@ -244,7 +244,7 @@ modified by using the correct utilities.
/cdrom/.disk/udeb_include
/cdrom/.disk/udeb_exclude [anna]
- List of packages (udebs) to install or not install in into the d-i
+ List of packages (udebs) to install into or exclude from the d-i
ramdisk.
@@ -253,8 +253,8 @@ modified by using the correct utilities.
/cdrom/.disk/base_include
/cdrom/.disk/base_exclude [base-installer]
- The content of these files are taken as lists of packages to
- install or not into the target area.
+ The contents of these files are taken as lists of packages to
+ install into or exclude from the target area.
@@ -278,7 +278,7 @@ modified by using the correct utilities.
-/dev/.udev/firmware-missing [udev,hw-setup]
+/run/udev/firmware-missing [udev,hw-detect]
Used to register for which kernel modules udev was unable to load
firmware.
diff -pruN 20101020/doc/devel/internals/building.xml 20201202/doc/devel/internals/building.xml
--- 20101020/doc/devel/internals/building.xml 2010-02-11 20:00:39.000000000 +0000
+++ 20201202/doc/devel/internals/building.xml 2020-06-25 21:49:40.000000000 +0000
@@ -151,7 +151,7 @@ option boot parameter.
daily sid_d-i
CD images are built using daily D-I builds,
udebs from unstable and regular packages from testing
-daily squeeze_d-i
CD/DVD images are built using the current
+daily stretch_d-i
CD/DVD images are built using the current
D-I release in testing, udebs from testing and regular packages from testing
weekly CD builds are built using the current D-I release in testing, udebs from
@@ -167,7 +167,7 @@ a new stable (point) release
The sid_d-i
CDs are what's normally linked as the daily
built images from the D-I project page; when preparing for a release
-those will link to squeeze_d-i
CDs to facilitate pre-release
+those will link to stretch_d-i
CDs to facilitate pre-release
testing.
@@ -254,7 +254,7 @@ The easiest way to start is with the pur
to make images bootable
-localudebs : allows to use (versions of) udebs not
+localudebs : allows using (versions of) udebs not
available on the mirror you use
@@ -301,7 +301,7 @@ EXTRATARGETS = build_hd-media_gtk
-Th first line defines that the netboot image has two flavors: the default one
+The first line defines that the netboot image has two flavors: the default one
(for the newt frontend), and a second one for the gtk frontend. The latter is
further defined in the config/i386/hd-media/gtk.cfg file.
The second line ensures that the gtk image will always be built together with
@@ -380,7 +380,7 @@ Finally, the script will check for pkg-lists/exclude. The latter exists and contains
some udebs otherwise pulled in by dependencies, but that should not be
included because of library reduction, which is covered in the next section.
-Note that the exclusion if not triggered by the file name, but rather by the
+Note that the exclusion is not triggered by the file name, but rather by the
dash after the name of the udebs.
@@ -434,7 +434,7 @@ reduction is done by calling mk
As only the executables that are included in an image are taken into account
-during the library reduction, we have provide for executables in components
+during the library reduction, we have to provide for executables in components
that are installed later as they would fail if they use symbols that have
been taken out.
diff -pruN 20101020/doc/devel/internals/build.sh 20201202/doc/devel/internals/build.sh
--- 20101020/doc/devel/internals/build.sh 2010-02-11 20:00:39.000000000 +0000
+++ 20201202/doc/devel/internals/build.sh 2020-06-25 21:49:40.000000000 +0000
@@ -7,10 +7,10 @@ if [ -n "$xsltproc" ] ; then
if [ -e "$stylesheet" ]; then
$xsltproc --xinclude style-html.xsl internals.xml
else
- echo stylesheet missing; please install the docbook-xsl Debian package
+ echo "stylesheet missing; please install the docbook-xsl Debian package"
exit 1
fi
else
- echo xsltproc not found; please install the xsltproc Debian package
+ echo "xsltproc not found; please install the xsltproc Debian package"
exit 1
fi
diff -pruN 20101020/doc/devel/internals/internals.xml 20201202/doc/devel/internals/internals.xml
--- 20101020/doc/devel/internals/internals.xml 2010-02-11 20:00:39.000000000 +0000
+++ 20201202/doc/devel/internals/internals.xml 2020-07-26 06:38:45.000000000 +0000
@@ -11,6 +11,7 @@
+
]>
@@ -70,10 +71,9 @@ the debian-boot list.
For any kind of work on Debian Installer, you should check out the d-i
-SVN repository on alioth:
-
-$ svn co svn+ssh://svn.debian.org/svn/d-i/trunk
-
+repository on Salsa, see
+
+the README file .
@@ -84,7 +84,7 @@ access to the repository, please send a
Additional development oriented documentation can be found on the Debian Installer Wiki ,
-in the SVN repository under installer/doc/devel or
+in the repository under installer/doc/devel or
in README files included with the source for various
components.
@@ -94,6 +94,7 @@ components.
&running.xml;
&udebs.xml;
&building.xml;
+&maintenance.xml;
&menu-item.xml;
&hooks.xml;
diff -pruN 20101020/doc/devel/internals/maintenance.xml 20201202/doc/devel/internals/maintenance.xml
--- 20101020/doc/devel/internals/maintenance.xml 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/internals/maintenance.xml 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,126 @@
+
+Maintenance of the installer
+
+
+This document only provides an introduction to some tasks required to
+keep the installer up and running. It should be mostly helpful for
+d-i release managers.
+
+
+
+Updating to a new LinuxThe same logic should
+be applicable to the FreeBSD kernel, even if some details might be
+different. kernel version
+
+
+This is possible when the linux package gets
+uploaded, bumping its ABI. For example, it gets bumped from
+3.9-1
to 3.10-1
. This becomes needed when
+the linux-latest package gets uploaded, since
+obsolete
+linux-image-<oldabi>-<arch>
+packages (and relevant kernel modules) get decrufted soon after
+that. Daily builds start to fail to build at this point, failing to
+fetch decrufted packages.
+
+
+
+A cron job on d-i.debian.org
generates an linux kernel
+ABI summary for the testing
, unstable
, and
+experimental
suites, and also sends a notification when
+the ABI gets bumped in any of them. The summary is available here:
+
+
+
+
+The following files need to be updated:
+build/config/*.cfg ; beware, some architectures
+have specific version handling, so it might be needed to update some
+extra variables (like the upstream kernel version), rather than only
+those containing the kernel ABI.
+
+
+
+
+
+
+Dropping a deprecated filesystem
+
+
+
+This is needed when the kernel drops support for a filesystem, say
+foofs
; on the kernel side, that means the following
+packages go away:
+foofs-modules-<abi>-<arch>
. Kernel
+maintainers should send a notification to the mailing list in advance.
+
+
+
+From a quick grep under the packages/
directory, it
+appears that the following changes are needed. This list isn't ensured
+to be exhaustive:
+
+
+
+
+ Drop all foofs-modules-${kernel:Version}
occurrences
+ from the files under the build/config/
+ directory.
+
+
+
+ Get partman-foofs
removed from the archive.
+
+
+
+ Move the partman-foofs.git
repository below the
+ attic/
directory.
+
+
+
+ Update the top-level .mrconfig file to mark
+ the said repository as obsolete, adding deleted =
+ true
to its section.
+
+
+
+ Update kernel-wedge
if relevant. FIXME: Find out when
+ that's needed, and what's needed.
+
+
+
+ Update iso-scan
to drop foofs
from the
+ FS
variable in the
+ debian/iso-scan.postinst script.
+
+
+
+ Update partman-auto
to drop foofs
+ from the lib/resize.sh script.
+
+
+
+ Update os-prober
to drop foofs
from the
+ FILESYSTEMS
variable in the
+ os-probes/init/common/10filesystems file.
+
+
+
+ Update partconf
to drop foofs
from
+ the file_system_modules
variable, but there might
+ be some more occurrences.
+
+
+
+ Update rescue
to drop relevant dependencies, and
+ remove try_load_module foofs
from
+ debian/rescue-mode.postinst accordingly.
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/doc/devel/internals/Makefile 20201202/doc/devel/internals/Makefile
--- 20101020/doc/devel/internals/Makefile 2010-02-11 20:00:39.000000000 +0000
+++ 20201202/doc/devel/internals/Makefile 2020-11-30 23:08:26.000000000 +0000
@@ -1,4 +1,4 @@
-all: *.xsl *.xml
+all:
@./build.sh
clean:
diff -pruN 20101020/doc/devel/internals/menu-item-numbers.xml 20201202/doc/devel/internals/menu-item-numbers.xml
--- 20101020/doc/devel/internals/menu-item-numbers.xml 2010-07-22 22:34:30.000000000 +0000
+++ 20201202/doc/devel/internals/menu-item-numbers.xml 2020-06-25 21:49:40.000000000 +0000
@@ -48,13 +48,13 @@ were before to give more flexibility.
s390-netdevice (s390)
1800 netcfg
netcfg-static
-1900 auto-install
+1900 auto-install (deprecated)
2100 network-preseed
network-console
2110 localechooser (s390)
-2150 ai-localechooser
-2155 ai-kbd-chooser
- ai-console-setup-udeb
+2150 ai-localechooser (deprecated)
+2155 ai-kbd-chooser (deprecated)
+ ai-console-setup-udeb (deprecated)
2300 choose-mirror
download-installer
2400 user-setup
@@ -116,7 +116,7 @@ were before to give more flexibility.
-90000 -> \infty Neverdefault
+90000+ Neverdefault
93000 cdebconf-priority
diff -pruN 20101020/doc/devel/internals/udebs.xml 20201202/doc/devel/internals/udebs.xml
--- 20101020/doc/devel/internals/udebs.xml 2010-02-11 20:00:39.000000000 +0000
+++ 20201202/doc/devel/internals/udebs.xml 2020-06-25 21:49:40.000000000 +0000
@@ -129,17 +129,17 @@ Build-Depends: debhelper (>= 7.3.10),
Package: kbd-chooser
Architecture: i386 amd64 powerpc alpha hppa sparc [...]
-XC-Package-Type: udeb
+Package-Type: udeb
Depends: ${shlibs:Depends}, ${misc:Depends}, console-keymaps
Description: Detect a keyboard and select layout
-XB-Installer-Menu-Item: 1200
+Installer-Menu-Item: 1200
-The line XC-Package-Type tells
+The line Package-Type tells
debhelper to treat the package as a udeb. The
-XB-Installer-Menu-Item is added in the control file for
+Installer-Menu-Item is added in the control file for
the udeb and will eventually end up in the dpkg
status file to help main-menu figure out that this
udeb should be included in the menu and in what order
diff -pruN 20101020/doc/devel/kerntabl 20201202/doc/devel/kerntabl
--- 20101020/doc/devel/kerntabl 2010-10-20 12:40:41.000000000 +0000
+++ 20201202/doc/devel/kerntabl 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Please do not assume this table is up-to-date unless you've just updated
-it yourself. It is provided as a framework for tracking kernel updates.
-
-This is used to track the kernel versions that we have udebs built for; the
-udeb versions that are being used to build d-i images, any versions of the
-kernel debs that are hardcoded into base-installer, and the kernels that are
-put on CDs. All of these have to be coordinated for a d-i release.
-
-The numbers between brackets are the package version for linux-2.6.
-
-arch kernel udebs build/config
-i386 2.6.32 (-25) 2.6.32-5
-amd64 2.6.32 (-25) 2.6.32-5
-armel 2.6.32 (-25) 2.6.32-5
-hppa 2.6.32 (-25) 2.6.32-5
-ia64 2.6.32 (-25) 2.6.32-5
-mips 2.6.32 (-25) 2.6.32-5
-mipsel 2.6.32 (-25) 2.6.32-5
-powerpc 2.6.32 (-25) 2.6.32-5
-s390 2.6.32 (-25) 2.6.32-5
-sparc 2.6.32 (-25) 2.6.32-5
-
-alpha 2.6.30 (-6) 2.6.30-1 # unoficial
-m68k 2.6.26 (-7) 2.6.26-1 # unoficial
-sh4 2.6.32 (-??) 2.6.32-5 # unoficial
diff -pruN 20101020/doc/devel/menu-item-numbers.txt 20201202/doc/devel/menu-item-numbers.txt
--- 20101020/doc/devel/menu-item-numbers.txt 2010-02-11 20:00:40.000000000 +0000
+++ 20201202/doc/devel/menu-item-numbers.txt 2020-07-26 06:38:45.000000000 +0000
@@ -2,4 +2,4 @@ The list of the currently assigned menu-
the "D-I Internals" document.
See installer/doc/devel/internals/menu-item-numbers.xml, or
-http://d-i.alioth.debian.org/doc/internals/.
+http://d-i.debian.org/doc/internals/.
diff -pruN 20101020/doc/devel/modules.txt 20201202/doc/devel/modules.txt
--- 20101020/doc/devel/modules.txt 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/devel/modules.txt 2020-06-25 21:49:40.000000000 +0000
@@ -91,6 +91,7 @@ Disallowed Headers
* Pre-Depends
* Conflicts
+* Breaks
* Essential
* Suggests
@@ -117,5 +118,5 @@ A 2 minute primer on building udebs.
====================================
1. Add a Build-Dependency against debhelper (>= 4.2).
-2. Add "XC-Package-Type: udeb" to the package's stanza in the control file.
+2. Add "Package-Type: udeb" to the package's stanza in the control file.
3. Build the package!
diff -pruN 20101020/doc/devel/new-kernel-checklist.txt 20201202/doc/devel/new-kernel-checklist.txt
--- 20101020/doc/devel/new-kernel-checklist.txt 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/devel/new-kernel-checklist.txt 2020-06-25 21:49:40.000000000 +0000
@@ -1,38 +1,25 @@
This is a checklist of steps involved in updating d-i to use a new version
of the kernel.
- 1. New kernel deb enters the archive.
- 2. Update linux-kernel-di package to use new kernel.
- 3. Compare available modules in new kernel and add any that are useful for
+ 1. Compare available modules in new kernel and add any that are useful for
installation to an appropriate udeb.
- 4. Update build/config/ KERNELVERSION to use new kernel (only commit once
+ 2. New kernel package enters the archive.
+ 3. Update build/config/ KERNELVERSION to use new kernel (only commit once
udebs are accepted).
- 5. Make sure images still build, as sometimes new kernels will overflow
- floppies, etc. If not go back to step 3 and refactor.
- 6. Do initial test installs, which must be done against unstable to
+ 4. Make sure images still build, as sometimes new kernels will overflow
+ space limits. If not, the kernel-wedge udeb configuration in the kernel
+ package needs to be revised.
+ 5. Do initial test installs, which must be done against unstable to
use the new kernel udebs from unstable or using hand-build CD
images.
- 7. Get ftp-master to remove kernel udebs for the old kernel version from
- unstable. Before this is done netinst CDs will be larger than usual.
- 8. New kernel deb enters testing.
- 9. Update rootskel's debian-installer/kernel/image and/or
- debian-installer/kernel/image-2.6 templates to use the version number
- of the new kernel. (Not necessary for all arches.)
-10. Update base-installer's postinst to change any hard-coded kernel
- versions. (Not necessary for all arches.)
-11. Update debian-cd's tasks/debian-installer+kernel, tasks/debian-installer,
- and tasks/exclude-etch for new kernel.
-12. Test to make sure 24, 32, and 48 mb installs still work. New kernels
- and added/changed modules sometimes break lowmem.
-13. Get new debian-cd uploaded and into testing.
-14. Get ftp-master to propagate all the updated udebs into testing.
- Until this point, naive users will be unable to use some sid_d-i
- install images as the needed udebs will not be in testing.
-15. Full user testing, etc.
-16. Get ftp-master to remove kernel udebs for the old kernel version
- from testing. This will *break* some old released install media
- (floppy, netboot, not cdrom), but it's necessary before release.
-17. Update kernel version in installer/doc/manual/build/buildone.sh for
- relevant architecture(s).
-18. Inform maintainer of Release Notes of the changes in kernel version
+ 6. New kernel package enters testing.
+ 7. Test to make sure lowmem installs still work. New kernels and
+ added/changed modules sometimes break lowmem. Documentation on the
+ minimum memory requirements may need to be updated
+ (manual/build/arch-options/).
+ 8. Get new debian-cd uploaded and into testing.
+ 9. Full user testing, etc.
+10. Update kernel version in manual/build/arch-options for the
+ relevant kernel.
+11. Inform maintainer of Release Notes of the changes in kernel version
(or update ddp/manuals.sgml/release-notes/release-notes.ent in CVS).
diff -pruN 20101020/doc/devel/package-upload.txt 20201202/doc/devel/package-upload.txt
--- 20101020/doc/devel/package-upload.txt 2009-09-29 22:57:23.000000000 +0000
+++ 20201202/doc/devel/package-upload.txt 2020-06-25 21:49:40.000000000 +0000
@@ -1,11 +1,11 @@
To upload a package correctly, do the following:
-* Ensure that your build environment is set up correctly to avoid .svn
+* Ensure that your build environment is set up correctly to avoid .git
directories being included in your uploads.
The following settings in your configuration should do this (assuming
'debuild' is used to build the package):
- ~/.bashrc:
- export DH_ALWAYS_EXCLUDE=CVS:.svn
+ export DH_ALWAYS_EXCLUDE=CVS:.svn:.git
- ~/.devscripts:
DEBUILD_DPKG_BUILDPACKAGE_OPTS="-i -I"
DEBUILD_PRESERVE_ENVVARS=DH_ALWAYS_EXCLUDE
@@ -15,15 +15,15 @@ To upload a package correctly, do the fo
If you use pdebuild from pbuilder the following settings should be used:
- ~/.pbuilderrc
- export DH_ALWAYS_EXCLUDE=CVS:.svn
+ export DH_ALWAYS_EXCLUDE=CVS:.svn:.git
DEBBUILDOPTS="-i -I"
-* Update from Subversion:
- svn up
+* Update from git:
+ git pull
* Check that you don't have any uncommitted changes or files that do not
belong in the package:
- svn st
+ git status
* Update the translator info in debian/changelog by copying and pasting
the output (if any) of the following command:
@@ -40,7 +40,7 @@ To upload a package correctly, do the fo
debc, debdiff, etc.
* Commit and tag the release:
- debcommit --release
+ debcommit --all --release
Since many packages in d-i only contain shell scripts and the like, you can
build them even if they aren't for your normal host architecture: just pass
diff -pruN 20101020/doc/devel/partman/build.sh 20201202/doc/devel/partman/build.sh
--- 20101020/doc/devel/partman/build.sh 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/partman/build.sh 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+xsltproc=`which xsltproc`
+stylesheet=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl
+
+if [ -n "$xsltproc" ] ; then
+ if [ -e "$stylesheet" ]; then
+ $xsltproc --xinclude style-html.xsl partman-doc.dbk
+ else
+ echo "stylesheet missing; please install the docbook-xsl Debian package"
+ exit 1
+ fi
+else
+ echo "xsltproc not found; please install the xsltproc Debian package"
+ exit 1
+fi
diff -pruN 20101020/doc/devel/partman/internals.css 20201202/doc/devel/partman/internals.css
--- 20101020/doc/devel/partman/internals.css 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/partman/internals.css 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,6 @@
+/* Cascading stylesheet for the Debian Installer internals talk */
+
+/* Use grey background for examples */
+pre.screen {
+ background-color : #E0E0E0;
+}
diff -pruN 20101020/doc/devel/partman/Makefile 20201202/doc/devel/partman/Makefile
--- 20101020/doc/devel/partman/Makefile 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/devel/partman/Makefile 2020-11-30 23:08:26.000000000 +0000
@@ -1,26 +1,5 @@
-SHELL=bash
-name=partman-doc
-
-$(name).html/: $(name).sgml
- debiandoc2html $(name).sgml
-
-%.txt: %.sgml
- debiandoc2text $<
-
-%.pdf: %.sgml
- debiandoc2pdf $<
-
-%.dvi: %.sgml
- debiandoc2dvi $<
-
-%.info: %.sgml
- debiandoc2info $<
-
-%.ps: %.sgml
- debiandoc2ps $<
-
-%.tov: %.sgml
- debiandoc2textov $<
+all:
+ @./build.sh
clean:
- rm -rf $(name).html
+ @rm -f *.html
diff -pruN 20101020/doc/devel/partman/partman-doc.dbk 20201202/doc/devel/partman/partman-doc.dbk
--- 20101020/doc/devel/partman/partman-doc.dbk 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/partman/partman-doc.dbk 2020-11-30 23:08:26.000000000 +0000
@@ -0,0 +1,1751 @@
+
+
+
+
+]>
+
+
+
+Partition Management for the Debian Installer
+
+
+
+
+Anton Zinoviev anton@lml.bas.bg
+
+
+
+
+
+
+
+ 2003,2004,2007 Anton Zinoviev
+
+
+This manual is free software; you may redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2, or (at your option) any later version.
+
+
+This is distributed in the hope that it will be useful, but without
+any warranty ; without even the implied warranty of merchantability
+or fitness for a particular purpose. See the GNU General Public License for
+more details.
+
+
+A copy of the GNU General Public License is available as
+/usr/share/common-licenses/GPL in the Debian GNU/Linux
+distribution or on the World Wide Web at the GNU website . You can also
+obtain it by writing to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+
+
+
+
+Introduction
+
+There are many wishlist features that we might desire from any installer of
+GNU/Linux and that are related to partitioning:
+
+
+
+
+The partitioner should support different file systems. Some of them need more
+care than only libraries and suitable arguments for mount .
+
+
+
+
+It should support not only regular partitions but also software RAID and LVM as
+well as encrypted file systems.
+
+
+
+
+It should be able to partition disks automatically and allow the user to
+inspect and customise the automatic partitioning later.
+
+
+
+
+It should be able to resize partitions and move their contents from one place
+to another.
+
+
+
+
+The users should be protected from mistakes – by allowing them to undo their
+partitioning operations.
+
+
+
+
+The partitioner should discover that there is already some installed GNU/Linux
+system and analyse its fstab , passwd ,
+etc. in order to provide an automatic upgrade from the old already installed
+GNU/Linux system to the new one.
+
+
+
+
+One nice feature of the Debian installer is that it is modular. Its components
+are packaged in separate udebs and they can have relatively independent
+development process. This document describes how we can solve all mentioned
+tasks keeping the Debian installer as modular as it is now. Ideally in order
+to add some new feature only a few new udebs must be all that is needed – no
+changes in the existing udebs and no recompilation would be required.
+
+
+The script partman from the package partman-base opens the main partitioning menu; it
+may look like this one:
+
+
++------------------+ [!!] Partition the storage devices +-----------------+
+| Partition, free space or device to be modified |
+| |
+| IDE1 master - Seagate U Series 40810 (40.0 GB) |
+| #3 primary 2.1 GB B F ext3 / |
+| pri/log 4.4 GB FREE SPACE |
+| #5 logical 3.6 GB |
+| #7 logical 10.0 GB F ext3 /usr |
+| #8 logical 19.9 GB K ext2 /home |
+| IDE2 master - Maxtor 6Y120L0 (122.9 GB) |
+| #7 logical 1.0 GB linux-swap |
+| logical 114.5 GB FREE SPACE |
+| #5 logical 5.5 GB reiserfs |
+| #6 logical 1.9 GB |
+| |
+| Undo changes to partitions |
+| Finish partitioning and write changes to disk |
+| |
+| <Go Back> <Continue> |
+| |
++-------------------------------------------------------------------------+
+
+
+When the users choose some free space they are offered to create a new
+partition just like they are in cfdisk . When users choose a
+partition they are offered with a menu with various editing operations:
+
+
++------------------+ [!!] Partition the storage devices +-----------------+
+| Settings on the partition: |
+| |
+| Usage method: format the partition |
+| File system: ext3 |
+| Mount point: /var/mail |
+| Mount options: noatime,nodev,nosuid,noexec,usrquota |
+| Bootable flag: off |
+| Size: 995.2 MB |
+| |
+| Finished setting up partition |
+| Delete the partition |
+| |
+| <Go Back> <Continue> |
+| |
++-------------------------------------------------------------------------+
+
+
+All udebs are allowed to add items to this menu as well as to several other
+menus. They can add new items in the list of devices such as software RAID and
+LVM devices, networked file systems, encrypted partitions, etc. The package
+partman-partitioning is responsible for
+pure partitioning operations such as creation of new partitions and deletion.
+The packages partman-target and
+partman-basicmethods are responsible
+for the items `Choose how this partition should be used' and `Choose a file
+system'. The package partman-basicfilesystems adds support for
+ext2 , linux-swap ,
+fat16 and fat32 . The package partman-ext3 adds support for
+ext3 .
+
+
+
+Changes in partman since 2005
+
+This chapter documents important changes in the sctructure of partman. It is
+provided as a test if you need to reread some of the sections in this document.
+
+
+
+
+New directory check.d with some of the scripts formerly in
+finish.d
+
+
+
+
+New directory display.d with different methods to do the
+partitioning (manual, automatic, etc.)
+
+
+
+
+New command GET_LABEL_TYPE in parted_server
+
+
+
+
+
+Package interrelations
+Basics
+
+The GNU Parted disk partitioning library provides high-level, architecture
+independent functions for operations such as creating, deleting, resizing and
+moving of partitions. Most of the functions of libparted work in a
+nondestructive way. The partition table is written in data structures and any
+change in the partition table happens only in these data structures rather than
+directly on the disk. This makes possible to implement partitioning tools
+based on libparted that support undoing
+of the editing operations.
+
+
+However we have to solve two problems. The first is that we want to use as
+much as possible shell scripts rather than C programs. The second is that
+different programs have to operate with same instance of libparted structures.
+For example the user can use some tool for automatic partitioning, then correct
+or customise the automatic partitioning, perform some other arbitrary
+operations being still allowed to undo everything.
+
+
+There is one obvious solution of these two problems – we keep the data
+structures of libparted in a daemon process and communicate with it in order to
+make changes in these data structures. This process is
+/bin/parted_server from the package partman-base .
+
+
+The scripts from /lib/partman/init.d/ are executed before
+all partitioning operations. They can be used to initialise the partitioning
+system. The scripts may be invoked more than once in which case they should
+behave properly. For example this directory can contain a script to discover
+the existing hard drives. If invoked for second time the script must either do
+nothing or check if there is some new kernel module giving access to new still
+undiscovered device.
+
+
+Any udeb may install a script in this directory. For example the script
+/lib/partman/init.d/30parted from the package partman-base is responsible for running
+parted_server . Notice that the scripts are prefixed by a
+two-digit number. This number determines the order the scripts are executed.
+If any of the scripts exit with non-zero exit code the partitioning will be
+aborted. This means that in almost all cases these scripts must end with
+exit-code 0.
+
+
+When the initialisation completes, the scripts from
+/lib/partman/display.d are executed. These scripts are
+supposed to make the actual partitioning interactively or non-interactively.
+The exit code code of these scripts is interpreted
+as follows:
+
+
+
+code = 0
+
+
+The script did nothing, move to the next script in
+display.d .
+
+
+
+
+1 <= code <= 99
+
+
+Restart the partitioning (move again to the first script in
+display.d ).
+
+
+
+
+100 <= code <= 254
+
+
+The script successfully partitioned the disks, do not execute the following
+scripts in display.d .
+
+
+
+
+code = 255
+
+
+Abort the partitioning.
+
+
+
+
+
+When the disks become ready, the scripts in
+/lib/partman/check.d are executed. They have to check if
+everything is OK to proceed with commiting the changes on the disks, mounting
+file systems, etc. For example the package partman-target installs there a script to check if
+there is a root file system. If a script in check.d exits
+with non-zero exit code then the scripts in display.d are
+executed again and as a result the user is allowed to fix the partitioning.
+
+
+The directory check.d is remarkable with the fact that some
+of the scripts in it are installed by non-partman packages. The packages for
+the various bootloaders (lilo, grub, palo, etc.) install there scripts to
+ensure the partitioning scheme conforms to their requirements.
+
+
+While the user is modifying the partitions this happens only in the memory of
+the computer and not in the edited devices. This is because almost all changes
+happen either in the data-structures of parted_server or in
+files in the installer's ram-disk. That's why we can provide the user with the
+option to undo everything. When the user chooses to undo the scripts in the
+directory /lib/partman/undo.d/ are executed. Any udeb may
+install a script in this directory. For example the script
+/lib/partman/undo.d/30parted is responsible for restoring
+the contents of the data structures of parted_server . In
+most cases the scripts from undo.d must exit with exit-code
+0. If any of the scripts exit with non-zero exit code the partitioning will be
+aborted.
+
+
+In order to perform the editing operations on the storage devices (and in
+particular to transfer the partitions from the internal data-structures of
+parted_server to the hard disks) the scripts from the
+directory /lib/partman/commit.d/ are executed. The order
+in which these scripts are executed is determined again by two-digit prefixes
+in the script names. Every script from commit.d is
+guaranteed that the scripts ordered before it have been already executed.
+However if any of the scripts exit with non-zero exit-code the execution of the
+scripts in commit.d will be stopped. In this case the
+partitioning will continue and the user is expected to fix the problem. If any
+script exits with non-zero exit code it is supposed to inform the user what
+went wrong using debconf.
+
+
+There are two cases when the scripts from commit.d are
+executed. The first case is when the user wants to commit the changes to the
+disks but continue partitioning. The second case is when the partitioning
+ends. In the first case if none of the scripts fails the scripts from
+init.d will be also executed and the user will be returned
+to the partitioning dialog. In the second case the scripts from
+finish.d will be executed. In both cases if any of the
+scripts in commit.d fail the user will be returned
+immediately back to the partitioning dialog.
+
+
+The scripts from /lib/partman/finish.d/ are responsible
+for final tasks such as to mount partitions on /target ,
+generate of fstab , stop parted_server
+etc. What tasks will be performed depends on what udebs are
+unpacked. If the packages responsible for mounting partitions and creating
+fstab are not unpacked we have only a simple partitioner providing partitioned-harddrives . If they are unpacked they
+provide also made-filesystems and
+mounted-partitions .
+ If any of these scripts exit with non-zero exit-code the execution
+of the scripts will be stopped. If the exit-code was 1 then the user will be
+returned back to the partitioning dialog and is expected to correct the
+problem. If the exit-code was neither 0 nor 1 then the partitioning will be
+aborted.
+
+
+For every hard disk in the system the script
+/lib/partman/init.d/30parted creates a subdirectory in
+/var/lib/partman/devices/ and informs
+parted_server that the device is to be edited (`opens' the
+device). All udebs that provide storage device (software RAID, LVM, encrypted
+partitions) must do the same. This subdirectory must contain at least three
+files – device , model and
+size . The first contains the name of a device file (for
+example /dev/ide/host0/bus0/target0/lun0/disc ). The
+second contains the name of the device (for example `Maxtor 6Y120L0'). The
+third contains the physical size of the storage device (in bytes, for example
+`122942324736'). Please notice that udebs that provide
+support for storage `devices' that cannot be partitioned (such as networked
+file systems) should not create a subdirectory in
+/var/lib/partman/devices and certainly cannot provide the
+device to the management of parted_server .
+ The subdirectories of
+/var/lib/partman/devices/ can but are not obligated to
+contain additional information. We call these subdirectories device
+directories .
+
+
+Every partition in a device managed by parted_server is
+given a unique name having the form
+first_byte -last_byte .
+This name can be used to determine where the partition starts and where it
+ends. Unlike one can suppose parted_server
+always measures sizes and places in bytes rather than in sectors.
+Last_byte is the number of the last byte of the last
+sector of the partition. If the device directory contains
+a subdirectory named
+first_byte -last_byte
+then this subdirectory stores information about the partition. We call this
+subdirectory directory of the partition . We call the
+stringfirst_byte -last_byte
+`id ' of the partition.
+
+
+
+
+
+Partitioning
+
+The partitioning starts with the menu of the menu-directory
+/lib/partman/choose_partition . This is the main
+partitioning menu. Every udeb is allowed to install new items in it. If the
+script do_option exits with exit-code 0 the user will be
+shown again the main partitioning menu. If the script exits with exit-code 100
+this means that the partitioning should be finished. In this case the scripts
+from commit.d and finish.d will be
+executed as described in . If the script
+do_option exits with exit code 255 the partitioning will be
+aborted immediately.
+
+
+The main partitioning menu always contains an item for every partitioned
+storage device, an item for every partition and an item for every free space.
+
+
+If the user chooses a storage device the menu of the menu-directory
+/lib/partman/storage_device will be opened. The first
+argument given to choices is the device
+directory We are not going to describe the arguments given to
+do_option . Look at .
+ .
+
+
+If the user chooses a free space the menu-directory
+/lib/partman/free_space will be opened. The first
+argument given to choices is the device directory. The
+second argument is the id of the free space.
+
+
+If the user chooses an active partition the menu-directory
+/lib/partman/active_partition will be opened. The first
+argument given to choices is the device directory. The
+second argument is the id of the chosen partition. If the script
+do_option exits with exit-code 0 the user will be shown
+again the menu active_partition for the same partition. If
+the script do_option exits with exit-code 100 or 255 the
+user will be returned back to the main partitioning menu. This should happen
+when the id of the partition is invalidated, for example when the partition is
+deleted or resized.
+
+
+In the main partitioning menu the partitions are presented by lines of this
+kind:
+
+
+#8 primary 19.9 GB K ext2 /home
+
+
+Notice that it is useless to indicate that the partition is primary if the type
+of the partition table is `mac' as this partition table doesn't support logical
+partitions. On the other hand this partition table supports partition names.
+We see that we need a flexible way to determine how the partitions are
+presented in the main partitioning menu.
+
+
+The directory /lib/partman/visual.d contains scripts that
+print the parts of the partition line. For example the script
+/lib/partman/visual.d/filesystem prints strings like
+`ext3' or `FREE SPACE'. These scripts usualy start with the following cliche:
+
+
+cd $1
+
+num=$2
+id=$3
+size=$4
+type=$5
+fs=$6
+path=$7
+shift; shift; shift; shift; shift; shift; shift
+name=$*
+
+
+$1 is the device directory. $num is the number of the partition (for example
+/dev/hda6 has number 6). $id is the id of the partition.
+$size is the size of the partition (in bytes). If this is an active partition
+then $type is either `primary' or `logical'. If this is a free space then
+$type shows what partition can be created in it and $type can be `primary',
+`logical', `pri/log' or `unusable'. $fs is `free' if this is a free space.
+Otherwise $fs is the type of the file system of this partition as known to
+parted_server . $path is a device name for the partition,
+for example /dev/ide/host0/bus0/target0/lun0/part6 . $name
+is the name of the partition or the empty string if the partition table doesn't
+support partition names.
+
+
+The script /lib/partman/commit.d/30parted transfers the
+partition tables from the internal structures of
+parted_server to the disks. The script
+/lib/partman/finish.d/80parted stops
+parted_server .
+
+
+The package partman-base installs in
+update.d (see ) a script
+to ensure that for every partition that contains some file system there is a
+file detected_filesystem in the directory of the partition
+whose contents is the type of the detected file system as returned by
+parted_server .
+
+
+
+Setup /target
+
+Without the package partman-target the
+packages partman-base and partman-partitioning provide only the regular
+partitioning operations. However if the package partman-target is also unpacked then the user will
+be provided with options to choose file systems for the partitions, specify
+wether they should be formatted and select mount points. The package
+partman-target adds to the menu
+directory /lib/partman/active_partition the item `Usage
+method:'. If the user chooses this item the menu directory
+/lib/partman/choose_method will be opened. The scripts
+choices from choose_method are given the
+device directory as first argument and the partition id as second argument.
+
+
+The package partman-basicmethods adds
+in the menu of the menu directory choose_method three items:
+`Do not use the partition', `Format the partition' and `Keep and use the
+existing data in the partition' (the last only if some file system is
+detected). Other udebs can provide another methods to use partitions.
+
+
+Every partition that is to be used somehow in the future Debian system should
+have a file named `method' in its directory (what is `directory of a partition'
+is described in ). The scripts
+do_option of the menu directory
+choose_method manage the file method . It
+contains the name of the usage method chosen by the user. For example if the
+user chooses to `format the partition' the contents of this file will be
+`format' and if the user chooses to `keep and use the existing data' the
+contents of this file will be `keep'. Partitions that won't be used do not
+have a file method .
+
+
+The udebs providing methods may provide also translatable names of the methods
+for the user interface using debconf templates named
+partman/method_long/some_method
+and
+partman/method_short/some_method .
+For example the package partman-palo
+providing method palo can provide also the following debconf
+templates:
+
+
+Template: partman/method_long/palo
+Type: text
+_Description: Palo boot partition
+
+Template: partman/method_short/palo
+Type: text
+_Description: Palo
+
+
+Another job for the scripts do_option of the menu directory
+choose_method is to create or remove a file named
+use_filesystem in the directory of the partitions. This
+file is created when the usage method requires the partition to be used
+together with some file system. Otherwise it is removed. Example methods that
+are used together with a file system are `format the partition' and `keep and
+use the existing data'. Example methods that are not used together with a file
+system are `LVM physical volume' and `PALO boot partition'.
+
+
+Finaly, the scripts do_option of the menu directory
+choose_method have to create or remove a file named `format'
+in the directory of the partitions. If the partition directory contains a file
+named format then it will be formatted. Otherwise it will
+not be formatted. For example if the user chooses to `format the partition'
+the script do_option will create a file
+format . If the user chooses to `keep and use the existing
+data' the file format will be removed if it exists.
+
+
+The menu item `Choose a file system' in the menu directory
+active_partition is also provided by the package partman-target . If the user chooses it the menu
+choose_filesystem will be opened. This menu however is not
+produced using a menu directory.
+
+
+Packages that provide support for some file system should install a script in
+the directory /lib/partman/valid_filesystems . The first
+argument given to this script is some device directory, the second argument is
+the id of some partition and the third argument is one of the strings
+`formatable' and `existing'. If it is `formatable' then the job of the script
+is to check if the specified partition can be formatted and used. If the third
+argument is `existing' then the job of the script is to check if the partition
+can be used without formatting. In either case if the partition can be used
+then the script should print a line with the identifier of the type of the file
+system.
+
+
+Packages that provide support for some file systems use the directory
+/lib/partman/parted_names to define a mapping from the
+unique file system type identifiers to the names used by
+parted_server . Suppose for example that the package
+providing support for UMSDOS file system chooses the string `umsdos' as unique
+identifier for the file system. Then this package must install in this
+directory a file named umsdos whose contents is the string
+`fat16'. This means that parted_server will know UMSDOS
+file systems as being fat16 file systems.
+
+
+The udebs providing file systems may provide also translatable names of the
+file systems for the user interface using debconf templates named
+partman/filesystem_long/some_filesystem
+and
+partman/filesystem_short/some_filesystem .
+For example the package partman-ext3
+providing file system with unique identifier ext3 can
+provide also the following debconf templates:
+
+
+Template: partman/filesystem_long/ext3
+Type: text
+_Description: Extended 3
+
+Template: partman/filesystem_short/ext3
+Type: text
+_Description: Ext3
+
+
+Most of the packages that provide support for a file system will have to add an
+item `Mount point:' to the menu active_partition . Of course
+this item should be shown only when the contents of the file
+acting_filesystem is appropriate. The mount point chosen by
+the user should be written in a file named mountpoint
+situated in the directory of the partition. If the user chooses not to mount
+this file system then the file mountpoint should be removed
+(if it exists).
+
+
+In order to be able to mount file systems and generate fstab the directories
+/lib/partman/fstab.d/ and
+/lib/partman/mount.d/ are used. The scripts from
+fstab.d should print lines in a form similar to that of
+/etc/fstab :
+
+
+file_system mount_point type options dump pass
+
+
+The first field (file_system ) is
+the name of a device that can be accessed by the installer. For example this
+can be /dev/ide/host0/bus0/target0/lun0/part5 despite that
+in the future system this device will be named /dev/hda5 .
+On the other hand the other five fields should look exactly the same way as in
+the fstab to be generated. For example
+options can contain options such
+as quota that are senseless for the installer.
+
+
+The scripts from mount.d are used to mount file systems. A
+string having the same form as the lines output by the scripts from
+fstab.d should be given as first argument to any script from
+mount.d . Any script from mount.d checks
+if it can mount the requested file system. If it cannot then the script exits
+with some non-zero exit code. Otherwise the script must mount the file system
+in the proper place in the hierarchy over /target , print
+on its standard output a command that should be used in order to unmount the
+file system and exit with exit code 0.
+
+
+The scripts in the directories fstab.d and
+mount.d are installed by the udebs that provide support for
+file systems.
+
+
+Packages that provide support for file systems install in
+commit.d a script to format the partitions that the user has
+requested to be formatted. The package partman-target installs in
+finish.d a script to mount the partitions on
+/target . The packages that provide support for storage
+devices (RAID, LVM, etc.) install in finish.d a script to
+add in /target/etc/fstab the necessary lines.
+
+
+The package partman-target installs in
+update.d (see ) a script
+to ensure that for every partition that is to be used there is a file
+acting_filesystem in the directory of the partition whose
+contents is the identifier of the type of file system under which the partition
+should be used.
+
+
+
+
+
+/lib/partman/lib/*
+
+Various scripts in partman make use of function libraries :
+separate files, mostly containing shell functions, that are sourced by scripts
+so they can make use of common functions and code duplication can be avoided.
+
+
+The main function library is base.sh , provided by
+partman-base . This file is sourced by
+most scripts in partman as it defines a lot of useful variables and common
+functions. Some of these are documented in the remainder of this chapter.
+ The script base.sh has become somewhat
+too long and this probably makes its sourcing slow. Although some
+reorganization has already taken place, it could be a good idea to split it up
+further.
+
+
+Other packages provide more targeted function libraries. In most cases their
+scope and use can easily be determined from their name.
+
+Environment
+
+The variables TAB and NL have values
+ASCII 9 and ASCII 10 correspondingly. They can be used as temporary values
+for the variable IFS . The function
+restore_ifs restores the variable IFS its
+original value.
+
+
+The function library base.sh also contains simple
+reimplementations of basename and dirname
+so that busybox doesn't have to provide them.
+
+
+
+Menus
+
+The function debconf_select is a high level function to ask
+user with a menu using a Debconf question with type `select'. Synopsis:
+
+
+debconf_select priority template choices default
+
+
+The first argument is the debconf-priority of the question and the second is
+the name of the template to be used. The third argument is a newline-separated
+list of items for the menu. Each item has the form
+
+
+menu_item_id <TAB>The text for the user
+
+
+Here <TAB> is ASCII 9. The text `The text for the
+user' is the text of the menu item. If
+menu_item_id of some menu-item is
+identical with the fourth argument given to debconf_select
+then this menu-item will be default.
+
+
+If the user cancels the question debconf_select returns with
+exit-code 255. Otherwise the value of the variable RET will
+be the menu_item_id of the chosen
+menu item. If the chosen menu item was chosen by the user then the exit-code
+is 0. If the item was chosen automatically (due to the debconf-priority or to
+some other reason) the exit-code is 1.
+
+
+The function debconf_select doesn't care to
+db_fset $template seen
+false . The template must have exactly the following type
+and choices fields:
+
+
+Type: select
+Choices-C: ${CHOICES}
+Choices: ${DESCRIPTIONS}
+
+
+The udebs that generate menus using menu-directories use the function
+ask_user instead of debconf_select .
+Synopsis:
+
+
+ask_user a_menu_directory additional_optional_arguments ...
+
+
+This function displays the menu for
+a_menu_directory . The first
+argument is a menu-directory (see ). If the user
+cancels the dialog then ask_user returns with exit code 255.
+Otherwise it returns with the exit code of the script
+do_option .
+
+
+If ask_user is called re-entrantly from within a
+do_option script, then the calling
+do_option script should typically be careful to handle or
+discard exit code 255 itself (and sometimes other codes, depending on the
+protocol in force) to avoid a backup operation inadvertently backing up out of
+several nested menus at once.
+
+
+The script choices is invoked with
+additional_optional_arguments as
+arguments. The first argument given to do_option is the
+menu_item_id of the chosen menu
+item and the other arguments are again
+additional_optional_arguments .
+
+
+To set the default selected item in a menu-directory, use the function
+menudir_default_choice . Synopsis:
+
+
+menudir_default_choice a_menu_directory subdirectory menu_item_id
+
+
+Where the subdirectory is the
+name of a subdirectory in the menu-directory with the leading sequence number
+stripped off and menu_item_id is
+the id of a menu-item printed by
+a_menu_directory /??subdirectory /choices .
+The specified item is set as default not forever but only for the next
+invocation of ask_user . It is not an error to set as
+default non-existing item; in this case the first item in the menu will be
+default.
+
+
+The function partition_tree_choices prints a sequence of
+lines in the form
+
+
+menu_item_id <TAB>The text for the user
+
+
+– one for every storage device and one for every partition. The
+menu_item_id of the storage
+devices is their storage directory. The
+menu_item_id of the partitions
+has the form
+storage_directory //partition_id .
+The output of partition_tree_choices can be given as third
+argument to debconf_select .
+
+
+
+Long numbers
+
+Notice that the sizes of most of the present storage devices are so large that
+we cannot measure them using 32-bit integers. Consequently we cannot use the
+usual shell arithmetic. The functions longint_le ,
+longint2human , human2longint and
+valid_human exist in order to deal with such big numbers.
+
+
+The function longint_le is used to compare two big numbers.
+
+
+longint_le number1 number2
+
+
+returns with exit code 0 if the first number is less or equal to the second
+and returns 1 otherwise.
+
+
+The function longint2human accepts in its first argument
+some number of bytes, converts it to something that is more meaningful for
+humans and outputs the result. For example
+
+
+longint2human 1234567890
+
+
+gives 1.2 GB . Notice that this function rounds its
+argument.
+
+
+The function human2longint is used for the opposite
+convertion:
+
+
+human2longint 1.234Gb
+
+
+gives 1234000000 .
+
+
+The function valid_human returns with exit code 0 when its
+first argument is a string that is suitable to be given to
+human2longint . Otherwise it returns with exit code 1.
+
+
+
+Updating partition directories
+
+Different components of the installer may need to get information about the
+partitions. They can communicate with parted_server in
+order to know the characteristics of the partition. However not everything can
+be known from parted_server . Imagine an udeb that provides
+the user with the option to upgrade some existing GNU/Linux installation. This
+udeb analyses the fstab and knows that some partition is
+used as /home and should not be formatted. This sort of
+information has nothing to do with parted_server . The udeb
+stores it in a subdirectory of the device directory named after the id of the
+partition.
+
+
+But now a problem arises. Suppose that the user chooses to format some
+partition as ext2 and mount it on /home . The udebs
+responsible for formatting and mounting create the directories
+filesystem and mountpoint in the
+partition. What will happen if the users change their mind and decide to use
+the same partition as swap space? Swap spaces have no mount points and the
+file mountpoint should be removed. Who is responsible for
+removing it? The udeb that allows the user to choose a file system for the
+partition doesn't have to know that swap-spaces have no mount points, only the
+udeb that provides support for swap-spaces can know that the file
+mountpoint should be removed.
+
+
+In order to solve this difficulty every script that makes changes to some
+partition should invoke the function update_partition from
+base.sh . Synopsis:
+
+
+update_partition device_directory partition_id
+
+
+In order to update the contents of the directory
+device_directory /partition_id
+the function update_partition executes the scripts from the
+directory /lib/partman/update.d/ . Every udeb is allowed
+to install scripts in this directory. Their names are prefixed by two-digit
+numbers that control the order of the execution. The scripts from
+update.d are given several arguments. $1 is the
+device_directory . $2 is the number of the partition
+(/dev/hda6 will have number 6). $3 is the id of the
+partition. $4 is the length of the partition (in bytes). $5 is the type of
+the partition, it can be either `primary' or `logical'. $6 is the type of the
+file system as known to parted_server , in most cases you
+should ignore this argument. $7 is the device name (for example
+/dev/ide/host0/bus0/target0/lun0/part6 ).
+"$8 $9 $10 $11 ..." is the name of the partition in partition tables that
+support partition names. Otherwise $8, $9, $10,... are not defined.
+
+
+
+Communication with parted_server
+
+The package partman-base creates two
+FIFOs – /var/lib/partman/infifo and
+/var/lib/partman/outfifo .
+Parted_server reads instructions from
+infifo and responds by writting to
+outfifo . Consequently the clients write to
+infifo and read from outfifo . The
+function library base.sh contain several functions to make
+the communication with parted_server easier. Here we will
+omit the details, if you want to know the exact communication protocol please
+read how these functions are implemented.
+
+
+The functions open_infifo , close_infifo ,
+open_outfifo and close_outfifo are called
+without arguments. They open and close infifo and
+outfifo assigning them file descriptors 6 and 7
+correspondingly. You do not need to use these low-level functions.
+
+
+The function write_line prints its arguments to
+outfifo .
+
+
+The function read_line reads from infifo
+a line, splits it in fields according to $IFS and assigns
+these fields to variables whose names are given to read_line
+as arguments. For example
+
+
+read_line x y z
+
+
+reads a line from infifo , splits it and assigns the first
+field to the variable x , the second field to the variable
+y and the rest to the variable z . You
+see that read_line is used the same way as the shell
+operator read .
+
+
+The function read_paragraph reads consequently lines from
+infifo until it reaches an empty line. It prints the read
+lines with the exception of the last empty line.
+
+
+The function read_list reads lines the same way as the
+function read_paragraph . However the function
+read_list always prints only one line that is a
+comma-separated sequence of the lines read from infifo . If
+read_paragraph prints
+
+
+This is the first line
+This is the second line
+This is the third line
+
+
+read_list prints
+
+
+This is the first line, This is the second line, This is the third line
+
+
+In order to initiate a communication dialog with
+parted_server you will use the function
+open_dialog . You will invoke it in the device directory of
+the device you want to issue command about. The first argument of
+open_dialog is a command for
+parted_server . The rest arguments are arguments for the
+command.
+
+
+You use the function close_dialog in order to terminate the
+communication dialog.
+
+
+When you send parted_server an order to do some long
+operation (e.g. resize a file system) the user will be shown a progress bar.
+You may give a name to it by the function name_progress_bar .
+It may be used right before the command open_dialog and
+accepts only one argument – a template with type text that describes what is
+being done.
+
+
+The function log appends its arguments to the file
+/var/log/partman . This file is used as log-file also by
+parted_server .
+
+
+
+
+
+The commands of parted_server
+
+You should be very careful when you communicate with the
+parted_server . If parted_server detects
+any error it will exit immediately. This is safer approach then to try to
+resolve somehow the error. However this also means that the user will not be
+shown any information about what happened and why the installer freezed. The
+log-file /var/log/partman can be used to see the reasons
+why parted_server exited.
+
+Open a new device
+
+Synopsis:
+
+
+cd device_directory
+open_dialog OPEN device_name
+read_line status
+close_dialog
+case $status in
+ OK)
+ # The device has been opened successfully
+ ;;
+ failed)
+ # We wasn't able to open the device
+ ;;
+esac
+
+
+Here device_name can be for
+example /dev/ide/host0/bus0/target0/lun0/disc .
+
+
+
+Close a device
+
+Synopsis:
+
+
+cd device_directory
+open_dialog CLOSE
+close_dialog
+
+
+After this command you may not issue commands regarding the device of
+device_directory . This command
+does not invoke the command COMMIT.
+
+
+
+Does the partition exist on the disk?
+
+Synopsis:
+
+
+cd device_directory
+open_dialog VIRTUAL partition_id
+read_line virtuality
+close_dialog
+case $virtuality in
+ yes)
+ # the partition does not exist on the disk
+ # probably because it is newly created
+ ;;
+ no)
+ # the partition exists on the disk
+ ;;
+esac
+
+
+
+Remember the partition table as unchanged
+
+Synopsis:
+
+
+cd device_directory
+open_dialog DISK_UNCHANGED
+close_dialog
+
+
+After this command parted_server will know that the
+partition table in its onw internal data structures is the same as the
+partition table actualy existing on the device. The main purpose of this
+command is to be used for partition tables with type loop .
+
+
+
+Report whether the partition table is changed
+
+Synopsis:
+
+
+cd device_directory
+open_dialog IS_CHANGED
+read_line changed
+close_dialog
+case $changed in
+ yes)
+ # the partition table is changed
+ ;;
+ no)
+ # the partition table is not changed
+ ;;
+esac
+
+
+
+Dump the partitions
+
+Synopsis:
+
+
+cd device_directory
+open_dialog DUMP
+close_dialog
+
+
+This command prints in /var/log/partition_dump all the
+data regarding the device. It is used for debugging.
+
+
+
+Write partitioning to the disk
+
+Synopsis:
+
+
+cd device_directory
+open_dialog COMMIT
+close_dialog
+
+
+This command transfers the partitions in the device of
+device_directory from the
+internal structures of parted_server to the disk.
+
+
+
+Undo the changes
+
+Synopsis:
+
+
+cd device_directory
+open_dialog UNDO
+close_dialog
+
+
+This command destroys the internal data structures in
+parted_server for a device and then rereads them from the
+device.
+
+
+
+Get the partitions
+
+Synopsis:
+
+
+cd device_directory
+open_dialog PARTITIONS
+while { read_line num id size type fs path name; [ "$id" ]; }; do
+ # do something for this partition
+done
+close_dialog
+
+
+The body of the loop is executed for every partition and free space. $num is
+the number of the partition (for example /dev/hda6 has
+number 6). $id is the id of the partition. $size is the size of the partition
+(in bytes). If this is an active partition then $type is either `primary' or
+`logical'. If this is a free space then $type shows what partition can be
+created in it. In this case $type can be `primary', `logical', `pri/log' or
+`unusable'. $fs is `free' if this is a free space. Otherwise $fs is the type
+of the file system of this partition as known to
+parted_server . $path is a device name for the partition,
+for example /dev/ide/host0/bus0/target0/lun0/part6 . $name
+is the name of the partition or the empty string if the partition table doesn't
+support partition names.
+
+
+Notice that in the loop-body you may not initiate another dialog with
+parted_server . If you need this you can use the following
+construction instead:
+
+
+cd device_directory
+open_dialog PARTITIONS
+partitions=$(read_paragraph)
+close_dialog
+
+echo "$partitions" |
+while { read num id size type fs path name; [ "$id" ]; }; do
+ # do something for this partition
+done
+
+
+
+Getting info about a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog PARTITION_INFO partition_id
+read_line num id size type fs path name
+close_dialog
+
+
+Here partition_id is the id of
+the partition to get info. The meaning of the variables are the same as in the
+command PARTITIONS.
+
+
+
+Getting cylinder/head/sector geometry of a partition/free space
+
+Synopsis:
+
+
+cd device_directory
+open_dialog GET_CHS partition_id
+read_line start_cyl start_head start_sector end_cyl end_head end_sector
+close_dialog
+
+
+
+Getting the supported partition table types
+
+Synopsis:
+
+
+cd device_directory
+open_dialog LABEL_TYPES
+supported=$(read_list)
+close_dialog
+
+
+For the result of this command
+device_directory is irrelevant.
+Despite this device_directory
+must be a valid device directory.
+
+
+This command is used to read which types partition tables are supported by
+parted_server (i.e. by libparted). $supported is a
+comma-separated list of the supported types. At the time of writting the
+following types are supported: bsd, gpt, mac, dvh, msdos, pc98, sun and loop.
+
+
+
+Get the type of the disk label
+
+Synopsis:
+
+
+cd device_directory
+open_dialog GET_LABEL_TYPE
+read_line label_type
+close_dialog
+if [ "$label_type" = unknown ]; then
+ echo "The disk is unknown or it has no disk label
+ or the disk label is unknown"
+else
+ echo "The type of the disk label is:" "$label_type"
+fi
+
+
+This command returns the type of the disk label (i.e. the partition table) of
+a disk. It can be used to check if there is a partition table (if not, then it
+is safe to create a new partition table or to use the entire disk for RAID,
+LVM, encrypted unit, etc).
+
+
+
+Create a new empty partition table
+
+Synopsis:
+
+
+cd device_directory
+open_dialog NEW_LABEL partition_table_type
+close_dialog
+
+
+This command creates in the device a new empty partition table with type
+partition_table_type . (Of course
+it won't be written to the disk if you don't use the command COMMIT.)
+
+
+
+Getting the meaningful flags for a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog VALID_FLAGS partition_id
+meaningful_flags=$(read_list)
+close_dialog
+
+
+$meaningful_flags is a comma-separated list of the flags that are meaningful
+for the partition with id
+partition_id .
+
+
+In order to check wether some particular flag xyz is meaningful you can use
+this code:
+
+
+cd device_directory
+xyz_is_meaningful=no
+open_dialog VALID_FLAGS partition_id
+while { read_line flag; [ "$flag" ]; }; do
+ if [ "$flag" = xyz ]; then
+ xyz_is_meaningful=yes
+ # you may not use break here
+ fi
+done
+close_dialog
+
+
+
+Getting the active flags of a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog GET_FLAGS partition_id
+active_flags=$(read_list)
+close_dialog
+
+
+$active_flags is a comma-separated list of the flags of the partition with id
+partition_id that are in state 1.
+This is a sublist of the list returned by the command VALID_FLAGS.
+
+
+In order to check if some partition is denoted as bootable you can use this
+code:
+
+
+cd device_directory
+is_bootable=no
+open_dialog GET_FLAGS partition_id
+while { read_line flag; [ "$flag" ]; }; do
+ if [ "$flag" = boot ]; then
+ is_bootable=yes
+ # you may not use break here
+ fi
+done
+close_dialog
+
+
+
+Set the flags of a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog SET_FLAGS partition_id
+for flag in $all_flags_that_should_be_active; do
+ write_line $flag
+done
+write_line NO_MORE
+close_dialog
+
+
+If you want to denote some partition as non-bootable you can use the following
+code:
+
+
+cd device_directory
+open_dialog GET_FLAGS partition_id
+new_flags=$(
+ while { read_line flag; [ "$flag" ]; }; do
+ if [ "$flag" != boot ]; then
+ echo $flag
+ fi
+ done
+)
+close_dialog
+
+open_dialog SET_FLAGS $id
+write_line "$new_flags"
+write_line NO_MORE
+close_dialog
+
+
+
+Check if partition names are supported
+
+Synopsis:
+
+
+cd device_directory
+open_dialog USES_NAMES
+read_line supported
+close_dialog
+case $supported in
+ yes)
+ # the partition table supports partition names
+ ;;
+ no)
+ # the partition table doesn't support partition names
+ ;;
+esac
+
+
+
+Set the name of a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog SET_NAME partition_id new_name
+close_dialog
+
+
+After this command the name of
+partition_id will be
+new_name . It is an error to use
+this command with a partition table that doesn't support partition names.
+
+
+
+Get the maximum number of primary partitions
+
+Synopsis:
+
+
+cd device_directory
+open_dialog GET_MAX_PRIMARY
+read_line primaries
+close_dialog
+logger "This disk may contain up to $primaries primary partitions"
+
+
+
+Check if extended and logical partitions are supported
+
+Synopsis:
+
+
+cd device_directory
+open_dialog USES_EXTENDED
+read_line supported
+close_dialog
+case $supported in
+ yes)
+ # the partition table supports extended and logical partitions
+ ;;
+ no)
+ # the partition table doesn't support extended and logical partitions
+ ;;
+esac
+
+
+
+Get the known to parted_server file systems
+
+Synopsis:
+
+
+cd device_directory
+open_dialog FILE_SYSTEM_TYPES
+known_filesystems=$(read_list)
+close_dialog
+
+
+$known_filesystems is a comma-separated list of the file systems that are known
+to parted_server . You probably won't need to use this
+command.
+
+
+
+Try to detect the file system in a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog GET_FILE_SYSTEM partition_id
+read_line filesystem
+close_dialog
+if [ "$filesystem" = none ]; then
+ # no known file system is detected
+else
+ # a file system of type $filesystem is detected
+fi
+
+
+
+Change the filesystem of a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog CHANGE_FILE_SYSTEM partition_id new_filesystem
+close_dialog
+
+
+libparted assigns every partition some file system. This command can be used
+to change this file system. The file system assigned to the partition is not
+necessarily the same as the actual file system. Libparted uses it to determine
+automatically the type of the partition in some partition tables. For example
+with msdos partition tables the partitions with file system `ext2' receive type
+83. The partitions that are swap spaces receive type 82.
+
+
+
+Create a new partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog NEW_PARTITION $type $fs $freespace $position $length
+read_line num id size type fs path name
+close_dialog
+if [ "$id" ]; then
+ # the partition is successfully created
+else
+ # wasn't able to create the partition
+fi
+
+
+$type is either primary or logical. $fs is the type of the file system to be
+assigned to the partition. $freespace is the id of some free space. $position
+is either `full', `beginning' or `end' and determines where in $freespace to
+create the new partition. If $position is not `full' then $length is the
+length that the new partition should have (in bytes).
+
+
+If the new file system is successfully created $num is tne number of the
+created partition (for example /dev/hda6 has number 6).
+$id is the id of the new partition. $size is the size of the new partition.
+$size is approximately $length but not necessarily the same. $type and $fs
+don't change their values. $path is a device name, for example
+/dev/ide/host0/bus0/target0/lun0/part6 . $name is the name
+of the new partition or an empty string if the partition table doesn't support
+partition names.
+
+
+
+Delete a partition
+
+Synopsis:
+
+
+cd device_directory
+open_dialog DELETE_PARTITION partition_id
+close_dialog
+
+
+
+Resize a partition
+
+Synopsis:
+
+
+cd device_directory
+name_progress_bar some/debconf/template
+open_dialog RESIZE_PARTITION partition_id new_size
+read_line new_id
+close_dialog
+
+
+This command resizes a partition. As usualy
+new_size is measured in bytes.
+$new_id is the new id that the partition receives. The resizing is not
+supported always. If it fails $new_id will be the same as
+partition_id .
+
+
+If the partition exists on the storage device and contains some file system,
+then the data in the partition will be preserved and the new partition table
+will be written on the storage device . When it is
+impossible to resize the file system, the partition will be left unresized.
+When the partition doesn't exist on the storage device, the new version of the
+partition table will not be written to it.
+
+
+This command doesn't move the start of the partition but only its end.
+
+
+The command name_progress_bar may be omitted. The debconf
+template must have type text. It will be used to give the user information of
+what is being done.
+
+
+
+Get resize range
+
+Synopsis:
+
+
+cd device_directory
+open_dialog GET_RESIZE_RANGE partition_id
+read_line minimal_size current_size maximal_size
+close_dialog
+
+
+This command returns the minimal and the maximal size that can be achieved by
+using the command RESIZE_PARTITION. $minimal_size, $current_size and
+$maximal_size are measured in bytes.
+
+
+
+
+
+Bugs and limitations
+
+All files and directories are assumed to not contain spaces in their names.
+
+
+If the partition table supports extended and logical partitions the user won't
+be shown free spaces whose size is less than one cylinder.
+
+
+
+
+
+
diff -pruN 20101020/doc/devel/partman/partman-doc.sgml 20201202/doc/devel/partman/partman-doc.sgml
--- 20101020/doc/devel/partman/partman-doc.sgml 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/devel/partman/partman-doc.sgml 1970-01-01 00:00:00.000000000 +0000
@@ -1,1576 +0,0 @@
-
-
-
- Partition Management for the Debian Installer
-
- Anton Zinoviev anton@lml.bas.bg
-
-
-
- © 2003,2004,2007 Anton Zinoviev
-
- This manual is free software; you may redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2, or
-(at your option) any later version.
-
-
This is distributed in the hope that it will be useful, but
-without any warranty ; without even the implied warranty of
-merchantability or fitness for a particular purpose. See the GNU
-General Public License for more details.
-
-
A copy of the GNU General Public License is available as
-/usr/share/common-licenses/GPL in the Debian GNU/Linux
-distribution or on the World Wide Web at the . You can
-also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-
-
- Introduction
-
- There are many wishlist features that we might desire from any
-installer of GNU/Linux and that are related to partitioning:
-
-- The partitioner should support different file systems. Some of
- them need more care than only libraries and suitable arguments for
-
mount .
-
-- It should support not only regular partitions but also software
- RAID and LVM as well as encrypted file systems.
-
-
- It should be able to partition disks automatically and allow
- the user to inspect and customise the automatic partitioning
- later.
-
-
- It should be able to resize partitions and move their contents
-from one place to another.
-
-
- The users should be protected from mistakes – by allowing
-them to undo their partitioning operations.
-
-
- The partitioner should discover that there is already some
- installed GNU/Linux system and analyse its
fstab ,
- passwd , etc. in order to provide an automatic upgrade from
- the old already installed GNU/Linux system to the new one.
-
-
-
One nice feature of the Debian installer is that it is modular.
- Its components are packaged in separate udebs and they can have
- relatively independent development process. This document describes
- how we can solve all mentioned tasks keeping the Debian installer as
- modular as it is now. Ideally in order to add some new feature only
- a few new udebs must be all that is needed – no changes in the
- existing udebs and no recompilation would be required.
-
-
The script partman from the package
-partman-base opens the main partitioning menu; it may
-look like this one:
-
-+------------------+ [!!] Partition the storage devices +-----------------+
-| Partition, free space or device to be modified |
-| |
-| IDE1 master - Seagate U Series 40810 (40.0 GB) |
-| #3 primary 2.1 GB B F ext3 / |
-| pri/log 4.4 GB FREE SPACE |
-| #5 logical 3.6 GB |
-| #7 logical 10.0 GB F ext3 /usr |
-| #8 logical 19.9 GB K ext2 /home |
-| IDE2 master - Maxtor 6Y120L0 (122.9 GB) |
-| #7 logical 1.0 GB linux-swap |
-| logical 114.5 GB FREE SPACE |
-| #5 logical 5.5 GB reiserfs |
-| #6 logical 1.9 GB |
-| |
-| Undo changes to partitions |
-| Finish partitioning and write changes to disk |
-| |
-| <Go Back> <Continue> |
-| |
-+-------------------------------------------------------------------------+
-
-
-
When the users choose some free space they are offered to create a
-new partition just like they are in cfdisk . When users
-choose a partition they are offered with a menu with various editing
-operations:
-
-
-+------------------+ [!!] Partition the storage devices +-----------------+
-| Settings on the partition: |
-| |
-| Usage method: format the partition |
-| File system: ext3 |
-| Mount point: /var/mail |
-| Mount options: noatime,nodev,nosuid,noexec,usrquota |
-| Bootable flag: off |
-| Size: 995.2 MB |
-| |
-| Finished setting up partition |
-| Copy here data from another partition |
-| Delete the partition |
-| |
-| <Go Back> <Continue> |
-| |
-+-------------------------------------------------------------------------+
-
-
-
All udebs are allowed to add items to this menu as well as to
-several other menus. They can add new items in the list of devices
-such as software RAID and LVM devices, networked file systems,
-encrypted partitions, etc. The package
-partman-partitioning is responsible for pure
-partitioning operations such as creation of new partitions and
-deletion. The packages partman-target and
-partman-basicmethods are responsible for the items
-`Choose how this partition should be used' and `Choose a file system'.
-The package partman-basicfilesystems adds support
-for ext2 , linux-swap , fat16 and
-fat32 . The package partman-ext3 adds
-support for ext3 .
-
- Changes in partman since 2005
-
- This chapter documents important changes in the sctructure of
-partman. It is provided as a test if you need to reread some of the
-sections in this document.
-
-
-- New directory
check.d with some of the scripts
-formerly in finish.d
-- New directory
display.d with different methods to
-do the partitioning (manual, automatic, etc.)
-- New command GET_LABEL_TYPE in parted_server
-
-
- Package interrelations
-
- Basics
-
- The GNU Parted disk partitioning library provides high-level,
- architecture independent functions for operations such as creating,
- deleting, resizing and moving of partitions as well as creating some
- kinds of file systems. Most of the functions of libparted work in a
- non nondestructive way. The partition table is written in data
- structures and any change in the partition table happens only in
- these data structures rather than directly on the disk. This makes
- possible to implement partitioning tools based on
- libparted that support undoing of the editing
- operations.
-
-
However we have to solve two problems. The first is that we want
-to use as much as possible shell scripts rather than C programs. The
-second is that different programs have to operate with same instance
-of libparted structures. For example the user can use some tool for
-automatic partitioning, then correct or customise the automatic
-partitioning, perform some other arbitrary operations being still
-allowed to undo everything.
-
-
There is one obvious solution of these two problems – we
-keep the data structures of libparted in a daemon process and
-communicate with it in order to make changes in these data structures.
-This process is /bin/parted_server from the package
-partman-base .
-
-
The scripts from /lib/partman/init.d/ are executed
- before all partitioning operations. They can be used to initialise
- the partitioning system. The scripts may be invoked more than once
- in which case they should behave properly. For example this
- directory can contain a script to discover the existing hard drives.
- If invoked for second time the script must either do nothing or
- check if there is some new kernel module giving access to new still
- undiscovered device.
-
-
Any udeb may install a script in this directory. For example
-the script /lib/partman/init.d/30parted from the package
-partman-base is responsible for running
-parted_server . Notice that the scripts are prefixed by a
-two-digit number. This number determines the order the scripts are
-executed. If any of the scripts exit with non-zero exit code the
-partitioning will be aborted. This means that in almost all cases
-these scripts must end with exit-code 0.
-
-
When the initialisation completes, the scripts from
-/lib/partman/display.d are executed. These scripts are
-supposed to make the actual partitioning interactively or
-non-interactively. The exit code code of these scripts is
-interpreted as follows:
-
-code = 0- The script did nothing, move to the next
-script in
display.d .
-1 <= code <= 99- Restart the partitioning (move
-again to the first script in
display.d ).
-100 <= code <= 254- The script succesfuly
-partitioned the disks, do not execute the following scripts in
-
display.d .
-code = 255- Abort the partitioning.
-
-
-
When the disks become ready, the scripts in
-/lib/partman/check.d are executed. They have to check if
-everything is OK to proceed with commiting the changes on the disks,
-mounting file systems, etc. For example the package
-partman-target installs there a script to check if
-there is a root file system. If a script in check.d
-exits with non-zero exit code then the scripts in
-display.d are executed again and as a result the user is
-allowed to fix the partitioning.
-
-
The directory check.d is remarkable with the fact
-that some of the scripts in it are installed by non-partman packages.
-The packages for the various bootloaders (lilo, grub, palo, etc.)
-install there scripts to ensure the partitioning scheme conforms to
-their requirements.
-
-
While the user is modifying the partitions this happens only in
- the memory of the computer and not in the edited devices. This is
- because almost all changes happen either in the data-structures of
- parted_server or in files in the installer's ram-disk.
- That's why we can provide the user with the option to undo
- everything. When the user chooses to undo the scripts in the
- directory /lib/partman/undo.d/ are executed. Any udeb
- may install a script in this directory. For example the script
- /lib/partman/undo.d/30parted is responsible for
- restoring the contents of the data structures of
- parted_server . In most cases the scripts from
- undo.d must exit with exit-code 0. If any of the
- scripts exit with non-zero exit code the partitioning will be
- aborted.
-
-
In order to perform the editing operations on the storage devices
-(and in particular to transfer the partitions from the internal
-data-structures of parted_server to the hard disks) the
-scripts from the directory /lib/partman/commit.d/ are
-executed. The order in which these scripts are executed is determined
-again by two-digit prefixes in the script names. Every script from
-commit.d is guaranteed that the scripts ordered before it
-have been already executed. However if any of the scripts exit with
-non-zero exit-code the execution of the scripts in
-commit.d will be stopped. In this case the partitioning
-will continue and the user is expected to fix the problem. If any
-script exits with non-zero exit code it is supposed to inform the user
-what went wrong using debconf.
-
-
There are two cases when the scripts from commit.d
-are executed. The first case is when the user wants to commit the
-changes to the disks but continue partitioning. The second case is
-when the partitioning ends. In the first case if none of the scripts
-fails the scripts from init.d will be also executed and
-the user will be returned to the partitioning dialog. In the second
-case the scripts from finish.d will be executed. In both
-cases if any of the scripts in commit.d fail the user
-will be returned immediately back to the partitioning dialog.
-
-
The scripts from /lib/partman/finish.d/ are
-responsible for final tasks such as to mount partitions on
-/target , generate of fstab , stop
-parted_server etc.What tasks will be performed
-depends on what udebs are unpacked. If the packages responsible for
-mounting partitions and creating fstab are not unpacked we have only a
-simple partitioner providing
-partitioned-harddrives . If they are unpacked they
-provide also made-filesystems and
-mounted-partitions . If any of these
-scripts exit with non-zero exit-code the execution of the scripts
-will be stopped. If the exit-code was 1 then the user will be
-returned back to the partitioning dialog and is expected to correct
-the problem. If the exit-code was neither 0 nor 1 then the
-partitioning will be aborted.
-
-
For every hard disk in the system the script
-/lib/partman/init.d/30parted creates a subdirectory in
-/var/lib/partman/devices/ and informs
-parted_server that the device is to be edited (`opens'
-the device). All udebs that provide storage device (software RAID,
-LVM, encrypted partitions) must do the same. This subdirectory must
-contain at least three files – device ,
-model and size . The first contains the name
-of a device file (for example
-/dev/ide/host0/bus0/target0/lun0/disc ). The second
-contains the name of the device (for example `Maxtor 6Y120L0'). The
-third contains the physical size of the storage device (in bytes, for
-example `122942324736'). Please notice that udebs that
-provide support for storage `devices' that cannot be partitioned
-(such as networked file systems) should not create a subdirectory in
-/var/lib/partman/devices and certainly cannot provide
-the device to the management of parted_server .
-The subdirectories of /var/lib/partman/devices/ can but
-are not obligated to contain additional information. We call these
-subdirectories device directories .
-
-
Every partition in a device managed by parted_server
-is given a unique name having the form
-first_byte -last_byte . This name can be used to
-determine where the partition starts and where it
-ends.Unlike one can suppose parted_server
-always measures sizes and places in bytes rather than in sectors.
-Last_byte is the number of the last byte of the last sector
-of the partition. If the device directory contains a
-subdirectory named
-first_byte -last_byte then this
-subdirectory stores information about the partition. We call this
-subdirectory directory of the partition . We call the
-stringfirst_byte -last_byte `id ' of the
-partition.
-
-
-
-
-
-
-
diff -pruN 20101020/doc/devel/partman/style-common.xsl 20201202/doc/devel/partman/style-common.xsl
--- 20101020/doc/devel/partman/style-common.xsl 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/partman/style-common.xsl 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+1
+
+
+1
+
+internals.css
+
+
diff -pruN 20101020/doc/devel/partman/style-html.xsl 20201202/doc/devel/partman/style-html.xsl
--- 20101020/doc/devel/partman/style-html.xsl 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/devel/partman/style-html.xsl 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+0
+
+
+0
+
+
diff -pruN 20101020/doc/devel/partman-auto-raid-recipe.txt 20201202/doc/devel/partman-auto-raid-recipe.txt
--- 20101020/doc/devel/partman-auto-raid-recipe.txt 2010-02-11 20:00:40.000000000 +0000
+++ 20201202/doc/devel/partman-auto-raid-recipe.txt 2020-06-25 21:49:40.000000000 +0000
@@ -5,12 +5,16 @@ it how to construct the RAID array(s).
The preseedable parameter partman-auto-raid/recipe should consist of
recipes separated by periods ("."). The recipes are of the form:
-
+
where is a list of the devices to make up the RAID and
is a list of the spare devices in the array; devices are
separated by hashes ("#").
+ can be used to pass extra arguments to "mdadm --create", like
+"--layout o2". Blanks must be substituted by hashes ("#"), e.g. you have
+to specify "--layout#o2".
+
For example:
d-i partman-auto-raid recipe string \
1 2 0 ext3 / /dev/sda1#/dev/sdb1 . \
diff -pruN 20101020/doc/devel/partman-auto-recipe.txt 20201202/doc/devel/partman-auto-recipe.txt
--- 20101020/doc/devel/partman-auto-recipe.txt 2009-06-18 13:16:14.000000000 +0000
+++ 20201202/doc/devel/partman-auto-recipe.txt 2020-11-30 23:08:26.000000000 +0000
@@ -182,7 +182,7 @@ partman-auto/text/home_scheme ::
method{ swap }
format{ } .
-100 10000 1000000000 ext3
+100 10000 -1 ext3
method{ format }
format{ }
use_filesystem{ }
@@ -208,7 +208,7 @@ being on the first disk.
To explicitly declare a Physical Volume, define a partition as follows:
-100 1000 1000000000 ext3
+100 1000 -1 ext3
$defaultignore{ }
$primary{ }
method{ lvm }
@@ -259,15 +259,16 @@ formated in revision 0 ext2.
filesystem{ ext2r0 }
mountpoint{ /boot } .
-And finally, an example of how to set up the efi boot partition needed on
-ia64.
+Finally, an example of how to set up an efi boot partition on amd64.
-100 100 150 fat16
- $primary{ }
+538 538 1075 free
+ $iflabel{ gpt }
+ $reusemethod{ }
method{ efi }
format{ } .
For other examples, see the architecture-specific recipes in partman-auto.
+The EFI example above was taken from partman-auto/recipe-amd64-efi/atomic.
5. LIMITATIONS
@@ -276,14 +277,11 @@ For other examples, see the architecture
Due to limitation of the algorithms in partman-auto, there must be at
least one partition with high maximal size so that the whole free
space can be used. Usually you can give the partition containing
-/home a maximal size 1000000000 which is high enough for the present
-storage devices. If the large /home is not an option for you, you can
-also define in the recipe one additional partition with size
-1000000000, method "keep" and leave it unmounted. When the
-installation completes you can remove it.
+/home a maximal size. -1 is used to indicate unlimited maximal size.
-Do not use higher than 1000000000 numbers because the shell arithmetic
-is limited to 31 bits (on i386).
+If the large /home is not an option for you, you can also define in the
+recipe one additional partition with size -1, method "keep" and leave it
+unmounted. When the installation completes you can remove it.
6. HOW THE ACTUAL PARTITION SIZES ARE COMPUTED
diff -pruN 20101020/doc/devel/porting-to-2.6.txt 20201202/doc/devel/porting-to-2.6.txt
--- 20101020/doc/devel/porting-to-2.6.txt 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/devel/porting-to-2.6.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-Porting debian-installer to 2.6 for your architecture
-=====================================================
-
-This is a fairly haphazard collection of notes on what you need to do to
-port d-i to 2.6 for your architecture.
-
-Kernels and build system
-------------------------
-
- * Create packages/kernel/linux-kernel-di--2.6/ with
- appropriate sets of module udebs. There are plenty of examples to borrow
- from here.
-
- * Create 2.6.cfg files in installer/build/config/ for each target you want
- to ship with 2.6. You'll need to set at least KERNELVERSION,
- KERNELMAJOR, and EXTRANAME. i386 has good examples here. Use
- FLAVOUR_SUPPORTED in the parent config file to get 2.6.cfg to be
- included in the build system.
-
- * If your kernels don't have ext2 built-in (some 2.6 ones don't), set
- INITRD_FS = cramfs (or INITRD_FS = initramfs to live on the bleeding
- edge).
-
- * Add your architecture to the module-init-tools build-dependency list in
- installer/debian/control.
-
- * If you need different packages in your initrd on 2.6 versus 2.4 which
- aren't already handled by the build system, use [2.4] and [2.6]
- qualifiers (see installer/build/README).
-
-Other packages
---------------
-
- * Make any necessary changes to packages/rootskel/debian/templates-arch.
-
- * Make packages/base-installer/debian/postinst install an appropriate 2.6
- kernel when d-i is running with 2.6 itself.
-
- * You may need to make some changes to hardware detection in
- packages/hw-detect/.
-
- * You may need to tweak packages/usb-discover/usb-discover, particularly
- if you're using a different kernel version from other architectures.
diff -pruN 20101020/doc/devel/porting.txt 20201202/doc/devel/porting.txt
--- 20101020/doc/devel/porting.txt 2009-11-27 22:09:09.000000000 +0000
+++ 20201202/doc/devel/porting.txt 2020-06-25 21:49:40.000000000 +0000
@@ -53,15 +53,15 @@ you.
* partman
- packages/partman/partman-partitioning/lib/disk-label.sh has a
- default_disk_label function that you will need to extend so it knows what
- kind of disk label is the default on your architecture.
+ packages/partman-partitioning/lib/disk-label.sh has a default_disk_label
+ function that you will need to extend so it knows what kind of disk label
+ is the default on your architecture.
* kernel udebs
Unless you're using monolithic kernels, you will need to create kernel
- module udebs. The simplest way is to go into packages/kernel/ and copy
- and modifiy of the linux-kernel-di-* directories.
+ module udebs. The simplest way is to go into packages/ and copy and modify
+ the linux-kernel-di-* directories.
This web page may also be helpful:
http://wiki.debian.org/DebianInstaller/Modify/CustomKernel
@@ -108,6 +108,7 @@ you.
Finally, you'll probably need to add some way to make d-i install a boot
loader for your architecture on the target system, using a boot loader
- installer. Existing boot loader installers live under packages/arch/, and
- if the boot loader is used for another architecture, you can modify one
- of these. If not, some programming will be needed..
+ installer. Existing boot loader installers live under
+ packages/*-installer/, and if the boot loader is used for another
+ architecture, you can modify one of these. If not, some programming will
+ be needed..
diff -pruN 20101020/doc/devel/release-checklist 20201202/doc/devel/release-checklist
--- 20101020/doc/devel/release-checklist 2009-07-20 14:23:07.000000000 +0000
+++ 20201202/doc/devel/release-checklist 2020-06-25 21:49:40.000000000 +0000
@@ -169,8 +169,6 @@ alpha
desktop task install
armel
- NSLU2
- IOP32x
QNAP TS-109/TS-209
QNAP TS-409
Kurobox Pro
diff -pruN 20101020/doc/history.txt 20201202/doc/history.txt
--- 20101020/doc/history.txt 2009-09-12 14:13:38.000000000 +0000
+++ 20201202/doc/history.txt 2020-06-25 21:49:40.000000000 +0000
@@ -54,6 +54,9 @@ The "first" things
First message to debian-boot by Frans Pop - March 1st 2004
http://lists.debian.org/debian-boot/2004/03/msg00045.html
+ D-I repository moved from CVS to Subversion - March 21st 2004
+ http://lists.debian.org/debian-boot/2004/03/msg02586.html
+
First political struggle around D-I - April 5th 2004
http://lists.debian.org/debian-boot/2004/04/msg00438.html
@@ -64,12 +67,15 @@ The "first" things
the "g-i aka graphical installer" revival story - March 31st 2005
http://lists.debian.org/debian-boot/2005/03/msg01184.html
- Base-config commits suicide - Dec 21st 2005
+ Base-config removed - Dec 21st 2005
http://lists.debian.org/debian-boot/2005/12/msg00917.html
First daily builds with the graphical installer included - May 17th 2006
http://lists.debian.org/debian-boot/2006/05/msg00659.html
+ D-I repository switched to use git - January 17th 2011
+ http://lists.debian.org/debian-boot/2011/01/msg00748.html
+
Status reports
--------------
@@ -200,10 +206,48 @@ Lenny installer Release Candidate 1: Nov
Lenny installer Release Candidate 2: January 31st, 2009
http://lists.debian.org/debian-devel-announce/2009/01/msg00009.html
- improved brltty (Braille devices)
- - improved falllback to English when translations are incomplete
+ - improved fallback to English when translations are incomplete
- Languages: 63
Lenny release: February 14th, 2009
http://www.debian.org/News/2009/20090214
- Languages: 63
+Squeeze installer Alpha 1: February 10th, 2010
+ https://lists.debian.org/debian-devel-announce/2010/02/msg00011.html
+ - help during installation process
+ - installation of recommended packages
+ - improvementsin language/country/locale selection
+ - improved mirror selection
+ - option to select "UTC" timezone
+ - ext4 support in partman
+ - Languages: 66 (Asturian, Estonian, Kazakh)
+
+Squeeze installer Beta 1: October 30th, 2010
+ https://lists.debian.org/debian-devel-announce/2010/10/msg00013.html
+ - support for isohybrid images to improve USB stick installs
+ - support for firmware .deb files in firmware/ on installation media
+ - Support for Guruplug and OpenRD-Ultimate
+ - Languages: 67 (Kannada, Persian, Telugu. Dropped Wolof, Welsh)
+
+Squeeze installer Beta 2: December 8th, 2010
+ https://lists.debian.org/debian-devel-announce/2010/12/msg00001.html
+ - improved OS detection
+ - ZFS support in kfreebsd-* (later disabled on i386)
+ - improved USB CD-ROM detection
+ - Languages: 67
+
+Squeeze installer Release Candidate 1: January 12th, 2011
+ https://lists.debian.org/debian-devel-announce/2011/01/msg00002.html
+ - uses Squeeze artwork theme
+ - support new suite name for volatile
+ - many hardware support fixes
+ - many fixes for release critical bugs
+ - Languages: 70 (Lao, Sinhala). 100% complete for 57.
+
+Squeeze installer Release Candidate 2: January 22th, 2011
+ https://lists.debian.org/debian-devel-announce/2011/01/msg00005.html
+ - fix keyboard configuration for several languages
+ - final set of release critical fixes
+ - Languages: 70
+
diff -pruN 20101020/doc/i18n/build/entities/urls.ent 20201202/doc/i18n/build/entities/urls.ent
--- 20101020/doc/i18n/build/entities/urls.ent 2010-08-21 15:14:19.000000000 +0000
+++ 20201202/doc/i18n/build/entities/urls.ent 2020-11-30 23:08:26.000000000 +0000
@@ -9,41 +9,43 @@
Standard Debian URLs
-->
-
-
-https://alioth.debian.org/account'>
+
+
+https://salsa.debian.org/public'>
-
-
+
+
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
&url-sublevel1-pot;'>
&url-sublevel1-po;'>
&url-sublevel2-pot;'>
@@ -67,43 +69,42 @@
&url-level3-pot;'>
&url-level3-po;'>
-
-
-
-
-svn+ssh://&svn-debian-auth;/svn/d-i/people/sandbox">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
submit@bugs.debian.org">
debian-boot@lists.debian.org">
debian-i18n@lists.debian.org">
-
+
-
+
-
+
&methods-advices.xml;
-&svn-basics.xml;
+&git-basics.xml;
&checkouts.xml;
-&branches.xml;
&bug-reports.xml;
&gettext-tools.xml;
&language-codes.xml;
diff -pruN 20101020/doc/i18n/ChangeLog 20201202/doc/i18n/ChangeLog
--- 20101020/doc/i18n/ChangeLog 2008-10-27 10:43:26.000000000 +0000
+++ 20201202/doc/i18n/ChangeLog 2020-11-30 23:08:26.000000000 +0000
@@ -10,20 +10,20 @@
* Refer to Adam Conrad's subversion backport instead.
2004/08/09 Christian Perrier
- * Complete rewrite:
- * "stages" are replaced by "levels"
- * core D-I translation is made in a general file
- * more details about each translation specifics
- * more details about getting/sending translations for each
+ * Complete rewrite:
+ * "stages" are replaced by "levels"
+ * core D-I translation is made in a general file
+ * more details about each translation specifics
+ * more details about getting/sending translations for each
package
- * lots of other changes
- * XMLised
+ * lots of other changes
+ * XMLised
2004/07/18 Dennis Stampfer
* In statistics is no STATUS.utf8.txt anymore. It is called <lang>.txt
-
+
2004/06/12 Christian Perrier
- * Change all references to D. Barbier pages to
+ * Change all references to D. Barbier pages to
Dennis Stampfer or Pierre Machard pages
* Change reference from CVS to SVN for base-config
* Adapt instructions for ISO-3166 translations
@@ -48,10 +48,10 @@
2004/03/24 Christian Perrier
* Major update:
- * debian-installer switched to subversion
- * reference page is now Dennis Stampfer 's
+ * debian-installer switched to subversion
+ * reference page is now Dennis Stampfer 's
page which references to other specialised status pages
- * general modifications for fitting the current context of d-i
+ * general modifications for fitting the current context of d-i
development
2004/03/10 Christian Perrier
diff -pruN 20101020/doc/i18n/en/appendix/branches.xml 20201202/doc/i18n/en/appendix/branches.xml
--- 20101020/doc/i18n/en/appendix/branches.xml 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/branches.xml 1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-Branches in &d-i; SVN repository
-
-&d-i; is maintained in two separate branches:
-
-
-
-
- The sarge branch includes all
- packages included in the release of the installer
- targeted at the sarge release of the Debian
- distribution. This is the stable
- branch of Debian installer with few modifications.
-
-
-
-
- The trunk branch is the development
- branch of D-I. This is the place where new features, or
- bug fixes appear first. So, this is also the place where
- new translations have to go and the place where new
- strings are added or existing strings are changed.
-
-
-
-
-
-From the translator point of view, all updates, even those
-targeted at sarge have to be made in the trunk branch. The
-synchronisation script run by the &i18n-coords; will do the job of
-spreading the changes to the sarge branch. So, in short, most of the
-time, translators will only change files in the trunk branch.
-
-
-
-The only case where translators will have to commit changes to the
-sarge branch is for strings which have disappeared from trunk and are
-only in sarge. A list of those strings will be maintained by the
-&i18n-coords;.
-
-
-
-From the developers point of view, the only important point to mention
-is that changesets merged from trunk to sarge do not need to include
-the content of debian/po directories as it will be updated anyway by
-the synchronisation script.
-
-
-
diff -pruN 20101020/doc/i18n/en/appendix/bug-reports.xml 20201202/doc/i18n/en/appendix/bug-reports.xml
--- 20101020/doc/i18n/en/appendix/bug-reports.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/bug-reports.xml 2020-07-26 06:38:45.000000000 +0000
@@ -3,8 +3,8 @@
This section applies to translators who need to send their completed
translations back to the package maintainers, especially for packages
-from levels above 2 for which no direct Subversion or CVS commit is
-possible (either because the translator cannot use SVN or CVS or
+from levels above 2 for which no direct Subversion commit is
+possible (either because the translator cannot use GIT or
because the package maintainer(s) do not encourage wide commit
access).
@@ -15,7 +15,10 @@ Debian bug reports, severities and tags
-All interactions with Debian package maintainers should be made through the Debian Bug Tracking System (BTS). Other ways of interaction such as sending files to maintainers directly, or to the &i18n-coords; is to be prohibited as it makes things impossible to track down.
+All interactions with Debian package maintainers should be made through the
+Debian Bug Tracking System (BTS). Other ways of interaction such as sending
+files to maintainers directly, or to the &i18n-coords; is to be prohibited as
+it makes things impossible to track down.
@@ -33,7 +36,7 @@ expected) as well as an enhancement sugg
-Debian bug reports are handled through a web and email
+Debian bug reports are handled through a web and e-mail
interface. Access to the bug reports can be made through the BTS web
site: &url-bts;.
@@ -72,7 +75,7 @@ translations as well as base-config and
-The subject of the bug report should begin by "[INTL:xx]". When the
+The subject of the bug report should start with "[INTL:xx]". When the
package has several translatable materials, the subject should mention
which translation is sent.
@@ -93,7 +96,7 @@ Generic method to send bug reports
Reporting a bug to a Debian package is just sending a specially
-written mail to &email-bts;.
+formatted mail to &email-bts;.
@@ -179,7 +182,7 @@ mode standard
ui text
# offline setting - comment out to be online
#offline
-# name and email setting (if non-default)
+# name and e-mail setting (if non-default)
realname "John Doe"
email "johndoe@johndoe.com"
# You can add other settings after this line. See
diff -pruN 20101020/doc/i18n/en/appendix/checkouts.xml 20201202/doc/i18n/en/appendix/checkouts.xml
--- 20101020/doc/i18n/en/appendix/checkouts.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/checkouts.xml 2020-11-30 23:08:26.000000000 +0000
@@ -1,11 +1,7 @@
Checkout commands
-
-Translation checkout commands for d-i
-
-
-First said, translators don't need to checkout the repositories by
+First said, translators don't need to checkout the repository by
hand to translate the po files. They can get all files here:
@@ -16,7 +12,8 @@ hand to translate the po files. They can
-where <STAGE> is either level1, level2, level3, level4 and level5 <LANGUAGECODE> your language code like de, es, zh_CN, ...
+where <LEVEL> is either level1, level2 or level3,
+and <LANGUAGECODE> is your language code like de, es, zh_CN, ...
@@ -34,7 +31,9 @@ POT templates can be found at:
-For translators who prefer working from developer's repositories, the following lists, level by level, all checkout commands to get access to translation material.
+For translators who prefer working from developer's repositories, the
+following lists, level by level, all checkout commands to get access to
+translation material.
@@ -42,10 +41,7 @@ For translators who prefer working from
-Anonymous: &svn-level1-anon;
-
-
-Non anonymous: &svn-level1;
+&git-level1;
@@ -59,46 +55,62 @@ Non anonymous: &svn-level1;
-Anonymous: &svn-tasksel-anon;
+&git-tasksel;
+
+
+
+
+
+Iso-codes
+
+
-Non anonymous: &svn-tasksel;
+&git-iso-codes;
-Iso-codes
+Popularity-contest
-Anonymous: &git-iso-codes-anon;
+&git-popcon;
+
+
+
+
+
+eject (in util-linux)
+
+
-Non anonymous: &git-iso-codes;
+&git-eject;
-Console-data
+espeakup
-Anonymous: &svn-console-data;
+&git-espeakup;
-Popularity-contest
+grub2
-Anonymous: &svn-popcon;
+&git-grub2;
@@ -114,7 +126,7 @@ Anonymous: &svn-popcon;
-Anonymous: &svn-debconf;
+&git-debconf;
@@ -123,9 +135,11 @@ Anonymous: &svn-debconf;
Newt
-
-No repository yet
-
+
+
+&git-newt;
+
+
@@ -134,7 +148,7 @@ No repository yet
-Anonymous: &svn-win32-loader-anon;
+&git-win32-loader-anon;
@@ -142,5 +156,21 @@ Anonymous: &svn-win32-loader-an
+
+Checkout commands for developers
+
+
+Developers need the following commands to checkout the whole source tree:
+
+
+
+
+git clone git@salsa.debian.org:installer-team/d-i.git
+cd d-i
+./scripts/git-setup
+mr checkout
+
+
+
diff -pruN 20101020/doc/i18n/en/appendix/coordination-team.xml 20201202/doc/i18n/en/appendix/coordination-team.xml
--- 20101020/doc/i18n/en/appendix/coordination-team.xml 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/coordination-team.xml 2020-07-26 06:38:45.000000000 +0000
@@ -7,7 +7,9 @@ The &d-i; internationalisation (i18n) co
-Christian Perrier bubulle@debian.org is responsible for the i18n manual maintenance, daily monitoring of the i18n automation tools and should be contacted for any i18n related problems during the &d-i; development process.
+Christian Perrier bubulle@debian.org or Holger Wansing linux@wansing-online.de
+are responsible for the i18n maintenance, daily monitoring of the i18n automation tools and should be contacted
+for any i18n related problems during the &d-i; development process.
@@ -17,7 +19,7 @@ Davide Viti zinosat@tiscali.it
-Frans Pop fjp@debian.org is responsible for the
+Holger Wansing linux@wansing-online.de is responsible for the
Installation Guide and its localization effort.
diff -pruN 20101020/doc/i18n/en/appendix/gettext-tools.xml 20201202/doc/i18n/en/appendix/gettext-tools.xml
--- 20101020/doc/i18n/en/appendix/gettext-tools.xml 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/gettext-tools.xml 2020-07-26 06:38:45.000000000 +0000
@@ -16,7 +16,7 @@ of dedicated tools will save translators
This document does not intend to be a reference document about these
tools. Most tools have been packaged for the Debian GNU/Linux
distribution and thus installing them on a Debian system is as easy as
-running apt-get install <package> .
+running apt install <package> .
Short list of PO editing tools:
@@ -25,24 +25,18 @@ running apt-get install <pac
- KBabel (Debian package
- kbabel ): very complete and
- powerful. Needs installing the KDE libraries (but, of course, it
- may work without the full KDE environment).
+ Lokalize (Debian package
+ lokalize ): very complete and
+ powerful. Needs installing the Qt and KDE Frameworks libraries.
- The KBabel editor is undoubtfully the most complete gettext
+ The Lokalize editor (formerly KBabel) is undoubtfully the most complete gettext
message catalogs editor and its use is recommended by the
&i18n-coords;. Its support for non-Latin languages is very
complete, including correct Right-To-Left (RTL) and BiDi support
- For Arabic/Hebrew and other RTL languages as well as support for
+ for Arabic/Hebrew and other RTL languages as well as support for
combined languages such as languages using the Devanagari script.
-
- The major drawback is for Gnome users: KBabel may be quite long
- to launch and memory hungry because of the need of KDE and Qt
- libraries.
-
@@ -51,9 +45,9 @@ running apt-get install <pac
GNOME Desktop.
- Gtranslator is roughly the equivalent of KBabel for users of the
+ Gtranslator is roughly the equivalent of Lokalize for users of the
Gnome environment. Of course, it can be used outside the Gnome
- environment with the same drawback as KBabel.
+ environment with the same drawback as Lokalize.
However, it is not well suited for &d-i; translations as
@@ -145,7 +139,9 @@ idea on how their translation will look
length (use this utility on a usual 80x25 terminal). But as cdebconf
and debconf displays slightly differ, and as some scripts do heavy use
of text substitution, one should not fully rely on this program. Running
-debian-installer is the only solution to test translations.
+debian-installer is the only reliable solution to test your translation.
+(Note: this does not work for the po files from level 1 under
+sublevelX !)
diff -pruN 20101020/doc/i18n/en/appendix/git-basics.xml 20201202/doc/i18n/en/appendix/git-basics.xml
--- 20101020/doc/i18n/en/appendix/git-basics.xml 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/git-basics.xml 2020-07-26 06:38:45.000000000 +0000
@@ -0,0 +1,318 @@
+Some basic notions about git
+
+
+Getting an account on &salsa;
+
+
+
+git commit access requires the creation of an account on the &salsa;
+server. This is as simple as opening &url-salsa; and clicking on Sign in / Register
+in the top right corner.
+
+
+
+Official Debian developers will probably use the same login as their
+Debian login, but must go through the account creation process
+anyway. Non-Debian developers should be aware that the login they
+will choose on &salsa; will be followed by -guest
. This has
+absolutely no meaning of any kind of second class
+citizens , but is just an easy way for &salsa; system
+administrators to know who is an official Debian developer.
+
+
+
+
+
+
+Installing git and myrepos
+
+
+
+Translators need to install git
+on their system. Just do apt install git
+
+
+
+&d-i; contributors who want to work on the code of the installer (so not just translation
+work), additionally need to install myrepos
+by apt install myrepos
+
+
+
+Users of non-Debian Linux distributions will probably easily find
+installation sources for git and myrepos in their distribution packages
+list.
+
+
+
+
+
+
+
+Using git to get and commit files
+
+
+
+Once their account is allowed to write to the project, translators
+can download the translation files using the
+checkout commands mentioned in .
+
+
+
+Developers can download the full project source tree using
+git and mr commands as detailed in .
+Note, that this is not necessary for translators!
+
+
+
+
+
+ssh connections require you to use RSA key-based
+authentication to connect to &salsa;.
+
+
+
+If you don't have an existing SSH keypair on your local system, you must create
+one with the ssh-keygen command:
+
+
+
+
+spongebob@mykerinos:~$ ssh-keygen -t rsa
+Generating public/private rsa key pair.
+Enter file in which to save the key (/home/spongebob/.ssh/id_dsa):
+Enter passphrase (empty for no passphrase):
+Enter same passphrase again:
+Your identification has been saved in /home/spongebob/.ssh/id_rsa.
+Your public key has been saved in /home/spongebob/.ssh/id_rsa.pub.
+The key fingerprint is:
+8d:6d:14:72:72:07:01:6a:85:de:97:d3:aa:b2:ee:4a spongebob@mykerinos
+
+
+
+
+In the example above, the user spongebob creates a SSH RSA
+keypair, which is saved in a directory named .ssh in his/her home directory.
+
+
+
+This keypair is protected by a passphrase. The passphrase has to be entered each
+time the keypair will be used to connect to a remote host. Take care to choose a non
+trivial passphrase.
+
+
+
+After doing so, the public part of that keypair must be put in your account on &salsa;.
+
+
+
+
+
+In case users have problems with GIT checkouts/commits, they can ask
+for help, either on IRC, &irc-channel; or by mail with the
+&i18n-coords;.
+
+
+
+
+
+Core &d-i; and various levels packages repositories checkout command
+lines
+
+
+
+Typical non anonymous and anonymous checkout command lines for &d-i;
+and related packages are listed in .
+
+
+
+Below is an example of a checkout of the d-i GIT repository,
+containing the po files for level 1:
+
+
+
+
+user@host:~$ &git-clone-d-i-repo;
+Cloning into 'd-i'...
+remote: Counting objects: 405013, done.
+remote: Compressing objects: 100% (72424/72424), done.
+remote: Total 405013 (delta 316140), reused 404965 (delta 316098)
+Receiving objects: 100% (405013/405013), 187.52 MiB | 199.00 KiB/s, done.
+Resolving deltas: 100% (316140/316140), done.
+user@host:~$
+
+
+After this the d-i directory contains all
+files from the repository. Updating this directory later needs running git pull :
+
+
+user@host:~$ cd d-i
+user@host:~/d-i$ git pull
+Already up-to-date.
+user@host:~/d-i$
+
+
+
+Now find the po translation files in the subdirectories under
+packages/po .
+
+
+user@host:~/d-i$ cd packages/po/sublevel1
+user@host:~/d-i/packages/po/sublevel1$
+
+
+Just update the local copy:
+
+
+user@host:~/d-i/packages/po/sublevel1$ lokalize fr.po
+.../...
+
+
+(Use Lokalize or any other gettext utility, see for
+details about gettext files handling, editing and maintenance tools.)
+
+
+Once you have saved the modified version of the file, the status can be
+displayed with the git status command:
+
+
+user@host:~/d-i/packages/po/sublevel1$ git status -s
+ M fr.po
+user@host:~/d-i/packages/po/sublevel1$
+
+
+The above means that fr.po includes uncommited
+modifications. The changed files need to be added to the staging area
+by git add filename .
+Then commit the modifications by using the
+git commit command:
+
+
+user@host:~/d-i/packages/po/sublevel1$ git add fr.po
+user@host:~/d-i/packages/po/sublevel1$ git commit -m "Insert a senseful commit message here, like 'Updated french translation'"
+
+
+Now you need to push your changings to the remote GIT repository:
+
+
+user@host:~/d-i/packages/po/sublevel1$ git push
+
+
+
+
+In general, a few recommendations can be made to translators:
+
+
+
+
+Always use the git pull before working on a
+file or directory. This will minimize conflicts
+in case a file is changed in the repository while they work on it;
+
+
+
+
+Always use the git status command before committing
+changes, to be sure that only relevant changes are committed.
+
+
+
+
+
+
+
+Changelog entries handling
+
+
+When committing translations directly to GIT
+repositories for Debian packages (except for level 1 translations),
+translators must update the debian/changelog file
+accordingly.
+
+
+
+This does not apply to level 1 translations, that
+is the &d-i; core packages translations. For
+these translations, no changelog updates are needed.
+
+
+
+Each change in Debian packages must be documented in the
+debian/changelog file.
+
+
+
+Below is an excerpt of the changelog file for
+&base-config;:
+
+
+
+
+base-config (2.39) UNRELEASED; urgency=low
+
+ * Updated translations:
+ - Croatian by Krunoslav Gernhard
+
+ -- Christian Perrier <bubulle@debian.org> Sat, 24 Jul 2004 08:14:13 +0200
+
+base-config (2.38) unstable; urgency=high
+.../...
+
+
+
+This gives the following information:
+
+
+
+
+
+the last released version of the package is 2.38. The GIT repository
+ currently contains the future unpublished 2.39 release;
+
+
+
+
+the only change which occurred since 2.38 is the update of the Croatian
+ translation (made by Krunoslav Gernhard);
+
+
+
+
+the committer of this change was Christian Perrier.
+
+
+
+
+
+Different Debian packages may use slightly different methods and
+styles for changelog maintenance. When working
+with GIT repositories, using
+UNRELEASED for the last entry is highly recommended
+for new unpublished changes.
+
+
+
+Using the debchange utility from the
+devscripts Debian package for handling
+changelog entries maintenance is also highly
+recommended..
+
+
+
+
+
+
+
diff -pruN 20101020/doc/i18n/en/appendix/language-codes.xml 20201202/doc/i18n/en/appendix/language-codes.xml
--- 20101020/doc/i18n/en/appendix/language-codes.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/language-codes.xml 2020-07-26 06:38:45.000000000 +0000
@@ -20,13 +20,15 @@ be used in the locales file.
On Debian systems, the iso-codes packages
-includes a list of all ISO-639 material. This list must be used as a reference when in doubt for the code of a given language.
+includes a list of all ISO-639 material. This list must be used as a
+reference when in doubt for the code of a given language.
Some languages may have variants , for instance
depending on the region they're spoken in. The distinction must be
-made on the written form of the language: different variants in terms of spoken language are out of topic here.
+made on the written form of the language: different
+variants in terms of spoken language are out of topic here.
diff -pruN 20101020/doc/i18n/en/appendix/methods-advices.xml 20201202/doc/i18n/en/appendix/methods-advices.xml
--- 20101020/doc/i18n/en/appendix/methods-advices.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/methods-advices.xml 2020-07-26 06:38:45.000000000 +0000
@@ -29,8 +29,8 @@ If a translation team exists for a langu
work with them . They should first check the
debian-l10n-<language> mailing list where
<language> is the language name in English
-(e.g. debian-l10n-polish ,
-debian-l10n-portuguese , etc.)
+(e.g. debian-l10n-polish@lists.debian.org ,
+debian-l10n-portuguese@lists.debian.org , etc.)
@@ -140,7 +140,8 @@ packages. &d-i; translators should follo
translations for the various levels.
-The translation status pages are the recommended reference to use in order to follow each language's statistics. See
+The translation status pages are the recommended reference to use in
+order to follow each language's statistics. See
for details.
@@ -179,6 +180,7 @@ the spelling in translation files.
Finally, podebconf-display-po (from the
po-debconf package) can be used on
debconf translation files:
+(but not on the po files from level1 under sublevelX !)
diff -pruN 20101020/doc/i18n/en/appendix/svn-basics.xml 20201202/doc/i18n/en/appendix/svn-basics.xml
--- 20101020/doc/i18n/en/appendix/svn-basics.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/appendix/svn-basics.xml 1970-01-01 00:00:00.000000000 +0000
@@ -1,397 +0,0 @@
-Some basic notions about SVN
-
-
-Getting an account on &alioth;
-
-
-
-SVN commit access requires the creation of an account on the &alioth;
-server. This is as simple as opening &url-alioth; and going to the
-account creation pages.
-
-
-
-Official Debian developers will probably use the same login as their
-Debian login, but must go through the account creation process
-anyway. Non-Debian developers should be aware that the login they
-will choose on &alioth; will be followed by -guest
. This has
-absolutely no meaning of any kind of second class
-citizens but is just an easy way for &alioth; system
-administrators to know who is an official Debian developer.
-
-
-
-
-
-
-Installing SVN
-
-
-
-Translators and other &d-i; contributors need to install SVN
-(Subversion) on their system. For Debian sid or
-sarge users, just do aptitude install
-subversion . Users of Debian woody
-release may use backports from &backports;. The following entry to
-/etc/apt/sources.list may be used for this:
-
-
-
-
- deb &url-backports;debian stable subversion
-
-
-
-
-Alternatively, Adam Conrad's backports may be used:
-
-
-
-
- deb http://people.debian.org/~adconrad woody subversion
-
-
-
-
-These backports are not officially supported by the Debian
-Project. Though their maintainers are well-known and respected Debian
-developers, they're the only people who can guarantee that these packages
-are well maintained and secured.
-
-
-
-Users of non-Debian Linux distributions will probably easily find
-installation sources for Subversion in their distribution packages
-list.
-
-
-
-For MS-Windows users, a good SVN client is TortoiseSVN which is free software. It can be downloaded from http://tortoisesvn.tigris.org/ .
-
-
-
-Successful attempts of using TortoiseSVN for &d-i; commits have been reported. The only trick is to feed the checkout URL alone to the "svn import" command of TortoiseSVN , without the leading "svn co" part.
-
-
-
-
-
-
-
-Using SVN to get and commit files
-
-
-
-Once their account is allowed to write to the project, translators and
-developers can download the full project source tree using the
-checkout commands mentioned in .
-
-
-
-For doing svn+ssh connections (mandatory for
-being able to commit files later), users must have an account on
-&alioth; and be authorized for commit to the repository they want to
-checkout. Replace alioth_username by this login
-name before using the SVN pseudo-URLS.
-
-
-
-svn+ssh connections need that you use DSA key based authentication to connect to &alioth;.
-
-
-
-If you don't have an existing SSH keypair on your local system, you must create one with the ssh-keygen command.
-
-
-
-
-spongebob@mykerinos:~$ ssh-keygen -t dsa
-Generating public/private dsa key pair.
-Enter file in which to save the key (/home/spongebob/.ssh/id_dsa):
-Created directory '/home/spongebob/.ssh'.
-Enter passphrase (empty for no passphrase):
-Enter same passphrase again:
-passphrase too short: have 3 bytes, need > 4
-Saving the key failed: /home/spongebob/.ssh/id_dsa.
-spongebob@mykerinos:~$ ssh-keygen -t dsa
-Generating public/private dsa key pair.
-Enter file in which to save the key (/home/spongebob/.ssh/id_dsa):
-Enter passphrase (empty for no passphrase):
-Enter same passphrase again:
-Your identification has been saved in /home/spongebob/.ssh/id_dsa.
-Your public key has been saved in /home/spongebob/.ssh/id_dsa.pub.
-The key fingerprint is:
-8d:6d:14:72:72:07:01:6a:85:de:97:d3:aa:b2:ee:4a spongebob@mykerinos
-
-
-
-
-In the example below, the user spongebob creates a SSH DSA keypair, which is saved in a directory named .ssh in his/her home directory.
-
-
-
-This keypair is protected by a passphrase. The passphrase has to be entered each time the keypair will be used to connect to a remote host. Take care to choose a non trivial passphrase.
-
-
-
-After doing so, the public part of that keypair must be put in your account on &alioth;. For this, you need to output the contents of .ssh/id_dsa.pub and paste it in the relevant field of the account management page on &alioth; (&alioth-account-page;), in the section named Shell account informations , by clicking on Edit keys .
-
-
-
-
-In case users have problems with SVN checkouts/commits, they can ask
-for help, either on IRC, &irc-channel; or by mail with the
-&i18n-coords;.
-
-
-MS-Windows users who want to use TortoiseSVN to checkout or commit can go to the TortoiseSVN SSH HowTo page to get information about setting up TortoiseSVN to do SVN+SSH connections.
-
-
-
-
-
-
-Testing SVN commit access to &d-i; repository
-
-
-
-A sandbox directory has been setup for developers
-and translators to practice with SVN before doing
-real work.
-
-
-The sequence for testing commit access should be similar to what
-follows. Please note that, depending whether your SSH keys have been
-added to your account on &svn-debian;, you can be prompted for a
-password up to three times. This is because of the special
-authentication setup on &svn-debian;.
-
-
-
-cd <somedir>
-svn co &svn-di-sandbox;
-Password:
-Password:
-Password:
-.../... (checkout should happen here)
-
-cd sandbox
-echo "Testcommit" >foo
-svn add foo
-svn ci -m "Testcommit of a file" foo
-.../...
-svn remove foo
-svn ci -m "Remove the test file"
-
-
-
-
-As stated by the README.txt file in this
-directory, please avoid commiting large files for testing as this
-clutters up the SVN server history.
-
-
-
-
-
-
-Core &d-i; and various levels packages repositories checkout command
-lines
-
-
-
-Typical non anonymous and anonymous checkout command lines for &d-i;
-and related packages are listed in .
-
-
-
-Below is an example of a typical checkout for the console-data package:
-
-
-
-
-user@host:~> &svn-console-data;
-TODO
-user@host:~>
-
-
-After this the console-data directory contains all
-files from the package. Updating this directory later needs running the svn update :
-
-
-user@host:~> cd console-data
-user@host:~/console-data> svn up
-TODO
-user@host:~>
-
-
-Subdirectories of a full SVN directory can also be checked out in case one want to work on specific parts. This can be very useful for &d-i; core translations as &d-i; SVN repository is very big:
-
-
-user@host:~> svn co &svn-level1; level1-po
-TODO
-user@host:~> cd level1-po/
-user@host:~/level1-po> ls -l
-total 19112
--rw-r--r-- 1 user user 369598 2005-08-18 02:56 ar.po
--rw-r--r-- 1 user user 266462 2005-08-18 02:56 be.po
-.../...
--rw-r--r-- 1 user user 1120 2005-07-17 08:17 PROSPECTIVE
-.../...
--rw-r--r-- 1 user user 2027 2005-07-31 08:54 README
--rw-r--r-- 1 user user 353752 2005-08-18 02:56 ro.po
--rw-r--r-- 1 user user 324 2005-08-16 16:30 run-l10n-sync
-.../...
--rw-r--r-- 1 user user 237996 2005-08-18 02:56 template.pot
-.../...
--rw-r--r-- 1 user user 350181 2005-08-18 02:56 xh.po
--rw-r--r-- 1 user user 335898 2005-08-18 02:56 zh_CN.po
--rw-r--r-- 1 user user 335413 2005-08-18 02:56 zh_TW.po
-user@host:~/level1-po>
-
-
-If the translation file already exists, then just update the local copy:
-
-
-user@host:~/level1-po> kbabel fr.po
-.../...
-
-
-(use KBabel or any other gettext utility, see for details about gettext files handling, editing and maintenance tools)
-
-
-Once saved the modified version of the file, the status can be
-displayed with the svn status command:
-
-
-user@host:~/level1-po> svn status
-M fr.po
-user@host:~/level1-po>
-
-
-The above means that fr.po includes uncommited
-modifications. These modifications can be committed by using the svn commit command:
-
-
-user@host:~/level1-po> svn commit
-
-
-The user will then be dropped in a file editor (either
-vi or any other file editor pointed by the EDITOR
-variable. The changelog message can be then filled in the
-editor. Saving it and exiting the editor will trigger the commit
-action to the SVN repository.
-
-
-A more targeted commit command is also possible, as well as giving the
-commit message on the command line:
-
-
-user@host:~/level1-po> svn commit -m"French translation update" fr.po
-TODO
-user@host:~/level1-po>
-
-
-
-
-In general, a few recommendations can be made to translators:
-
-
-
-
-Always use the svn update before working on a
-file or directory. This will minimize conflicts
-in case a file is changed in the repository while they work on it;
-
-
-
-
-Always use the svn status command before committing
-changes, to be sure that only relevant changes are committed.
-
-
-
-
-
-
-
-Changelog entries handling
-
-
-When committing translations directly to SVN
-repositories for Debian packages (except for level 1 translations),
-translators must update the debian/changelog file
-accordingly.
-
-
-
-This does not apply to level 1 translations, that
-is the &d-i; core packages translations. For
-these translations, no changelog updates are needed.
-
-
-
-Each change in Debian packages must be documented in the
-debian/changelog file.
-
-
-
-Below is an excerpt of the changelog file for
-&base-config;:
-
-
-
-
-base-config (2.39) UNRELEASED; urgency=low
-
- * Updated translations:
- - Croatian by Krunoslav Gernhard
-
- -- Christian Perrier <bubulle@debian.org> Sat, 24 Jul 2004 08:14:13 +0200
-
-base-config (2.38) unstable; urgency=high
-.../...
-
-
-
-This gives the following information:
-
-
-
-
-
-the last released version of the package is 2.38. The SVN repository
- currently contains the future unpublished 2.39 release;
-
-
-
-
-the only change which occurred since 2.38 is the update of the Croatian
- translation (made by Krunoslav Gernhard);
-
-
-
-
-the committer of this change was Christian Perrier.
-
-
-
-
-
-Different Debian packages may use slightly different methods and
-styles for changelog maintenance. When working
-with SVN /CVS repositories, using UNRELEASED for the last entry is highly recommended for new unpublished changes.
-
-
-
-Using the debchange utility from the
-devscripts Debian package for handling
-changelog entries maintenance is also highly
-recommended..
-
-
-
-
-
-
-
diff -pruN 20101020/doc/i18n/en/bookinfo.xml 20201202/doc/i18n/en/bookinfo.xml
--- 20101020/doc/i18n/en/bookinfo.xml 2010-08-01 00:32:23.000000000 +0000
+++ 20201202/doc/i18n/en/bookinfo.xml 2020-07-26 06:38:45.000000000 +0000
@@ -10,10 +10,16 @@ This document describes how &d-i; intern
It is aimed at being used as a reference for all &d-i; translators and
developers when i18n/l10n topics are involved.
+
+
+The source code of this document can be found in the
+debian-installer
+git repository .
+
- 2001-2010
+ 2001-2017
the &d-i; team
Petter Reinholdtsen
Dennis Stampfer
diff -pruN 20101020/doc/i18n/en/coordination.xml 20201202/doc/i18n/en/coordination.xml
--- 20101020/doc/i18n/en/coordination.xml 2010-08-01 00:32:23.000000000 +0000
+++ 20201202/doc/i18n/en/coordination.xml 2020-07-26 06:38:45.000000000 +0000
@@ -69,7 +69,7 @@ tasks:
improves the framework to make the translators
life easy (status pages, spellchecking
- framework;
+ framework);
@@ -81,9 +81,9 @@ tasks:
- maintains the installation manual
+ maintains the installation guide
internationalization along with the installation
- manual maintainer.
+ guide maintainer.
diff -pruN 20101020/doc/i18n/en/language-tasks.xml 20201202/doc/i18n/en/language-tasks.xml
--- 20101020/doc/i18n/en/language-tasks.xml 2010-08-01 00:32:23.000000000 +0000
+++ 20201202/doc/i18n/en/language-tasks.xml 2020-07-26 06:38:45.000000000 +0000
@@ -4,7 +4,9 @@
Introduction
-The tasksel package is responsible for the installation of several package sets , for various activities (desktop, file server, ...).
+The tasksel package is responsible for the installation
+of several package sets , for various activities (desktop,
+file server, ...).
@@ -22,12 +24,17 @@ as well as the type of install.
-For instance, if &d-i; is run in French language, the french task will
-be automatically installed.
+For instance, if &d-i; is run in French language, the french
+task will be automatically installed.
-Language tasks are separated in two type of tasks: the &language; task and the &language;-desktop task. The former is installed for every standard system install while the latter is only installed if the desktop tasks is selected by the user (the desktop task installs a basic graphical environment, which can be completed with the Gnome or KDE tasks.
+Language tasks are separated in two types of tasks: the
+&language; task and the &language;-desktop
+task. The former is installed for every standard system install while the latter is
+only installed if the desktop tasks is selected by the user (the
+desktop task installs a basic graphical environment, which can
+be completed with the Gnome or KDE tasks).
@@ -57,22 +64,22 @@ Documentation about using Linux or &debi
-Dictionaries or word lists for &language;
+Dictionaries or word lists for &language;;
-Set of manual pages translated in &language;
+Set of manual pages translated in &language;;
-Console input methods for &language;
+Console input methods for &language;;
-Console fonts for &language;
+Console fonts for &language;;
@@ -90,7 +97,8 @@ many other unrelated packages to be inst
-Like all packages included in tasks, packages included in &language; tasks should be suitably generic for a large number of the users of the language (at least 25%).
+Like all packages included in tasks, packages included in &language;
+tasks should be suitably generic for a large number of the users of the language (at least 25%).
@@ -111,7 +119,7 @@ Appropriate choices for such task are:
Localization packages for packages which are included in the
-desktop task
+desktop task;
@@ -121,7 +129,7 @@ Fonts useful for the display of &languag
-Special input methods for &language; in a graphical environment
+Special input methods for &language; in a graphical environment;
diff -pruN 20101020/doc/i18n/en/maintainers.xml 20201202/doc/i18n/en/maintainers.xml
--- 20101020/doc/i18n/en/maintainers.xml 2008-10-27 10:43:26.000000000 +0000
+++ 20201202/doc/i18n/en/maintainers.xml 2020-07-26 06:38:45.000000000 +0000
@@ -2,6 +2,35 @@
+Checkout of the whole &d-i; source tree
+
+
+
+Developers need the whole source tree, which requires the use of
+git and mr :
+
+
+
+
+git clone git@salsa.debian.org:installer-team/d-i.git
+cd d-i
+./scripts/git-setup
+mr checkout
+
+
+
+
+In the past, we had everything in one subversion repository. Then one day, the
+developer parts were migrated to git, while the translator files were left
+on subversion; this is why we had the project divided into two parts now.
+Then, the Alioth server was replaced by Salsa, and thus everything was migrated
+to git.
+
+
+
+
+
+
&d-i; packages internationalization and localization
@@ -89,14 +118,14 @@ General recommendations
&d-i; developers are strongly encouraged to read the
po-debconf(7) man page and must have a good
knowledge of po-debconf mechanisms. Please ask
-for advice in the &email-debian-boot-list; mailing list when in doubt.
+for advice on the &email-debian-boot-list; mailing list when in doubt.
Templates files must be named
<package>.templates . Developer
should not use files named
-debian/templates though
+debian/templates , even though
debhelper scripts properly handle such files. This
requirement has been added because the translators work on a general
file which groups together all templates from all &d-i; packages. This
@@ -114,7 +143,9 @@ New debconf templates introduction
Maintainers must respect the Debconf Templates Style Guide
-(DTSG) (see the Debian Developers Reference, chapter Best Packaging Practices , section General recommendations for authors and translators ) and the
+(DTSG) (see the Debian Developers Reference, chapter
+Best Packaging Practices , section General
+recommendations for authors and translators ) and the
general style for writing templates for &d-i; (a special section of
the DTSG mentions &d-i; templates). In any case,
before committing new templates or templates
@@ -215,9 +246,9 @@ understand the way translations are hand
All PO files from all packages sitting under the
packages directory of the &d-i; source tree are
-merged into one single file and translators update this file. These
-so-called master PO files are kept into
-packages/po into the &d-i; main directory.
+merged into five po files and translators work on these files. These
+so-called master PO files are kept in
+packages/po in the &d-i; main directory.
@@ -328,21 +359,30 @@ not kept and thus the string becomes
Review changes to existing templates
-Some peer review is strongly suggested when changing existing debconf templates and the changes are significant enough to motivate a peer review (maintainers should be aware that even minor changes might be inconsistent with the &d-i; writing style, so in doubt, any change should be considered as significant enough).
+
+Some peer review is strongly suggested when changing existing debconf templates
+and the changes are significant enough to motivate a peer review (maintainers
+should be aware that even minor changes might be inconsistent with the &d-i;
+writing style, so in doubt, any change should be considered as significant enough).
+
-In such case, it is recommended to first duplicate the existing template, with another name (for instance, the former name followed by _save .
+In such case, it is recommended to first duplicate the existing template, with
+another name (for instance, the former name followed by _save ).
-The changed template is then unmarked for translation (by removing the leading "_" character) and a review may be requested in the mailing list.
+The changed template is then unmarked for translation (by removing the
+leading "_" character) and a review may be requested in the mailing list.
-As soon as the review is completed, the modified template should be marked for translation again.
+As soon as the review is completed, the modified template should be marked for
+translation again.
-Before removing the old template, the i18n synchronisation script must be run once to fill in the new template with the former translation, by fuzzy matching .
+Before removing the old template, the i18n synchronisation script must be run once
+to fill in the new template with the former translation, by fuzzy matching .
@@ -390,14 +430,15 @@ In this case, preventive unfuz
cd <di_dir>/packages/po/
-svn update
+git pull
mkdir NEW
for i in *.po; do
msgcat --no-wrap $i |\
sed -e '/^msgid/s/partitons/partitions/g' |\
msgcat - > NEW/$i && mv NEW/$i $i
done
-svn commit -m"Preventive unfuzzy before correcting typo in <mypackage>" *.po
+git add *
+git commit -m"Preventive unfuzzy before correcting typo in <mypackage>" *.po
rmdir NEW
@@ -417,11 +458,7 @@ chosen so that it matches only the occur
The po4a package maintainers have written a
special tool named msguntypot to handle
-suchpreventive unfuzzyfication . This utility will
-soon (at the moment of this writing) be included in the
-po4a package as it needs some of its Perl
-modules. In the meantime, maintainers may ask for it to the
-&i18n-coords;.
+such preventive unfuzzyfication .
diff -pruN 20101020/doc/i18n/en/manual.xml 20201202/doc/i18n/en/manual.xml
--- 20101020/doc/i18n/en/manual.xml 2008-10-27 10:43:26.000000000 +0000
+++ 20201202/doc/i18n/en/manual.xml 2020-07-26 06:38:45.000000000 +0000
@@ -1,11 +1,13 @@
-Installation manual translations
+Installation guide translations
Introduction
-This space to be filled by the installation manual
-internationalization coordinator.
+The main page for internationalization of the installation guide is
+https://d-i.debian.org/manual/ .
+It contains links to preview variants of the manual in the available languages as well as some
+documentation and statistics.
diff -pruN 20101020/doc/i18n/en/new-language.xml 20201202/doc/i18n/en/new-language.xml
--- 20101020/doc/i18n/en/new-language.xml 2010-08-26 23:39:24.000000000 +0000
+++ 20201202/doc/i18n/en/new-language.xml 2020-11-30 23:08:26.000000000 +0000
@@ -30,7 +30,8 @@ First contact with &d-i; development tea
-Translators or translation teams of a non supported language should contact the &d-i; i18n coordination team (see ). They should provide a real
+Translators or translation teams of a not supported language should contact
+the &d-i; i18n coordination team (see ). They should provide a real
name (the Debian Project encourages the use of real names) and
possibly a GPG key (this is not mandatory but could help in the
future).
@@ -45,7 +46,7 @@ steps is a very important step to quickl
The &i18n-coords; must have
-the real name and a reliable email address of at least one translator
+the real name and a reliable e-mail address of at least one translator
who must be an individual. This individual will be called the
language coordinator for the given language.
@@ -122,7 +123,7 @@ can be provided.
-coord_email : language coordinator email
+coord_email : language coordinator e-mail
@@ -154,7 +155,7 @@ describes specifics of the German langua
-Informations included in a locale:
+Information included in a locale:
@@ -208,9 +209,9 @@ Informations included in a locale:
The writer of a locale must use the locale files format. The contents
of this file must be in UTF-8. Translators shouldn't be afraid by
-this: this part may be handled by a i18n specialist in Debian, most
+this: this part may be handled by an i18n specialist in Debian, most
often one of the &i18n-coords;. The new translator(s) will only need
-to provide him/her the above informations when (s)he will need it.
+to provide him/her the above information when (s)he asks for it.
@@ -282,12 +283,14 @@ Localechooser entry
First needed is having the new language added to
localechooser (the package responsible for
-choosing language at the very beginning of the Debian Installer
-process) This will be handled by the &i18n-coords;.
+choosing language at the very beginning of a Debian installation).
+This will be handled by the &i18n-coords;.
-This entry should mention the &d-i; interfaces which this language is available on (text, latin-1 serial, dialog or graphical interface). This choice depends on the needed rendering mechanism for this language.
+This entry should mention the &d-i; interfaces which this language is
+available on (text, latin-1 serial, dialog or graphical interface).
+This choice depends on the needed rendering mechanism for this language.
@@ -298,31 +301,37 @@ This defines five categories for languag
-Category 0 : languages that can be rendered on any ASCII console. This only includes English by a design decision of &d-i;. In short, even if a language can be rendered using only ASCII characters, it will not be placed in category 0;
+Category 0 : languages that can be rendered on any
+ASCII console. This only includes English by a design decision of &d-i;.
+In short, even if a language can be rendered using only ASCII characters,
+it will not be placed in category 0;
Category 1 : languages that can be rendered on any
-Latin-1 console (several serial terminals). This includes so-called Latin-1 languages;
+Latin-1 console (several serial terminals). This includes so-called
+Latin-1 languages;
-Category 2 : languages that can be rendered et the Linux text console, without needeing a framebuffer terminal.
+Category 2 : languages that can be rendered at the
+Linux text console, without the need of a framebuffer terminal.
-Category 3 : languages that can be rendered et the Linux text console, only by using a framebuffer terminal. The
+Category 3 : languages that can be rendered at the
+Linux text console only by using a framebuffer terminal. The
key point for these languages is the availability of their glyphs in
the bterm-unifont package. These languages should
also not need complex rendering mechanisms such as combination
-mechanisms. The difference with 2 is the possibility to display the language
-at the Linux console without framebuffer.
+mechanisms. The difference against Category 2 is the possibility to
+display the language at the Linux console without framebuffer.
@@ -395,7 +404,7 @@ reasonably sized alphabet.
It is allowed to add characters that can be entered directly using a
-"standard" keyboard for the language and are printed on the tops of keys,
+"standard" keyboard for the language and are printed on the keys,
for example as displayed on http://en.wikipedia.org/wiki/Keymap. This
includes characters accessible through AltGr and characters that can be
created using dead keys.
@@ -408,19 +417,22 @@ namely French:
-àâéèëêïîôùûüÿÀÂÉÈËÊÔÙÛÜŸÇ°£§µ
+àâéèëêïîôùûüÿçœÀÂÉÈËÊÏiÎÔÙÛÜŸÇŒ°£µ§
For this step to be completed, the new file must have been committed in
the installer/built/needed-characters
-directory. The file name must be the ISO 639-3 language code with .utf as extension.
+directory. The file name must be the ISO 639-3 language code with
+.utf as extension.
As long as the language remains a prospective language, that file
-should be named after the language's ISO 639-3 code and the .prospective file extension. The extension will be changed to .utf when the language is completely supported.
+should be named after the language's ISO 639-3 code and the
+.prospective file extension. The extension will be
+changed to .utf when the language is completely supported.
@@ -429,6 +441,12 @@ languages list by changing the needed_characters.
+
+For font switching support in the bare Linux console, the language coordinator must
+also provide which console-setup font should be used, to
+be recorded in its debian/font-switch script.
+
+
@@ -437,7 +455,8 @@ Font for the graphical version of &d-i;
-The graphical version of &d-i; will use several different font sets, depending on the language.
+The graphical version of &d-i; will use several different font sets,
+depending on the language.
@@ -463,48 +482,20 @@ value to ttf_font .
-Default console keyboard and font
+Default keymap
-This step is only relevant for languages which can be rendered at the
-console, namely languages in categories 0 to 3 (see ). For languages in category 4,
-this step will be automatically considered completed.
-
-
-
-If the language coordinator already knows about console font and
-keyboard specifics, please provide this information (&d-i; and more
-generally Debian uses the console-tools and
-console-data packages for handling console
-input and output).
-
-
-
-For each specified console keyboard mapping the language coordinator
-should provide an equivalent X keyboard mapping. This information
-will be used to choose the correct default keyboard layout in the
-installed X environment. The &i18n-coords; will record the pairs and
-should make sure this information is passed to the X Task Force. The
-X Task Force will use this information to choose the correct default
-keyboard mapping on fresh installations based on selected console
-layout selection.
-
-
-
-Translators should be aware that this information is about input and
-display for the Linux console and not for the X environment. Linux
-console support is often very scarce for many languages, so this step
-will often be reduced to defining the default keyboard mapping for the
-console environment for this language.
+This step is meant to decide about the default keymap to propose to
+users in the console-setup package. This keymap
+will also become the default keymap on the installed system, both at the
+console and in graphical environments.
For this step to be completed, a bug report mentioning the requested
default keyboard mapping for the new language must have been reported
-by the &i18n-coords; to the console-data or the
-kbd packages.
+by the &i18n-coords; to the console-setup package.
@@ -517,33 +508,34 @@ value to keymap .
-Account creation in Alioth
+Account creation on Salsa
-All &d-i; work is maintained in a centralized revision control system,
-using SVN . For translators not familiar with
-SVN , will give them
-enough information for them to be able to commit their translations
+All &d-i; work is maintained in a revision control system,
+using GIT . For translators not familiar with
+GIT , will give them
+enough information to be able to commit their translations
themselves.
This chapter will also explain in details how to get an account on the
-Alioth server, the server used for centralized development of several
+Salsa server, the server used for centralized development of several
co-maintained Debian packages and projects.
After your account has been created, please check that you can login
-with it on &url-alioth; using the chosen password. Then, mention your
+with it on Salsa
+using the chosen password. Then, mention your
account name to the &i18n-coords; who will grant you commit access to
the needed repositories.
For this step to be completed, the language coordinator must have a
-working &alioth; account and must have sent his/her account name to
+working &salsa; account and must have sent his/her account name to
the &i18n-coords;.
@@ -563,13 +555,13 @@ Granting and checking the translator com
After the new translator is notified by the &i18n-coords; that (s)he
-has been granted commit access to the &d-i; SVN
-repositories, (s)he should check that (s)he's able to checkout the
-&d-i; repository, as well as the &tasksel; repository.
+has been granted commit access to the &d-i; GIT
+repository, (s)he should check that (s)he's able to checkout the
+&d-i; repository.
-For this, will give him/her any needed
+For this, will give him/her any needed
details.
@@ -581,7 +573,11 @@ there. This will be verified by the &i18
-&i18n-coords; must then add the language code to the packages/po/PROSPECTIVE file in order to avoid the translations to immediately spread out to individual packages. This is motivated by the will of activating languages only after they completed the first two sublevels of translations ( ).
+&i18n-coords; must then add the language code to the
+packages/po/PROSPECTIVE file in order to avoid the translations to
+immediately spread out to individual packages. This is motivated by the
+will of activating languages only after they completed the first two
+sublevels of translations ( ).
@@ -656,11 +652,15 @@ value to mailing_list
-Optionnally, translators may subscribe to the &email-debian-boot-list; which is the development mailing list for &d-i;. Topics there are more technical but will allow translators to participate more deeply in &d-i; development.
+Optionally, translators may subscribe to the &email-debian-boot-list;
+which is the development mailing list for &d-i;. Topics there are more
+technical but will allow translators to participate more deeply in &d-i; development.
-Joining IRC channels is also a good communication method: Debian i18n contributors usually hang around on #debian-i18n on irc.debian.org while &d-i; developers join #debian-boot.
+Joining IRC channels is also a good communication method: Debian i18n
+contributors usually hang around on #debian-i18n on irc.debian.org while
+&d-i; developers join #debian-boot.
@@ -674,7 +674,7 @@ Announcement of the translation effort
When a new translation effort is started, the language coordinator
must announce it in the &email-debian-boot-list; mailing list so
that all &d-i; developers are aware of the new translation effort. A
-short personal introduction will be appreciated, even if no
+short personal introduction will be appreciated, even if not
mandatory. The &d-i; development team is a real team whose members
appreciate working together in a friendly environment.
@@ -694,11 +694,13 @@ the .prospective fi
-Finally, a new entry will be added to the file used by the scripts which generate the translation status pages (&url-d-i-translation-status;).
+Finally, a new entry will be added to the file used by the scripts which
+generate the translation status pages (&url-d-i-translation-status;).
-The new language process officially finishes here. The only work that's left to do is...translating.
+The new language process officially finishes here. The only work that's
+left to do is ... translating.
@@ -712,7 +714,7 @@ Follow the &d-i; development
Subscription to the &d-i; development list (&email-debian-boot-list;)
is also encouraged though not mandatory. This list has a traffic of
about 20-30 mails per day, including many administrivia mails
-(packages uploads or bugs reports), but is the best method for being
+(packages uploads or bug reports), but is the best method for being
involved in &d-i; development.
diff -pruN 20101020/doc/i18n/en/preface.xml 20201202/doc/i18n/en/preface.xml
--- 20101020/doc/i18n/en/preface.xml 2008-10-27 10:43:26.000000000 +0000
+++ 20201202/doc/i18n/en/preface.xml 2020-07-26 06:38:45.000000000 +0000
@@ -3,6 +3,7 @@
+
is aimed at registered translators and explains
how they should organize their work in order to have the whole
&debian; installation process localized in their own language. The
@@ -11,36 +12,51 @@ chapter with details about the specifics
to be translated.
- of this document explains
+
+
+ of this document explains
how &d-i; packages maintainers should handle i18n in the packages they
maintain.
+
details the addition of a new language to &d-i;
supported languages list, with a step-by-step process to be followed
by the new translator and the &d-i; i18n coordination team.
-
- explains how translations are
-handled, particularly for level 1 as part of the
-core &d-i; packages.
+
+
+ describes the translation of the Installation guide.
- explains the internal
+
+
+ explains the internal
organisation of the &d-i; development team for i18n/l10n handling. The
role of the i18n coordinators is explained in this chapter.
- explains mechanisms involved in the automated spellchecking processes for &d-i; related translations.
+
+
+ explains how translations are
+handled, particularly for level 1 as part of the
+core &d-i; packages.
- explains how the so-called "language" tasks in &tasksel; are handled in &d-i;
+
+
+ explains mechanisms involved in the automated spellchecking processes for &d-i; related translations.
+
+
+
+
+ explains how the so-called "language" tasks in &tasksel; are handled in &d-i;
Several appendices give more details about topics not directly
-related to &d-i; such as SVN basics, methods for translation work,
+related to &d-i; such as git basics, methods for translation work,
gettext message catalogs tools, Debian bug reports and language codes.
diff -pruN 20101020/doc/i18n/en/spellchecking.xml 20201202/doc/i18n/en/spellchecking.xml
--- 20101020/doc/i18n/en/spellchecking.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/spellchecking.xml 2020-07-26 06:38:45.000000000 +0000
@@ -115,7 +115,7 @@ is the following:
- "strings for this file"
-if the word is easy to find you won't need any help from me to locate
+If the word is easy to find you won't need any help from me to locate
it and you just need to see which po file it belongs to. Emacs has a
very handy function "forward-paragraph" (ctrl-up on my system) that
takes you directly to the line containing the path. Otherwise you can
@@ -128,11 +128,11 @@ search. Here follow a few practical exam
to some documentation about regexp to find out more.
If you use emacs you can match an exact word by using
-isearch-forward-regexp and "\<word\>"
+isearch-forward-regexp and "\<word\>".
From the shell you can run 'grep -nw "word" lang_all.txt'
-(the n
parameter will tell grep to print the line number where match
-occurs)
+(the n
parameter will tell grep to print the line number where the match
+occurs).
Sometimes you may have to look for something like "a word composed
by two letters: the first is "p" the second is not a printable char";
diff -pruN 20101020/doc/i18n/en/technical/active-languages.xml 20201202/doc/i18n/en/technical/active-languages.xml
--- 20101020/doc/i18n/en/technical/active-languages.xml 2010-08-06 04:28:36.000000000 +0000
+++ 20201202/doc/i18n/en/technical/active-languages.xml 2020-07-26 06:38:45.000000000 +0000
@@ -4,12 +4,15 @@ Active languages
-Active languages are languages which have been removed from the prospective languages list. As soon as this is done, translations for these languages are added to the indvidual &d-i; packages by the synchronisation
-script (see ).
+Active languages are languages which have been removed from the prospective languages
+list. As soon as this is done, translations for these languages are added to the
+indvidual &d-i; packages by the synchronisation script (see
+ ).
-This section describes the technical operations that should take place when the decision to activate a given language is taken by the &i18n-coords;.
+This section describes the technical operations that should take place when
+the decision to activate a given language is taken by the &i18n-coords;.
@@ -18,7 +21,10 @@ Removing the language from the prospecti
-The first action to take place is the removal of the language from the packages/po/PROSPECTIVE file. Then, the next run of the synchronization script will automatically add translation files for that language into each &d-i; package.
+The first action to take place is the removal of the language from the
+packages/po/PROSPECTIVE file. Then, the next run of
+the synchronization script will automatically add translation files for that
+language into each &d-i; package.
@@ -39,7 +45,10 @@ Activate language in localechooser
-The language should be activated in the localechooser package. For this, the language entry in the languagelist shoul be uncommented and the localechooser must be rebuilt and uploaded.
+The language should be activated in the localechooser
+package. For this, the language entry in the languagelist
+should be uncommented and the localechooser must be
+rebuilt and uploaded.
@@ -49,7 +58,10 @@ Uploading packages
-For the translation to be effective, all &d-i; packages with localized messages should be rebuilt and uploaded. Until this happens, translations for that language will not appear. Of course, this shouldn't be done for all packages except when the release time is coming.
+For the translation to be effective, all &d-i; packages with localized messages
+should be rebuilt and uploaded. Until this happens, translations for that language
+will not appear. Of course, this shouldn't be done for all packages except when
+the release time is coming.
@@ -59,11 +71,14 @@ Add or check tasks in tasksel
-Tasks related to the new language should be considered for addition in tasksel (see ).
+Tasks related to the new language should be considered for addition in tasksel
+(see ).
-These tasks should also be added in the tasks.list file of the debian-cd package so that CD or DVD prioritize the task's components for inclusion on first CDs or DVDs
+These tasks should also be added in the tasks.list file of
+the debian-cd package so that CD or DVD prioritize the task's
+components for inclusion on first CDs or DVDs.
@@ -73,7 +88,9 @@ Check the availability of font for the g
-A check should be made for the chosen font for the graphical installer. In case a dedicated font is needed, the udeb providing that font must be existing, or a patch should be created against the relevant package for it to provide this udeb package.
+A check should be made for the chosen font for the graphical installer. In case a
+dedicated font is needed, the udeb providing that font must be existing, or a patch
+should be created against the relevant package for it to provide this udeb package.
@@ -84,7 +101,11 @@ Record the new status of the language
-The status of the relevant language chould be changed in installer/doc/i18n/languages.xml . "prospective" should be removed from the "nlp_step" field and the "supported" field should be changed from "false" to the next version of the installer release (see other languages for examples).
+The status of the relevant language chould be changed in
+installer/doc/i18n/languages.xml . "prospective" should be
+removed from the "nlp_step" field and the "supported" field should be changed from
+false
to the next version of the installer release (see other languages
+for examples).
diff -pruN 20101020/doc/i18n/en/technical/status-pages.xml 20201202/doc/i18n/en/technical/status-pages.xml
--- 20101020/doc/i18n/en/technical/status-pages.xml 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/i18n/en/technical/status-pages.xml 2020-07-26 06:38:45.000000000 +0000
@@ -9,8 +9,8 @@
The &d-i; team and the &i18n-coords; maintain web pages giving the
statistics of translations for each language, level by level. The
scripts that generate these statistics may be found in the
-scripts/l10n/statistics directory of &d-i;
-SVN repository.
+scripts/l10n/l10n-stats directory of &d-i;
+GIT repository.
@@ -45,7 +45,9 @@ Status pages generation scripts
-FIXME: Here should come details about the status pages generation scripts: how the script work, how are determined packages and how information about packages locations is kept, status pages template file, etc.
+FIXME: Here should come details about the status pages generation scripts:
+how the script work, how are determined packages and how information about
+packages locations is kept, status pages template file, etc.
@@ -62,7 +64,9 @@ status pages and learn about changes in
-For this, Peter Mann wrote a monitoring script named websec-txt . This script is available in the scripts/l10n directory in &d-i; SVN repository.
+For this, Peter Mann wrote a monitoring script named websec-txt .
+This script is available in the scripts/l10n directory in
+&d-i; SVN repository.
@@ -74,7 +78,8 @@ contain the contents of the monitored fi
-Below is the suggested contents for monitoring &d-i; translation status pages (assuming <code> being the translators language ISO-639 code):
+Below is the suggested contents for monitoring &d-i; translation status pages
+(assuming <code> being the translators language ISO-639 code):
diff -pruN 20101020/doc/i18n/en/technical/supported-languages.xml 20201202/doc/i18n/en/technical/supported-languages.xml
--- 20101020/doc/i18n/en/technical/supported-languages.xml 2008-10-27 10:43:25.000000000 +0000
+++ 20201202/doc/i18n/en/technical/supported-languages.xml 2020-07-26 06:38:45.000000000 +0000
@@ -2,11 +2,16 @@
Supported languages list
-The i18n coordinators record all needed information about supported languages in a file named the supported languages list . This file is an XML file which can be found as installer/doc/i18n/languages.xml in the installer SVN tree.
+The i18n coordinators record all needed information about supported languages
+in a file named the supported languages list . This file
+is an XML file which can be found as installer/doc/i18n/languages.xml in the
+installer GIT tree.
-The data of this file are used to represent information about the supported languages in &d-i; at the following address: &url-languagelist; .
+The data of this file are used to represent information about the supported
+languages in &d-i; at the following address:
+&url-languagelist; .
diff -pruN 20101020/doc/i18n/en/technical/synchronization.xml 20201202/doc/i18n/en/technical/synchronization.xml
--- 20101020/doc/i18n/en/technical/synchronization.xml 2009-05-11 12:24:33.000000000 +0000
+++ 20201202/doc/i18n/en/technical/synchronization.xml 2020-07-26 06:38:45.000000000 +0000
@@ -8,7 +8,7 @@ The need for a synchronization process
The files which are really used for building &d-i; packages are hosted
-in the SVN (Subversion) repository used for the development of &d-i;
+in the git (Subversion) repository used for the development of &d-i;
packages. Each &d-i; package sources is hosted in a subdirectory of
the packages/ directory, with a very classical
Debian package source tree organization, including the
@@ -231,7 +231,7 @@ The general process is:
- synchronize the local copy with the &d-i; SVN ;
+ synchronize the local copy with the &d-i; GIT ;
@@ -275,12 +275,14 @@ The general process is:
- synchronize with &d-i; SVN ;
+ synchronize with &d-i; GIT ;
- if the script is run with the --merge option, merge translations from the reference PO file (the reference file is given priority for identical strings);
+ if the script is run with the --merge option,
+ merge translations from the reference PO file (the reference file is
+ given priority for identical strings);
@@ -297,7 +299,7 @@ The general process is:
- commit back the changed file to &d-i; SVN .
+ commit back the changed file to &d-i; GIT .
@@ -310,7 +312,7 @@ The general process is:
- synchronize the local copy with the &d-i; SVN (in case some
+ synchronize the local copy with the &d-i; GIT (in case some
update occurred in the meantime);
@@ -322,7 +324,7 @@ The general process is:
- commit back the changes to &d-i; SVN ;
+ commit back the changes to &d-i; GIT ;
@@ -341,7 +343,7 @@ as they are modified (except by using th
--atomic-commits switch which slows down the
whole process a lot and triggers a lot of commit actions). So, the
script is sometimes likely to trigger conflicts. For that reason, it
-will stop working on a SVN copy where SVN conflict files are
+will stop working on a GIT copy where GIT conflict files are
present. This explains why this script must always be monitored even
when it is scheduled to execute periodically.
@@ -365,7 +367,9 @@ skilled shell programmer cleans it out).
-The script uses some command-line switches which may affect its behaviour. Some of these switches are mostly present for historical reasons and are kept because they may have some new use in the future:
+The script uses some command-line switches which may affect its behaviour.
+Some of these switches are mostly present for historical reasons and are kept
+because they may have some new use in the future:
@@ -374,7 +378,7 @@ The script uses some command-line switch
--debug will trigger more output by the
script. Otherwise, the script reports about its actions but
- commands output (such as svn ,
+ commands output (such as git ,
debconf-updatepo ,
msgmerge ) will be redirected to
/dev/null ;
@@ -382,8 +386,8 @@ The script uses some command-line switch
- --online triggers svn
- update commands before working on files. Except for
+ --online triggers git
+ pull commands before working on files. Except for
testing, there is no reason for not using
this switch.
@@ -393,7 +397,7 @@ The script uses some command-line switch
--commit allows the script to
commit files back to the &d-i;
repository. Otherwise, the modified files are kept in the
- local SVN copy. Of course, this switch should be used in
+ local GIT copy. Of course, this switch should be used in
production. Omitting it is useful only for testing.
@@ -411,7 +415,7 @@ The script uses some command-line switch
the --atomic-updates switch instructs
- l10n-sync to issue a svn update command
+ l10n-sync to issue a git pull command
before working on each package. This may be very CPU, network-
and time-consuming and should only be used when there is some
need to limit possible conflicts;
@@ -431,13 +435,6 @@ The script uses some command-line switch
- the --svn switch defines the command for
- calling the svn utility. It may be used in
- case some special behaviour is needed;
-
-
-
-
the --debconf-updatepo defines the
command for calling the debconf-updatepo
utility. It allows using a specially crafted
@@ -468,14 +465,13 @@ The script uses some command-line switch
The script needs the location of the local copy of the &d-i;
repository as an argument. It makes some simple checks about the
-copy. A partial SVN checkout may be used, with only
-the packages/ directory.
+copy.
When using this script with commits, the &d-i; copy must be as clean as
possible. It should not be used for development tasks. The script
-checks for possible SVN conflict files and aborts if it finds some.
+checks for possible GIT conflict files and aborts if it finds some.
@@ -491,12 +487,16 @@ are not copied in the individual package
The PROSPECTIVE list
-When languages are on early stages of translation after they have been added through the new language process ( ), they are temporarily listed in a file named packages/po/PROSPECTIVE .
+When languages are on early stages of translation after they have been added
+through the new language process ( ), they are
+temporarily listed in a file named packages/po/PROSPECTIVE .
Languages listed in that file are excluded from synchronization, and,
-therefore, PO files are not created in individual packages. As a consequence, activating a language means that the language code is removed from the PROSPECTUVE file.
+therefore, PO files are not created in individual packages. As a consequence,
+activating a language means that the language code is
+removed from the PROSPECTUVE file.
@@ -537,11 +537,12 @@ interaction.
First of all, when run from a cron job, the script has to be able to
commit files. This means that the account it is run from should use a
SSH key with an empty passphrase and add this key
-to the account it commits to on &svn-debian;.
+to the account it commits to on &git-debian;.
-First, create a SSH key with an empty passphrase and put it in a special file:
+First, create a SSH key with an empty passphrase and
+put it in a special file:
@@ -561,8 +562,8 @@ The key fingerprint is:
Then, this key should be added to
-~/.ssh/authorized_keys on &svn-debian; for the
-Alioth account (<alioth_account>) under which identity commits
+~/.ssh/authorized_keys on &git-debian; for the
+Salsa account (<salsa_account>) under which identity commits
will be done.
@@ -574,15 +575,14 @@ happen, the following should be added to
-host &svn-debian;
- user <alioth_account>
- IdentityFile /home/user/.ssh/nopass
+host &git-debian;
+ user <salsa_account>
Of course, this actually means that this local account will then be
-able to commit to &svn-debian; with <alioth_account> as
+able to commit to &git-debian; with <salsa_account> as
identity, without further control . This means
that the account the script is run with should be very safely
protected.
@@ -601,7 +601,7 @@ control possibilities to the synchronisa
First of all, before doing any work, the script opens a special file
-kept in the SVN repository and named
+kept in the GIT repository and named
packages/po/run-l10n-sync . The "run=" line in
this file mentions whether synchronisation should happen or not. If
the file contains "run=0", then the script will exit without taking
@@ -610,7 +610,7 @@ any action.
This mechanism gives all &d-i; developers with commit access to the
-SVN repository a very simple way to disable the
+GIT repository a very simple way to disable the
synchronization script actions. For this, developers just need to
change the file and commit the new version.
@@ -625,7 +625,8 @@ While the script is disabled, runs can s
While it is running, the script also creates a file named
.l10n-sync.lock at the root of the local copy of
&d-i; repository. The file is removed only after successful runs of
-the script. When this file already exists, the script does not run and exits with an error message.
+the script. When this file already exists, the script does not run and
+exits with an error message.
diff -pruN 20101020/doc/i18n/en/translators/level1.xml 20201202/doc/i18n/en/translators/level1.xml
--- 20101020/doc/i18n/en/translators/level1.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/translators/level1.xml 2020-07-26 06:38:45.000000000 +0000
@@ -17,8 +17,8 @@ translatable material in the &d-i; devel
Most parts of the translatable material is spread over core &d-i;
-packages. The package development is handled in the main &d-i;
-Subversion (SVN ) repository.
+packages. The package development is handled in the
+main &d-i; GIT repository .
@@ -29,7 +29,8 @@ translations.
Level 1 is the key for a language being fully integrated in &d-i;.
-A language will be activated by &i18n-coords; only when the first two sublevels are completely translated.
+A language will be activated by &i18n-coords; only when the
+first two sublevels are completely translated.
@@ -40,11 +41,15 @@ Sublevels
-In the past, all &d-i; level 1 strings were gathered into a single master
file. While that was easy to manage, it had the inconvenience of grouping very important and often used strings with very obscure strings that are relevant for some architectures only, or some special (and rarely used) features.
+In the past, all &d-i; level 1 strings were gathered into a single master
+file. While that was easy to manage, it had the inconvenience of grouping very important
+and often used strings with very obscure strings that are relevant for some architectures
+only, or some special (and rarely used) features.
-In order for translators to better prioritize their work, this master file has been split into five sublevel
files:
+In order for translators to better prioritize their work, this master file has been split
+into five sublevel
files:
@@ -55,23 +60,26 @@ In order for translators to better prior
- Sublevel 2: general strings not used during default installs. Includes error messages and dialogs
+ Sublevel 2: general strings not used during default installs. Includes error messages
+and dialogs
- Sublevel 3: expert strings (some low priority features such as RAID, encrypted partitions, etc.)
+ Sublevel 3: expert strings (some low priority features such as RAID, encrypted partitions,
+etc.)
- Sublevel 4: specific to less-popular arches (powerpc, mips, sparc) or used in experimental features
+ Sublevel 4: specific to less-popular arches (such as powerpc, mips or sparc) or used in
+experimental features
- Sublevel 5: same for high-end (hppa, ia64, s390) and hobby (m68k) arches and old stuff (partconf,
-+partitioner, that are replaced by partman for a while)
+ Sublevel 5: same for high-end (such as hppa, ia64 or s390x) and hobby (m68k) arches and
+old stuff (partconf, partitioner, that are replaced by partman for a while)
@@ -84,14 +92,22 @@ Files location and access methods
-Translators should remember that using SVN is strongly encouraged as
-this is the only way for them to commit their own translations.
+Translators should remember that using GIT is encouraged.
+
+
+
+However, there is another possibility to contribute translations for &d-i;:
+via a Hosted Weblate project under
+&hosted-weblate; .
+(If you would like to use Weblate and your language is not listed there, sent
+a mail to &email-debian-boot-list;.)
- SVN access: &svn-level1;. Sublevel files are in directories named sublevelX
+ GIT access: &git-level1;. Sublevel files are in directories named
+sublevelX
@@ -106,7 +122,7 @@ this is the only way for them to commit
- &url-sublevel1-po-link;
+ &url-sublevel1-po;
@@ -116,7 +132,7 @@ this is the only way for them to commit
- &url-sublevel2-po-link;
+ &url-sublevel2-po;
@@ -126,7 +142,7 @@ this is the only way for them to commit
- &url-sublevel3-po-link;
+ &url-sublevel3-po;
@@ -136,7 +152,7 @@ this is the only way for them to commit
- &url-sublevel4-po-link;
+ &url-sublevel4-po;
@@ -146,16 +162,22 @@ this is the only way for them to commit
- &url-sublevel5-po-link;
+ &url-sublevel5-po;
+
+
+
+
+Beginning a new translation
+
-To begin the translation work for sublevel 1, translators should copy the
+To begin a new translation for sublevel 1, translators should copy the
packages/po/sublevel1/template.pot to
&language;.po (where &language; is
the ISO-639 code of the language, see ) and complete
-Updating/Adding translations
+Updating/adding translations
-Translation updates should be done by direct commits to the &d-i; SVN
-repository (see for details about SVN
-use). In case this is absolutely impossible, these updates can be sent
-as bug reports against the debian-installer
+Translation updates should be done by direct commits to the &d-i; GIT
+repository (see for details about GIT
+use) or via Weblate . In case either of this is absolutely
+impossible, updates can be sent as bug reports against the debian-installer
package (see for details).
@@ -218,15 +240,17 @@ and 32 characters for double-width chara
-This constraint may be checked by the scripts/l10n/choices-check.pl script from the &d-i; development tree:
+This constraint may be checked by the scripts/l10n/choices-check.pl
+script from the &d-i; development tree:
-scripts/l10n/choices-check.pl < packages/po/&language;.po
+scripts/l10n/choices-check.pl < packages/po/<sublevelX>/&language;.po
-This script will output the offending line(s) number(s) as well as the number of characters in this/these line(s).
+This script will output the offending line(s) number(s) as well as the number of characters
+in this/these line(s).
@@ -258,7 +282,8 @@ in the &d-i; main menu to allow users to
The length of this main menu entry is limited to 58 columns, i.e. 58 characters
for single-width languages and only 29 characters for double-width languages.
-These main menu entries all have a comment with Main menu item
in the PO and POT files.
+These main menu entries all have a comment with Main menu item
in the
+PO and POT files.
@@ -269,7 +294,7 @@ Variable names
-Many places in &d-i; use variables (e.g. ${LOCALE} is currently not
+Many places in &d-i; use variables (e.g. like in ${LOCALE} is currently not
supported in Debian
). The variable names should not be
translated and be kept inside braces prepended by the
dollar sign in the translation.
@@ -282,9 +307,8 @@ details about the spell checking scripts
-Advanced translation software such as kbabel (renamed
-to lokalize in KDE4) are able to visually display such
-errors and warn about them before saving files.
+Advanced translation software such as lokalize are able to
+visually display such errors and warn about them before saving files.
diff -pruN 20101020/doc/i18n/en/translators/level2.xml 20201202/doc/i18n/en/translators/level2.xml
--- 20101020/doc/i18n/en/translators/level2.xml 2010-07-10 19:15:15.000000000 +0000
+++ 20201202/doc/i18n/en/translators/level2.xml 2020-11-30 23:08:26.000000000 +0000
@@ -48,11 +48,6 @@ other Debian packages:
iso-codes
-
-
- console-data
-
-
popularity-contest
@@ -60,7 +55,12 @@ other Debian packages:
- eject
+ util-linux (for eject)
+
+
+
+
+ espeakup
@@ -71,14 +71,14 @@ other Debian packages:
-iso-codes and console-data packages material is used by some level1
+iso-codes package material is used by some level1
packages from &d-i; while others are packages installed as part of the
base system and prompting users during installs (either default ones
or in some conditions).
-Translators should translate these files in the same order that they appear
+Translators should translate these files in the same order as they appear
in this section.
@@ -95,8 +95,8 @@ Package description
-The &tasksel; package, called for each installation, proposes tasks to trigger
-the installation of complete sets of Debian packages. A
+The &tasksel; package, called for each installation, proposes tasks
+to trigger the installation of complete sets of Debian packages. A
task is a collection of several individual Debian
packages all related to a specific activity.
@@ -144,14 +144,14 @@ order of importance:
-tasks/po/debian-tasks.pot : tasks descriptions translations. These files are named tasks
-translations.
+tasks/po/debian-tasks.pot : tasks descriptions translations.
+These files are named tasks translations.
-debian/po/templates.pot : text of the screen shown to users. These files are named debconf
-translations.
+debian/po/templates.pot : text of the screen shown to users.
+These files are named debconf translations.
@@ -169,7 +169,7 @@ Access to these files:
-GIT access: &git-tasksel; (documenting how to use GIT is way out of the scope of this document)
+GIT access: &git-tasksel;
@@ -178,12 +178,14 @@ Access to these files:
- &url-level2-pot-link;, tasksel_tasks.pot (tasks), tasksel_debian_po.pot (debconf) and tasksel_po.pot (programs)
+ &url-level2-pot-link;, tasksel_tasks.pot (tasks),
+tasksel_debian_po.pot (debconf) and tasksel_po.pot (programs)
- &url-level2-po-link;, tasksel_tasks_&language;.po (tasks), tasksel_debian_po_&language;.po (debconf) and tasksel_po_&language;.po (program)
+ &url-level2-po;, tasksel_tasks_&language;.po (tasks),
+tasksel_debian_po_&language;.po (debconf) and tasksel_po_&language;.po (program)
@@ -195,7 +197,7 @@ Access to these files:
-Updating/Adding translations
+Updating/adding translations
@@ -222,7 +224,7 @@ repository and later commit the needed u
- In case GIT push actions are
+In case GIT push actions are
absolutely impossible, these updates can be sent as bug reports
against the tasksel package (see for details) and mention whether the file is
@@ -238,7 +240,7 @@ Specific recommendations
-In the program translation file, "aptitude" is a program name and
+In the program translation file, aptitude
is a program name and
should not be translated.
@@ -267,7 +269,7 @@ likely to be used in other parts of the
For this reason, translators need to translate country names
-from ISO-3166 in the iso-codes package (ISO-3166 is the
+from ISO-3166-1 in the iso-codes package (ISO-3166-1 is the
standard for country (and other areas of specific geographic
interest
names and codes)).
@@ -283,7 +285,11 @@ Files location and access methods
This package is a regular
Debian package. The
package maintainer uses a GIT repository.
-However, iso-codes domains are also registered in the Translation Project . iso-codes encourage translators to use the Translation project in order to update translations for ISO-3166 (as well as ISO-639 for language names, ISO-4217 for currency names, ISO-3166-2 for countries subdivisions names and ISO-15924 for language scripts names).
+However, iso-codes domains are also registered in the
+Translation Project . iso-codes
+encourage translators to use the Translation project in order to update translations
+for ISO-3166 (as well as ISO-639 for language names, ISO-4217 for currency names,
+ISO-3166-2 for countries subdivisions names and ISO-15924 for language scripts names).
@@ -294,7 +300,9 @@ As a consequence, references to GIT are
Anonymous GIT checkout command: &git-iso-codes-anon;
- The translation material is in directory iso_3166 (working on iso_639 , which contain language names, will be appreciated by maintainers, though not directly useful for &d-i;).
+ The translation material is in directory iso_3166-1
+(working on iso_639 , which contain language names, will be
+appreciated by maintainers, though not directly useful for &d-i;).
@@ -306,12 +314,12 @@ Anonymous GIT checkout command:
- &url-level2-pot;/iso-codes_iso_3166.pot
+ &url-level2-pot;/iso-codes_iso_3166-1.pot
- &url-level2-po;/iso-codes_iso_3166_&language;.po
+ &url-level2-po;/iso-codes_iso_3166-1_&language;.po
@@ -322,12 +330,13 @@ Anonymous GIT checkout command:
-Updating/Adding translations
+Updating/adding translations
-Translations should preferrably be updated through the Translation Project. Alternatively, in case a given team of the TP is unresponsive, they can be reported as bugs against the
-iso-codes package.
+Translations should preferrably be updated through the Translation Project.
+Alternatively, in case a given team of the TP is unresponsive, they can be reported
+as bugs against the iso-codes package.
@@ -362,10 +371,12 @@ maintainer: iso-codes@packages.de
-The ISO-639 (language names), ISO-15924 (scripts names) and ISO-4217 files (currencies names) can
-also be translated. However, this is a very tedious task which may
-turn to be very difficult (translating language names is even more
-difficult than translating country names). Finally, for the very courageous translators, ISO-3166-2 is available, featuring thousands of strings for the subdivisions of most countries in the world.
+The ISO-639 (language names), ISO-15924 (scripts names) and ISO-4217 files
+(currencies names) can also be translated. However, this is a very tedious
+task which may turn to be very difficult (translating language names is even more
+difficult than translating country names). Finally, for the very courageous
+translators, ISO-3166-2 is available, featuring thousands of strings for the
+subdivisions of most countries in the world.
@@ -374,7 +385,7 @@ difficult than translating country names
-Console-data
+Popularity-contest
@@ -383,11 +394,25 @@ Package description
-A core &d-i; package (kbd-chooser ) uses
-keyboard names (and mapping files) from the
-console-data package. Thus, in order to get it
-completely translated, translators need to translate
-console-data debconf templates.
+The popularity-contest (very often nicknamed as
+popcon ) package is automatically installed on
+every Debian system as it is part of what is called the
+base system.
+
+
+
+This package installs scripts which periodically sends statistics about
+installed packages on the local system to Debian Developers.
+These statistics are used when building releases, for
+instances for getting information about the most used architecture
+ports as well as the most used packages.
+
+
+
+Of course, as the Debian Project is highly committed to the respect of
+its users privacy, this survey is disabled by default. So, when the
+package is installed, it prompts the user whether (s)he wants to
+activate this survey system.
@@ -397,15 +422,10 @@ completely translated, translators need
Files location and access methods
-
-This package is a regular
Debian package. The
-package maintainer uses a SVN repository.
-
-
-Anonymous SVN checkout command: &svn-console-data;
-
+Anonymous GIT checkout command: &git-popcon;
+
HTTP access:
@@ -413,12 +433,12 @@ Anonymous SVN checkout command:
- &url-level2-pot;/console-data_debian_po.pot
+ &url-level2-pot;/popularity-contest_debian_po.pot
- &url-level2-po;/console-data_debian_po_&language;.po
+ &url-level2-po;/popularity-contest_debian_po_&language;.po
@@ -429,11 +449,11 @@ Anonymous SVN checkout command:
-Updating/Adding translations
+Updating/adding translations
-Translations should be reported as bugs against the console-data package.
+Translations should be reported as bugs against the popularity-contest package.
@@ -444,18 +464,18 @@ Specific recommendations
-The keyboard layout
-names are most of the time language names. Translators should try to remain consistent with translations made for the iso-codes package.
+Translators must be very careful with this specific translation: keep
+the prompt very clear as it is in English and keep it
+short .
-
-Popularity-contest
+Util-linux (eject)
@@ -464,26 +484,14 @@ Package description
-The popularity-contest (very often nicknamed as
-popcon ) package is automatically installed on
-every Debian system as it is part of what is called the
-base system.
+The util-linux package is used as part of &d-i; to offer
+the eject program, which allows to eject the CD that is eventually in the CD-ROM drive.
-This package installs scripts which periodically send to Debian
-Developers statistics about installed packages on the local
-system. These statistics are used when building releases, for
-instances for getting informations about the most used architecture
-ports as well as the most used packages.
+The translatable part is the menu entry title for eject.
-
-Of course, as the Debian Project is highly committed to the respect of
-its users privacy, this survey is disabled by default. So, when the
-package is installed, it prompts the user whether (s)he wants to
-activate this survey system.
-
@@ -492,10 +500,16 @@ activate this survey system.
Files location and access methods
+
+This package is a regular
Debian package. The
+package maintenance team uses GIT to maintain
+it.
+
+
-
-Anonymous SVN checkout command: &svn-popcon;
-
+
+GIT access: &git-eject;
+
HTTP access:
@@ -503,12 +517,12 @@ Anonymous SVN checkout command:
- &url-level2-pot;/popularity-contest_debian_po.pot
+ &url-level2-pot;/util-linux_debian_po.pot
- &url-level2-po;/popularity-contest_debian_po_&language;.po
+ &url-level2-po;/util-linux_debian_po_&language;.po
@@ -519,24 +533,12 @@ Anonymous SVN checkout command:
-Updating/Adding translations
+Updating/adding translations
-Translations should be reported as bugs against the popularity-contest package.
-
-
-
-
-
-
-Specific recommendations
-
-
-
-Translators must be very careful with this specific translation: keep
-the prompt very clear as it is in English and keep it
-short .
+Translations should be reported as bugs against the util-linux package;
+mention it concerns the eject program.
@@ -545,7 +547,7 @@ short.
-Eject
+Espeakup
@@ -554,7 +556,9 @@ Package description
-The eject package is used as part of &d-i; to offer a menu entry allowing to eject the CD that is eventually in the CD-ROM drive.
+The espeakup package is used as part of &d-i;
+to offer a menu entry allowing to configure the voice syntheziser used
+for voice-enabled installs.
@@ -577,7 +581,7 @@ it.
-GIT access: &git-eject;
+GIT access: &git-espeakup;
@@ -586,12 +590,12 @@ it.
- &url-level2-pot;/eject_debian_po.pot
+ &url-level2-pot;/espeakup_debian_po.pot
- &url-level2-po;/eject_debian_po_&language;.po
+ &url-level2-po;/espeakup_debian_po_&language;.po
@@ -602,11 +606,11 @@ it.
-Updating/Adding translations
+Updating/adding translations
-Translations should be reported as bugs against the eject package.
+Translations should be reported as bugs against the espeakup package.
@@ -620,28 +624,17 @@ Grub2
-Package description
-
-
-
-During expert installs on i386 and amd64, the grub2 package may prompt users about installing GRUB 2 instead of the older GRUB.
-
-
-
-
-
-
Files location and access methods
This package is a regular
Debian package. The
-package maintenance team uses an BZR repository.
+package maintenance team uses a GIT repository.
-Anonymous BZR checkout command: &bzr-grub2;
+GIT access: &git-grub2;
@@ -650,12 +643,12 @@ Anonymous BZR checkout command:
- &url-level2-pot;/grub2_debian_po.pot
+ &url-level2-pot;/grub_debian_po.pot
- &url-level2-po;/grub2_debian_po_&language;.po
+ &url-level2-po;/grub_debian_po_&language;.po
@@ -666,7 +659,7 @@ Anonymous BZR checkout command:
-Updating/Adding translations
+Updating/adding translations
diff -pruN 20101020/doc/i18n/en/translators/level3.xml 20201202/doc/i18n/en/translators/level3.xml
--- 20101020/doc/i18n/en/translators/level3.xml 2010-05-22 19:06:21.000000000 +0000
+++ 20201202/doc/i18n/en/translators/level3.xml 2020-07-26 06:38:45.000000000 +0000
@@ -16,11 +16,6 @@ users during the installation of the desktop tasks of tasksel .
-
-Given its great importance in a localized desktop system, the
-menu package (menu sections) has been added to
-this list.
-
This includes one package maintained by the &d-i; team (win32-loader) as well as a few
other Debian packages:
@@ -28,7 +23,7 @@ other Debian packages:
- debconf (debconf)
+ debconf
@@ -83,16 +78,17 @@ Files location and access methods
-The package uses a SVN repository. Commit access may be requested to
+The package uses a GIT repository. Commit access may be requested to
the &i18n-coords;. However, as the translatable parts do not change
very often, getting commit access is not highly useful.
-Anonymous SVN access: &svn-debconf;
+GIT access: &git-debconf;
-The debconf translation lies in the debian/po directory, while the programs translation is in po/ .
+The debconf translation lies in the debian/po directory, while
+the programs translation is in po/ .
@@ -119,7 +115,7 @@ The debconf translation lies in the
-Updating/Adding translations
+Updating/adding translations
@@ -164,8 +160,10 @@ Package description
The newt package is a library (whiptail) which includes widgets used by
the most popular interface to the debconf software, the software
-involved in packages configuration steps. These widgets include the Yes or No widgets used by boolean templates, as well as the OK or Abort buttons
-text.
+involved in packages configuration steps. These widgets include the
+Yes or No widgets used by
+boolean templates, as well as the OK or
+Abort buttons text.
@@ -176,23 +174,31 @@ Files location and access methods
-No public revision control repository is available for this package so access through the translation statistics pages is the only way to get translation material for it:
+The package uses a GIT repository.
+As the translatable parts do not change very often, getting commit access is not
+highly useful.
+ GIT access: &git-newt;
+
+ ...
+
+
+
HTTP access:
- &url-level3-pot;/newt_newt_po.pot
+ &url-level3-pot;/newt_po.pot
- &url-level3-po;/newt_newt_po_&language;.po
+ &url-level3-po;/newt_po_&language;.po
@@ -203,7 +209,7 @@ No public revision control repository is
-Updating/Adding translations
+Updating/adding translations
@@ -218,7 +224,7 @@ Specific recommendations
-N/A
+none
@@ -236,14 +242,18 @@ Package description
-The &win32-loader; package, is a utility that can be run from the Windows environment and which, with a few questions, prepares a system for booting a &d-i; installation process. This utility is included on Debian installation media to allow an easier startup of a Debian installation.
+The &win32-loader; package contains is a utility that can be run from the Windows
+environment and which, with a few questions, prepares a system for booting a &d-i;
+installation process. This utility is included on Debian installation media to
+allow an easier startup of a Debian installation.
This package is, technically speaking, a regular
Debian package. However, the package maintainer is the &d-i; team and
the package is managed and developed the same way core &d-i; packages
-are managed. The package is part of the core &d-i; development repository in the packages/arch/i386/win32-loader .
+are managed. The package is part of the core &d-i; development repository under
+packages/arch/i386/win32-loader .
@@ -254,11 +264,11 @@ Files location and access methods
-Using SVN is strongly encouraged as
+Using GIT is strongly encouraged as
this is the only way for them to commit the translations.
-This package's l10n material is included in one PO file:
+This package's l10n material is included in one POT file:
@@ -275,14 +285,11 @@ Access to these files:
-SVN Checkout commands:
+GIT clone commands:
-Anonymous: &svn-win32-loader-anon;
-
-
-Non-anonymous: &svn-win32-loader;
+&git-win32-loader;
@@ -297,12 +304,12 @@ Non-anonymous: &svn-win32-loade
- &url-level2-pot-link;, win32-loader_l10n_po.pot
+ &url-level3-pot;/win32-loader_l10n_po.pot
- &url-level2-po-link;, win32_loader_l10n_po_&language;.po
+ &url-level3-po;/win32_loader_l10n_po_&language;.po
@@ -314,7 +321,7 @@ Non-anonymous: &svn-win32-loade
-Updating/Adding translations
+Updating/adding translations
@@ -326,7 +333,7 @@ repository and later commit the needed u
- In case SVN commits are
+In case GIT commits are
absolutely impossible, these updates can be sent as bug reports
against the win32-loader package (see for details).
@@ -340,7 +347,7 @@ Specific recommendations
-N/A
+none
diff -pruN 20101020/doc/i18n/en/translators/translators.xml 20201202/doc/i18n/en/translators/translators.xml
--- 20101020/doc/i18n/en/translators/translators.xml 2010-05-24 14:51:09.000000000 +0000
+++ 20201202/doc/i18n/en/translators/translators.xml 2020-07-26 06:38:45.000000000 +0000
@@ -31,8 +31,8 @@ Debian translations.
Due to the granularity of Debian work and more specifically the
packages system, translators may find differences between the various packages
-a bit annoying (some use SVN , some others CVS , some other no
-repository at all...). This is a consequence of the current work organization
+a bit annoying (some may use SVN , many others use git ,
+some other no repository at all ...). This is a consequence of the current work organization
in Debian.
@@ -54,10 +54,11 @@ level contents.
level 1: all core &d-i; packages;
- This level is split in five "sublevels" by order of strings
+ This level is split in five sublevels
by order of strings
priority (sublevel 1 groups together the strings used in all
default installs while sublevel 5 groups together very rare
- strings used only for uncommon architectures).
+ strings used only for uncommon architectures; sublevel 2 - 4
+ are placed somewhere in between).
@@ -70,7 +71,7 @@ level contents.
- level 3: all material indirectly related to installation;
+ level 3: all material indirectly related to installation.
diff -pruN 20101020/doc/i18n/languages.xml 20201202/doc/i18n/languages.xml
--- 20101020/doc/i18n/languages.xml 2010-08-29 19:54:37.000000000 +0000
+++ 20201202/doc/i18n/languages.xml 2020-11-30 23:08:26.000000000 +0000
@@ -1,6 +1,9 @@
+
+
@@ -46,18 +49,16 @@
coord_name CDATA #REQUIRED
coord_email CDATA #REQUIRED
coord_gpg CDATA #IMPLIED
- coord_account CDATA #IMPLIED
+ last_commit_di CDATA #IMPLIED
bkp_coord_name CDATA #IMPLIED
bkp_coord_email CDATA #IMPLIED
bkp_coord_gpg CDATA #IMPLIED
- bkp_coord_account CDATA #IMPLIED
manual_coord_name CDATA #IMPLIED
manual_coord_email CDATA #IMPLIED
- manual_coord_account CDATA #IMPLIED
+ last_commit_manual CDATA #IMPLIED
team_email CDATA #IMPLIED
team_repository CDATA #IMPLIED
- supported ( potato | woody | sarge | etch | lenny |
- squeeze_alpha1 | squeeze_beta1 | squeeze_beta2 | false ) #REQUIRED
+ supported ( potato | woody | sarge | etch | lenny | squeeze | wheezy | false ) #REQUIRED
nlp_step ( initial | identification | locale | language_name | localechooser_entry | needed_characters | ttf_font | keymap | account | commit | tools | mailing_list | announce | prospective | contact_lost ) #IMPLIED
speakers CDATA #IMPLIED
speakers_corr CDATA #IMPLIED
@@ -70,79 +71,53 @@
code3="amh"
english_name="Amharic"
coord_name="Tegegne Tefera"
- coord_email="tefera@mekuria.com,tefera.tegegne@gmail.com"
- coord_account=""
- bkp_coord_name="Shwangizaw"
- bkp_coord_email="shewan@gmail.com"
- bkp_coord_account=""
- coord_gpg=""
- manual_coord_name=""
- manual_coord_email=""
+ coord_email="tefera@mekuria.com"
+ last_commit_di="2014"
team_email="ubuntu-l10n-am@lists.ubuntu.com"
- team_repository=""
supported="lenny"
- nlp_step=""
speakers="17417913"
speakers_corr="45000000"
countries_official="ET"
countries_most_spoken="ET"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
Marko Uskokovic
Team: translations@cp6linux.org
Serbian was activated for lenny and deactivated for squeeze beta1
+and later activated again
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/doc/i18n/languages.xsl 20201202/doc/i18n/languages.xsl
--- 20101020/doc/i18n/languages.xsl 2010-08-06 04:28:36.000000000 +0000
+++ 20201202/doc/i18n/languages.xsl 2020-07-26 06:38:45.000000000 +0000
@@ -34,6 +34,9 @@ Lenny
Squeeze
+Wheezy
+
+
Work in progress
@@ -57,7 +60,10 @@ Number of supported languages
-
+
+
+
+
@@ -68,29 +74,33 @@ Number of supported languages
Percent world population
- to %.
+ to %.
- to %
+ to %
- to %
+ to %
- to %
+ to %
- to %
+ to %
- to %
+ to %
- to %
+ to %
+
+
+ to %
+
Debian Installer translators and translation teams
@@ -270,8 +302,10 @@ Future
Code
Language
Supported
-Coordinator
-Backup Coordinator
+Translator for installer
+Last commit for installer
+Translator for installation-guide
+Last commit for guide
Number of Speakers (Ethnologue)
Number of Speakers (Ethnologue corrected )
Repository
@@ -308,10 +342,10 @@ by Debian Installer developers when they
badly representing reality.
- World population: www.geohive.com as of 2005-09-05
+ World population: www.geohive.com as of 2011-04-21 (link dead)
- Maps: Visited countries
+ Maps: Visited countries (link dead)
XSL Transform wizardry courtesy of Eugeniy Meshcheryakov
@@ -352,8 +386,20 @@ badly representing reality.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -pruN 20101020/doc/talks/d-i_debconf5/d-i_debconf5.xml 20201202/doc/talks/d-i_debconf5/d-i_debconf5.xml
--- 20101020/doc/talks/d-i_debconf5/d-i_debconf5.xml 2008-10-27 10:43:30.000000000 +0000
+++ 20201202/doc/talks/d-i_debconf5/d-i_debconf5.xml 2020-11-30 23:08:26.000000000 +0000
@@ -171,7 +171,7 @@ not installable on a standard debian sys
Due to the use of debconf (the tool, not the conference) it is possible to have
various frontends as well as the already famous preseeding feature. anna 's
-not nearly apt but still manages it's job very well, which is loading udebs
+not nearly apt but still manages its job very well, which is loading udebs
and placing them with the proper order into main-menu which in non-expert mode
is hidden from the user.
diff -pruN 20101020/doc/talks/d-i_internals/2004/d-i_internals.tex 20201202/doc/talks/d-i_internals/2004/d-i_internals.tex
--- 20101020/doc/talks/d-i_internals/2004/d-i_internals.tex 2008-10-27 10:43:28.000000000 +0000
+++ 20201202/doc/talks/d-i_internals/2004/d-i_internals.tex 2020-11-30 23:08:26.000000000 +0000
@@ -444,7 +444,7 @@
\item One for each supported filesystem
\item Simple to add support for new filesystems
\item Additional udebs for architecture support
- \item Any addition can be implemented in it's own udeb
+ \item Any addition can be implemented in its own udeb
\end{itemize}
\end{block}
}
@@ -455,7 +455,7 @@
\item Clients written in Shell send commands over FIFOs
\end{itemize}
\end{block}
- Partman would be a topic for a talk on it's own.
+ Partman would be a topic for a talk on its own.
}
}
\frame[label=bootloader]{
diff -pruN 20101020/doc/talks/d-i_paris_minidebconf12/build.sh 20201202/doc/talks/d-i_paris_minidebconf12/build.sh
--- 20101020/doc/talks/d-i_paris_minidebconf12/build.sh 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/talks/d-i_paris_minidebconf12/build.sh 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+pdflatex *.tex
+pdflatex *.tex
Binary files 20101020/doc/talks/d-i_paris_minidebconf12/openlogo-nd.pdf and 20201202/doc/talks/d-i_paris_minidebconf12/openlogo-nd.pdf differ
diff -pruN 20101020/doc/talks/d-i_paris_minidebconf12/re-discovering-the-Debian-Installer.tex 20201202/doc/talks/d-i_paris_minidebconf12/re-discovering-the-Debian-Installer.tex
--- 20101020/doc/talks/d-i_paris_minidebconf12/re-discovering-the-Debian-Installer.tex 1970-01-01 00:00:00.000000000 +0000
+++ 20201202/doc/talks/d-i_paris_minidebconf12/re-discovering-the-Debian-Installer.tex 2020-06-25 21:49:40.000000000 +0000
@@ -0,0 +1,499 @@
+% HINT: Remove [handout] to see how slides were presented during the
+% actual talk.
+\documentclass[handout]{beamer}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+\colorlet{structure}{red!65!black}
+
+\usepackage{listings,multicol}
+\usepackage{graphics}
+\usepackage{graphicx}
+\usepackage{hyperref}
+\usepackage{stmaryrd}
+\usepackage{ulem}
+
+\beamertemplatenavigationsymbolsempty
+
+\AtBeginSection[] {
+ \begin{frame}[plain]
+ \frametitle{}
+ \tableofcontents[currentsection]
+ \end{frame}
+}
+
+\usecolortheme{beaver}
+
+\lstset{basicstyle=\footnotesize\tt}
+
+\title{(re)discovering the Debian Installer}
+\author[Cyril]{
+ Cyril Brulebois\\
+ \small{\url{kibi@debian.org}}
+}
+\date{Paris Mini-DebConf, november 2012}
+
+\logo{\includegraphics[viewport=274 335 360 440,width=1cm]{openlogo-nd.pdf}}
+
+
+\begin{document}
+
+\begin{frame}[fragile]
+ \titlepage
+\end{frame}
+
+\section*{Summary}
+
+\begin{frame}[fragile]
+ \frametitle{(re)discovering the Debian Installer}
+
+ \tableofcontents
+\end{frame}
+
+
+\section{Foreword}
+
+\begin{frame}[fragile]
+ \frametitle{Some terminology}
+
+ \begin{itemize}
+ \item d-i: Debian Installer
+ \item g-i: Graphical Installer (using X.org since squeeze)
+ \end{itemize}
+
+ \vspace{1em}
+ \pause
+
+ \begin{itemize}
+ \item udeb: $\mu$deb, with relaxed policy
+ \pause
+ \begin{itemize}
+ \item no copyright
+ \item maint scripts: postinst at most
+ \item config/templates
+ \item possibly built against a limited number of libraries
+ \item heavily compressed (xz) by default, thanks to debhelper
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+
+\section{Many options to install Debian!}
+
+\begin{frame}[fragile]
+ \frametitle{Supported architectures in \texttt{squeeze}}
+ \begin{itemize}
+ \item amd64
+ \item armel (+ armhf in \texttt{wheezy})
+ \item kfreebsd-i386
+ \item kfreebsd-amd64
+ \item i386
+ \item ia64
+ \item mips
+ \item mipsel
+ \item powerpc
+ \item s390 (+ s390x in \texttt{wheezy})
+ \item sparc
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Image media (1/2)}
+
+ Image type:
+ \begin{itemize}
+ \item netinst: small CD
+ \begin{itemize}
+ \item special case: \textit{multi-arch} (amd64/i386)
+ \item mini-CD (businesscard): dropped for \texttt{wheezy}
+ \end{itemize}
+ \pause
+ \item CD/DVD
+ \begin{itemize}
+ \item download: HTTP/FTP, jigdo, BitTorrent
+ \item alternate desktops for CD\#1: KDE, LXDE, Xfce
+ \end{itemize}
+ \pause
+ \item Blu-ray (jigdo only)
+ \pause
+ \item net\textbf{boot} / PXE
+ \begin{itemize}
+ \item for network-based boot
+ \item \textbf{not} the same as net\textbf{inst}
+ \item frequent kernel/module version mismatch during development!
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Image media (2/2)}
+
+ Options/availability depending on:
+ \begin{itemize}
+ \item image type
+ \item architecture (e.g. no CD for s390/s390x)
+ \item considered \textit{build}:
+ \begin{itemize}
+ \item stable (official releases, e.g. squeeze 6.0.6)
+ \item testing (official releases, e.g. wheezy beta 4)
+ \item testing (daily/weekly builds)
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+
+\section{Using the Debian Installer}
+
+\begin{frame}[fragile]
+ \frametitle{Modularity}
+
+ Installation interface:
+ \begin{itemize}
+ \item text-based install (terminal)
+ \item graphical install (X.org)
+ \item text-based install, with speech synthesis (\texttt{s, Enter})
+ \end{itemize}
+
+ \vspace{1em}
+ \pause
+
+ Advanced options:
+ \begin{itemize}
+ \item expert install
+ \item rescue mode
+ \item automated install: \textit{preseed}
+ \item desktop environment choice
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{What happens under the hood? (1/2)}
+
+ Contents of an installation image:
+ \begin{itemize}
+ \item a bootloader
+ \item documentation
+ \item kernel(s)
+ \item initramfs(es)
+ \item data: debs + udebs
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{What happens under the hood? (2/2)}
+
+ How does the installer work?
+ \begin{enumerate}
+ \pause
+ \item show a bootloader
+ \pause
+ \item user picks an interface, options, etc.
+ \pause
+ \item start a debconf frontend
+ \pause
+ \item user answers lots of questions
+ \pause
+ \item udebs are loaded on the fly, more questions are asked
+ \pause
+ \item famous question: which tasks to install?
+ \pause
+ \item install install install, eject, reboot, done
+ \end{enumerate}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Demonstration-time!}
+
+ Selected environment:
+ \begin{itemize}
+ \item virtualbox
+ \item netinst i386 image, official wheezy beta 4 build
+ \end{itemize}
+
+ \vspace{1em}
+ \pause
+
+ Two features:
+ \begin{enumerate}
+ \item graphical automated installation, started with:
+\begin{lstlisting}
+url=http://10.0.2.2/~kibi/preseed.cfg
+\end{lstlisting}
+ \pause
+ \item rescue mode, trying to save an encrypted LVM setup (removed/broken cryptsetup, oops!)
+ \end{enumerate}
+\end{frame}
+
+
+\section{How do we build it?}
+
+\begin{frame}[fragile]
+ \frametitle{Starting from the venerable svn…}
+
+\begin{lstlisting}
+$ svn ls svn://svn.debian.org/svn/d-i/trunk
+.mrconfig
+README
+manual/
+packages/
+scripts/
+\end{lstlisting}% $
+
+\begin{itemize}
+\item \texttt{manual/} $\rightarrow$ \texttt{installation-guide} source package
+\item \texttt{packages/} $\rightarrow$ translation efforts (only contains \texttt{po/})
+\item \texttt{.mrconfig} $\rightarrow$ helps keep all repositories up to date
+\end{itemize}
+
+\vspace{1em}
+
+Initial checkout:
+\begin{lstlisting}[basicstyle=\tiny]
+mr bootstrap http://anonscm.debian.org/viewvc/d-i/trunk/.mrconfig?view=co d-i
+\end{lstlisting}
+\end{frame}
+
+
+\begin{frame}[fragile]
+ \frametitle{… to many git repositories}
+
+At the top-level:
+
+\begin{itemize}
+\item \texttt{di-autobuild/} $\rightarrow$ automation for d-i builds (on buildds) [git]
+\item \texttt{installer/} $\rightarrow$ \texttt{debian-installer} source package [git]
+\end{itemize}
+
+\vspace{1em}
+
+Under \texttt{packages/}:
+
+\begin{lstlisting}
+$ ls -d packages/*/
+packages/aboot-installer/
+packages/anna/
+packages/apt-setup/
+packages/arcboot-installer/
+packages/auto-install/
+...
+\end{lstlisting}% $
+
+$\rightarrow$ one repository per source package [git]\\
+$\rightarrow$ each can produce \texttt{deb} and/or \texttt{udeb} packages
+\end{frame}
+
+
+\begin{frame}[fragile]
+ \frametitle{udeb-producing packages (1/2)}
+
+ \begin{itemize}
+ \item packages maintained by debian-boot
+ \begin{itemize}
+ \item anna-udeb
+ \item cdebconf-udeb
+ \item grub-installer
+ \end{itemize}
+ \pause
+ \item Linux \& FreeBSD kernels: kernel-wedge
+ \begin{itemize}
+ \item input-modules-\textit{version}-di
+ \item usb-modules-\textit{version}-di
+ \end{itemize}
+ \pause
+ \item core packages:
+ \begin{itemize}
+ \item e2fsprogs-udeb
+ \item gnupg-udeb
+ \item util-linux-udeb
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{udeb-producing packages (2/2)}
+
+ \begin{itemize}
+ \item GTK+ stack:
+ \begin{itemize}
+ \item libcairo2-udeb
+ \item libpango1.0-udeb
+ \item libgtk2.0-0-udeb
+ \end{itemize}
+ \pause
+ \item X.org stack:
+ \begin{itemize}
+ \item many libx*-udeb packages
+ \item a generic input driver: evdev
+ \item a generic video driver: fbdev
+ \item a minimal X server
+ \end{itemize}
+ \pause
+ \item accessibility stack:
+ \begin{itemize}
+ \item brltty
+ \item espeakup
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{The debian-installer source package: layout}
+
+ \begin{itemize}
+ \item \texttt{build/} $\rightarrow$ heavy work
+ \begin{itemize}
+ \item \texttt{Makefile} $\rightarrow$ entry-point for building everything
+ \item \texttt{boot/} $\rightarrow$ arch-specific conf. for boot loaders
+ \item \texttt{config/} $\rightarrow$ arch-specific variables, calls to various utils, …
+ \item \texttt{localudebs/} $\rightarrow$ local dropzone!
+ \item \texttt{pkg-lists/} $\rightarrow$ what do we need for each arch and image?
+ \item \texttt{util/}
+ \end{itemize}
+ \pause
+ \item \texttt{debian/} $\rightarrow$ \textsl{almost} straightforward packaging
+ \begin{itemize}
+ \item \texttt{unstable} or \texttt{UNRELEASED} as target $\rightarrow$ small differences
+ \item \texttt{debian-installer-images\_20121114\_amd64\textbf{.tar.gz}}
+ \end{itemize}
+ \pause
+ \item \texttt{doc/} $\rightarrow$ development, i18n, talks
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{The debian-installer source package: machinery}
+
+ What happens in \texttt{build/}?
+ \begin{itemize}
+ \item Use \texttt{sources.list} for udebs:\\
+ \texttt{\small deb http://mirror/debian wheezy main/debian-installer}
+ \item Support for local udebs is present
+ \item \texttt{util/get-package} is used to:
+ \begin{itemize}
+ \item fetch udebs, resolving dependencies
+ \item install them into a rootfs
+ \end{itemize}
+ \item Call more tools to handle partitioning etc.
+ \end{itemize}
+\end{frame}
+
+
+\section{How do we release it?}
+
+\begin{frame}[fragile]
+ \frametitle{Many people to talk to/work with}
+ \begin{itemize}
+ \item individual package maintainers/packaging teams
+ \item debian-boot
+ \item debian-release
+ \item debian-cd
+ \item ftpmasters
+ \item debian-live
+ \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Process outline}
+ \begin{enumerate}
+ \item upload of udeb-producing packages to unstable
+ \item test of daily builds
+ \item manual coordination with RT to migrate the udebs to testing
+ \pause
+ \item upload of debian-installer to unstable
+ \pause
+ \item ftpmasters: dak copy-installer
+ \item RT: urgent debian-installer
+ \item CD/DVD images built using debian-cd
+ \pause
+ \item cdimage.debian.org: last-minute checks
+ \item release announce: mail to dda@/dd@, and website update
+ \end{enumerate}
+
+ \pause
+ Timing:
+ \begin{itemize}
+ \item 3 weeks for development (before step 4 happens)
+ \item 1 week for releasing
+ \pause
+ \item 1 week for the unexpected
+
+ \end{itemize}
+\end{frame}
+
+
+\section{Future plans}
+
+\begin{frame}[fragile]
+ \frametitle{Future plans}
+
+ Release candidate 1
+ \begin{itemize}
+ \item Target: December/January
+ \item Support for Versatile Express (armhf in qemu)
+ \item Lots of small bug fixes in various areas
+ \item Possibly more EFI bug fixes
+ \end{itemize}
+
+ \vspace{1em}
+ \pause
+
+ Long term:
+ \begin{itemize}
+ \item What to do with Secure Boot?
+ \item Regression testing using VMs
+ \item What do \textbf{you} want to see implemented in d-i?
+ \end{itemize}
+\end{frame}
+
+
+\section*{Thanks!}
+\begin{frame}[fragile]
+ \frametitle{Thanks!}
+
+ In addition to everyone involved:
+ \begin{itemize}
+ \item Previous d-i release managers for their hard work
+ \item Christian Perrier, l10n coordinator
+ \item CD team: Steve McIntyre
+ \item All \texttt{installation-reports} submitters!
+ \end{itemize}
+
+ \vspace{1em}
+ \pause
+ On a personal note:
+ \begin{itemize}
+ \item Josselin Mouette, for his great \textit{Please save the graphical installer} blog post
+ \end{itemize}
+\end{frame}
+
+\section*{}
+
+\begin{frame}[fragile]
+ \frametitle{Appendix: \texttt{preseed.cfg}}
+
+ \begin{lstlisting}[basicstyle=\tiny]
+d-i keyboard-configuration/xkb-keymap select fr
+d-i debian-installer/locale string fr_FR
+d-i mirror/country string manual
+d-i mirror/http/hostname string 10.0.2.2:9999
+d-i mirror/http/directory string /debian
+d-i partman-auto/method string crypto
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-auto/choose_recipe select atomic
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i cdrom-detect/eject boolean false
+d-i passwd/make-user boolean false
+d-i passwd/root-password password root
+d-i passwd/root-password-again password root
+d-i finish-install/reboot_in_progress note
+d-i partman-crypto/passphrase password rootroot
+d-i partman-crypto/passphrase-again password rootroot
+d-i partman-crypto/weak_passphrase boolean true
+ \end{lstlisting}
+\end{frame}
+
+\end{document}
diff -pruN 20101020/doc/talks/d-i_qa/d-i_qa.tex 20201202/doc/talks/d-i_qa/d-i_qa.tex
--- 20101020/doc/talks/d-i_qa/d-i_qa.tex 2008-10-27 10:43:29.000000000 +0000
+++ 20201202/doc/talks/d-i_qa/d-i_qa.tex 2020-06-25 21:49:40.000000000 +0000
@@ -173,7 +173,7 @@ docbook, docbook-xml, docbook-xsl, xsltp
\begin{itemize}
\item
Daily builds for all architectures \\
- http://people.debian.org/\~{}joeyh/d-i/build-logs.html
+ http://d-i.debian.org/daily-images/build-logs.html
\item
The D-I testlab (Joey Hess): \\
alpha, hppa, i386, ia64, mipsel, sparc \\