Merge pull request #22 from jdorigao/rescue-wip

organizing dependencies (part 2)
REG-Linux · Sep 8, 2024 · 846ab93 · 846ab93
2 parents 25b5b4b + 7b6758f
commit 846ab93
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/buildroot b/buildroot
diff --git 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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ BR2_KERNEL_HEADERS_6_6=y
		BR2_PACKAGE_HOST_DOSFSTOOLS=y
		BR2_PACKAGE_HOST_MTOOLS=y

		BR2_PACKAGE_ACPID=y