JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

qemu-uboot-xxx: fix missed rootfs cache due to pkg removals

Browse Source
This commit is contained in:
Ricardo Pardini
2023-02-12 17:30:40 +01:00
parent ce68e373f1
commit 68e20a4bf4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/sources/families/include/uefi_common.inc
View File

@@ -36,12 +36,10 @@ if [[ "${QEMU_UBOOT_BOOTCONFIG}" != "" ]]; then
declare -g BOOTSCRIPT="boot-qemu-${LINUXFAMILY}.cmd:boot.cmd"
declare -g BOOTDIR="qemu-uboot-${LINUXFAMILY}"
declare -g BOOTBRANCH='tag:v2023.01'
declare -g BOOTSOURCE='https://github.com/u-boot/u-boot' # Gotta set this again, it is unset by grub extension
declare -g UBOOT_TARGET_MAP="all;;u-boot.rom" # Can't find the target that produces 'u-boot.rom', so for now 'make all'
declare -g PACKAGE_LIST_FAMILY="spice-vdagent qemu-guest-agent" # Nice-to-have packages for running under qemu
declare -g BOOTSOURCE='https://github.com/u-boot/u-boot' # Gotta set this again, it is unset by grub extension
declare -g UBOOT_TARGET_MAP="all;;u-boot.rom" # Can't find the target that produces 'u-boot.rom', so for now 'make all'
declare -g BOOTCONFIG="${QEMU_UBOOT_BOOTCONFIG}"
declare -g PACKAGE_LIST_FAMILY_REMOVE="plymouth" # Nice-to-have packages for running under qemu
declare -g PLYMOUTH="no" # try with smaller initrd?
add_packages_to_image spice-vdagent qemu-guest-agent # Nice-to-have packages for running under qemu
# A patch to convert to `q35` machine type DTS (x86 only)
declare -g BOOTPATCHDIR="u-boot-qemu-${LINUXFAMILY}"

3
lib/functions/configuration/package-lists.sh
View File

@@ -7,7 +7,7 @@ function get_caller_reference() {
declare -g caller_reference="${caller_ref}:${caller_file}:${caller_line}"
}
# Adds to the main package list.
# Adds to the main package list. Using this causes an immediate miss on any cached/standard rootfs.
function add_packages_to_rootfs() {
get_caller_reference
declare -g -a EXTRA_PACKAGES_ROOTFS=("${EXTRA_PACKAGES_ROOTFS[@]}")
@@ -32,6 +32,7 @@ function add_packages_to_image() {
}
# Removes a package from all lists: debootstrap, rootfs, desktop and image.
# Using this causes an immediate miss on any cached/standard rootfs.
function remove_packages() {
get_caller_reference
declare -g -a REMOVE_PACKAGES=("${REMOVE_PACKAGES[@]}")