From 4e0ba84530922aa1a4f0d8ac3e313950ac40e152 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 31 Jul 2022 10:59:45 -0700 Subject: lkrg: update to 0.9.4 drop Makefile fixup patch. Use sed instead LIC_FILES_CHKSUM update do to yr update Signed-off-by: Armin Kuster --- V2] Add LIC_FILES_CHKSUM change reason --- recipes-kernel/lkrg/files/makefile_cleanup.patch | 53 ------------------------ recipes-kernel/lkrg/lkrg-module_0.9.3.bb | 34 --------------- recipes-kernel/lkrg/lkrg-module_0.9.4.bb | 38 +++++++++++++++++ 3 files changed, 38 insertions(+), 87 deletions(-) delete mode 100644 recipes-kernel/lkrg/files/makefile_cleanup.patch delete mode 100644 recipes-kernel/lkrg/lkrg-module_0.9.3.bb create mode 100644 recipes-kernel/lkrg/lkrg-module_0.9.4.bb (limited to 'recipes-kernel') diff --git a/recipes-kernel/lkrg/files/makefile_cleanup.patch b/recipes-kernel/lkrg/files/makefile_cleanup.patch deleted file mode 100644 index f29afbe..0000000 --- a/recipes-kernel/lkrg/files/makefile_cleanup.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Armin Kuster - - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -7,15 +7,8 @@ - - P_OUTPUT = output - P_PWD ?= $(shell pwd) --P_KVER ?= $(shell uname -r) - P_BOOTUP_SCRIPT ?= scripts/bootup/lkrg-bootup.sh - TARGET := p_lkrg --ifneq ($(KERNELRELEASE),) -- KERNEL := /lib/modules/$(KERNELRELEASE)/build --else -- ## KERNELRELEASE not set. -- KERNEL := /lib/modules/$(P_KVER)/build --endif - - # - # Use DEBUG=on for debug build. -@@ -94,14 +87,13 @@ $(TARGET)-objs += src/modules/ksyms/p_re - src/p_lkrg_main.o - - --all: --# $(MAKE) -C $(KERNEL) M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y -- $(MAKE) -C $(KERNEL) M=$(P_PWD) modules -+modules: -+ $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules - mkdir -p $(P_OUTPUT) - cp $(P_PWD)/$(TARGET).ko $(P_OUTPUT) - --install: -- $(MAKE) -C $(KERNEL) M=$(P_PWD) modules_install -+moduled_install: -+ $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules_install - depmod -a - $(P_PWD)/$(P_BOOTUP_SCRIPT) install - -@@ -109,7 +101,7 @@ uninstall: - $(P_PWD)/$(P_BOOTUP_SCRIPT) uninstall - - clean: -- $(MAKE) -C $(KERNEL) M=$(P_PWD) clean -+ $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) clean - $(RM) Module.markers modules.order - $(RM) $(P_PWD)/src/modules/kmod/client/kmod/Module.markers - $(RM) $(P_PWD)/src/modules/kmod/client/kmod/modules.order diff --git a/recipes-kernel/lkrg/lkrg-module_0.9.3.bb b/recipes-kernel/lkrg/lkrg-module_0.9.3.bb deleted file mode 100644 index 2553974..0000000 --- a/recipes-kernel/lkrg/lkrg-module_0.9.3.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Linux Kernel Runtime Guard" -DESCRIPTION="LKRG performs runtime integrity checking of the Linux \ -kernel and detection of security vulnerability exploits against the kernel." -SECTION = "security" -HOMEPAGE = "https://www.openwall.com/lkrg/" -LICENSE = "GPL-2.0-only" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=5105ead24b08a32954f34cbaa7112432" - -DEPENDS = "virtual/kernel elfutils" - -SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \ - file://makefile_cleanup.patch \ -" - -SRCREV = "c578e9f786299b67ffd62057b4534b0bf4fb7ece" - -S = "${WORKDIR}/git" - -inherit module kernel-module-split - -MAKE_TARGETS = "modules" - -MODULE_NAME = "p_lkrg" - -module_do_install() { - install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} - install -m 0644 ${MODULE_NAME}.ko \ - ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko -} - -RPROVIDES:${PN} += "kernel-module-lkrg" - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" diff --git a/recipes-kernel/lkrg/lkrg-module_0.9.4.bb b/recipes-kernel/lkrg/lkrg-module_0.9.4.bb new file mode 100644 index 0000000..fa46cb6 --- /dev/null +++ b/recipes-kernel/lkrg/lkrg-module_0.9.4.bb @@ -0,0 +1,38 @@ +SUMMARY = "Linux Kernel Runtime Guard" +DESCRIPTION="LKRG performs runtime integrity checking of the Linux \ +kernel and detection of security vulnerability exploits against the kernel." +SECTION = "security" +HOMEPAGE = "https://www.openwall.com/lkrg/" +LICENSE = "GPL-2.0-only" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f3e5dd56319d33a1944d635c1c86c6f" + +DEPENDS = "virtual/kernel elfutils" + +SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main" + +SRCREV = "c58cb52145b8e8ccc6bd19079f5c835933281cdc" + +S = "${WORKDIR}/git" + +inherit module kernel-module-split + +MAKE_TARGETS = "modules" + +MODULE_NAME = "lkrg" + +do_configure:append () { + sed -i -e 's/^all/modules/' ${S}/Makefile + sed -i -e 's/^install/modules_install/' ${S}/Makefile + sed -i -e 's/KERNEL/KERNEL_SRC/g' ${S}/Makefile +} + +module_do_install() { + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} + install -m 0644 ${MODULE_NAME}.ko \ + ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko +} + +RPROVIDES:${PN} += "kernel-module-lkrg" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -- cgit v1.2.3-54-g00ecf