diff -Nru u-boot-menu-4.0.1ubuntu0.1/debian/changelog u-boot-menu-4.0.2ubuntu5~20.04.1/debian/changelog --- u-boot-menu-4.0.1ubuntu0.1/debian/changelog 2021-01-27 11:08:03.000000000 -0600 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/debian/changelog 2021-06-24 16:04:00.000000000 -0500 @@ -1,17 +1,62 @@ -u-boot-menu (4.0.1ubuntu0.1) focal; urgency=medium +u-boot-menu (4.0.2ubuntu5~20.04.1) focal; urgency=medium + + * SRU changes from hirsute to enable booting on the HiFive Unmatched + LP: #1925267 LP: #1923162 + + -- William 'jawn-smith' Wilson Thu, 24 Jun 2021 16:04:00 -0500 + +u-boot-menu (4.0.2ubuntu5) hirsute; urgency=medium + + * Go back to generating fdtdir option in extlinux.conf, instead patch + u-boot qemu-riscv64_smode target to not process or load fdtdir + option. Currently the dtb for riscv64 unmatched board in kernel & + u-boot are _unmatched_ meaning u-boot must use its dtb, and kernel + must use its dtb. Hence fdtdir option in extlinux.conf is + required. LP: #1925267 LP: #1923162 + + -- Dimitri John Ledkov Wed, 21 Apr 2021 03:32:22 +0100 + +u-boot-menu (4.0.2ubuntu4) hirsute; urgency=medium + + * Revert "Add support for ubuntu kernels location of device trees." as + it breaks booting riscv64 images with qemu, as the qemu in-ram dtb + should be used not the one from disk. LP: #1923162 + + -- Dimitri John Ledkov Mon, 12 Apr 2021 15:50:07 +0100 + +u-boot-menu (4.0.2ubuntu3) hirsute; urgency=medium + + * Add support for ubuntu kernels location of device trees. + + -- Dimitri John Ledkov Tue, 16 Mar 2021 18:29:10 +0000 + +u-boot-menu (4.0.2ubuntu2) hirsute; urgency=medium - * SRU UX improvements from 4.0.2ubuntu2 to focal LP: #1913468 - - [ Dimitri John Ledkov ] * Make default U_BOOT_PARAMETERS to be "ro earlycon". If one is using embedded boards, most likely they want verbosity. + -- Dimitri John Ledkov Tue, 24 Nov 2020 18:26:52 +0000 + +u-boot-menu (4.0.2ubuntu1) hirsute; urgency=medium + * u-boot-update: use PRETTY_NAME from os-release as menu label. + -- Dimitri John Ledkov Thu, 19 Nov 2020 12:18:13 +0000 + +u-boot-menu (4.0.2) unstable; urgency=medium + [ Vagrant Cascadian ] + * install example script for syncing .dtb files + for systems with a split /boot partition * fix comment handling in in /etc/fstab - -- Dimitri John Ledkov Wed, 27 Jan 2021 17:08:03 +0000 + [ Jonas Smedegaard ] + * declare compliance with Debian Policy 4.5.0 + * use debhelper compatibility level 13 (not 10); + build-depend on debhelper-compat (not debhelper) + * copyright: extend coverage + + -- Jonas Smedegaard Tue, 14 Jul 2020 18:42:17 +0200 u-boot-menu (4.0.1) unstable; urgency=medium diff -Nru u-boot-menu-4.0.1ubuntu0.1/debian/compat u-boot-menu-4.0.2ubuntu5~20.04.1/debian/compat --- u-boot-menu-4.0.1ubuntu0.1/debian/compat 2019-03-31 13:28:00.000000000 -0500 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/debian/compat 1969-12-31 18:00:00.000000000 -0600 @@ -1 +0,0 @@ -10 diff -Nru u-boot-menu-4.0.1ubuntu0.1/debian/control u-boot-menu-4.0.2ubuntu5~20.04.1/debian/control --- u-boot-menu-4.0.1ubuntu0.1/debian/control 2021-01-27 11:08:03.000000000 -0600 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/debian/control 2021-06-24 16:04:00.000000000 -0500 @@ -1,14 +1,14 @@ Source: u-boot-menu Section: admin Priority: optional -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/debian/u-boot-menu.git Vcs-Browser: https://salsa.debian.org/debian/u-boot-menu Homepage: https://github.com/suihkulokki/u-boot-menu Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Riku Voipio Uploaders: Jonas Smedegaard -Build-Depends: debhelper (>= 10) +Build-Depends: debhelper-compat (= 12) Rules-Requires-Root: no Package: u-boot-menu diff -Nru u-boot-menu-4.0.1ubuntu0.1/debian/copyright u-boot-menu-4.0.2ubuntu5~20.04.1/debian/copyright --- u-boot-menu-4.0.1ubuntu0.1/debian/copyright 2019-12-18 06:41:27.000000000 -0600 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/debian/copyright 2020-11-18 17:58:00.000000000 -0600 @@ -6,7 +6,8 @@ Files: * Copyright: 2006-2012, Daniel Baumann 2016-2017, Riku Voipio - 2019, Jonas Smedegaard + 2019-2020, Jonas Smedegaard + 2019-2020 Vagrant Cascadian License: GPL-2+ Files: debian/* diff -Nru u-boot-menu-4.0.1ubuntu0.1/debian/u-boot-menu.examples u-boot-menu-4.0.2ubuntu5~20.04.1/debian/u-boot-menu.examples --- u-boot-menu-4.0.1ubuntu0.1/debian/u-boot-menu.examples 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/debian/u-boot-menu.examples 2020-11-18 17:58:00.000000000 -0600 @@ -0,0 +1 @@ +zz-sync-dtb diff -Nru u-boot-menu-4.0.1ubuntu0.1/u-boot-update u-boot-menu-4.0.2ubuntu5~20.04.1/u-boot-update --- u-boot-menu-4.0.1ubuntu0.1/u-boot-update 2021-01-27 11:08:01.000000000 -0600 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/u-boot-update 2021-03-16 13:29:10.000000000 -0500 @@ -91,7 +91,7 @@ U_BOOT_TIMEOUT="${U_BOOT_TIMEOUT:-50}" U_BOOT_MENU_LABEL="${U_BOOT_MENU_LABEL:-${PRETTY_NAME:-Debian GNU/Linux kernel}}" U_BOOT_PARAMETERS="${U_BOOT_PARAMETERS:-ro earlycon}" -U_BOOT_FDT_DIR="${U_BOOT_FDT_DIR:-/usr/lib/linux-image-}" +U_BOOT_FDT_DIR="${U_BOOT_FDT_DIR:-/lib/firmware/}" # Find parameter for root from fstab if [ -z "${U_BOOT_ROOT}" ] @@ -178,6 +178,9 @@ if [ -e ${_BOOT_PATH}${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT} ] && [ -n "${U_BOOT_FDT}" ] then _FDT="fdt ${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT}" + elif [ -d ${_BOOT_PATH}${U_BOOT_FDT_DIR}${_VERSION}/device-tree ] + then + _FDT="fdtdir ${U_BOOT_FDT_DIR}${_VERSION}/device-tree/" elif [ -d ${_BOOT_PATH}${U_BOOT_FDT_DIR}${_VERSION}/ ] then _FDT="fdtdir ${U_BOOT_FDT_DIR}${_VERSION}/" diff -Nru u-boot-menu-4.0.1ubuntu0.1/zz-sync-dtb u-boot-menu-4.0.2ubuntu5~20.04.1/zz-sync-dtb --- u-boot-menu-4.0.1ubuntu0.1/zz-sync-dtb 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-menu-4.0.2ubuntu5~20.04.1/zz-sync-dtb 2020-11-18 17:58:00.000000000 -0600 @@ -0,0 +1,34 @@ +#!/bin/sh -e + +## Copyright 2019-2020 Vagrant Cascadian + +## This program comes with ABSOLUTELY NO WARRANTY; for details see +## COPYING. This is free software, and you are welcome to +## redistribute it under the terms of the GNU GPL, version 2 or any +## later version; see COPYING for details. + +# sync .dtb files into /boot to simplify installations on systems with +# a split /boot partition. To use, install this file into +# /etc/kernel/postinst.d/zz-sync-dtb and mark it as executable. + +version="$1" + +command -v rsync >/dev/null 2>&1 || exit 0 + +# passing the kernel version is required +if [ -z "${version}" ]; then + echo >&2 "W: sync-dtb: ${DPKG_MAINTSCRIPT_PACKAGE:-kernel package} did not pass a version number" + exit 2 +fi + +dtbdir="/usr/lib/linux-image-${version}" + + + +if [ -d "${dtbdir}" ]; then + echo >&2 "W: sync-dtb: syncing ${dtbdir}" + mkdir -p /boot/${dtbdir} + rsync -a "${dtbdir}/." "/boot/${dtbdir}/." +else + echo >&2 "W: sync-dtb: ${dtbdir} NOT PRESENT" +fi