[PR PATCH] tinyramfs: add upstream patches for modules

[dkwo <dkwo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages tiny
https://github.com/void-linux/void-packages/pull/44131

tinyramfs: add upstream patches for modules
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/44131.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tiny-44131.patch --]
[-- Type: text/x-diff, Size: 2836 bytes --]

From d19a8ddd0c2aeed21e50834d46209e3488be30b8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 28 May 2023 10:35:06 -0400
Subject: [PATCH] tinyramfs: add upstream patches for modules

---
 srcpkgs/tinyramfs/patches/modinfo.patch  | 22 ++++++++++++++++++++++
 srcpkgs/tinyramfs/patches/modprobe.patch | 22 ++++++++++++++++++++++
 srcpkgs/tinyramfs/template               |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tinyramfs/patches/modinfo.patch
 create mode 100644 srcpkgs/tinyramfs/patches/modprobe.patch

diff --git a/srcpkgs/tinyramfs/patches/modinfo.patch b/srcpkgs/tinyramfs/patches/modinfo.patch
new file mode 100644
index 000000000000..000534a9ff85
--- /dev/null
+++ b/srcpkgs/tinyramfs/patches/modinfo.patch
@@ -0,0 +1,22 @@
+From 9d699d00aada7eaabbc787a8584b0279abe5fa83 Mon Sep 17 00:00:00 2001
+From: illiliti <illiliti@protonmail.com>
+Date: Sat, 15 Apr 2023 03:36:22 +0300
+Subject: [PATCH] tinyramfs: copy modules.builtin.modinfo file
+
+---
+ tinyramfs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tinyramfs b/tinyramfs
+index f2f1d96..7b7a6b0 100755
+--- a/tinyramfs
++++ b/tinyramfs
+@@ -143,6 +143,9 @@ copy_modules()
+     copy_file "${moddir}/${kernel}/modules.builtin" \
+               "/lib/modules/${kernel}/modules.builtin" 0644
+ 
++    copy_file "${moddir}/${kernel}/modules.builtin.modinfo" \
++              "/lib/modules/${kernel}/modules.builtin.modinfo" 0644
++
+     depmod -b "$tmpdir" "$kernel"
+ }
diff --git a/srcpkgs/tinyramfs/patches/modprobe.patch b/srcpkgs/tinyramfs/patches/modprobe.patch
new file mode 100644
index 000000000000..27670bc11663
--- /dev/null
+++ b/srcpkgs/tinyramfs/patches/modprobe.patch
@@ -0,0 +1,22 @@
+From 80074e02dde40fc25af66098c45984f0e4ea5e3c Mon Sep 17 00:00:00 2001
+From: illiliti <illiliti@protonmail.com>
+Date: Sun, 28 May 2023 23:14:59 +0300
+Subject: [PATCH] lib/common.sh: discard module options in modprobe output
+
+---
+ lib/common.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/common.sh b/lib/common.sh
+index 1f72a69..db7477a 100755
+--- a/lib/common.sh
++++ b/lib/common.sh
+@@ -95,7 +95,7 @@ copy_kmod()
+ {
+     modprobe -S "$kernel" -D "$1" 2> /dev/null |
+ 
+-    while read -r _ _mod || [ "$_mod" ]; do
++    while read -r _ _mod _ || [ "$_mod" ]; do
+         case $_mod in /*) copy_file "$_mod" "$_mod" 0644; esac
+     done
+ }
diff --git a/srcpkgs/tinyramfs/template b/srcpkgs/tinyramfs/template
index 2e82a71f4770..0fa041fdb220 100644
--- a/srcpkgs/tinyramfs/template
+++ b/srcpkgs/tinyramfs/template
@@ -1,7 +1,7 @@
 # Template file for 'tinyramfs'
 pkgname=tinyramfs
 version=0.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="util-linux cpio binutils kmod"
 short_desc="Tiny initramfs written in POSIX shell"