ixgbe/ixgbevf/backport-iwlwifi: Adapt to S/UNPACKDIR changesHEADmaster

Remove or update S definitions as required to work with oe-core
S/UNPACKDIR changes.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

3 files changed, 5 insertions, 6 deletions

diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb b/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb
index 696c5c26..75ebf6f4 100644
--- a/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb
+++ b/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb
@@ -5,7 +5,7 @@ PCI Express* 10 Gigabit Network Connections."
 HOMEPAGE = "https://sourceforge.net/projects/e1000/"
 SECTION = "kernel/network"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
 
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
            "
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/"
 
 CVE_PRODUCT = "linux:linux_kernel_ixgbe"
 
-S = "${WORKDIR}/${BP}/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 EXTRA_OEMAKE = ' KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
 
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb
index 92e25739..8bb0923c 100644
--- a/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb
+++ b/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb
@@ -8,7 +8,7 @@ The guest OS loading this driver must support MSI-X interrupts."
 HOMEPAGE = "https://sourceforge.net/projects/e1000/"
 SECTION = "kernel/network"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
 
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
            "
@@ -20,7 +20,7 @@ UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/"
 
 CVE_PRODUCT = "linux:linux_kernel_ixgbe"
 
-S = "${WORKDIR}/${BP}/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 EXTRA_OEMAKE = 'KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
 
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
index 6233df3e..07d2b500 100644
--- a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
+++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
@@ -26,7 +26,6 @@ SRC_URI = " \
            file://iwlwifi.conf \
           "
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}"
 
@@ -39,7 +38,7 @@ MODULES_INSTALL_TARGET = "install"
 do_install:append() {
         ## install configs and service scripts
         install -d ${D}${sysconfdir}/modprobe.d
-        install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
+        install -m 0644 ${UNPACKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
 }
 
 RDEPENDS:${PN} = "linux-firmware-iwlwifi"