Skip to contentSkip to conversation

lkrg-module: covert to git fetcher

PATCH New Armin Kuster 1 participant 2 messages Apr 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lkrg-module: covert to git fetcher

This allows to track tip easier.
refresh patch
Fix LICENSE to match SPDX format

---
 recipes-kernel/lkrg/files/makefile_cleanup.patch |  6 +++---
 recipes-kernel/lkrg/lkrg-module_0.9.2.bb         | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
recipes-kernel/lkrg/files/makefile_cleanup.patch +3 -3
index a4db2d9..799b1a6 100644
@@ -4,10 +4,10 @@ This needs more work. Its my starting point.
 
 Signed-off-by: Armin Kuster <[email protected]>
 
-Index: lkrg-0.9.2/Makefile
+Index: git/Makefile
 ===================================================================
---- lkrg-0.9.2.orig/Makefile
-+++ lkrg-0.9.2/Makefile
+--- git.orig/Makefile
++++ git/Makefile
 @@ -4,28 +4,10 @@
  # Author:
  #  - Adam 'pi3' Zabrocki (http://pi3.com.pl)
recipes-kernel/lkrg/lkrg-module_0.9.2.bb +5 -5
index e055fbe..85f7d44 100644
@@ -3,18 +3,18 @@ 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 = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5105ead24b08a32954f34cbaa7112432"
 
 DEPENDS = "virtual/kernel elfutils"
 
-SRC_URI = "https://download.openwall.net/pub/projects/lkrg/lkrg-${PV}.tar.gz \
-           file://makefile_cleanup.patch "
+SRCREV = "43db5f19fca259feb1962f6db33382348cbc8320"
 
-SRC_URI[sha256sum] = "c2b501c47089cce3ec3114cef6520b73aa3a098836183186b9bb5e097c99ac27"
+SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \
+           file://makefile_cleanup.patch "
 
-S = "${WORKDIR}/lkrg-${PV}"
+S = "${WORKDIR}/git"
 
 inherit module kernel-module-split
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 linux-yocto_security.inc: add lkrg kfrags

---
 recipes-kernel/linux/files/lkrg.cfg           | 4 ++++
 recipes-kernel/linux/files/lkrg.scc           | 5 +++++
 recipes-kernel/linux/linux-yocto_security.inc | 3 +++
 3 files changed, 12 insertions(+)
 create mode 100644 recipes-kernel/linux/files/lkrg.cfg
 create mode 100644 recipes-kernel/linux/files/lkrg.scc
recipes-kernel/linux/files/lkrg.cfg new file +4 -0
new file mode 100644
index 0000000..e02bf76
@@ -0,0 +1,4 @@
+CONFIG_DEBUG_KERNEL=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_JUMP_LABEL=y
+CONFIG_DEBUG_SECTION_MISMATCH=y
recipes-kernel/linux/files/lkrg.scc new file +5 -0
new file mode 100644
index 0000000..83397f8
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable Support for LKRG"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware lkrg.cfg
recipes-kernel/linux/linux-yocto_security.inc +3 -0
index defca57..b79af80 100644
@@ -1,3 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("IMAGE_CLASSES", "dm-verity-img", " features/device-mapper/dm-verity.scc", "" ,d)}"
+SRC_URI += " ${@bb.utils.contains("DISTRO_FEATURES", "lkrg", "file://lkrg.scc", "" ,d)}"
Signature · 1 line
2.25.1