aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2023-03-29 11:22:46 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2023-03-29 11:22:46 +0200
commit3ee6cfd452730ac6c7d52a6d58036d186f509ed6 (patch)
treeb2e9000f5c8defa04535a1e9f9f11a5fdac09a5d
parent631950fbfeaf62e2c318ecb5a06711cf1ff084b2 (diff)
main/mkinitfs: increase socket boffer to 4MB
backport of https://gitlab.alpinelinux.org/alpine/mkinitfs/-/commit/5cfe4c4fbdd1183fa2f3e6c1e1063c569eb77f83
-rw-r--r--main/mkinitfs/APKBUILD7
-rw-r--r--main/mkinitfs/nlplug-findfs-increase-socket-buffer-to-4MB.patch15
2 files changed, 20 insertions, 2 deletions
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 8b42473450c..c00d1e152bb 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -3,7 +3,7 @@ pkgname=mkinitfs
pkgver=3.7.0
# shellcheck disable=SC2034 # used for git versions, keep around for next time
_ver=${pkgver%_git*}
-pkgrel=3
+pkgrel=4
pkgdesc="Tool to generate initramfs images for Alpine"
url="https://gitlab.alpinelinux.org/alpine/mkinitfs"
arch="all"
@@ -23,7 +23,9 @@ depends="
subpackages="$pkgname-doc"
install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
triggers="$pkgname.trigger=/usr/share/kernel/*"
-source="https://gitlab.alpinelinux.org/alpine/mkinitfs/-/archive/$pkgver/mkinitfs-$pkgver.tar.gz"
+source="https://gitlab.alpinelinux.org/alpine/mkinitfs/-/archive/$pkgver/mkinitfs-$pkgver.tar.gz
+ nlplug-findfs-increase-socket-buffer-to-4MB.patch
+ "
provides="initramfs-generator"
provider_priority=900 # highest
@@ -38,4 +40,5 @@ package() {
sha512sums="
72d31cf5554a3fd3eb48bff79a2c81694f208e0bb727a997f875fdf847b90d028973dbbf1c71d1a7174806de5aab5e21810d852c0ef5f04e46c96367b751d9f4 mkinitfs-3.7.0.tar.gz
+171977b09d71df8ea3749c761913adcb78c07c34759ec1cc68d0fccde3f93d1c20442479b696e56611140f459e7362ffcbc568a4786a2838d81ab48af440253c nlplug-findfs-increase-socket-buffer-to-4MB.patch
"
diff --git a/main/mkinitfs/nlplug-findfs-increase-socket-buffer-to-4MB.patch b/main/mkinitfs/nlplug-findfs-increase-socket-buffer-to-4MB.patch
new file mode 100644
index 00000000000..e205fc8f7ae
--- /dev/null
+++ b/main/mkinitfs/nlplug-findfs-increase-socket-buffer-to-4MB.patch
@@ -0,0 +1,15 @@
+Upstream: https://gitlab.alpinelinux.org/alpine/mkinitfs/-/commit/5cfe4c4fbdd1183fa2f3e6c1e1063c569eb77f83
+
+diff --git a/nlplug-findfs/nlplug-findfs.c b/nlplug-findfs/nlplug-findfs.c
+index 06bca77..878b14a 100644
+--- a/nlplug-findfs/nlplug-findfs.c
++++ b/nlplug-findfs/nlplug-findfs.c
+@@ -419,7 +419,7 @@ static int init_netlink_socket(void)
+
+ /* kernel will not create events bigger than 16kb, but we need
+ buffer up all events during coldplug */
+- slen = 1024*1024;
++ slen = 4*1024*1024;
+ if (setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &slen,
+ sizeof(slen)) < 0) {
+ err(1, "setsockopt");