diff mbox series

[1/1,SRU,OEM-5.17] UBUNTU: SAUCE: intel-gpgpu: rename compat.ko to i915-compat.ko

Message ID 20220524150755.365120-2-vicamo.yang@canonical.com
State New
Headers show
Series UBUNTU: SAUCE: intel-gpgpu: rename compat.ko to i915-compat.ko | expand

Commit Message

You-Sheng Yang May 24, 2022, 3:07 p.m. UTC 
From: "You-Sheng Yang (vicamo)" <vicamo.yang@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1975593

Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
---
 ubuntu/intel-gpgpu/compat/Makefile      | 6 ++++--
 ubuntu/intel-gpgpu/dkms.conf            | 2 +-
 ubuntu/intel-gpgpu/scripts/uninstall.sh | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/ubuntu/intel-gpgpu/compat/Makefile b/ubuntu/intel-gpgpu/compat/Makefile
index 5710b2edc00d..34fe53df1968 100644
--- a/ubuntu/intel-gpgpu/compat/Makefile
+++ b/ubuntu/intel-gpgpu/compat/Makefile
@@ -1,9 +1,11 @@ 
 ccflags-y += -I$(src) -Wframe-larger-than=1280
 ifeq ($(CONFIG_BACKPORT_INTEGRATE),)
-obj-m += compat.o
+obj-m += i915-compat.o
 else
-obj-y += compat.o
+obj-y += i915-compat.o
 endif
+i915-compat-y += $(compat-y)
+
 compat-y += main.o
 
 # Kernel backport compatibility code
diff --git a/ubuntu/intel-gpgpu/dkms.conf b/ubuntu/intel-gpgpu/dkms.conf
index c0a784d02a1d..8143cd6c824b 100644
--- a/ubuntu/intel-gpgpu/dkms.conf
+++ b/ubuntu/intel-gpgpu/dkms.conf
@@ -3,7 +3,7 @@  PACKAGE_VERSION="5539.220408.2"
 AUTOINSTALL="yes"
 REMAKE_INITRD="yes"
 
-BUILT_MODULE_NAME[0]="compat"
+BUILT_MODULE_NAME[0]="i915-compat"
 BUILT_MODULE_LOCATION[0]="compat"
 DEST_MODULE_LOCATION[0]="/updates"
 
diff --git a/ubuntu/intel-gpgpu/scripts/uninstall.sh b/ubuntu/intel-gpgpu/scripts/uninstall.sh
index 91a0fe6235e8..96112b9ccfe2 100755
--- a/ubuntu/intel-gpgpu/scripts/uninstall.sh
+++ b/ubuntu/intel-gpgpu/scripts/uninstall.sh
@@ -4,9 +4,9 @@  set -e
 
 source ./scripts/mod_helpers.sh
 
-if test "$(mod_filename compat)" = "compat.ko.gz" ; then
+if test "$(mod_filename compat)" = "i915-compat.ko.gz" ; then
 	compr=".gz"
-elif test "$(mod_filename compat)" = "compat.ko.xz" ; then
+elif test "$(mod_filename compat)" = "i915-compat.ko.xz" ; then
 	compr=".xz"
 else
 	compr=""