kernel-module-*: Do not set PACKAGE_ARCH to something less specific

Issue: CR-1098191

The kernel-module recipes set PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" which is broken
because kernel modules depend on the kernel which is MACHINE specific. The
assignment claims that you could use a kernel module built for some other board
for any other zynqmp board, which is not true since their kernel versions and
configuration will differ.

Remove the assignment so that the kernel module becomes MACHINE_ARCH again.

This solves issues with kernel modules that refuse to install during the
do_rootfs stage, and various setscene tasks running over and again when
switching between MACHINEs.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

4 files changed, 0 insertions, 8 deletions

diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
index cfb03dcb..fdeeab3a 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
+++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
@@ -44,8 +44,6 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_zynqmp-eg = "zynqmp-eg"
 COMPATIBLE_MACHINE_zynqmp-ev = "zynqmp-ev"
 
-PACKAGE_ARCH = "${SOC_VARIANT_ARCH}"
-
 EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
                 ARCH="${ARCH}" \
                 BUILD=release \
diff --git a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
index e7e6b467..40d2aff3 100755
--- a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
@@ -22,5 +22,3 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_zynqmp = "zynqmp"
 COMPATIBLE_MACHINE_versal = "versal"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
index b26ecd94..4b21fd49 100644
--- a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
@@ -22,5 +22,3 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_zynqmp = "zynqmp"
 COMPATIBLE_MACHINE_versal = "versal"
-
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
index 817aa380..b3f88a81 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
@@ -25,6 +25,4 @@ RDEPENDS_${PN} = "vcu-firmware"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_zynqmp = "zynqmp"
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-
 KERNEL_MODULE_AUTOLOAD += "dmaproxy"