iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

PKG: util-linux: add & enable LSBLK (#173)

Browse Source 
patch configure.ac in utils (usptream) + add option in BR2 (custom)
This commit is contained in:
Apaczer
2025-05-27 23:02:37 +02:00
committed by GitHub
parent a1cba2dc21
commit 635a21ea25
5 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/miyoo_musl_defconfig
View File

@@ -287,7 +287,7 @@ BR2_PACKAGE_OPKG=y
BR2_PACKAGE_OPKG_UTILS=y BR2_PACKAGE_OPKG_UTILS=y
BR2_PACKAGE_DIALOG=y BR2_PACKAGE_DIALOG=y
BR2_PACKAGE_SCREEN=y BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y BR2_PACKAGE_UTIL_LINUX_LSBLK=y
BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_PARTX=y
BR2_PACKAGE_NANO=y BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2=y

2
configs/miyoo_uclibc_defconfig
View File

@@ -264,7 +264,7 @@ BR2_PACKAGE_OPKG=y
BR2_PACKAGE_OPKG_UTILS=y BR2_PACKAGE_OPKG_UTILS=y
BR2_PACKAGE_DIALOG=y BR2_PACKAGE_DIALOG=y
BR2_PACKAGE_SCREEN=y BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y BR2_PACKAGE_UTIL_LINUX_LSBLK=y
BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_PARTX=y
BR2_PACKAGE_NANO=y BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2=y

30
package/util-linux/0003-autotools-allow-enabling-lsblk-with-disable-all-prog.patch Executable file
View File

@@ -0,0 +1,30 @@
From 3c40da1fea8c7c9c550624b27d94ca36d887721d Mon Sep 17 00:00:00 2001
From: Apaczer <94932128+Apaczer@users.noreply.github.com>
Date: Sat, 24 May 2025 23:38:13 +0200
Subject: [PATCH] autotools: allow enabling lsblk with --disable-all-programs
via upstream commit d87ac5c
---
configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 54a91e87d..498ff7b67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1631,7 +1631,11 @@ AC_CHECK_FUNCS([swapon])
AC_CHECK_FUNCS([swapoff])
-UL_BUILD_INIT([lsblk], [check])
+AC_ARG_ENABLE([lsblk],
+ AS_HELP_STRING([--disable-lsblk], [do not build lsblk]),
+ [], [UL_DEFAULT_ENABLE([lsblk], [check])]
+)
+UL_BUILD_INIT([lsblk])
UL_REQUIRES_LINUX([lsblk])
UL_REQUIRES_BUILD([lsblk], [libblkid])
UL_REQUIRES_BUILD([lsblk], [libmount])
--
2.45.2.windows.1

9
package/util-linux/Config.in
View File

@@ -198,6 +198,15 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP
help help
Set up and control loop devices Set up and control loop devices
config BR2_PACKAGE_UTIL_LINUX_LSBLK
bool "lsblk"
depends on BR2_USE_MMU #
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
help
List block devices.
config BR2_PACKAGE_UTIL_LINUX_LSLOGINS config BR2_PACKAGE_UTIL_LINUX_LSLOGINS
bool "lslogins" bool "lslogins"
depends on BR2_USE_MMU # libsmartcols depends on BR2_USE_MMU # libsmartcols

1
package/util-linux/util-linux.mk
View File

@@ -153,6 +153,7 @@ UTIL_LINUX_CONF_OPTS += \
$(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \
$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \
$(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \
$(if $(BR2_PACKAGE_UTIL_LINUX_LSBLK),--enable-lsblk,--disable-lsblk) \
$(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \
$(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \
$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \