diff --git a/main/busybox/0001-blkdiscard-ship-link-to-sbin-instead-of-usr-bin.patch b/main/busybox/0001-blkdiscard-ship-link-to-sbin-instead-of-usr-bin.patch new file mode 100644 index 00000000000..a89dd69b39f --- /dev/null +++ b/main/busybox/0001-blkdiscard-ship-link-to-sbin-instead-of-usr-bin.patch @@ -0,0 +1,29 @@ +From e2bafe8e7419e034901e80f36113d93147b02a2d Mon Sep 17 00:00:00 2001 +From: Lauri Tirkkonen +Date: Wed, 23 Jul 2025 10:27:43 +0900 +Subject: [PATCH] blkdiscard: ship link to /sbin instead of /usr/bin + +util-linux ships blkdiscard in /sbin, so follow what it does. + +Link: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/sys-utils/Makemodule.am?id=5a75fb2b9e384c61a4b2afd13fe9bba219d5bd93#n194 +Signed-off-by: Lauri Tirkkonen +--- + util-linux/blkdiscard.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util-linux/blkdiscard.c b/util-linux/blkdiscard.c +index 70fd34af3..cef25c896 100644 +--- a/util-linux/blkdiscard.c ++++ b/util-linux/blkdiscard.c +@@ -11,7 +11,7 @@ + //config: help + //config: blkdiscard discards sectors on a given device. + +-//applet:IF_BLKDISCARD(APPLET_NOEXEC(blkdiscard, blkdiscard, BB_DIR_USR_BIN, BB_SUID_DROP, blkdiscard)) ++//applet:IF_BLKDISCARD(APPLET_NOEXEC(blkdiscard, blkdiscard, BB_DIR_SBIN, BB_SUID_DROP, blkdiscard)) + + //kbuild:lib-$(CONFIG_BLKDISCARD) += blkdiscard.o + +-- +2.50.1 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index e00dc16a6a2..5ffe7dcda26 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Sören Tempel pkgname=busybox pkgver=1.37.0 -pkgrel=19 +pkgrel=20 pkgdesc="Size optimized toolbox of many common UNIX utilities" url="https://busybox.net/" arch="all" @@ -86,6 +86,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch 0001-tunctl-fix-segfault-on-ioctl-failure.patch 0001-init-add-support-for-separate-reboot-action.patch + 0001-blkdiscard-ship-link-to-sbin-instead-of-usr-bin.patch acpid.logrotate busyboxconfig @@ -403,6 +404,7 @@ ac026f8b289d1431c46d51a8c512eb0184aa81de1c41971a87c99bcdc5c63c2d9abed412cad20d30 7165661f3972f1800faf8d263126e3f238bb26bb7891230dbaad2d085e49e2ababc555294ecefed9d8ff00d93c8c3963e786db796cf3d03d68bf9e0492305d0c 0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch 9548603cbadf690ab31354642ab3f7bef1b9f696df6b661ea644548fb831b2f78a47a9b09b5489aa43da7061dcc6808864d130d053906f44090983f5cb3dc169 0001-tunctl-fix-segfault-on-ioctl-failure.patch 109d3e6a0141b0b28352c299a7d520f39d4626d424566d6ec14df95ba27f0ae8a755bb275c73217c07745c7b7f6fc7eb71555db818536afb09f04f29c4cd8b2f 0001-init-add-support-for-separate-reboot-action.patch +b8b408974dbcf803889786500d37970c3c3fc3ff7b651998616301691c29287e786ecca07a5b959ed31cf22b0c54b9da82385650c3961afb9f7c09233f46f864 0001-blkdiscard-ship-link-to-sbin-instead-of-usr-bin.patch aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate 93f0fa512a394a07f760b13bd70a28424d3ad1a6c283b77fd4894114c5b472cfbe65f3441afa28596771d75527aaa9794706a3b329b4898e5d83bce799169929 busyboxconfig 2f6efba02078647137f0518284c60004bf28d29a77146d488f813c4db6971ccf6ec5157734c521516e6f3aa570c804fe3ed2c69c46a3ef8636c5f88758948eb7 busyboxconfig-extras