|
| 1 | +From 8d9bbc893466da39eea9f5b92dc2797cb7d79e12 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Shikha Vyaghra < [email protected]> |
| 3 | +Date: Wed, 8 Jan 2025 19:42:26 +0000 |
| 4 | +Subject: [PATCH] makefile: allow to use any kernel arch |
| 5 | + |
| 6 | +The added check results in failing build for x86_64 architecture when we use |
| 7 | +`_cross_karch` in make commands in spec file and fails for aarch64 while |
| 8 | +using _cross_arch in the make commands. |
| 9 | + |
| 10 | +This check has been added recently and do not allow us to use |
| 11 | +Kernel_ARCH we want. |
| 12 | + |
| 13 | +We need different Kernel arch as we do cross builds. |
| 14 | + |
| 15 | +Signed-off-by: Shikha Vyaghra < [email protected]> |
| 16 | +Signed-off-by: Matthew Yeazel < [email protected]> |
| 17 | +--- |
| 18 | + kernel-open/Makefile | 10 ---------- |
| 19 | + kernel/Makefile | 10 ---------- |
| 20 | + 2 files changed, 20 deletions(-) |
| 21 | + |
| 22 | +diff --git a/kernel-open/Makefile b/kernel-open/Makefile |
| 23 | +index f7a8db6..725d474 100644 |
| 24 | +--- a/kernel-open/Makefile |
| 25 | ++++ b/kernel-open/Makefile |
| 26 | +@@ -104,16 +104,6 @@ else |
| 27 | + ) |
| 28 | + endif |
| 29 | + |
| 30 | +- KERNEL_ARCH = $(ARCH) |
| 31 | +- |
| 32 | +- ifneq ($(filter $(ARCH),i386 x86_64),) |
| 33 | +- KERNEL_ARCH = x86 |
| 34 | +- else |
| 35 | +- ifeq ($(filter $(ARCH),arm64 riscv),) |
| 36 | +- $(error Unsupported architecture $(ARCH)) |
| 37 | +- endif |
| 38 | +- endif |
| 39 | +- |
| 40 | + NV_KERNEL_MODULES ?= $(wildcard nvidia nvidia-uvm nvidia-vgpu-vfio nvidia-modeset nvidia-drm nvidia-peermem) |
| 41 | + NV_KERNEL_MODULES := $(filter-out $(NV_EXCLUDE_KERNEL_MODULES), \ |
| 42 | + $(NV_KERNEL_MODULES)) |
| 43 | +diff --git a/kernel/Makefile b/kernel/Makefile |
| 44 | +index f7a8db6..725d474 100644 |
| 45 | +--- a/kernel/Makefile |
| 46 | ++++ b/kernel/Makefile |
| 47 | +@@ -104,16 +104,6 @@ else |
| 48 | + ) |
| 49 | + endif |
| 50 | + |
| 51 | +- KERNEL_ARCH = $(ARCH) |
| 52 | +- |
| 53 | +- ifneq ($(filter $(ARCH),i386 x86_64),) |
| 54 | +- KERNEL_ARCH = x86 |
| 55 | +- else |
| 56 | +- ifeq ($(filter $(ARCH),arm64 riscv),) |
| 57 | +- $(error Unsupported architecture $(ARCH)) |
| 58 | +- endif |
| 59 | +- endif |
| 60 | +- |
| 61 | + NV_KERNEL_MODULES ?= $(wildcard nvidia nvidia-uvm nvidia-vgpu-vfio nvidia-modeset nvidia-drm nvidia-peermem) |
| 62 | + NV_KERNEL_MODULES := $(filter-out $(NV_EXCLUDE_KERNEL_MODULES), \ |
| 63 | + $(NV_KERNEL_MODULES)) |
| 64 | +-- |
| 65 | +2.49.0 |
0 commit comments