From 1f43b9d0490e2cefd725fadfff67d0042e9e40f9 Mon Sep 17 00:00:00 2001
From: Vyacheslav Pedash <vyacheslav.pedash@globallogic.com>
Date: Thu, 11 Mar 2021 17:32:31 +0200
Subject: MTX-3899 Fix PR values

The value of WORKDIR variable depends on PR. If PR and consequently WORKDIR
changes its value build will fail because values in butbake cache will not correspond
to the real ones. KERNEL_MODULE_PACKAGE_SUFFIX is derived from files in kernel
staging directory and cosequenlty recives expected value only when kernel shared
directory is populated. Therefore, it can not be used in PR.
PR values are set to constant strings and to preserve current package names
 KERNEL_MODULE_PACKAGE_SUFFIX is added to PKGR
---
 recipes-kernel/vizzini/vizzini.inc    | 9 +--------
 recipes-kernel/vizzini/vizzini_1.1.bb | 3 ++-
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'recipes-kernel/vizzini')

diff --git a/recipes-kernel/vizzini/vizzini.inc b/recipes-kernel/vizzini/vizzini.inc
index 48eb241..17120cf 100644
--- a/recipes-kernel/vizzini/vizzini.inc
+++ b/recipes-kernel/vizzini/vizzini.inc
@@ -15,16 +15,9 @@ SRC_URI = " \
 inherit module
 inherit update-rc.d
 
-EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
-                M=${S} \
-                modules \
+EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_DIR} \
                 "
 
-do_compile () {
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake
-}
-
 PACKAGES = "kernel-module-${PN} ${PN}-dev"
 
 FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/vizzini.ko"
diff --git a/recipes-kernel/vizzini/vizzini_1.1.bb b/recipes-kernel/vizzini/vizzini_1.1.bb
index 0cd1c5e..17bbe39 100644
--- a/recipes-kernel/vizzini/vizzini_1.1.bb
+++ b/recipes-kernel/vizzini/vizzini_1.1.bb
@@ -1,6 +1,7 @@
 require vizzini.inc
-PR = "r1.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
+PR = "r1.1"
 
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
 
 SRC_URI += "file://xr21v141x-lnx3.10-3.11.tar.gz \
 			file://vizzini-1.1-enable-cts-v2.patch \
-- 
cgit v1.2.3