Fix the loadpin-trigger build break
Merging in some of the changes from go/cos-review/69095
BUG=b/333968559
TEST=emerge-gmec-amd64-hw sys-apps/loadpin-trigger
RELEASE_NOTE=n/a
Change-Id: Ia0fb5a708c7f798b3c0b1deef4c69964a8510575
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/69371
Reviewed-by: Zizheng Wu <zizhengwu@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-edgeos/sys-apps/loadpin-trigger/files/Makefile b/project-edgeos/sys-apps/loadpin-trigger/files/Makefile
index 1e191bb..1007450 100644
--- a/project-edgeos/sys-apps/loadpin-trigger/files/Makefile
+++ b/project-edgeos/sys-apps/loadpin-trigger/files/Makefile
@@ -14,8 +14,8 @@
#
obj-m := loadpin_trigger.o
-modules:
- $(MAKE) CC=$(CC) LD=$(LD) -C $(KERNEL_SOURCES) M=$(CURDIR) ARCH=$(ARCH) \
- KBUILD_OUTPUT=$(KBUILD_OUTPUT) $@
+module:
+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules
-module: modules
+clean:
+ rm -f *.ko
diff --git a/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r-r4.ebuild b/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r-r5.ebuild
similarity index 100%
rename from project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r-r4.ebuild
rename to project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r-r5.ebuild
diff --git a/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r.ebuild b/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r.ebuild
index f83582b..498aca2 100644
--- a/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r.ebuild
+++ b/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1r.ebuild
@@ -8,7 +8,7 @@
# rootfs, but the recent kernel param loadpin.exclude=kernel-module we added
# makes loadpin ignore module loading.
-EAPI=6
+EAPI=7
inherit cos-linux-mod
DESCRIPTION="Kernel module to trigger loadpin on boot"
@@ -25,18 +25,14 @@
S="${WORKDIR}"
-# Prevent kernel module signature being striped.
-STRIP_MASK+=" *.ko"
-
-MODULE_NAME="loadpin_trigger"
+# modulename(libdir:srcdir:objdir)
+export MODULE_NAMES="loadpin_trigger(::)"
pkg_setup() {
- MODULE_NAMES="${MODULE_NAME}(::)"
# We cannot rely on auto detection because we have two kernels installed.
KERNEL_DIR="$(find "${ROOT}/usr/src" -maxdepth 1 -name "lakitu-kernel-rt-[0-9]*")"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
}
src_prepare() {
@@ -46,6 +42,7 @@
src_compile() {
cros_allow_gnu_build_tools
+ export BUILD_PARAMS="KDIR=${KBUILD_OUTPUT}"
cos-linux-mod_src_compile
}
diff --git a/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v-r3.ebuild b/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v-r4.ebuild
similarity index 100%
rename from project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v-r3.ebuild
rename to project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v-r4.ebuild
diff --git a/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v.ebuild b/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v.ebuild
index 65e7f4a..2a94d53 100644
--- a/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v.ebuild
+++ b/project-edgeos/sys-apps/loadpin-trigger/loadpin-trigger-1v.ebuild
@@ -8,7 +8,7 @@
# rootfs, but the recent kernel param loadpin.exclude=kernel-module we added
# makes loadpin ignore module loading.
-EAPI=6
+EAPI=7
inherit cos-linux-mod
DESCRIPTION="Kernel module to trigger loadpin on boot"
@@ -25,18 +25,14 @@
S="${WORKDIR}"
-# Prevent kernel module signature being striped.
-STRIP_MASK+=" *.ko"
-
-MODULE_NAME="loadpin_trigger"
+# modulename(libdir:srcdir:objdir)
+export MODULE_NAMES="loadpin_trigger(::)"
pkg_setup() {
- MODULE_NAMES="${MODULE_NAME}(::)"
# We cannot rely on auto detection because we have two kernels installed.
KERNEL_DIR="$(find "${ROOT}/usr/src" -maxdepth 1 -name "lakitu-kernel-[0-9]*")"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
}
src_prepare() {
@@ -46,6 +42,7 @@
src_compile() {
cros_allow_gnu_build_tools
+ export BUILD_PARAMS="KDIR=${KBUILD_OUTPUT}"
cos-linux-mod_src_compile
}
