From e3d8cb5c433fd6852aba537181b4e19d48b2b052 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 11 Aug 2021 11:58:45 +0200 Subject: [PATCH] target/x86: add grub2-bios-setup to DEFAULT_PACKAGES With the commit 5876d6a62fc0ae5799e7d9c896356f75c99a6f0a the command under `/usr/sbin/grub-bios-setup` has been moved to its own package named `grub-bios-setup`. The script `81_upgrade_bootloader` under `/lib/preinit` is used by all x86 targets to update the bootloader. The script is using the command `grub-bios-setup` for this. I get the following output at the first boot after the upgrade. `/etc/preinit: line 9: /usr/sbin/grub-bios-setup: not found`. To fix this, the DEFAULT_PACKAGES dependency is extended by the entry `grub2-bios-setup` so that the missing command is installed again. Signed-off-by: Florian Eckert (cherry picked from commit 027845b4ce906a7819e12f6298b96dba0cb4a183) --- target/linux/x86/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index b486d2a857..25286dc3f2 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -20,11 +20,12 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs kmod-usb-hid kmod-e1000e kmod-igb kmod-igbvf \ kmod-igc kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-iavf \ - kmod-r8101 kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs autocore-x86 \ - automount kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via \ + kmod-r8101 kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs \ + kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via \ kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 \ kmod-usb-audio kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 \ - kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-mlx4-core kmod-mlx5-core + kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-mlx4-core kmod-mlx5-core \ + autocore-x86 automount grub2-bios-setup $(eval $(call BuildTarget))