add source info to module description

whi-tw · Dec 10, 2022 · d53e24f · d53e24f
1 parent 8648a7a
commit d53e24f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,12 +35,17 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: "true"
+          fetch-depth: 0
       - name: Extract Kernel
         run: |
           mkdir linux-source
           tar -xf firmware/${{ matrix.firmware }}/linux-udr.tar.gz --strip-components=1 -C linux-source
       - name: Copy kernel config file into kernel directory
         run: cp firmware/${{ matrix.firmware }}/kernel-config linux-source/.config
+      - name: Update git tag placeholder in any patches
+        run: |
+          REF_STRING="$(git describe --tags)"
+          sed -i "s@%%GIT_REF%%@${REF_STRING}@" firmware/${{ matrix.firmware }}/patches/*.patch
       - name: Apply firmware-specific patches
         run: find firmware/${{ matrix.firmware }}/patches -type f -name '*.patch' -print0 | sort -z | xargs -t -0 -n 1 patch -p0 -i
       - name: Restore cached apt depentencies
@@ -51,7 +56,7 @@ jobs:
       - name: Prepare for building
         run: |
           cd linux-source
-          make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- olddefconfig prepare modules_prepare
+          make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- olddefconfig prepare
       - name: Build the module
         run: |
           cd linux-source

diff --git a/firmware/2.2.12/kernel-config b/firmware/2.2.12/kernel-config
@@ -266,7 +266,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_STRIPPED=n
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y

diff --git a/firmware/2.2.12/patches/0002-update-macvlan-module-description.patch b/firmware/2.2.12/patches/0002-update-macvlan-module-description.patch
@@ -0,0 +1,9 @@
+--- linux-source/drivers/net/macvlan.c	2021-10-28 11:55:15.000000000 +0000
++++ macvlan.c	2022-12-10 17:11:50.515520812 +0000
+@@ -1614,5 +1614,5 @@
+
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
+-MODULE_DESCRIPTION("Driver for MAC address based VLANs");
++MODULE_DESCRIPTION("Driver for MAC address based VLANs (https://github.com/whi-tw/macvlan-unifi-udr %%GIT_REF%%)");
+ MODULE_ALIAS_RTNL_LINK("macvlan");
diff --git a/firmware/3.0.13/kernel-config b/firmware/3.0.13/kernel-config
@@ -266,7 +266,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_STRIPPED=n
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y

diff --git a/firmware/3.0.13/patches/0002-update-macvlan-module-description.patch b/firmware/3.0.13/patches/0002-update-macvlan-module-description.patch
@@ -0,0 +1,9 @@
+--- linux-source/drivers/net/macvlan.c	2021-10-28 11:55:15.000000000 +0000
++++ macvlan.c	2022-12-10 17:11:50.515520812 +0000
+@@ -1614,5 +1614,5 @@
+
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
+-MODULE_DESCRIPTION("Driver for MAC address based VLANs");
++MODULE_DESCRIPTION("Driver for MAC address based VLANs (https://github.com/whi-tw/macvlan-unifi-udr %%GIT_REF%%)");
+ MODULE_ALIAS_RTNL_LINK("macvlan");