mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-07-21 05:27:04 +00:00
Code Issues Projects Releases Wiki Activity

lkrg: update to 0.9.3

Browse Source 
refresh patch

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2022-06-20 21:57:58 -07:00
parent f453866cf6
commit 7cff72ef80
2 changed files with 30 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-kernel/lkrg/files/makefile_cleanup.patch
+26 -46
View File
@@ -1,73 +1,53 @@
Upstream-Status: Pending Upstream-Status: Inappropriate [embedded specific]
This needs more work. Its my starting point.
Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Index: git/Makefile Index: git/Makefile
=================================================================== ===================================================================
--- git.orig/Makefile --- git.orig/Makefile
+++ git/Makefile +++ git/Makefile
@@ -4,28 +4,10 @@ @@ -7,15 +7,8 @@
# Author:
# - Adam 'pi3' Zabrocki (http://pi3.com.pl) P_OUTPUT = output
##
-
-P_OUTPUT = output
P_PWD ?= $(shell pwd) P_PWD ?= $(shell pwd)
-P_KVER ?= $(shell uname -r) -P_KVER ?= $(shell uname -r)
-P_BOOTUP_SCRIPT ?= scripts/bootup/lkrg-bootup.sh P_BOOTUP_SCRIPT ?= scripts/bootup/lkrg-bootup.sh
-TARGET := p_lkrg TARGET := p_lkrg
-ifneq ($(KERNELRELEASE),) -ifneq ($(KERNELRELEASE),)
- KERNEL := /lib/modules/$(KERNELRELEASE)/build - KERNEL := /lib/modules/$(KERNELRELEASE)/build
-else -else
- ## KERNELRELEASE not set. - ## KERNELRELEASE not set.
- KERNEL := /lib/modules/$(P_KVER)/build - KERNEL := /lib/modules/$(P_KVER)/build
-endif -endif
-
-#
-# Uncomment for debug compilation
-#
-# ccflags-m := -ggdb -DP_LKRG_DEBUG_BUILD -finstrument-functions
-# ccflags-y := ${ccflags-m}
-# p_lkrg-objs += src/modules/print_log/p_lkrg_debug_log.o
-obj-m += $(TARGET).o #
-$(TARGET)-objs += src/modules/ksyms/p_resolve_ksym.o \ # Use DEBUG=on for debug build.
+obj-m := p_lkrg.o @@ -94,14 +87,13 @@ $(TARGET)-objs += src/modules/ksyms/p_re
+p_lkrg-y := src/modules/ksyms/p_resolve_ksym.o \
src/modules/hashing/p_lkrg_fast_hash.o \
src/modules/comm_channel/p_comm_channel.o \
src/modules/integrity_timer/p_integrity_timer.o \
@@ -92,23 +74,14 @@ $(TARGET)-objs += src/modules/ksyms/p_re
src/p_lkrg_main.o src/p_lkrg_main.o
-all: -all:
-# $(MAKE) -C $(KERNEL) M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y -# $(MAKE) -C $(KERNEL) M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y
- $(MAKE) -C $(KERNEL) M=$(P_PWD) modules - $(MAKE) -C $(KERNEL) M=$(P_PWD) modules
- mkdir -p $(P_OUTPUT)
- cp $(P_PWD)/$(TARGET).ko $(P_OUTPUT)
-
-install:
- $(MAKE) -C $(KERNEL) M=$(P_PWD) modules_install
- depmod -a
- $(P_PWD)/$(P_BOOTUP_SCRIPT) install
-uninstall:
- $(P_PWD)/$(P_BOOTUP_SCRIPT) uninstall
+modules: +modules:
+ $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules
+ mkdir -p $(P_OUTPUT)
+modules_install: 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 + $(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: clean:
- $(MAKE) -C $(KERNEL) M=$(P_PWD) clean - $(MAKE) -C $(KERNEL) M=$(P_PWD) clean
- $(RM) Module.markers modules.order + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) clean
- $(RM) $(P_PWD)/src/modules/kmod/client/kmod/Module.markers $(RM) Module.markers modules.order
- $(RM) $(P_PWD)/src/modules/kmod/client/kmod/modules.order $(RM) $(P_PWD)/src/modules/kmod/client/kmod/Module.markers
- $(RM) -rf $(P_OUTPUT) $(RM) $(P_PWD)/src/modules/kmod/client/kmod/modules.order
+ rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
+ rm -f Module.markers Module.symvers modules.order
+ rm -rf .tmp_versions Modules.symvers
recipes-kernel/lkrg/lkrg-module_0.9.2.bb → recipes-kernel/lkrg/lkrg-module_0.9.3.bb
+4 -3
View File
@@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5105ead24b08a32954f34cbaa7112432"
DEPENDS = "virtual/kernel elfutils" DEPENDS = "virtual/kernel elfutils"
SRCREV = "43db5f19fca259feb1962f6db33382348cbc8320"
SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \ SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \
file://makefile_cleanup.patch " file://makefile_cleanup.patch \
"
SRCREV = "c578e9f786299b67ffd62057b4534b0bf4fb7ece"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"