diff options
| author | Yuuki Galaxy | 2019-10-14 15:04:34 +0800 |
|---|---|---|
| committer | Yuuki Galaxy | 2019-10-14 15:04:34 +0800 |
| commit | d73b2d46d1e07134ff23bc772e6055f3cf61ac81 (patch) | |
| tree | ee263d28969359eae703b3995a832441220314d0 | |
| parent | c3c7af1ff76c5e4ee99d6b13ff8297c27e18ad02 (diff) | |
| download | aur-d73b2d46d1e07134ff23bc772e6055f3cf61ac81.tar.gz | |
Squashed commit of the following:
commit f9f3b421cb5e8c7e4a1d5c44651bd6b6a7804edf
Author: Yuuki Galaxy <galaxy001@gmail.com>
Date: Mon Oct 14 14:59:06 2019 +0800
fixed: PKGBUILD
commit 0dc751bcca4dbcd3e6ee1c91972817a2d0aaf0bd
Author: seawright <seawright@sky.com>
Date: Thu Oct 10 18:21:01 2019 +0100
modified: PKGBUILD
new file: kmod-link2.patch
Additional kmod link patch added to prevent errors when compiling driver
modules against Linux kernel version 5.2.1 and higher.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 3 | ||||
| -rw-r--r-- | kmod-link2.patch | 44 |
3 files changed, 49 insertions, 0 deletions
@@ -16,6 +16,7 @@ pkgbase = oss-git source = rm-init-scripts.patch source = soundon.patch source = kmod-link.patch + source = kmod-link2.patch source = ossvermagic.patch sha512sums = SKIP sha512sums = 5599f75ac2784aca7d0367e88705938d2680e7a0eb7ae7300080e3fc0ea0c9d3b183554a9e208ed8359f675028024e8de62baa5f8dbc79e9f3bd942db6aa6157 @@ -26,6 +27,7 @@ pkgbase = oss-git sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690 sha512sums = a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6 sha512sums = f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df + sha512sums = 6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b sha512sums = eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad pkgname = oss-git @@ -26,6 +26,7 @@ source=(oss::git://git.code.sourceforge.net/p/opensound/git rm-init-scripts.patch soundon.patch kmod-link.patch + kmod-link2.patch ossvermagic.patch) sha512sums=('SKIP' '5599f75ac2784aca7d0367e88705938d2680e7a0eb7ae7300080e3fc0ea0c9d3b183554a9e208ed8359f675028024e8de62baa5f8dbc79e9f3bd942db6aa6157' @@ -36,6 +37,7 @@ sha512sums=('SKIP' '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690' 'a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6' 'f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df' + '6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b' 'eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad') pkgver() { @@ -80,6 +82,7 @@ prepare() { # FS#35672 mv oss/build/{osscore.c,osscore_wrapper.c} + patch -p3 < "$srcdir/kmod-link2.patch" patch -p2 < "$srcdir/kmod-link.patch" cd ../.. } diff --git a/kmod-link2.patch b/kmod-link2.patch new file mode 100644 index 000000000000..a1a6049fa0cc --- /dev/null +++ b/kmod-link2.patch @@ -0,0 +1,44 @@ +--- a/setup/Linux/oss/build/Makefile.tmpl ++++ b/setup/Linux/oss/build/Makefile.tmpl +@@ -5,6 +5,7 @@ EXTRA_CFLAGS += -I${OSSLIBDIR}/include/internals -I${OSSLIBDIR}/include/sys + ifneq ($(KERNELRELEASE),) + + obj-m := MODNAME.o ++ MODNAME-objs := MODNAME_wrapper.o MODNAME_mainline.o + + else + +--- a/setup/Linux/oss/build/install.sh ++++ b/setup/Linux/oss/build/install.sh +@@ -228,10 +228,11 @@ do + N=`basename $n .o` + echo Building module $N + +- rm -f $N_mainline.o Makefile ++ rm -f $N\_mainline.o $N\_wrapper.c Makefile + +- sed "s/MODNAME/$N/" < Makefile.tmpl > Makefile +- ln -s $n $N_mainline.o ++ sed "s/MODNAME/$N/g" < Makefile.tmpl > Makefile ++ ln -s $N.c $N\_wrapper.c ++ ln -s $n $N\_mainline.o + + if ! make KERNELDIR=$KERNELDIR > build.list 2>&1 + then +@@ -240,13 +241,9 @@ do + exit 4 + fi + +- if ! $LD -r $N.ko $N_mainline.o -o /lib/modules/$UNAME/kernel/oss/$N.ko +- then +- echo Linking $N module failed +- exit 6 +- fi +- +- rm -f $N_mainline.o ++ cp -f $N.ko /lib/modules/$UNAME/kernel/oss/ ++ rm -f $N\_mainline.o ++ rm -f $N\_wrapper.c + make clean + done + |