diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/all/bootscr.rpi flash-kernel-3.98ubuntu11~18.04.1/bootscript/all/bootscr.rpi --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/all/bootscr.rpi 1970-01-01 00:00:00.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/all/bootscr.rpi 2020-01-24 15:19:25.000000000 +0000 @@ -0,0 +1,65 @@ +# Ubuntu Classic RPi U-Boot script (for armhf and arm64) + +# Expects to be called with the following environment variables set: +# +# devtype e.g. mmc/scsi etc +# devnum The device number of the given type +# distro_bootpart The partition containing the boot files +# (introduced in u-boot mainline 2016.01) +# prefix Prefix within the boot partiion to the boot files +# kernel_addr_r Address to load the kernel to +# fdt_addr_r Address to load the FDT to +# ramdisk_addr_r Address to load the initrd to. + +# Take fdt addr from the prior stage boot loader, if available +if test -n "$fdt_addr"; then + setexpr fdt_addr sub "^0x" "" # work-around missing 0x prefix + setenv fdt_addr 0x${fdt_addr} + fdt addr ${fdt_addr} + fdt move ${fdt_addr} ${fdt_addr_r} # implicitly sets fdt active +else + fdt addr ${fdt_addr_r} +fi +fdt get value bootargs /chosen bootargs + +setenv bootargs "${bootargs}" +@@UBOOT_ENV_EXTRA@@ + +@@UBOOT_PREBOOT_EXTRA@@ + +if test -z "${fk_image_locations}"; then + setenv fk_image_locations ${prefix} +fi + +for pathprefix in ${fk_image_locations}; do + # Store the gzip header (1f 8b) in the kernel area for comparison to the + # header of the image we load. Load "vmlinuz" into the portion of memory for + # the RAM disk (because we want to uncompress to the kernel area if it's + # compressed) and compare the word at the start + mw.w ${kernel_addr_r} 0x8b1f # little endian + if test -e ${devtype} ${devnum}:${partition} ${pathprefix}vmlinuz; then + load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${pathprefix}vmlinuz + kernel_size=${filesize} + if cmp.w ${kernel_addr_r} ${ramdisk_addr_r} 1; then + # gzip compressed image (NOTE: *not* a self-extracting gzip compressed + # kernel, just a kernel image that has been gzip'd) + echo "Decompressing kernel..." + unzip ${ramdisk_addr_r} ${kernel_addr_r} + setenv kernel_size ${filesize} + setenv try_boot "booti" + else + # Possibly self-extracting or uncompressed; copy data into the kernel area + # and attempt launch with bootz then booti + echo "Copying kernel..." + cp.b ${ramdisk_addr_r} ${kernel_addr_r} ${kernel_size} + setenv try_boot "bootz booti" + fi + + load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${pathprefix}initrd.img + setenv ramdisk_size ${filesize} + for cmd in ${try_boot}; do + echo "Booting Ubuntu (with ${cmd}) from ${devtype} ${devnum}:${partition}..." + ${cmd} ${kernel_addr_r} ${ramdisk_addr_r}:${ramdisk_size} ${fdt_addr_r} + done + fi +done diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/all/bootscr.uboot-generic flash-kernel-3.98ubuntu11~18.04.1/bootscript/all/bootscr.uboot-generic --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/all/bootscr.uboot-generic 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/all/bootscr.uboot-generic 2020-01-24 15:19:25.000000000 +0000 @@ -25,7 +25,7 @@ setenv bootargs "${bootargs} console=${console}" fi -setenv bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@ +setenv bootargs "@@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@" @@UBOOT_ENV_EXTRA@@ if test -z "${fk_kvers}"; then @@ -48,14 +48,32 @@ setenv partition ${distro_bootpart} fi -load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz-${fk_kvers} \ -&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}${fdtpath} \ -&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img-${fk_kvers} \ -&& echo "Booting Debian ${fk_kvers} from ${devtype} ${devnum}:${partition}..." \ -&& bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} - -load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz \ -&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}dtb \ -&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img \ -&& echo "Booting Debian from ${devtype} ${devnum}:${partition}..." \ -&& bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} +@@UBOOT_PREBOOT_EXTRA@@ + +if test -z "${fk_image_locations}"; then + setenv fk_image_locations ${prefix} +fi + +for pathprefix in ${fk_image_locations} +do + if test -e ${devtype} ${devnum}:${partition} ${pathprefix}vmlinuz-${fk_kvers} + then + load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${pathprefix}vmlinuz-${fk_kvers} \ + && load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${pathprefix}${fdtpath} \ + && load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${pathprefix}initrd.img-${fk_kvers} \ + && echo "Booting Debian ${fk_kvers} from ${devtype} ${devnum}:${partition}..." \ + && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} + fi +done + +for pathprefix in ${fk_image_locations} +do + if test -e ${devtype} ${devnum}:${partition} ${pathprefix}vmlinuz + then + load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${pathprefix}vmlinuz \ + && load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${pathprefix}dtb \ + && load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${pathprefix}initrd.img \ + && echo "Booting Debian from ${devtype} ${devnum}:${partition}..." \ + && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} + fi +done diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/all/uboot.env.rpi2 flash-kernel-3.98ubuntu11~18.04.1/bootscript/all/uboot.env.rpi2 --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/all/uboot.env.rpi2 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/all/uboot.env.rpi2 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -bootcmd=run boot_ubuntu -boot_ubuntu=run setup; run loadkernel; run loadinitrd; bootz ${kernel_addr_r} ${ramdisk_addr_r}:${initrdsize} ${fdt_addr_r} -setup=fdt addr ${fdt_addr_r}; fdt get value bootargs /chosen bootargs -loadkernel=fatload mmc 0:1 ${kernel_addr_r} vmlinuz -loadinitrd=fatload mmc 0:1 ${ramdisk_addr_r} initrd.img; setenv initrdsize $filesize -fdt_addr_r=0x02000000 -kernel_addr_r=0x01000000 -ramdisk_addr_r=0x02100000 diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/arm64/bootscr.rpi3 flash-kernel-3.98ubuntu11~18.04.1/bootscript/arm64/bootscr.rpi3 --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/arm64/bootscr.rpi3 2018-12-04 22:18:12.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/arm64/bootscr.rpi3 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -setenv fdt_addr_r 0x03000000 -fdt addr ${fdt_addr_r} -fdt get value bootargs /chosen bootargs -setenv kernel_addr_r 0x01000000 -setenv ramdisk_addr_r 0x03100000 -fatload mmc 0:1 ${kernel_addr_r} vmlinuz -fatload mmc 0:1 ${ramdisk_addr_r} initrd.img -setenv initrdsize $filesize -booti ${kernel_addr_r} ${ramdisk_addr_r}:${initrdsize} ${fdt_addr_r} diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/arm64/bootscr.uboot-generic flash-kernel-3.98ubuntu11~18.04.1/bootscript/arm64/bootscr.uboot-generic --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/arm64/bootscr.uboot-generic 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/arm64/bootscr.uboot-generic 2020-01-24 15:19:25.000000000 +0000 @@ -41,6 +41,8 @@ setenv partition ${distro_bootpart} fi +@@UBOOT_PREBOOT_EXTRA@@ + load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz-${fk_kvers} \ && load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}${fdtpath} \ && load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img-${fk_kvers} \ diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.cubox flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.cubox --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.cubox 1970-01-01 00:00:00.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.cubox 2020-01-24 15:19:25.000000000 +0000 @@ -0,0 +1,36 @@ +# Boot-Script for SolidRun CuBox (Dove) +# environment variables provided by the 2009.08* vendor U-Boot: +# device_name [usb,mmc,ide] +# partition [1,2] +# directory [/,/boot/] +# fstype [ext4,fat] + +# set load-address for ramdisk image +setenv loadaddrrd 0x20000000 + +# set up serial console as default +setenv console ttyS0,115200n8 + +# set bootargs +setenv bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ console=${console} @@LINUX_KERNEL_CMDLINE@@ + +# set up distr-boot-like variable names where possible +setenv devnum 0 +setenv devtype ${device_name} +setenv distro_bootpart ${partition} +setenv kernel_addr_r ${loadaddr} +setenv prefix ${directory} +setenv ramdisk_addr_r ${loadaddrrd} + +# allow overriding u-boot environment +@@UBOOT_ENV_EXTRA@@ + +# look for boot images where this script was loaded from +setenv partition ${distro_bootpart} + +# Boot it +${fstype}load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}uImage +${fstype}load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}uInitrd + +echo "Booting Debian from ${devtype} ${devnum}:${partition}..." +bootm ${kernel_addr_r} ${ramdisk_addr_r} diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.cubox-i flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.cubox-i --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.cubox-i 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.cubox-i 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -# boot script for CuBox-i - -if test "${devtype}" = "" -then - setenv device mmc -else - # use device provided by distro_bootcmd - setenv device "${devtype}" -fi - -if test "${devnum}" = "" -then - setenv partition ${mmcdev}:${mmcpart} -elif test "${distro_bootpart}" = "" -then - # use partition provided by distro_bootcmd - setenv partition ${devnum}:${bootpart} -else - # use partition provided by distro_bootpart - setenv partition ${devnum}:${distro_bootpart} -fi - -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 bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@ - -if test -z "${prefix}" ; then - setenv image_locations '/boot/ /' -else - setenv image_locations "${prefix}" -fi - -if test -z "${fk_kvers}"; then - setenv fk_kvers '@@KERNEL_VERSION@@' -fi - -if test -n "${fdtfile}"; then - setenv fdtpath dtbs/${fk_kvers}/${fdtfile} -else - setenv fdtpath dtb-${fk_kvers} -fi - -for pathprefix in ${image_locations} -do - load ${device} ${partition} ${loadaddr} ${pathprefix}vmlinuz-${fk_kvers} \ - && load ${device} ${partition} ${fdt_addr} ${pathprefix}${fdtpath} \ - && load ${device} ${partition} ${ramdiskaddr} ${pathprefix}initrd.img-${fk_kvers} \ - && echo "Booting Debian ${fk_kvers} from ${device} ${partition}..." \ - && bootz ${loadaddr} ${ramdiskaddr}:${filesize} ${fdt_addr} -done diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.imx-base flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.imx-base --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.imx-base 1970-01-01 00:00:00.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.imx-base 2020-01-24 15:19:25.000000000 +0000 @@ -0,0 +1,37 @@ +# boot script for Wandboard + +if test "${devtype}" ; then + setenv devtype mmc +fi + +if test "${devnum}" ; then + setenv devnum ${mmcdev} +fi + +if test -z "${partition}" ; then + setenv partition ${distro_bootpart} +fi + +if test -z "${partition}" ; then + setenv partition ${bootpart} +fi + +if test -z "${partition}" ; then + setenv partition ${mmcpart} +fi + +if test -z "${ramdisk_addr_r}" ; then + setenv ramdisk_addr_r 0x13000000 +fi + +if test -z "${ramdiskaddr}" ; then + setenv ramdiskaddr ${ramdisk_addr_r} +fi + +if test -z "${fk_image_locations}" ; then + setenv fk_image_locations "${prefix}" +fi + +if test -z "${fk_image_locations}" ; then + setenv fk_image_locations "/boot/ /" +fi diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.odroid flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.odroid --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.odroid 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.odroid 2020-01-24 15:19:25.000000000 +0000 @@ -18,66 +18,3 @@ if test -z "${ramdisk_addr_r}" ; then setenv ramdisk_addr_r ${initrdaddr} fi - -# Bootscript using the new unified bootcmd handling -# introduced with u-boot v2014.10, and patched into -# the debian odroid target since 2016.03+dfsg1-5. -# -# Expects to be called with the following environment variables set: -# -# devtype e.g. mmc/scsi etc -# devnum The device number of the given type -# bootpart The partition containing the boot files -# distro_bootpart The partition containing the boot files -# (introduced in u-boot mainline 2016.01) -# prefix Prefix within the boot partiion to the boot files -# kernel_addr_r Address to load the kernel to -# fdt_addr_r Address to load the FDT to -# ramdisk_addr_r Address to load the initrd to. -# -# The uboot must support the bootz and generic filesystem load commands. - -# Workaround lack of baudrate included with console on various iMX -# systems (e.g. wandboard, cubox-i, hummingboard) -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 bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@ -@@UBOOT_ENV_EXTRA@@ - -if test -z "${fk_kvers}"; then - setenv fk_kvers '@@KERNEL_VERSION@@' -fi - -# These two blocks should be the same apart from the use of -# ${fk_kvers} in the first, the syntax supported by u-boot does not -# lend itself to removing this duplication. - -if test -n "${fdtfile}"; then - setenv fdtpath dtbs/${fk_kvers}/${fdtfile} -else - setenv fdtpath dtb-${fk_kvers} -fi - -if test -z "${distro_bootpart}"; then - setenv partition ${bootpart} -else - setenv partition ${distro_bootpart} -fi - -load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz-${fk_kvers} \ -&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}${fdtpath} \ -&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img-${fk_kvers} \ -&& echo "Booting Debian ${fk_kvers} from ${devtype} ${devnum}:${partition}..." \ -&& bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} - -load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz \ -&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}dtb \ -&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img \ -&& echo "Booting Debian from ${devtype} ${devnum}:${partition}..." \ -&& bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.rpi3 flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.rpi3 --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.rpi3 2018-12-04 22:18:12.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.rpi3 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -setenv fdt_addr_r 0x03000000 -fdt addr ${fdt_addr_r} -fdt get value bootargs /chosen bootargs -setenv kernel_addr_r 0x01000000 -setenv ramdisk_addr_r 0x03100000 -fatload mmc 0:1 ${kernel_addr_r} vmlinuz -fatload mmc 0:1 ${ramdisk_addr_r} initrd.img -setenv initrdsize $filesize -bootz ${kernel_addr_r} ${ramdisk_addr_r}:${initrdsize} ${fdt_addr_r} diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.sunxi flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.sunxi --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.sunxi 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.sunxi 2020-01-24 15:19:25.000000000 +0000 @@ -39,7 +39,13 @@ setenv bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@ @@UBOOT_ENV_EXTRA@@ -image_locations='/boot/ /' +if test -z "${image_locations}"; then + setenv image_locations ${prefix} +fi +if test -z "${image_locations}"; then + setenv image_locations /boot/ / +fi + if test -z "${fk_kvers}"; then setenv fk_kvers '@@KERNEL_VERSION@@' fi diff -Nru flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.wandboard flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.wandboard --- flash-kernel-3.90ubuntu3.18.04.2/bootscript/armhf/bootscr.wandboard 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/bootscript/armhf/bootscr.wandboard 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -# boot script for Wandboard - -if test "${devtype}" = "" -then - setenv device mmc -else - # use device provided by distro_bootcmd - setenv device "${devtype}" -fi - -if test "${devnum}" = "" -then - setenv partition ${mmcdev}:${mmcpart} -elif test "${distro_bootpart}" = "" -then - # use partition provided by distro_bootcmd - setenv partition ${devnum}:${bootpart} -else - # use partition provided by distro_bootpart - setenv partition ${devnum}:${distro_bootpart} -fi - -if test -z "${ramdiskaddr}" ; then - setenv ramdiskaddr 0x13000000 -fi - -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 bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@ -@@UBOOT_ENV_EXTRA@@ - -if test -z "${prefix}" ; then - setenv image_locations '/boot/ /' -else - setenv image_locations "${prefix}" -fi - -if test -z "${fk_kvers}"; then - setenv fk_kvers '@@KERNEL_VERSION@@' -fi - -if test -n "${fdtfile}"; then - setenv fdtpath dtbs/${fk_kvers}/${fdtfile} -else - setenv fdtpath dtb-${fk_kvers} -fi - -for pathprefix in ${image_locations} -do - load ${device} ${partition} ${loadaddr} ${pathprefix}vmlinuz-${fk_kvers} \ - && load ${device} ${partition} ${fdt_addr} ${pathprefix}${fdtpath} \ - && load ${device} ${partition} ${ramdiskaddr} ${pathprefix}initrd.img-${fk_kvers} \ - && echo "Booting Debian ${fk_kvers} from ${device} ${partition}..." \ - && bootz ${loadaddr} ${ramdiskaddr}:${filesize} ${fdt_addr} -done diff -Nru flash-kernel-3.90ubuntu3.18.04.2/db/all.db flash-kernel-3.98ubuntu11~18.04.1/db/all.db --- flash-kernel-3.90ubuntu3.18.04.2/db/all.db 2019-02-14 11:12:13.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/db/all.db 2020-01-24 15:19:25.000000000 +0000 @@ -75,6 +75,13 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools +Machine: Banana Pi M2 Berry +Kernel-Flavors: armmp armmp-lpae +Boot-Script-Path: /boot/boot.scr +DTB-Id: sun8i-v40-bananapi-m2-berry.dtb +U-Boot-Script-Name: bootscr.sunxi +Required-Packages: u-boot-tools + Machine: BA10 tvbox Kernel-Flavors: armmp Boot-Script-Path: /boot/boot.scr @@ -309,11 +316,59 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools +Machine: SolidRun Clearfog A1 +Kernel-Flavors: armmp +Boot-Script-Path: /boot/boot.scr +DTB-Id: armada-388-clearfog.dtb +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun Clearfog Base A1 +Kernel-Flavors: armmp +Boot-Script-Path: /boot/boot.scr +DTB-Id: armada-388-clearfog-base.dtb +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun Clearfog Pro A1 +Kernel-Flavors: armmp +Boot-Script-Path: /boot/boot.scr +DTB-Id: armada-388-clearfog-pro.dtb +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun CuBox +Kernel-Flavors: armmp +DTB-Id: dove-cubox.dtb +DTB-Append: yes +Boot-Kernel-Path: /boot/uImage +Boot-Initrd-Path: /boot/uInitrd +U-Boot-Kernel-Address: 0x00008000 +U-Boot-Initrd-Address: 0x0 +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.cubox +Required-Packages: u-boot-tools +Bootloader-Sets-Incorrect-Root: yes + Machine: SolidRun Cubox-i Dual/Quad Kernel-Flavors: armmp DTB-Id: imx6q-cubox-i.dtb Boot-Script-Path: /boot/boot.scr -U-Boot-Script-Name: bootscr.cubox-i +U-Boot-Script-Name: bootscr.imx-base bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun Cubox-i Dual/Quad (1.5som) +Kernel-Flavors: armmp +DTB-Id: imx6q-cubox-i-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.imx-base bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun Cubox-i Dual/Quad (1.5som+emmc) +Kernel-Flavors: armmp +DTB-Id: imx6q-cubox-i-emmc-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.imx-base bootscr.uboot-generic Required-Packages: u-boot-tools Machine: D-Link DNS-320 NAS (Rev A1) @@ -381,7 +436,7 @@ Machine: Firefly-RK3399 Board Kernel-Flavors: arm64 -DTB-Id: rk3399-firefly.dtb +DTB-Id: rockchip/rk3399-firefly.dtb Boot-Script-Path: /boot/boot.scr U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools @@ -458,12 +513,6 @@ Required-Packages: u-boot-tools Bootloader-Sets-Incorrect-Root: yes -Machine: GLAN Tank -Method: symlink -Kernel-Flavors: iop32x -Machine-Id: 1100 -Bootloader-Sets-Incorrect-Root: yes - Machine: GTA02 Method: multi Kernel-Flavors: s3c24xx @@ -481,7 +530,7 @@ Machine: Hardkernel ODROID-C2 Kernel-Flavors: arm64 -DTB-Id: meson-gxbb-odroidc2.dtb +DTB-Id: amlogic/meson-gxbb-odroidc2.dtb Boot-Script-Path: /boot/boot.scr U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools @@ -490,7 +539,14 @@ Kernel-Flavors: armmp armmp-lpae DTB-Id: exynos4412-odroidu3.dtb Boot-Script-Path: /boot/boot.scr -U-Boot-Script-Name: bootscr.odroid +U-Boot-Script-Name: bootscr.odroid bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: Hardkernel Odroid HC1 +Kernel-Flavors: armmp armmp-lpae +DTB-Id: exynos5422-odroidhc1.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools Machine: Hardkernel Odroid XU4 @@ -566,6 +622,20 @@ U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools +Machine: SolidRun HummingBoard Solo/DualLite (1.5som) +Kernel-Flavors: armmp +DTB-Id: imx6dl-hummingboard-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard Solo/DualLite (1.5som+emmc) +Kernel-Flavors: armmp +DTB-Id: imx6dl-hummingboard-emmc-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + Machine: SolidRun HummingBoard Dual/Quad Kernel-Flavors: armmp DTB-Id: imx6q-hummingboard.dtb @@ -573,6 +643,62 @@ U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools +Machine: SolidRun HummingBoard Dual/Quad (1.5som) +Kernel-Flavors: armmp +DTB-Id: imx6q-hummingboard-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard Dual/Quad (1.5som+emmc) +Kernel-Flavors: armmp +DTB-Id: imx6q-hummingboard-emmc-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard2 Solo/DualLite +Kernel-Flavors: armmp +DTB-Id: imx6dl-hummingboard2.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard2 Solo/DualLite (1.5som) +Kernel-Flavors: armmp +DTB-Id: imx6dl-hummingboard2-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard2 Solo/DualLite (1.5som+emmc) +Kernel-Flavors: armmp +DTB-Id: imx6dl-hummingboard2-emmc-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard2 Dual/Quad +Kernel-Flavors: armmp +DTB-Id: imx6q-hummingboard2.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard2 Dual/Quad (1.5som) +Kernel-Flavors: armmp +DTB-Id: imx6q-hummingboard2-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: SolidRun HummingBoard2 Dual/Quad (1.5som+emmc) +Kernel-Flavors: armmp +DTB-Id: imx6q-hummingboard2-emmc-som-v15.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + Machine: I12 / Q5 / QT840A A20 tvbox Kernel-Flavors: armmp armmp-lpae Boot-Script-Path: /boot/boot.scr @@ -779,15 +905,6 @@ U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools -# Really: Intel SS4000-e and compatibles -Machine: Lanner EM7210 -Method: redboot -Kernel-Flavors: iop32x -Machine-Id: 1212 -Mtd-Kernel: zImage -Mtd-Initrd: ramdisk.gz -Bootloader-Sets-Incorrect-Root: yes - Machine: LeMaker Banana Pi Kernel-Flavors: armmp armmp-lpae Boot-Script-Path: /boot/boot.scr @@ -866,9 +983,10 @@ U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools +Machine: Marvell 8040 MACCHIATOBin Machine: Marvell 8040 MACHIATOBin Kernel-Flavors: arm64 -DTB-Id: armada-8040-mcbin.dtb +DTB-Id: marvell/armada-8040-mcbin.dtb Boot-Script-Path: /boot/boot.scr U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools @@ -1227,7 +1345,7 @@ Boot-Script-Path: preEnv.txt Required-Packages: u-boot-tools Bootloader-sets-root: yes -DTB-Kernel-Version: 3.11 +DTB-Append-From: 3.11 DTB-Id: omap4-panda-es.dtb Machine: QCT APQ8064 CDP @@ -1265,9 +1383,23 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools +Machine: Pine64 LTS +Kernel-Flavors: arm64 +DTB-Id: allwinner/sun50i-a64-pine64-lts.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + Machine: Pine64+ Kernel-Flavors: arm64 -DTB-Id: sun50i-a64-pine64-plus.dtb +DTB-Id: allwinner/sun50i-a64-pine64-plus.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: Pine64 Rock64 +Kernel-Flavors: arm64 +DTB-Id: rockchip/rk3328-rock64.dtb Boot-Script-Path: /boot/boot.scr U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools @@ -1386,6 +1518,22 @@ U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools +Machine: Asus NovaGo TP370QL +Kernel-Flavors: arm64 +DTB-Id: qcom/msm8998-asus-novago-tp370ql.dtb + +Machine: Lenovo Miix 630 +Kernel-Flavors: arm64 +DTB-Id: qcom/msm8998-lenovo-miix-630.dtb + +Machine: HP Envy x2 +Kernel-Flavors: arm64 +DTB-Id: qcom/msm8998-hp-envy-x2.dtb + +Machine: Lenovo Yoga C630 +Kernel-Flavors: arm64 +DTB-Id: qcom/sdm850-lenovo-yoga-c630.dtb + Machine: R7 A10s hdmi tv-stick Kernel-Flavors: armmp Boot-Script-Path: /boot/boot.scr @@ -1400,57 +1548,74 @@ U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools -# Raspberry Pi 2 (BCM2709) Machine: BCM2709 Machine: Raspberry Pi 2 Model B Machine: Raspberry Pi 2 Model B Rev 1.1 Machine: Raspberry Pi 2 Model B Rev 1.2 +Method: pi +Kernel-Flavors: raspi2 DTB-Id: bcm2709-rpi-2-b.dtb -U-Boot-Script-Name: uboot.env.rpi2 +U-Boot-Script-Name: bootscr.rpi Required-Packages: u-boot-tools -Boot-DTB-Path: /boot/firmware/bcm2709-rpi-2-b.dtb -Boot-Kernel-Path: /boot/firmware/vmlinuz -Boot-Initrd-Path: /boot/firmware/initrd.img -Boot-Script-Path: /boot/firmware/uboot.env -# XXX we should copy the entire overlay dtbs dir too -# Raspberry Pi 3 (BCM2710) Machine: BCM2710 Machine: Raspberry Pi 3 Model B Machine: Raspberry Pi 3 Model B Rev 1.2 +Method: pi +Kernel-Flavors: raspi2 DTB-Id: bcm2710-rpi-3-b.dtb -U-Boot-Script-Name: bootscr.rpi3 +U-Boot-Script-Name: bootscr.rpi +Required-Packages: u-boot-tools + +Machine: Raspberry Pi 3 Model A+ +Machine: Raspberry Pi 3 Model A Plus +Machine: Raspberry Pi 3 Model A Plus Rev 1.0 +Method: pi +Kernel-Flavors: raspi2 +DTB-Id: bcm2710-rpi-3-b-plus.dtb +U-Boot-Script-Name: bootscr.rpi Required-Packages: u-boot-tools -Boot-DTB-Path: /boot/firmware/bcm2710-rpi-3-b.dtb -Boot-Kernel-Path: /boot/firmware/vmlinuz -Boot-Initrd-Path: /boot/firmware/initrd.img -Boot-Script-Path: /boot/firmware/boot.scr -# XXX we should copy the entire overlay dtbs dir too +# XXX when a 3A+ specific dtb is added to linux-raspi2, use it here -# Raspberry Pi 3 B+ Machine: Raspberry Pi 3 Model B+ Machine: Raspberry Pi 3 Model B Plus Machine: Raspberry Pi 3 Model B Plus Rev 1.3 +Method: pi +Kernel-Flavors: raspi2 DTB-Id: bcm2710-rpi-3-b-plus.dtb -U-Boot-Script-Name: bootscr.rpi3 +U-Boot-Script-Name: bootscr.rpi Required-Packages: u-boot-tools -Boot-DTB-Path: /boot/firmware/bcm2710-rpi-3-b-plus.dtb -Boot-Kernel-Path: /boot/firmware/vmlinuz -Boot-Initrd-Path: /boot/firmware/initrd.img -Boot-Script-Path: /boot/firmware/boot.scr -# XXX we should copy the entire overlay dtbs dir too -# Raspberry Pi Compute Module 3 and 3+ Machine: Raspberry Pi Compute Module 3 Rev 1.0 Machine: Raspberry Pi Compute Module 3 Plus Rev 1.0 +Method: pi +Kernel-Flavors: raspi2 DTB-Id: bcm2710-rpi-cm3.dtb -U-Boot-Script-Name: bootscr.rpi3 +U-Boot-Script-Name: bootscr.rpi +Required-Packages: u-boot-tools + +Machine: Raspberry Pi 4 Model B +Machine: Raspberry Pi 4 Model B Rev 1.1 +Machine: Raspberry Pi 4 Model B Rev 1.2 +Method: pi +Kernel-Flavors: raspi2 +DTB-Id: bcm2711-rpi-4-b.dtb +U-Boot-Script-Name: bootscr.rpi +Required-Packages: u-boot-tools + +Machine: Rockchip RK3288 Tinker Board +Kernel-Flavors: armmp armmp-lpae +DTB-Id: rk3288-tinker.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools + +Machine: Rockchip RK3399 Evaluation Board +Kernel-Flavors: arm64 +DTB-Id: rockchip/rk3399-evb.dts +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools -Boot-DTB-Path: /boot/firmware/bcm2710-rpi-cm3.dtb -Boot-Kernel-Path: /boot/firmware/vmlinuz -Boot-Initrd-Path: /boot/firmware/initrd.img -Boot-Script-Path: /boot/firmware/boot.scr -# XXX we should copy the entire overlay dtbs dir too Machine: SAMSUNG SSDK5440 board based on EXYNOS5440 Kernel-Flavors: exynos5 exynos generic @@ -1459,7 +1624,7 @@ U-Boot-Script-Address: 0x80001000 U-Boot-Script-Name: bootscr.exynos5 DTB-Id: exynos5440-ssdk5440.dtb -DTB-Kernel-Version: 3.11 +DTB-Append-From: 3.11 Boot-Kernel-Path: /boot/uImage Boot-Initrd-Path: /boot/uInitrd Boot-Script-Path: /boot/boot.scr @@ -1473,7 +1638,7 @@ U-Boot-Script-Address: 0x80001000 U-Boot-Script-Name: bootscr.exynos5 DTB-Id: exynos5440-sd5v1.dtb -DTB-Kernel-Version: 3.11 +DTB-Append-From: 3.11 Boot-Kernel-Path: /boot/uImage Boot-Initrd-Path: /boot/uInitrd Boot-Script-Path: /boot/boot.scr @@ -1557,13 +1722,12 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools -Machine: Thecus N2100 -Method: redboot -Kernel-Flavors: iop32x -Machine-Id: 1101 -Mtd-Kernel: kernel -Mtd-Initrd: ramdisk -Bootloader-Sets-Incorrect-Root: yes +Machine: Theobroma Systems RK3399-Q7 SoM +Kernel-Flavors: arm64 +DTB-Id: rockchip/rk3399-puma-haikou.dtb +Boot-Script-Path: /boot/boot.scr +U-Boot-Script-Name: bootscr.uboot-generic +Required-Packages: u-boot-tools Machine: TI AM335x BeagleBone Machine: TI AM335x BeagleBone Black @@ -1649,14 +1813,14 @@ Kernel-Flavors: armmp DTB-Id: imx6dl-wandboard.dtb Boot-Script-Path: /boot/boot.scr -U-Boot-Script-Name: bootscr.wandboard +U-Boot-Script-Name: bootscr.imx-base bootscr.uboot-generic Required-Packages: u-boot-tools Machine: Wandboard i.MX6 Dual Lite Board rev B1 Kernel-Flavors: armmp DTB-Id: imx6dl-wandboard-revb1.dtb Boot-Script-Path: /boot/boot.scr -U-Boot-Script-Name: bootscr.wandboard +U-Boot-Script-Name: bootscr.imx-base bootscr.uboot-generic Required-Packages: u-boot-tools Machine: Wandboard i.MX6 Quad Board @@ -1671,14 +1835,14 @@ Boot-Script-Path: preEnv.txt Required-Packages: u-boot-tools Bootloader-sets-root: yes -DTB-Kernel-Version: 3.12 +DTB-Append-From: 3.12 DTB-Id: imx6q-wandboard.dtb Machine: Wandboard i.MX6 Quad Board rev B1 Kernel-Flavors: armmp DTB-Id: imx6q-wandboard-revb1.dtb Boot-Script-Path: /boot/boot.scr -U-Boot-Script-Name: bootscr.wandboard +U-Boot-Script-Name: bootscr.imx-base bootscr.uboot-generic Required-Packages: u-boot-tools Machine: Wexler TAB7200 diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/changelog flash-kernel-3.98ubuntu11~18.04.1/debian/changelog --- flash-kernel-3.90ubuntu3.18.04.2/debian/changelog 2019-02-14 11:12:13.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/changelog 2020-01-29 16:15:05.000000000 +0000 @@ -1,3 +1,385 @@ +flash-kernel (3.98ubuntu11~18.04.1) bionic; urgency=medium + + * Permit flash-kernel to workaround an inconsistent /boot directory when + triggered prior to the kernel finishing its triggers (LP: #1861292) + + -- Dave Jones Wed, 29 Jan 2020 16:15:05 +0000 + +flash-kernel (3.98ubuntu10~18.04.1) bionic; urgency=medium + + * SRU of 3.98ubuntu10 to support Raspberry Pi 4B. (LP: #1847587) + * Removed new entries from db/all.db for machines that were not already + supported on Bionic + * Remove "quiet splash" from kernel command line options; Bionic shipped + without these options and we shouldn't change the boot experience for + existing users + * Ensure the "overlays" dir always exists on the boot partition; the Bionic + image for the Pi 2 shipped without this dir + + -- Dave Jones Fri, 24 Jan 2020 16:14:06 +0000 + +flash-kernel (3.98ubuntu10) focal; urgency=medium + + * Always run flash-kernel on install/upgrade + + -- Dave Jones Wed, 22 Jan 2020 19:53:20 +0000 + +flash-kernel (3.98ubuntu9) focal; urgency=medium + + * Ensure overlays dir always exists + + -- Dave Jones Fri, 17 Jan 2020 13:40:28 +0000 + +flash-kernel (3.98ubuntu8) focal; urgency=medium + + * Add support for the Raspberry Pi 4 rev 1.2 board (LP: #1854487) + + -- Dave Jones Fri, 29 Nov 2019 11:35:00 +0000 + +flash-kernel (3.98ubuntu7) focal; urgency=medium + + * Add systemd depends, as systemd-detect-virt is called in the scripts. + + -- Dimitri John Ledkov Tue, 26 Nov 2019 14:18:02 +0000 + +flash-kernel (3.98ubuntu6) focal; urgency=medium + + * Remove redundant DTB-Kernel-Version field + * Remove redundant copying of boot dtb + * Fix mkimage_kernel tests + * Add "pi" value for the "Method" field which copies all dtbs and overlays + to the boot partition and provides defaults for the boot paths of the + kernel, initrd, and u-boot script. This fixes upgrades to support the Pi 4 + on Bionic (LP: #1850678) + * Update pi bootscript to support all flash-kernel vars, including + calculated devtype and partition for future USB boot support + * Add entry for Raspberry Pi 3A+ (LP: #1841955) + + -- Dave Jones Thu, 07 Nov 2019 14:02:26 +0000 + +flash-kernel (3.98ubuntu5) eoan; urgency=medium + + * Fix AARCH64 qcom laptop names, to those accepted upstream and in the + Ubuntu kernel. LP: #1847594 + + -- Dimitri John Ledkov Thu, 10 Oct 2019 13:04:59 +0100 + +flash-kernel (3.98ubuntu4) eoan; urgency=medium + + * Add support for Raspberry Pi 4 (LP: #1847587) + + -- Dave Jones Thu, 10 Oct 2019 10:41:43 +0100 + +flash-kernel (3.98ubuntu3) eoan; urgency=medium + + * Add support for AAarch64 Qualcomm laptops. + + -- Dimitri John Ledkov Sun, 21 Jul 2019 11:17:17 -0300 + +flash-kernel (3.98ubuntu2) eoan; urgency=medium + + * Merge all RPi bootscripts into one unified bootscript which handles all Pi + architectures + * Remove uboot.env case which was only used for RPi2 (now supported by the + unified RPi bootscript) + + -- Dave Jones Tue, 11 Jun 2019 13:43:21 +0000 + +flash-kernel (3.98ubuntu1) eoan; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - add "quiet splash" as default options to omap bootscr + - re-add support for the FLASH_KERNEL_SKIP env variable, so the image + build infrastructure has a chance to skip the automated flash-kernel run + during image builds. + - Also check for FLASH_KERNEL_SKIP to avoid setting up the root parameter + in case flash-kernel will not be used + - make the package postinst respect FLASH_KERNEL_SKIP + - make sure that if we dont want to override the bootloader root= + option by setting "Bootloader-sets-root: yes", we actually dont do it + - use umount -l in the cleanup function, else we fail while finishing up + with the script + - add a diversion for update-initramfs to live-installers + post-base-installer.d to avoid update-initramfs runs before flash-kernel + is configured + - add a check for the diverted update-initramfs to flash-kernel-installer, + so it gets reverted before we try to call update-initramfs + - make post-base-installer.d/01flash-kernel-diversion actually an + executable shell script + - enable UUID detection of the currently used root device + - if uEnv.txt is defined in the db for an arch, generate preEnv.txt from + UBOOT_DEFAULTS and UUID detection data + - make sure blkid only gives us the UUID and not any other metadata like + labels or filesystem + - hide the boot device from udisk's automounting after installation on all + systems using uEnv.txt to configure u-boot + - make sure we only rename the bootrom partition so udisks hides it, + when using mkdosfs for setting the label like we did in jasper (where + we cached the contents before doing this) MLO and u-boot.bin are gone + - make sure that /dev is bind mounted in /target when running + update-initramfs from flash-kernel-installer, else we do not find the + boot media (this is only a workaround, actual fixing of the netinst + environment is needed to fix this properly) + - drop the "|| true" from the initramfs building code, if we fail here we + actually dont want to attempt to flash that + - Do not run flash-kernel inside an LXC container + - Call systemd-detect-virt instead of the Ubuntu specific + running-in-container wrapper. + - Add generic-lpae to the XB-Subarchitecture list in debian/control + - debian/flash-kernel-installer.isinstallable: add arm*/generic-lpae + - Fix typo in dtb_kver test that made it break all non-dtb platforms. + - Apply patch from Paolo Pisati for appended DTB support + - Filter the selection of 'latest' usable kernel through the whitelist. + - Do not fail if there are no specified Kernel-Flavors for this machine. + - Allow us to find DTBs in both the old flat layout and the new vendor + subdirectory layout, so we keep backward compatibility + - Add support for installing dtb files in boot partition + - Add support for gzip-compressed kernel images + - db/all.db: add dummy entries as noops when running on VMs + - Add support for Calxeda Highbank + - Add support for Calxeda Highbank (with bootscr.highbank different from + Debian's version) + - bootscr.highbank: allow more space to load larger kernels + - Add support for Marvell ArmadaXP + - Re-add support for Marvell ArmadaXP + - Fix armadaxp kernel load address + - Add support for OMAP3 and OMAP4 boards + - add DB entry for "OMAP3 Beagle Board" (funnily thats missing) + - add Panda to the list of supported board in the README file + - debian/control: Re-add omap and omap4 to the flash-kernel-installer + XB-Subarchitecture field. These appear to have been lost somewhere + along the way. + - Also add omap and omap4 to flash-kernel-installer.isinstallable. + - switch omap3 and omap4 to uEnv.txt/preEnv.txt (the former holds all + active boot commands, the latter holds the kernel commandline only) + - switch omap3 and omap4 from Bootloader-sets-root: no to yes, we now + generate a root=UUID= line on the fly for arches using + uEnv.txt/preEnv.txt + - introduce bootscript/uEnvtxt.omap + - do not move the original uEnvtxt.omap to the target, use a copy + instead + - Add support for grouper boards + - add support for the grouper architecture + - Add support for Samsung Exynos 5440 platforms + - Add support for EXYNOS5440-based platforms + - Add support for HP ProLiant m400 and m800 cartridges + - Added support for HP ProLiant m800 Server Cartridge + - Add support for HP ProLiant m800 cartridges + - Set required boot arguments for HP ProLiant m800 cartridges + - Add support for HP ProLiant m400 Server Cartridges + - HP Moonshot Cartridges: Use $baudrate from u-boot environment as + serial console speed + - HP Moonshot Cartridges: Enable hardware flow control as required by + the HP moonshot chassis + - Enable U-Boot environment support for X-Gene platforms + - Use filesystem agnostic "load" command instead of assuming ext4 + - Add a bootscript specific to X-Gene Mustang boards since they need to + pull their dtb from the OS. + - Add support for Wandboard Quad + - Wandboard: Use /dev/disk/by-path/platform-2198000.usdhc-part1 + instead of the hardcoded mmcblk1p1, this should make things work on + boards with just a single microSD card in. + - Add basic support for WandBoard Quad. + - Add support for Raspberry Pi 2, 3, 3+, CM3, and CM3+ + - Extend support for the RPi2 to actually install the kernel/initramfs + on the fat partition, and provide a uboot boot script based on the one + used for Snappy images. + - Extend functions to support generating uboot.env images, as an + alternative to boot.scr and uEnv.txt, and use this for RPi2 as well. + - Adjust the uboot.env.rpi2 to use the one Paolo Pisati has tested, + instead of trying to base on the Snappy one, which is failing to boot. + - Adjust the size of uboot.env based on empirical results on the rpi2. + - Adjust rpi2/3 dtb address from 0x100 to 0x02000000 + - Support Raspberry Pi 2 Model B Rev 1.2 + - Add Raspberry Pi 3 Model B+ to the db. + - Modify the Pi 3 boot.scr addresses to fit a bigger kernel, prepare + separate versions for armhf and arm64. + - Add Raspberry Pi Compute Module 3 and 3+ to the db. + - Add support for Nexus 4 (Mako) + - Enabling support for mako (Nexus 4) + - Add support for QCT APQ8064 CDP + - Add support for QCT APQ8064 CDP; thanks Alfonso Sanchez-Beato. + - Migrate default /etc/default/flash-kernel content to new default without + asking via debconf + - Update tests with new fields: Android-Skip-Initrd, Bootloader-sets-root, + DTB-Kernel-Version + - Look for dtbs in /lib/firmware/$kvers/device-tree/ in find_dtb_file() + - Add Bootloader-sets-root to Toshiba AC100 [previously undocumented] + - Install all potential uboot scripts [previously undocumented] + - initramfs-hook/flash-kernel: Pretend we're running from the kernel's + postinst to activate the same guard against mismatched kernel versions. + - flash-kernel/functions: Stop attempting to install the latest kernel + if we request an older version, just refuse to act without --force. + + * Dropped changes merged in Debian: + - Remove commit-tmp cruft [previously undocumented] + + * Dropped obsolete changes: + - Add archs (why?) and duplicate generic (why?!) in d/control [previously + undocumented] + + -- Dave Jones Thu, 16 May 2019 12:08:32 +0000 + +flash-kernel (3.98) unstable; urgency=medium + + [ Vagrant Cascadian ] + * Add machine db entry for Rock64 (Closes: #906696). Thanks to Josua + Mayer. + * Add machine db entry for Banana Pi M2 Berry (Closes: #923483). Thanks + to Lucas Nussbaum. + + [ Cyril Brulebois ] + * Drop support for arm*/ixp4xx and arm*/iop32x; support for those + platforms was removed from the Linux kernel and therefore d-i. + + [ Heinrich Schuchardt ] + * Provide db entry for the Pine A64 LTS board (Closes: #923655). + + [ Jonas Smedegaard ] + * Add an entry for Olimex A64 Teres-I (Closes: #926071). + + [ Vagrant Cascadian ] + * Add entries for Raspberry Pi 1, Pi Zero and Pi 3 Compute Module + (Closes: #921518). Thanks to Alexandre GRIVEAUX. + + [ Updated translations ] + * Indonesian (id.po) by Muhammad Rifqi Priyo Susanto + * Vietnamese (vi.po) by Trần Ngọc Quân + + -- Holger Wansing Thu, 04 Apr 2019 23:38:42 +0200 + +flash-kernel (3.97) unstable; urgency=medium + + [ Vagrant Cascadian ] + * Add machine db entry for Odroid HC1 (Closes: #916980). Thanks to + Benjamin Drung. + + [ Karsten Merker ] + * Apply a patch from Hajo Noerenberg adding a machine db entry for + the Seagate Blackarmor NAS220 (Closes: #918193). + + -- Karsten Merker Fri, 04 Jan 2019 14:43:50 +0100 + +flash-kernel (3.96) unstable; urgency=medium + + [ Helmut Grohne ] + * Support DEB_BUILD_OPTIONS=nocheck (Closes: #908355) + + [ Karsten Merker ] + * Add a machine db entry for the Helios-4 NAS system, + provided by Josua Mayer. (Closes: #914016) + + -- Karsten Merker Sun, 18 Nov 2018 19:26:50 +0100 + +flash-kernel (3.95) unstable; urgency=medium + + [ Heinrich Schuchardt ] + * Add a machine db entry for the Rockchip RK3288 Tinker Board. + (Closes: #895934) + + [ Cyril Brulebois ] + * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement). + + [ Heinrich Schuchardt ] + * Update Firefly-RK3399 Board (Closes: #899091). + * Rockchip RK3399 Evaluation Board (Closes: #899090). + * Update entry for Marvell 8040 MACCHIATOBin (Closes: #899092): + - Add new Machine name. + - Update DTB path. + * Update Pine64+ (Closes: #899093). + * Update Raspberry Pi 3 Model B (Closes: #899096). + + [ Josua Mayer ] + * Clearfog Pro: correct DTB name (Closes: #902432). + * Add missing entries for HummingBoard variants (Closes: #905962). + + [ Vagrant Cascadian ] + * Add entries for additional Cubox-i models: + - SolidRun Cubox-i Dual/Quad (1.5som) + - SolidRun Cubox-i Dual/Quad (1.5som+emmc) + * Add entry for Raspberry PI 3 B+ (Closes: #905002). + Thanks to Johannes Keyser. + + -- Karsten Merker Sun, 19 Aug 2018 22:42:38 +0200 + +flash-kernel (3.94) unstable; urgency=medium + + [ Vagrant Cascadian ] + * Fix typos in imx-base boot script. + + [ Uwe Kleine-König ] + * Add Boot-DTB-Path-Version similar to Boot-Kernel-Path-Version. + + -- Christian Perrier Sat, 14 Apr 2018 07:42:10 +0200 + +flash-kernel (3.93) unstable; urgency=medium + + [ Vagrant Cascadian ] + * Add support for Theobroma Systems RK3399-Q7 SoM. + + -- Christian Perrier Sat, 10 Mar 2018 05:59:42 +0100 + +flash-kernel (3.92) unstable; urgency=medium + + [ Updated translations ] + * Hebrew (he.po) by Yaron Shahrabani + + -- Christian Perrier Wed, 21 Feb 2018 12:19:06 +0100 + +flash-kernel (3.91) unstable; urgency=medium + + [ Vagrant Cascadian ] + * Make ubootenv.d work on CuBox-i. Thanks to Rainer Dorsch. + * Do not install flash-kernel.in. + + [ Heinrich Schuchardt ] + * flash-kernel: Provide hook to start EFI application (Closes: #873390). + + [ Vagrant Cascadian ] + * Add support for SolidRun Clearfog Boards (Closes: #839595). Thanks to + Christoph Egger and Joshua Mayer. + * Add support for SolidRun CuBox (dove) (Closes: #876773). Thanks to + Josua Mayer. + * Fix when no Kernel-Flavors are defined (Closes: #887803). + * Add Boot-Kernel-Path-Version and Boot-Initrd-Path-Version to be used + to append the version to the generated kernel/initrd images. + * debian/control: Set Rules-Requires-Root: no. + + [ Heinrich Schuchardt ] + * flash-kernel: support relative paths for DTB-Id (Closes: #860304). + + [ Vagrant Cascadian ] + * Add compatibility symlink to dtb in vendor sub-directory. + * Add support for root device specified by PARTLABEL. + + [ Andre Heider ] + * Add support for multiple scripts sources + + [ Vagrant Cascadian ] + * Convert Wandboard and CuBox-i to use a shared imx-base plus + uboot-generic boot script. + * Adjust sunxi boot script to prefer prefix variable if defined to set + the locations to search for boot files. + + [ Updated translations ] + * Tajik (tg.po) by Victor Ibragimov + + -- Christian Perrier Thu, 01 Feb 2018 06:32:56 +0100 + +flash-kernel (3.90ubuntu5) disco; urgency=medium + + * Add Raspberry Pi Compute Module 3 and 3+ to the db. + + -- Dave Jones Thu, 14 Feb 2019 11:12:13 +0000 + +flash-kernel (3.90ubuntu4) disco; urgency=medium + + * Add Raspberry Pi 3 Model B+ to the db. + * Modify the Pi 3 boot.scr addresses to fit a bigger kernel, prepare + separate versions for armhf and arm64. + + -- Łukasz 'sil2100' Zemczak Wed, 05 Dec 2018 00:18:12 +0200 + flash-kernel (3.90ubuntu3.18.04.2) bionic; urgency=medium * Add Raspberry Pi Compute Module 3 and 3+ to the db. (LP: #1816029) diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/control flash-kernel-3.98ubuntu11~18.04.1/debian/control --- flash-kernel-3.90ubuntu3.18.04.2/debian/control 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/control 2020-01-24 15:19:25.000000000 +0000 @@ -8,17 +8,20 @@ Karsten Merker Build-Depends: debhelper (>= 9), devio, linux-base (>= 3.2), dash Standards-Version: 3.9.6 -Vcs-Browser: https://anonscm.debian.org/cgit/d-i/flash-kernel.git -Vcs-Git: https://anonscm.debian.org/git/d-i/flash-kernel.git +Vcs-Browser: https://salsa.debian.org/installer-team/flash-kernel +Vcs-Git: https://salsa.debian.org/installer-team/flash-kernel.git +Rules-Requires-Root: no Package: flash-kernel -Architecture: arm64 armel armhf armeb arm +Architecture: arm64 armel armhf Depends: ${misc:Depends}, devio, initramfs-tools (>= 0.92f), + systemd, linux-base (>= 3.2), mtd-utils, - ucf + ucf, + awk Recommends: u-boot-tools Description: utility to make certain embedded devices bootable flash-kernel is a script which will put the kernel and initramfs in @@ -31,8 +34,8 @@ Section: debian-installer Priority: standard Package-Type: udeb -Architecture: arm64 armel armhf armeb arm -XB-Subarchitecture: armadaxp exynos5 generic-lpae generic iop32x ixp4xx keystone kirkwood orion5x s3c24xx mx5 omap omap4 xgene generic +Architecture: arm64 armel armhf +XB-Subarchitecture: armadaxp exynos5 generic-lpae iop32x ixp4xx keystone kirkwood orion5x s3c24xx mx5 omap omap4 xgene generic Provides: bootable-system Depends: cdebconf-udeb, installed-base XB-Installer-Menu-Item: 7300 diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/dirs flash-kernel-3.98ubuntu11~18.04.1/debian/dirs --- flash-kernel-3.90ubuntu3.18.04.2/debian/dirs 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/dirs 2020-01-24 15:19:25.000000000 +0000 @@ -1,3 +1,5 @@ usr/sbin +etc/flash-kernel/preboot.d +usr/share/flash-kernel/preboot.d etc/flash-kernel/ubootenv.d usr/share/flash-kernel/ubootenv.d diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/flash-kernel.install flash-kernel-3.98ubuntu11~18.04.1/debian/flash-kernel.install --- flash-kernel-3.90ubuntu3.18.04.2/debian/flash-kernel.install 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/flash-kernel.install 2020-01-24 15:19:25.000000000 +0000 @@ -7,5 +7,5 @@ initramfs-tools usr/share db usr/share/flash-kernel functions usr/share/flash-kernel -debian/default usr/share/flash-kernel +debian/default/flash-kernel usr/share/flash-kernel/default dtb-probe usr/share/flash-kernel diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/flash-kernel.postinst flash-kernel-3.98ubuntu11~18.04.1/debian/flash-kernel.postinst --- flash-kernel-3.90ubuntu3.18.04.2/debian/flash-kernel.postinst 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/flash-kernel.postinst 2020-01-24 15:19:25.000000000 +0000 @@ -37,17 +37,7 @@ /etc/default/flash-kernel ucfr flash-kernel /etc/default/flash-kernel ;; - triggered) - # we dont want to run if FLASH_KERNEL_SKIP is set, the ubuntu - # image build system uses this - if [ -n "$FLASH_KERNEL_SKIP" ]; then - echo "FLASH_KERNEL_SKIP is set, skipping flash-kernel call" - exit 0 - else - FLASH_KERNEL_NOTRIGGER=y flash-kernel - fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) + triggered|abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 @@ -55,4 +45,19 @@ ;; esac +if [ -n "$FLASH_KERNEL_SKIP" ]; then + # we dont want to run if FLASH_KERNEL_SKIP is set, the ubuntu image build + # system uses this + echo "FLASH_KERNEL_SKIP is set, skipping flash-kernel call" + exit 0 +else + if [ "x$1" = xtriggered ]; then + # this forces flash-kernel to run rather than setting our trigger to + # cause a later run (as happens without _NOTRIGGER being set) + FLASH_KERNEL_NOTRIGGER=y flash-kernel + else + flash-kernel + fi +fi + #DEBHELPER# diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/po/he.po flash-kernel-3.98ubuntu11~18.04.1/debian/po/he.po --- flash-kernel-3.90ubuntu3.18.04.2/debian/po/he.po 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/po/he.po 2020-01-24 15:19:25.000000000 +0000 @@ -3,47 +3,39 @@ # # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # -# translation of he.po to Hebrew +# translation of debian-installer_packages_po_sublevel1_he.po to Hebrew # Hebrew messages for debian-installer. # Copyright (C) 2003 Software in the Public Interest, Inc. # This file is distributed under the same license as debian-installer. -# -# +# Translations from iso-codes: +# Translations taken from ICU SVN on 2007-09-09 +# Translations taken from KDE: # Amit Dovev , 2007. # Meital Bourvine , 2007. -# Omer Zak , 2008, 2010. -# Lior Kaplan , 2004-2007, 2008, 2010, 2011. -# -# -# Translations from iso-codes: -# Tobias Quathamer , 2007. -# Translations taken from ICU SVN on 2007-09-09 -# Free Software Foundation, Inc., 2002,2004 -# Alastair McKinstry , 2002 -# Translations from KDE: -# Meni Livne , 2000. -# -# Translations taken from KDE: -# -# Free Software Foundation, Inc., 2002,2003. -# Alastair McKinstry , 2002. -# - Meni Livne , 2000. -# Lior Kaplan , 2005,2006, 2007, 2008, 2010. -# Meital Bourvine , 2007. +# Omer Zak , 2008, 2010, 2012, 2013. +# Tobias Quathamer , 2007. +# Free Software Foundation, Inc., 2002,2004. +# Alastair McKinstry , 2002. +# Meni Livne , 2000. +# Free Software Foundation, Inc., 2002,2003. +# Meni Livne , 2000. +# Meital Bourvine , 2007. +# Lior Kaplan , 2004-2007, 2008, 2010, 2011, 2015, 2017. +# Yaron Shahrabani , 2018. # msgid "" msgstr "" -"Project-Id-Version: he\n" +"Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-06-29 08:15+0000\n" -"PO-Revision-Date: 2011-10-26 23:28+0200\n" -"Last-Translator: Lior Kaplan \n" -"Language-Team: Hebrew <>\n" +"PO-Revision-Date: 2018-06-14 08:38+0000\n" +"Last-Translator: Yaron Shahrabani \n" +"Language-Team: Hebrew (https://www.transifex.com/yaron/teams/79473/he/)\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: text #. Description @@ -70,7 +62,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:3001 msgid "Preparing the system..." -msgstr "מכין את המערכת..." +msgstr "המערכת בהכנה…" #. Type: text #. Description @@ -79,7 +71,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:4001 msgid "Writing the kernel to flash memory..." -msgstr "כותב את הקרנל לזיכרון הפלאש..." +msgstr "הליבה נכתבת אל זיכרון הפלאש…" #. Type: text #. Description @@ -89,7 +81,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:5001 msgid "Generating boot image on disk..." -msgstr "בונה קובץ איתחול על הדיסק..." +msgstr "נבנה קובץ אתחול על הכונן…" #. Type: text #. Description diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/po/id.po flash-kernel-3.98ubuntu11~18.04.1/debian/po/id.po --- flash-kernel-3.90ubuntu3.18.04.2/debian/po/id.po 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/po/id.po 2020-01-24 15:19:25.000000000 +0000 @@ -16,7 +16,9 @@ # * I Gede Wijaya S (gwijayas@yahoo.com), 2004. # * Arief S F (arief@gurame.fisika.ui.ac.id), 2004-2007. # * Setyo Nugroho (setyo@gmx.net), 2004. -# Arief S Fitrianto , 2008-2011. +# * Arief S Fitrianto , 2008-2011. +# * Al Qalit , 2018. +# * Andika Triwidada , 2018. # # Translations from iso-codes: # Alastair McKinstry , 2002. @@ -32,15 +34,16 @@ "Project-Id-Version: debian-installer (level1)\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-06-29 08:15+0000\n" -"PO-Revision-Date: 2012-02-13 03:15+0700\n" -"Last-Translator: Mahyuddin Susanto \n" +"PO-Revision-Date: 2019-03-11 16:03+0000\n" +"Last-Translator: Muhammad Rifqi Priyo Susanto " +"\n" "Language-Team: Debian Indonesia Translators \n" -"Language: \n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. Type: text #. Description @@ -49,7 +52,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:1001 msgid "Configuring flash memory to boot the system" -msgstr "Sedang mengonfigurasi memory flash untuk boot sistem" +msgstr "Sedang mengatur memori kilat untuk but sistem" #. Type: text #. Description @@ -58,7 +61,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:2001 msgid "Making the system bootable" -msgstr "Membuat sistem dapat booting" +msgstr "Membuat sistem dapat but" #. Type: text #. Description @@ -67,7 +70,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:3001 msgid "Preparing the system..." -msgstr "Menyiapkan sistem ..." +msgstr "Menyiapkan sistem..." #. Type: text #. Description @@ -76,7 +79,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:4001 msgid "Writing the kernel to flash memory..." -msgstr "Menulis kernel ke memory flash ..." +msgstr "Menulis kernel ke memori kilat..." #. Type: text #. Description @@ -86,7 +89,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:5001 msgid "Generating boot image on disk..." -msgstr "Membuat citra boot pada harddisk ..." +msgstr "Membuat citra but pada diska..." #. Type: text #. Description @@ -97,4 +100,4 @@ #. :sl4: #: ../flash-kernel-installer.templates:6001 msgid "Make the system bootable" -msgstr "Buat sistem dapat booting " +msgstr "Buat sistem dapat but" diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/po/is.po flash-kernel-3.98ubuntu11~18.04.1/debian/po/is.po --- flash-kernel-3.90ubuntu3.18.04.2/debian/po/is.po 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/po/is.po 2020-01-24 15:19:25.000000000 +0000 @@ -9,29 +9,30 @@ # Copyright (C) 2003 Software in the Public Interest, Inc. # # Copyright (C) 2010 Free Software Foundation +# Sveinn í Felli , 2018. # +# Translations from iso-codes: +# Copyright (C) 2002,2003, 2010, 2011, 2012 Free Software Foundation, Inc. +# Translations from KDE: +# Þórarinn Rúnar Einarsson # zorglubb , 2008. # Sveinn í Felli , 2010. # Alastair McKinstry, , 2002. -# Sveinn í Felli , 2010, 2011. +# Sveinn í Felli , 2010, 2011, 2012, 2013. # Alastair McKinstry , 2002. -# Translations from iso-codes: -# Copyright (C) 2002,2003, 2010, 2011 Free Software Foundation, Inc. -# Translations from KDE: -# Þórarinn Rúnar Einarsson msgid "" msgstr "" -"Project-Id-Version: debian-installer_packages_po_sublevel1_is\n" +"Project-Id-Version: Icelandic (Debian Installer)\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-06-29 08:15+0000\n" -"PO-Revision-Date: 2011-12-27 21:05+0000\n" -"Last-Translator: Sveinn í Felli \n" +"PO-Revision-Date: 2018-01-04 06:20+0000\n" +"Last-Translator: Sveinn í Felli \n" "Language-Team: Icelandic \n" "Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -">\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: text #. Description diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/po/tg.po flash-kernel-3.98ubuntu11~18.04.1/debian/po/tg.po --- flash-kernel-3.90ubuntu3.18.04.2/debian/po/tg.po 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/po/tg.po 2020-01-24 15:19:25.000000000 +0000 @@ -9,17 +9,17 @@ # # Debian Installer translators, please read the D-I i18n documentation # in doc/i18n/i18n.txt -# Victor Ibragimov , 2013 +# Victor Ibragimov , 2013, 2014, 2015, 2016, 2017, 2018 # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-06-29 08:15+0000\n" -"PO-Revision-Date: 2013-08-29 17:27+0500\n" +"PO-Revision-Date: 2018-01-21 20:21+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik \n" -"Language: Tajik\n" +"Language: tg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,7 +32,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:1001 msgid "Configuring flash memory to boot the system" -msgstr "Танзимкунии ҳофизаи флеш барои роҳандозии система" +msgstr "Танзимкунии ҳофизаи флеш барои роҳандозии низом" #. Type: text #. Description @@ -41,7 +41,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:2001 msgid "Making the system bootable" -msgstr "Таҳиякунии системаи боршаванда" +msgstr "Таҳиякунии низоми боршаванда" #. Type: text #. Description @@ -50,7 +50,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:3001 msgid "Preparing the system..." -msgstr "Омодасозии система..." +msgstr "Омодасозии низом..." #. Type: text #. Description @@ -80,4 +80,4 @@ #. :sl4: #: ../flash-kernel-installer.templates:6001 msgid "Make the system bootable" -msgstr "Таҳия кардани системаи боршаванда" +msgstr "Таҳия кардани низоми боршаванда" diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/po/vi.po flash-kernel-3.98ubuntu11~18.04.1/debian/po/vi.po --- flash-kernel-3.90ubuntu3.18.04.2/debian/po/vi.po 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/po/vi.po 2020-01-24 15:19:25.000000000 +0000 @@ -9,16 +9,19 @@ # Jean Christophe André # Vũ Quang Trung # Trịnh Minh Thành +# Nguyễn Hùng Vũ , 2001. # Clytie Siddall , 2005-2010 +# Hai-Nam Nguyen , 2012 +# Trần Ngọc Quân , 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: debian-installer Level 1\n" +"Project-Id-Version: debian-installer sublevel1\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-06-29 08:15+0000\n" -"PO-Revision-Date: 2010-09-28 18:01+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" +"PO-Revision-Date: 2019-02-27 14:34+0700\n" +"Last-Translator: Trần Ngọc Quân \n" +"Language-Team: Vietnamese \n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +35,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:1001 msgid "Configuring flash memory to boot the system" -msgstr "Đang cấu hình bộ nhớ khó phai để khởi động hệ thống" +msgstr "Đang cấu hình bộ nhớ flash để khởi động hệ thống" #. Type: text #. Description @@ -41,7 +44,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:2001 msgid "Making the system bootable" -msgstr "Đang bật hệ thống có khả năng khởi động" +msgstr "Đang tạo hệ thống có khả năng khởi động" #. Type: text #. Description @@ -50,7 +53,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:3001 msgid "Preparing the system..." -msgstr "Đang chuẩn bị hệ thống..." +msgstr "Đang chuẩn bị hệ thống…" #. Type: text #. Description @@ -59,7 +62,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:4001 msgid "Writing the kernel to flash memory..." -msgstr "Đang ghi hạt nhân vào bộ nhớ khó phai..." +msgstr "Đang ghi hạt nhân vào bộ nhớ flash…" #. Type: text #. Description @@ -69,7 +72,7 @@ #. :sl4: #: ../flash-kernel-installer.templates:5001 msgid "Generating boot image on disk..." -msgstr "Đang tạo ảnh khởi động trên đĩa..." +msgstr "Đang tạo ảnh khởi động trên đĩa…" #. Type: text #. Description @@ -80,4 +83,4 @@ #. :sl4: #: ../flash-kernel-installer.templates:6001 msgid "Make the system bootable" -msgstr "Bật hệ thống có khả năng khởi động" +msgstr "Làm cho thống có khả năng khởi động" diff -Nru flash-kernel-3.90ubuntu3.18.04.2/debian/rules flash-kernel-3.98ubuntu11~18.04.1/debian/rules --- flash-kernel-3.90ubuntu3.18.04.2/debian/rules 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/rules 2020-01-24 15:19:25.000000000 +0000 @@ -32,9 +32,11 @@ dh_auto_clean override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) FK_CHECKOUT=. ./test_db FK_CHECKOUT=. ./test_flash-kernel FK_CHECKOUT=. ./test_functions +endif %: dh $@ diff -Nru flash-kernel-3.90ubuntu3.18.04.2/functions flash-kernel-3.98ubuntu11~18.04.1/functions --- flash-kernel-3.90ubuntu3.18.04.2/functions 2018-04-25 11:11:21.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/functions 2020-01-29 16:15:05.000000000 +0000 @@ -21,6 +21,7 @@ BOOTSCRIPTS_DIR="${FK_CHECKOUT:-/etc/flash-kernel}/bootscript" FK_ETC_MACHINE="${FK_ETC_MACHINE:-/etc/flash-kernel/machine}" +FK_DEFAULTS="${FK_DEFAULTS:-/etc/default/flash-kernel}" PROC_CPUINFO="${FK_PROC_CPUINFO:-/proc/cpuinfo}" PROC_DTMODEL="${FK_PROC_DTMODEL:-/proc/device-tree/model}" PROC_MTD="/proc/mtd" @@ -248,21 +249,15 @@ error "dtb-probe $dtb_script failed" fi ;; - /*) - dtb_name="$field" - ;; *) - # DTBs on arm64 are stored in subdirs for each vendor; strip - # the dir away (in case someone specified it, although it's - # not needed). - # The DTB will be stored in /boot/dtbs/$kvers/ without - # additional subdirs. - dtb_name=$(basename "$field") + dtb_name="$field" ;; esac if [ -n "$dtb_name" ] ; then echo "Using DTB: $dtb_name" >&2 fi + dtb_dir=$(dirname "$dtb_name") + dtb_name=$(basename "$dtb_name") } machine_uses_flash() { @@ -308,6 +303,19 @@ } >"$output" } +gen_preboot() { + PRESTUBDIRS="/etc/flash-kernel/preboot.d /usr/share/flash-kernel/preboot.d" + PRESTUBS="$(find $PRESTUBDIRS -type f -regex '.*/[0-9a-zA-Z_-]+' -printf '%f\n' | LC_ALL=C sort -u)" + for file in $PRESTUBS; do + for dir in $PRESTUBDIRS; do + if [ -f $dir/$file ]; then + cat $dir/$file + break + fi + done + done +} + gen_ubootenv() { ENVSTUBDIRS="/etc/flash-kernel/ubootenv.d /usr/share/flash-kernel/ubootenv.d" ENVSTUBS="$(find $ENVSTUBDIRS -type f -regex '.*/[0-9a-zA-Z_-]+' -printf '%f\n' | LC_ALL=C sort -u)" @@ -434,11 +442,11 @@ } get_kernel_cmdline() { - . /etc/default/flash-kernel + . ${FK_DEFAULTS} echo "$LINUX_KERNEL_CMDLINE" } get_kernel_cmdline_defaults() { - . /etc/default/flash-kernel + . ${FK_DEFAULTS} echo "$LINUX_KERNEL_CMDLINE_DEFAULTS" } @@ -476,10 +484,12 @@ local sdata="$3" local script="$4" - local tdata="$tmpdir/$(basename $sdata)" + local tdata="$tmpdir/$(basename $sdata).out" local ubootenv="$(mktemp --tmpdir=$tmpdir)" gen_ubootenv > $ubootenv + local preboot="$(mktemp --tmpdir=$tmpdir)" + gen_preboot > $preboot if [ "$(stat --printf='%s' $ubootenv)" -gt 0 ] && \ ! grep -q '@@UBOOT_ENV_EXTRA@@' "$sdata" ; then @@ -493,6 +503,10 @@ -e "/@@UBOOT_ENV_EXTRA@@/{ s/@@UBOOT_ENV_EXTRA@@//g r $ubootenv + }" \ + -e "/@@UBOOT_PREBOOT_EXTRA@@/{ + s/@@UBOOT_PREBOOT_EXTRA@@//g + r $preboot }" < $sdata > $tdata mkimage -A "$mkarch" -O linux -T script -C none -a "$saddr" -e "$saddr" \ -n "$sdesc" -d "$tdata" "$script" >&2 1>/dev/null @@ -512,22 +526,9 @@ echo "done." >&2 } -mkimage_env() { - local esize="$1" - local edata="$2" - local escript="$3" - - # FIXME: should leverage gen_ubootenv - printf "Generating u-boot environment image... " >&2 - mkenvimage -r -s "$esize" -o "$escript" "$edata" - echo "done." >&2 - - -} - # Return a nonempty string *unless* NO_CREATE_DOT_BAK_FILES is set. get_dot_bak_preference() { - . /etc/default/flash-kernel + . ${FK_DEFAULTS} case $(echo "$NO_CREATE_DOT_BAK_FILES" | tr '[:upper:]' '[:lower:]') in true|yes|1) ;; *) echo yes ;; @@ -536,7 +537,7 @@ # Return a nonempty string *unless* MTD_BACKUP_DIR is "none". get_mtd_backup_dir() { - . /etc/default/flash-kernel + . ${FK_DEFAULTS} case "${MTD_BACKUP_DIR:=/var/backups/flash-kernel}" in none) echo "";; *) echo "${MTD_BACKUP_DIR}";; @@ -585,7 +586,6 @@ fi } -# XXX needs testsuite coverage abootimg_get_image_size() { local abootimg="$1" @@ -596,7 +596,6 @@ linux-version compare "$kvers" ge "$dtb_append_from" } -# XXX needs testsuite coverage android_flash() { local device="$1" @@ -616,10 +615,10 @@ # include_only_flavors(flav1, flav2, flav3) # filter lines of input in uname -r format (X.Y.Z-N-flavor) # and filter-out anything that is not in the listed input - # if exactly zero flavors are given, then assume everything is a match + # if the only flavor given is "any", then assume everything is a match local cur_uname cur_flav allowed_flav while read cur_uname; do - if [ $# -eq 0 ]; then + if [ "$*" = "any" ]; then echo "$cur_uname" else # could use cur_flav=$(get_kfile_suffix "$cur_uname") @@ -637,9 +636,9 @@ find_dtb_file() { local dtb path - case "$dtb_name" in + case "$dtb_dir" in /*) - dtb="$dtb_name" + dtb="$dtb_dir/$dtb_name" if [ ! -f "$dtb" ]; then error "Couldn't find $dtb" fi @@ -647,7 +646,7 @@ *) dtb= paths="/etc/flash-kernel/dtbs /usr/lib/linux-image-$kvers /lib/firmware/$kvers/device-tree/" - for path in $paths; do + for path in $paths; do dtb=$(find $path -name $dtb_name 2>/dev/null | head -n 1) [ -z "$dtb" ] || break done @@ -659,14 +658,38 @@ echo $dtb } +unique_filenames() { + awk ' + { + file=$0; + sub("^.*/", "", file); + if (!(file in files)) files[file]=$0; + } + END { + for (file in files) print files[file]; + }' +} + +find_all_dtbs() { + # NOTE: The following assumes that "find" processes and outputs + # filenames in the same order as starting points ($paths) are specified + paths="/etc/flash-kernel/dtbs /usr/lib/linux-image-$kvers /lib/firmware/$kvers/device-tree/" + find $paths -name "*.dtb" 2>/dev/null | unique_filenames +} + +find_all_overlays() { + paths="/etc/flash-kernel/dtbs /usr/lib/linux-image-$kvers /lib/firmware/$kvers/device-tree/" + find $paths -name "*.dtbo" 2>/dev/null | unique_filenames +} + handle_dtb() { if [ "x$dtb_name" = "x" ]; then return fi - local dtb_name=$(basename "$dtb_name") + local dtb if [ "x$FK_KERNEL_HOOK_SCRIPT" = "xpostrm.d" ] ; then - rm -f "/boot/dtbs/$kvers/$dtb_name" + rm -f "/boot/dtbs/$kvers/$dtb_dir/$dtb_name" # This was the old name we installed under. We # currently include it as an alternative symlink. @@ -690,22 +713,26 @@ fi else local dtb=$(find_dtb_file) - echo "Installing $dtb into /boot/dtbs/$kvers/$dtb_name" >&2 - mkdir -p /boot/dtbs/$kvers/ - cp "$dtb" "/boot/dtbs/$kvers/$dtb_name.new" + echo "Installing $dtb into /boot/dtbs/$kvers/$dtb_dir/$dtb_name" >&2 + mkdir -p "/boot/dtbs/$kvers/$dtb_dir" + cp "$dtb" "/boot/dtbs/$kvers/$dtb_dir/$dtb_name.new" backup_and_install \ - "/boot/dtbs/$kvers/$dtb_name.new" \ - "/boot/dtbs/$kvers/$dtb_name" + "/boot/dtbs/$kvers/$dtb_dir/$dtb_name.new" \ + "/boot/dtbs/$kvers/$dtb_dir/$dtb_name" + + if [ "$dtb_dir" != "." ]; then + ln -nfs "$dtb_dir/$dtb_name" "/boot/dtbs/$kvers/$dtb_name" + fi # Historically we installed the dtb as # dtb-$kvers, keep it around as an alternative # for now. Useful for platforms which do not # set ${fdtfile} - ln -nfs "dtbs/$kvers/$dtb_name" "/boot/dtb-$kvers" + ln -nfs "dtbs/$kvers/$dtb_dir/$dtb_name" "/boot/dtb-$kvers" # This can be used along with the unversioned # vmlinuz+initrd.gz e.g. as a fallback option - ln -nfs "dtbs/$kvers/$dtb_name" "/boot/dtb" + ln -nfs "dtbs/$kvers/$dtb_dir/$dtb_name" "/boot/dtb" fi } @@ -745,7 +772,10 @@ fi # if get_machine_field returns non-zero, then all flavors are allowed -kflavors="$(get_machine_field "$machine" "Kernel-Flavors")" || : +if ! kflavors=$(get_machine_field "$machine" "Kernel-Flavors") ; then + # Since no Kernel-Flavors were specified, allow any kernel. + kflavors="any" +fi latest_version=$(linux-version list | include_only_flavors $kflavors | linux-version sort | tail -1) if [ -n "$kvers" ] && [ "$FK_KERNEL_HOOK_SCRIPT" = "postrm.d" ]; then @@ -800,18 +830,9 @@ idesc="ramdisk $kvers" if [ ! -e $kfile ] || [ ! -e $ifile ]; then - # installation-report #781742 included: - # Can't find /boot/vmlinuz-[...] or /boot/initrd.img-[...] - # - # It's unclear how this can have happened or what state the - # system was in, so log some additional information in the - # hopes of catching it in the act next time. - ( - set -x - ls -l $kfile* - ls -l $ifile* - ) >> /tmp/flash-kernel-no-kernel-error.log 2>&1 - error "Can't find $kfile or $ifile (see /tmp/flash-kernel-no-kernel-error.log)" + # See debian bug #781742 and LP: #1861292 + echo "flash-kernel: $kfile or $ifile missing; expecting future run" >&2 + exit 0 fi kfilesize=$(stat -c '%s' "$kfile") ifilesize=$(stat -c '%s' "$ifile") @@ -830,7 +851,7 @@ fi kfile_suffix="" -for kflavor in ${kflavors:-"any"} ; do +for kflavor in $kflavors ; do if check_kflavors "$kvers" "$kflavor" ; then kfile_suffix="$kflavor" break @@ -849,7 +870,6 @@ method="$(get_machine_field "$machine" "Method")" || method="generic" mtd_kernel="$(get_machine_field "$machine" "Mtd-Kernel")" || : mtd_initrd="$(get_machine_field "$machine" "Mtd-Initrd")" || : -dtb_kver="$(get_machine_field "$machine" "DTB-Kernel-Version")" || : dtb_append="$(get_machine_field "$machine" "DTB-Append")" || : dtb_append_from="$(get_machine_field "$machine" "DTB-Append-From")" || : ukaddr="$(get_machine_field "$machine" "U-Boot-Kernel-Address")" || : @@ -858,14 +878,14 @@ umaddr="$(get_machine_field "$machine" "U-Boot-Multi-Address")" || : usaddr="$(get_machine_field "$machine" "U-Boot-Script-Address")" || : usname="$(get_machine_field "$machine" "U-Boot-Script-Name")" || : -# FIXME: currently hard coded because only RPi2 uses this; let's not define -# new fields without consulting with Debian. -ussize=16384 boot_device="$(get_machine_field "$machine" "Boot-Device")" || : boot_kernel_path="$(get_machine_field "$machine" "Boot-Kernel-Path")" || : boot_initrd_path="$(get_machine_field "$machine" "Boot-Initrd-Path")" || : +boot_kernel_path_version="$(get_machine_field "$machine" "Boot-Kernel-Path-Version")" || : +boot_initrd_path_version="$(get_machine_field "$machine" "Boot-Initrd-Path-Version")" || : boot_script_path="$(get_machine_field "$machine" "Boot-Script-Path")" || : boot_dtb_path="$(get_machine_field "$machine" "Boot-DTB-Path")" || : +boot_dtb_path_version="$(get_machine_field "$machine" "Boot-DTB-Path-Version")" || : boot_multi_path="$(get_machine_field "$machine" "Boot-Multi-Path")" || : android_boot_device="$(get_machine_field "$machine" "Android-Boot-Device")" || : android_skip_initrd="$(get_machine_field "$machine" "Android-Skip-Initrd")" || : @@ -955,17 +975,6 @@ gen_kernel "$kernel" "$tmpdir/kernel" "$machine_id" kernel="$tmpdir/kernel" fi - if [ -n "$dtb_kver" ]; then - if dpkg --compare-versions "$kvers" ge "$dtb_kver" >/dev/null; then - dtb="$(find /lib/firmware/$kvers/device-tree/ -name $dtb_name)" - if [ ! -f "$dtb" ] ; then - error "Couldn't find $dtb" - fi - append_dtb "$kernel" "$dtb" "$tmpdir/kernel.dtb" - mv "$tmpdir/kernel.dtb" "$tmpdir/kernel" - kernel="$tmpdir/kernel" - fi - fi if [ -n "$ukaddr" ]; then if [ -n "$ukepoint" ]; then mkimage_kernel "$ukaddr" "$ukepoint" "$desc" "$kernel" \ @@ -992,6 +1001,9 @@ fi if [ -n "$boot_kernel_path" ]; then boot_kernel_path="$boot_mnt_dir/$boot_kernel_path" + if [ "$boot_kernel_path_version" = "yes" ]; then + boot_kernel_path="${boot_kernel_path}-${kvers}" + fi # don't mv the original kernel if [ "$kernel" = "$kfile" ]; then cp "$kernel" "$tmpdir/kernel" @@ -1002,14 +1014,6 @@ flash_kernel "$tmpdir/uImage" "$kmtd" "" rm -f "$tmpdir/uImage" fi - if [ -n "$dtb_name" ] && [ -n "$boot_dtb_path" ]; then - dtb="$(find /lib/firmware/$kvers/device-tree/ -name $dtb_name)" - if [ -f "$dtb" ]; then - cp "$dtb" "$tmpdir/$dtb_name" - dtb_path="$boot_mnt_dir/$boot_dtb_path" - backup_and_install "$tmpdir/$dtb_name" "$dtb_path" - fi - fi if [ -n "$boot_multi_path" ]; then backup_and_install "$tmpdir/uImage" "$boot_multi_path" fi @@ -1020,6 +1024,9 @@ fi if [ -n "$boot_initrd_path" ]; then boot_initrd_path="$boot_mnt_dir/$boot_initrd_path" + if [ "$boot_initrd_path_version" = "yes" ]; then + boot_initrd_path="${boot_initrd_path}-${kvers}" + fi # don't mv the original initrd if [ "$initrd" = "$ifile" ]; then cp "$initrd" "$tmpdir/initrd" @@ -1039,20 +1046,16 @@ case $usname in bootscr*) boot_script_path="$boot_mnt_dir/$boot_script_path" - boot_script="$BOOTSCRIPTS_DIR/$usname" + boot_script="$tmpdir/bootscript" + for script in $usname ; do + echo "\n#\n# flash-kernel: $script\n#\n" >> "$boot_script" + cat "$BOOTSCRIPTS_DIR/$script" >> "$boot_script" + done mkimage_script "$usaddr" "boot script" "$boot_script" \ "$tmpdir/boot.scr" boot_script="$tmpdir/boot.scr" backup_and_install "$boot_script" "$boot_script_path" ;; - uboot.env*) - boot_script_path="$boot_mnt_dir/$boot_script_path" - boot_script="$BOOTSCRIPTS_DIR/$usname" - mkimage_env "$ussize" "$boot_script" \ - "$tmpdir/uboot.env" - boot_script="$tmpdir/uboot.env" - backup_and_install "$boot_script" "$boot_script_path" - ;; uEnvtxt*) VOLID=${VOLID:-"$(get_root_uuid)"} boot_script_in="$BOOTSCRIPTS_DIR/$usname" @@ -1073,12 +1076,47 @@ fi if [ -n "$boot_dtb_path" ] && [ "$dtb_append" != "no" ]; then boot_dtb_path="$boot_mnt_dir/$boot_dtb_path" + if [ "$boot_dtb_path_version" = "yes" ]; then + boot_dtb_path="${boot_dtb_path}-${kvers}" + fi boot_dtb=$(find_dtb_file) dtb="$tmpdir/dtb" cp "$boot_dtb" "$dtb" backup_and_install "$dtb" "$boot_dtb_path" fi ;; + "pi") + boot_dir="/boot/firmware" + boot_kernel_path=${boot_kernel_path:-$boot_dir/vmlinuz} + boot_initrd_path=${boot_initrd_path:-$boot_dir/initrd.img} + boot_script_path=${boot_script_path:-$boot_dir/boot.scr} + cp "$kfile" "$tmpdir/vmlinuz" + backup_and_install "$tmpdir/vmlinuz" "$boot_kernel_path" + cp "$ifile" "$tmpdir/initrd.img" + backup_and_install "$tmpdir/initrd.img" "$boot_initrd_path" + boot_script="$tmpdir/boot.scr" + for script in $usname ; do + echo "\n#\n# flash-kernel: $script\n#\n" >> "$boot_script" + cat "$BOOTSCRIPTS_DIR/$script" >> "$boot_script" + done + mkimage_script "$usaddr" "boot script" "$boot_script" "$tmpdir/boot.scr" + backup_and_install "$boot_script" "$boot_dir/boot.scr" + find_all_dtbs | { + while read dtb; do + dtb_name=$(basename $dtb) + cp "$dtb" "$tmpdir/$dtb_name" + backup_and_install "$tmpdir/$dtb_name" "$boot_dir/$dtb_name" + done + } + mkdir -p "$boot_dir/overlays" + find_all_overlays | { + while read overlay; do + overlay_name=$(basename $overlay) + cp "$overlay" "$tmpdir/$overlay_name" + backup_and_install "$tmpdir/$overlay_name" "$boot_dir/overlays/$overlay_name" + done + } + ;; "symlink") rm -f /boot/initrd /boot/zImage ln -s "$(basename "$ifile")" /boot/initrd diff -Nru flash-kernel-3.90ubuntu3.18.04.2/initramfs-tools/hooks/flash_kernel_set_root flash-kernel-3.98ubuntu11~18.04.1/initramfs-tools/hooks/flash_kernel_set_root --- flash-kernel-3.90ubuntu3.18.04.2/initramfs-tools/hooks/flash_kernel_set_root 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/initramfs-tools/hooks/flash_kernel_set_root 2020-01-24 15:19:25.000000000 +0000 @@ -104,7 +104,13 @@ PARTUUID) rootdev=/dev/disk/by-partuuid/$b if [ ! -e $rootdev ]; then - echo "UUID $b doesn't exist in /dev/disk/by-uuid" >&2 + echo "PARTUUID $b doesn't exist in /dev/disk/by-partuuid" >&2 + fi + ;; + PARTLABEL) + rootdev=/dev/disk/by-partlabel/$b + if [ ! -e $rootdev ]; then + echo "PARTLABEL $b doesn't exist in /dev/disk/by-partlabel" >&2 fi ;; *) diff -Nru flash-kernel-3.90ubuntu3.18.04.2/README flash-kernel-3.98ubuntu11~18.04.1/README --- flash-kernel-3.90ubuntu3.18.04.2/README 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/README 2020-01-24 15:19:25.000000000 +0000 @@ -119,13 +119,16 @@ This option is ignored if a DTB is to be appended, via either DTB-Append or DTB-Append-From. -* DTB-Id: (optional) specifies the name of the DTB file for this device - relative to the kernel package DTB dir or /etc/flash-kernel/dtbs. - It's not necessary to specify the directory if the DTB is in a vendor - subdirectory as flash-kernel will search for the filename in - subdirectories. If the value begins with a `!' then the field is a script - which should be run. The script must produce the DTB filename (just the - filename, without a vendor subdirectory) on stdout (and nothing else). +* DTB-Id: (optional) specifies the name of the DTB file for this device. + If DTB-Id specifies an absolute path the directory specifies the path from + where the DTB is copied. + If DTB-Id specifies a relative path the directory specifies the subdirectory + of the kernel version directory where the DTB will be installed. + The filename is used to search for the filename in subdirectories of + /usr/lib/linux-image-* or /etc/flash-kernel/dtbs. + If the value begins with a `!' then the field is a script which should be + run. The script must produce the DTB filename (possibly including a + directory) on stdout. * DTB-Append: (optional) when yes the DTB specified by DTB-Id will be appended to the kernel image. @@ -153,6 +156,10 @@ generated kernel and initrd files on the filesystem; see also Boot-Device +* Boot-Kernel-Path-Version, Boot-Initrd-Path-Version, Boot-DTB-Path-Version: + (optional) if "yes" appends the kernel version to files created with + Boot-Kernel-Path, Boot-Initrd-Path and Boot-DTB-Path. + * Boot-Script-Path: (optional) like Boot-Kernel-Path and Boot-Initrd-Path but for an U-Boot boot script; see also U-Boot-Script-Name and Boot-Device @@ -186,8 +193,6 @@ kernel, initrd and U-Boot script; Boot-Kernel-Path, Boot-Initrd-Path and Boot-Script-Path are then taken relative to this boot device -* DTB-Kernel-Version: (optional) minimal kernel version for DTB concatenation - Configuration - - - - - - - @@ -206,9 +211,9 @@ * /etc/flash-kernels/bootscript (directory). The files referenced via the Boot-Script-Name field are installed here. -* /etc/flash-kernel/ubootenv.d can be used to add or override u-boot - script snippets. See "Adding U-Boot Commands for Pre-Boot Execution" - below for more details. +* /etc/flash-kernel/ubootenv.d and /etc/flash-kernel/preboot.d can be used to + add or override u-boot script snippets. See "Adding U-Boot Commands for + Pre-Boot Execution" below for more details. * /etc/default/flash-kernel currently contains the following variables: - LINUX_KERNEL_CMDLINE, which should be used by bootscripts to set kernel @@ -235,10 +240,13 @@ Packages can drop in files containing U-Boot commands to be executed by a platform's bootscript before starting the OS. These files should be -dropped in /usr/share/flash-kernel/ubootenv.d. Users can add additional +dropped in /usr/share/flash-kernel/ubootenv.d and +/usr/share/flash-kernel/preboot.d. Users can add additional stubs, or override stubs provided by packages, by adding files to -/etc/flash-kernel/ubootenv.d. Files in the /etc path that have the same -name as files in the /usr path will override the /usr counterparts. - -Platform bootscripts must contain the @@UBOOT_ENV_EXTRA@@ macro for the -contents of these stubs to be incorporated. +/etc/flash-kernel/ubootenv.d and /etc/flash-kernel/preboot.d. Files in the +/etc path that have the same name as files in the /usr path will override the +/usr counterparts. + +Platform bootscripts must contain the @@UBOOT_ENV_EXTRA@@ and +@@UBOOT_PREBOOT_EXTRA@@ macros for the contents of these stubs to be +incorporated. diff -Nru flash-kernel-3.90ubuntu3.18.04.2/test_db flash-kernel-3.98ubuntu11~18.04.1/test_db --- flash-kernel-3.90ubuntu3.18.04.2/test_db 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/test_db 2020-01-24 15:19:25.000000000 +0000 @@ -22,7 +22,7 @@ MACHINE_DB="$(cat "${FK_CHECKOUT:-$FK_DIR}/db/"*.db)" test_no_unknown_fields() { - local expected='Android-Boot-Device Android-Skip-Initrd Boot-Device Boot-DTB-Path Boot-Initrd-Path Boot-Kernel-Path Bootloader-Sets-Incorrect-Root Bootloader-sets-root Boot-Multi-Path Boot-Script-Path DTB-Append DTB-Append-From DTB-Id DTB-Kernel-Version Kernel-Flavors Machine Machine-Id Method Mtd-Initrd Mtd-Kernel Optional-Packages Required-Packages U-Boot-Initrd-Address U-Boot-Kernel-Address U-Boot-Kernel-Entry-Point U-Boot-Multi-Address U-Boot-Script-Address U-Boot-Script-Name' + local expected='Android-Boot-Device Android-Skip-Initrd Boot-Device Boot-DTB-Path Boot-Initrd-Path Boot-Kernel-Path Bootloader-Sets-Incorrect-Root Bootloader-sets-root Boot-Multi-Path Boot-Script-Path DTB-Append DTB-Append-From DTB-Id Kernel-Flavors Machine Machine-Id Method Mtd-Initrd Mtd-Kernel Optional-Packages Required-Packages U-Boot-Initrd-Address U-Boot-Kernel-Address U-Boot-Kernel-Entry-Point U-Boot-Multi-Address U-Boot-Script-Address U-Boot-Script-Name' expected="$(echo "$expected" | sed 's/ /\n/g' | sort -u | xargs)" local fields="$(echo "$MACHINE_DB" | sed -n '/^[^#]*:/s/:.*//p' | sort -u | xargs)" if [ "$fields" != "$expected" ]; then diff -Nru flash-kernel-3.90ubuntu3.18.04.2/test_functions flash-kernel-3.98ubuntu11~18.04.1/test_functions --- flash-kernel-3.90ubuntu3.18.04.2/test_functions 2018-01-26 21:05:44.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/test_functions 2020-01-24 15:19:25.000000000 +0000 @@ -571,29 +571,28 @@ . "$functions" saved_args="" mkarch="arm" - mkimage_kernel "0xdeadbeef" "0xbaddcafe" "desc" "input" "output" 2>/dev/null - expected="-A arm -O linux -T kernel -C none -a 0xdeadbeef -e 0xbaddcafe -n desc -d input output" + mkimage_kernel "0xdeadbeef" "0xbaddcafe" "desc" "$kdata" "output" 2>/dev/null if [ "$expected" != "$saved_args" ]; then echo "Expected mkimage_kernel to be called with \"$expected\" but it was called with \"$saved_args\"" >&2 - return 1 + exit 1 fi ) } test_mkimage_kernel() { local kdata="/dev/zero" - local expected="-A arm -O linux -T kernel -C none -a 0xdeadbeef -e 0xdeadbeef -n desc -d $kdata output" - _test_mkimage_kernel "$kdata" "$expected" || exit 1 + local expected="-A arm -O linux -T kernel -C none -a 0xdeadbeef -e 0xbaddcafe -n desc -d $kdata output" + _test_mkimage_kernel "$kdata" "$expected" } add_test test_mkimage_kernel test_mkimage_kernel_gzip() { - local kdata="$(mktemp)" + get_tempfile + local kdata="$last_tempfile" gzip < /dev/null > "$kdata" - local expected="-A arm -O linux -T kernel -C gzip -a 0xdeadbeef -e 0xdeadbeef -n desc -d $kdata output" - _test_mkimage_kernel "$kdata" "$expected" || exit 1 - rm -f "$kdata" + local expected="-A arm -O linux -T kernel -C gzip -a 0xdeadbeef -e 0xbaddcafe -n desc -d $kdata output" + _test_mkimage_kernel "$kdata" "$expected" } add_test test_mkimage_kernel_gzip @@ -615,6 +614,60 @@ } add_test test_mkimage_initrd +test_mkimage_script() { + get_tempfile + mock_fk_defaults="$last_tempfile" + cat >"$mock_fk_defaults" <"$mock_script" </dev/null + expected="-A arm -O linux -T script -C none -a 0xdeadbeef -e 0xdeadbeef -n desc -d $tmpdir/$(basename $mock_script).out script" + expected_script="$(printf "setenv bootargs foo bar baz quux\n\nfoo\nbar\n\nbaz\nend")" + if [ "$expected" != "$saved_args" ]; then + echo "Expected mkimage_script to be called with \"$expected\" but it was called with \"$saved_args\"" >&2 + exit 1 + fi + if [ "$generated_script" != "$expected_script" ]; then + echo "The script generated by mkimage_script did not match the expected output" >&2 + exit 1 + fi + ) +} +add_test test_mkimage_script + test_mkimage_multi() { ( mkimage() { @@ -707,6 +760,123 @@ } add_test test_dtb_append_from +test_abootimg_get_image_size() { + abootimg_output=" + +Android Boot Image Info: + +* file name = boot.img + +* image size = 8388608 bytes (8.00 MB) + page size = 2048 bytes + +* Boot Name = \"\" + +* kernel size = 3002744 bytes (2.86 MB) + ramdisk size = 1639626 bytes (1.56 MB) + +* load addresses: + kernel: 0x10008000 + ramdisk: 0x11000000 + tags: 0x10000100 + +* cmdline = mem=448M@0M nvmem=64M@448M vmalloc=320M video=tegrafb console=tty0 usbcore.old_scheme_first=1 quiet splash elevator=noop tegraboot=sdmmc cmdpart=1:7168:10240,2:17408:16384,3:35840:614400,4:4004864:27096064 + +* id = 0x07571070 0x13950a6a 0x185c996f 0x9ab7b64d 0xcccd09bd 0x00000000 0x00000000 0x00000000 +" + ( + . "$functions" + size=$(abootimg_get_image_size "$abootimg_output") + if [ "$size" -ne 8388608 ]; then + echo "Expected 8388608 but got $size" >&2 + exit 1 + fi + ) +} +add_test test_abootimg_get_image_size + +test_android_flash() { + ( + abootimg() { + saved_args="$@" + } + . "$functions" + saved_args="" + kfile="vmlinuz" + ifile="initrd.img" + android_flash /dev/some-dev 2>/dev/null + expected="-u /dev/some-dev -k vmlinuz -r initrd.img" + if [ "$expected" != "$saved_args" ]; then + echo "Expected abootimg to be called with \"$expected\" but it was called with \"$saved_args\"" >&2 + exit 1 + fi + saved_args="" + android_skip_initrd=1 android_flash /dev/some-dev 2>/dev/null + expected="-u /dev/some-dev -k vmlinuz" + if [ "$expected" != "$saved_args" ]; then + echo "Expected abootimg to be called with \"$expected\" but it was called with \"$saved_args\"" >&2 + exit 1 + fi + ) +} +add_test test_android_flash + +test_find_all_dtbs() { + kvers="3.14" + get_tempfile + mock_find_output="$last_tempfile" + cat >"$mock_find_output" <&2 + exit 1 + fi + ) +} +add_test test_find_all_dtbs + +test_find_all_overlays() { + kvers="3.14" + get_tempfile + mock_find_output="$last_tempfile" + cat >"$mock_find_output" <&2 + exit 1 + fi + ) +} +add_test test_find_all_overlays + test_main # vim:syntax=sh