diff options
author | Armin Kuster <akuster808@gmail.com> | 2022-06-20 21:57:58 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-07-05 19:26:50 -0400 |
commit | 7cff72ef8071dc7871eb1f39c528d8cf5e78c611 (patch) | |
tree | 7881a790cc24f46e5e3a64e85c29a614659df56f /recipes-kernel | |
parent | f453866cf6b00d59a9dd4b0ba0a16cb3d2c0c743 (diff) | |
download | meta-security-7cff72ef8071dc7871eb1f39c528d8cf5e78c611.tar.gz |
lkrg: update to 0.9.3
refresh patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/lkrg/files/makefile_cleanup.patch | 72 | ||||
-rw-r--r-- | recipes-kernel/lkrg/lkrg-module_0.9.3.bb (renamed from recipes-kernel/lkrg/lkrg-module_0.9.2.bb) | 7 |
2 files changed, 30 insertions, 49 deletions
diff --git a/recipes-kernel/lkrg/files/makefile_cleanup.patch b/recipes-kernel/lkrg/files/makefile_cleanup.patch index 799b1a6..f29afbe 100644 --- a/recipes-kernel/lkrg/files/makefile_cleanup.patch +++ b/recipes-kernel/lkrg/files/makefile_cleanup.patch | |||
@@ -1,73 +1,53 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | This needs more work. Its my starting point. | ||
4 | |||
5 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | 3 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
6 | 4 | ||
5 | |||
7 | Index: git/Makefile | 6 | Index: git/Makefile |
8 | =================================================================== | 7 | =================================================================== |
9 | --- git.orig/Makefile | 8 | --- git.orig/Makefile |
10 | +++ git/Makefile | 9 | +++ git/Makefile |
11 | @@ -4,28 +4,10 @@ | 10 | @@ -7,15 +7,8 @@ |
12 | # Author: | 11 | |
13 | # - Adam 'pi3' Zabrocki (http://pi3.com.pl) | 12 | P_OUTPUT = output |
14 | ## | ||
15 | - | ||
16 | -P_OUTPUT = output | ||
17 | P_PWD ?= $(shell pwd) | 13 | P_PWD ?= $(shell pwd) |
18 | -P_KVER ?= $(shell uname -r) | 14 | -P_KVER ?= $(shell uname -r) |
19 | -P_BOOTUP_SCRIPT ?= scripts/bootup/lkrg-bootup.sh | 15 | P_BOOTUP_SCRIPT ?= scripts/bootup/lkrg-bootup.sh |
20 | -TARGET := p_lkrg | 16 | TARGET := p_lkrg |
21 | -ifneq ($(KERNELRELEASE),) | 17 | -ifneq ($(KERNELRELEASE),) |
22 | - KERNEL := /lib/modules/$(KERNELRELEASE)/build | 18 | - KERNEL := /lib/modules/$(KERNELRELEASE)/build |
23 | -else | 19 | -else |
24 | - ## KERNELRELEASE not set. | 20 | - ## KERNELRELEASE not set. |
25 | - KERNEL := /lib/modules/$(P_KVER)/build | 21 | - KERNEL := /lib/modules/$(P_KVER)/build |
26 | -endif | 22 | -endif |
27 | - | ||
28 | -# | ||
29 | -# Uncomment for debug compilation | ||
30 | -# | ||
31 | -# ccflags-m := -ggdb -DP_LKRG_DEBUG_BUILD -finstrument-functions | ||
32 | -# ccflags-y := ${ccflags-m} | ||
33 | -# p_lkrg-objs += src/modules/print_log/p_lkrg_debug_log.o | ||
34 | 23 | ||
35 | -obj-m += $(TARGET).o | 24 | # |
36 | -$(TARGET)-objs += src/modules/ksyms/p_resolve_ksym.o \ | 25 | # Use DEBUG=on for debug build. |
37 | +obj-m := p_lkrg.o | 26 | @@ -94,14 +87,13 @@ $(TARGET)-objs += src/modules/ksyms/p_re |
38 | +p_lkrg-y := src/modules/ksyms/p_resolve_ksym.o \ | ||
39 | src/modules/hashing/p_lkrg_fast_hash.o \ | ||
40 | src/modules/comm_channel/p_comm_channel.o \ | ||
41 | src/modules/integrity_timer/p_integrity_timer.o \ | ||
42 | @@ -92,23 +74,14 @@ $(TARGET)-objs += src/modules/ksyms/p_re | ||
43 | src/p_lkrg_main.o | 27 | src/p_lkrg_main.o |
44 | 28 | ||
45 | 29 | ||
46 | -all: | 30 | -all: |
47 | -# $(MAKE) -C $(KERNEL) M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y | 31 | -# $(MAKE) -C $(KERNEL) M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y |
48 | - $(MAKE) -C $(KERNEL) M=$(P_PWD) modules | 32 | - $(MAKE) -C $(KERNEL) M=$(P_PWD) modules |
49 | - mkdir -p $(P_OUTPUT) | ||
50 | - cp $(P_PWD)/$(TARGET).ko $(P_OUTPUT) | ||
51 | - | ||
52 | -install: | ||
53 | - $(MAKE) -C $(KERNEL) M=$(P_PWD) modules_install | ||
54 | - depmod -a | ||
55 | - $(P_PWD)/$(P_BOOTUP_SCRIPT) install | ||
56 | |||
57 | -uninstall: | ||
58 | - $(P_PWD)/$(P_BOOTUP_SCRIPT) uninstall | ||
59 | +modules: | 33 | +modules: |
60 | + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules | 34 | + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules |
61 | + | 35 | mkdir -p $(P_OUTPUT) |
62 | +modules_install: | 36 | cp $(P_PWD)/$(TARGET).ko $(P_OUTPUT) |
37 | |||
38 | -install: | ||
39 | - $(MAKE) -C $(KERNEL) M=$(P_PWD) modules_install | ||
40 | +moduled_install: | ||
63 | + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules_install | 41 | + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) modules_install |
42 | depmod -a | ||
43 | $(P_PWD)/$(P_BOOTUP_SCRIPT) install | ||
44 | |||
45 | @@ -109,7 +101,7 @@ uninstall: | ||
46 | $(P_PWD)/$(P_BOOTUP_SCRIPT) uninstall | ||
64 | 47 | ||
65 | clean: | 48 | clean: |
66 | - $(MAKE) -C $(KERNEL) M=$(P_PWD) clean | 49 | - $(MAKE) -C $(KERNEL) M=$(P_PWD) clean |
67 | - $(RM) Module.markers modules.order | 50 | + $(MAKE) -C $(KERNEL_SRC) M=$(P_PWD) clean |
68 | - $(RM) $(P_PWD)/src/modules/kmod/client/kmod/Module.markers | 51 | $(RM) Module.markers modules.order |
69 | - $(RM) $(P_PWD)/src/modules/kmod/client/kmod/modules.order | 52 | $(RM) $(P_PWD)/src/modules/kmod/client/kmod/Module.markers |
70 | - $(RM) -rf $(P_OUTPUT) | 53 | $(RM) $(P_PWD)/src/modules/kmod/client/kmod/modules.order |
71 | + rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c | ||
72 | + rm -f Module.markers Module.symvers modules.order | ||
73 | + rm -rf .tmp_versions Modules.symvers | ||
diff --git a/recipes-kernel/lkrg/lkrg-module_0.9.2.bb b/recipes-kernel/lkrg/lkrg-module_0.9.3.bb index 85f7d44..2553974 100644 --- a/recipes-kernel/lkrg/lkrg-module_0.9.2.bb +++ b/recipes-kernel/lkrg/lkrg-module_0.9.3.bb | |||
@@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5105ead24b08a32954f34cbaa7112432" | |||
9 | 9 | ||
10 | DEPENDS = "virtual/kernel elfutils" | 10 | DEPENDS = "virtual/kernel elfutils" |
11 | 11 | ||
12 | SRCREV = "43db5f19fca259feb1962f6db33382348cbc8320" | ||
13 | |||
14 | SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \ |
15 | file://makefile_cleanup.patch " | 13 | file://makefile_cleanup.patch \ |
14 | " | ||
15 | |||
16 | SRCREV = "c578e9f786299b67ffd62057b4534b0bf4fb7ece" | ||
16 | 17 | ||
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
18 | 19 | ||