From 94fd3a01db3e0ebfc2c4cb8b416739e20f35f93d Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@postmarketos.org>
Date: Mon, 23 Jun 2025 17:29:15 +0200
Subject: [PATCH] device-samsung-dream: use ncm instead of rndis in initfs
 network script

PostmarketOS now uses ncm instead of rndis, so update script accordingly.

Unfortunately usb networking does not work even after this change when
I test on dream2lte, so this needs further debugging.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6706
[ci:skip-build]: already built successfully in CI
---
 device/downstream/device-samsung-dream/APKBUILD      |  4 ++--
 .../downstream/device-samsung-dream/initfs-hook.sh   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/device/downstream/device-samsung-dream/APKBUILD b/device/downstream/device-samsung-dream/APKBUILD
index 7091dbfa1..0cb5d7139 100644
--- a/device/downstream/device-samsung-dream/APKBUILD
+++ b/device/downstream/device-samsung-dream/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-dream
 pkgdesc="Samsung Galaxy S8/S8+"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -49,5 +49,5 @@ nonfree_firmware() {
 
 sha512sums="
 b88c40b55bf92a01c9a2e6ea57a6661384fa746971a5c7c267a698f08ea02175c38fa9e06a92077e2c132d11de0a1bd2e8fd029128ef1d4770ddea61d93cd557  deviceinfo
-73eb760c6e29c7500b3a2090310f467bb906f7bef2556b80e00e57c25a5fdb1089e86438e67744861a5d43096d8733b812efe39e90a83584816a79d9024a2ec4  initfs-hook.sh
+df3254f47e304508f38aa8fcb822681dba24e5d73f4012c7ccea1695ee1a6a5d55a8c2ec00c6749915e9c25c91331db5944e4eed7c891c88f060e4a900a5beaf  initfs-hook.sh
 "
diff --git a/device/downstream/device-samsung-dream/initfs-hook.sh b/device/downstream/device-samsung-dream/initfs-hook.sh
index c0dafb09e..eb96b6f5d 100644
--- a/device/downstream/device-samsung-dream/initfs-hook.sh
+++ b/device/downstream/device-samsung-dream/initfs-hook.sh
@@ -9,14 +9,14 @@ CONFIGFS=/config/usb_gadget
 # Create an usb gadet configuration
 mkdir $CONFIGFS/g1 || echo "initfs-hook: Couldn't create $CONFIGFS/g1"
 
-# Create rndis function.
-mkdir $CONFIGFS/g1/functions/rndis.usb0 \
-	|| echo "initfs-hook: Couldn't create $CONFIGFS/g1/functions/rndis.usb0"
+# Create network function.
+mkdir $CONFIGFS/g1/functions/ncm.usb0 \
+	|| echo "initfs-hook: Couldn't create $CONFIGFS/g1/functions/ncm.usb0"
 
 # Create configuration instance for the gadget
 mkdir $CONFIGFS/g1/configs/c.1 \
 	|| echo "initfs-hook: Couldn't create $CONFIGFS/g1/configs/c.1"
 
-# Link the rndis instance to the configuration
-ln -s $CONFIGFS/g1/functions/rndis.usb0 $CONFIGFS/g1/configs/c.1 \
-	|| echo "initfs-hook: Couldn't symlink rndis.usb0"
+# Link the network instance to the configuration
+ln -s $CONFIGFS/g1/functions/ncm.usb0 $CONFIGFS/g1/configs/c.1 \
+	|| echo "initfs-hook: Couldn't symlink ncm.usb0"