From 384ddf9cc49a1460a58fa1075a9ac5c3c2188a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juliano=20Dorig=C3=A3o?= Date: Sun, 8 Sep 2024 16:11:20 -0400 Subject: [PATCH 1/2] organizing dependencies (part 2) --- configs/rescue-board.common | 6 +++++- configs/rescue-x86_64.board | 1 + package/core/rescue-system/Config.in | 10 ++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/configs/rescue-board.common b/configs/rescue-board.common index 48459e3..21cfb49 100644 --- a/configs/rescue-board.common +++ b/configs/rescue-board.common @@ -11,6 +11,10 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-gold --enable-plugins" # Linux tools BR2_PACKAGE_BUSYBOX=y BR2_PACKAGE_START_STOP_DAEMON=y +BR2_PACKAGE_UTIL_LINUX_BINARIES=y +BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y +BR2_PACKAGE_UTIL_LINUX_SETTERM=y +BR2_PACKAGE_EUDEV_RULES_GEN=y # system BR2_TARGET_GENERIC_HOSTNAME="REGLINUX" @@ -25,7 +29,7 @@ BR2_LINUX_KERNEL_LZ4=y # System BR2_PACKAGE_RESCUE_SYSTEM=y BR2_PACKAGE_GLIBC_UTILS=y -BR2_SYSTEM_BIN_SH_BASH=y # /bin/sh implementation; set here because a `choice` cannot be `select` +BR2_SYSTEM_BIN_SH_BASH=y # Disable generating rootfs tar (speedup) BR2_TARGET_ROOTFS_TAR=n diff --git a/configs/rescue-x86_64.board b/configs/rescue-x86_64.board index 917425a..c56b2c6 100644 --- a/configs/rescue-x86_64.board +++ b/configs/rescue-x86_64.board @@ -18,3 +18,4 @@ BR2_KERNEL_HEADERS_6_6=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_ACPID=y diff --git a/package/core/rescue-system/Config.in b/package/core/rescue-system/Config.in index 3f7bd27..2af7a49 100644 --- a/package/core/rescue-system/Config.in +++ b/package/core/rescue-system/Config.in @@ -19,8 +19,8 @@ config BR2_PACKAGE_RESCUE_SYSTEM select BR2_RISCV_ISA_RVC if BR2_PACKAGE_RESCUE_TARGET_RISCV64 # minimal system required packages - select BR2_PACKAGE_BASH # bash shell, used as the interactive shell select BR2_PACKAGE_RNG_TOOLS # system entropy. Currently disabled for RK3128 due to high CPU impact + select BR2_PACKAGE_IRQBALANCE # irq balancing select BR2_PACKAGE_HOST_GENEXT2FS # tools to generate rescue image select BR2_PACKAGE_DOSFSTOOLS # fat select BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT # fat @@ -32,23 +32,17 @@ config BR2_PACKAGE_RESCUE_SYSTEM select BR2_PACKAGE_NTFS_3G # ntfs select BR2_PACKAGE_NTFS_3G_NTFSPROGS # ntfs select BR2_PACKAGE_BTRFS_PROGS # btrfs - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # for util-linux compilation to work (so, may be removed in the future) - select BR2_PACKAGE_EUDEV_RULES_GEN # fork of systemd-udev with the goal of obtaining better compatibility with existing software such as OpenRC and Upstart - select BR2_PACKAGE_UTIL_LINUX_SETTERM # Set terminal attributes select BR2_PACKAGE_USBMOUNT # usb key/sd card mounter select BR2_PACKAGE_USBUTILS # usb key/sd card tools - select BR2_PACKAGE_ACPID if BR2_PACKAGE_RESCUE_TARGET_X86_64 select BR2_PACKAGE_KBD # loadkeys + # Disk tool select BR2_PACKAGE_PARTED # partition management (for the first boot) select BR2_PACKAGE_GPTFDISK # fs resize select BR2_PACKAGE_GPTFDISK_SGDISK # fs resize select BR2_PACKAGE_E2FSPROGS # fs resize select BR2_PACKAGE_E2FSPROGS_RESIZE2FS # fs resize - # irq balancing - select BR2_PACKAGE_IRQBALANCE - # compression tools select BR2_PACKAGE_UNZIP # for /userdata/system/upgrade/share.zip (What is this?) select BR2_PACKAGE_XZ # for updates From 7b6758f6b0481b6e67eded6231f9d130b9467e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juliano=20Dorig=C3=A3o?= Date: Sun, 8 Sep 2024 17:06:57 -0400 Subject: [PATCH 2/2] busybox: add dd, awk and sed --- buildroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot b/buildroot index 3105cd4..5d0aaf2 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 3105cd464c0f419224d97d3bd1956c44590efe59 +Subproject commit 5d0aaf279c320dfc90fc8fe6fb543646b004245b