summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2023-08-12 14:40:32 +0200
committerJakov Smolić <jsmolic@gentoo.org>2023-08-12 14:42:29 +0200
commit72e52dc7ccf8b5cfd91312b9085d03cc3a539e82 (patch)
tree19da213877c4f8b594a3433bfb5bbc22989a1a03 /dev-util
parentgames-action/descent3: treeclean (diff)
downloadgentoo-72e52dc7ccf8b5cfd91312b9085d03cc3a539e82.tar.gz
gentoo-72e52dc7ccf8b5cfd91312b9085d03cc3a539e82.tar.bz2
gentoo-72e52dc7ccf8b5cfd91312b9085d03cc3a539e82.zip
dev-util/sysdig-kmod: treeclean
Closes: https://bugs.gentoo.org/907486 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/sysdig-kmod/Manifest1
-rw-r--r--dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch63
-rw-r--r--dev-util/sysdig-kmod/metadata.xml8
-rw-r--r--dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild36
4 files changed, 0 insertions, 108 deletions
diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
deleted file mode 100644
index cc1b76c77570..000000000000
--- a/dev-util/sysdig-kmod/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
diff --git a/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch b/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch
deleted file mode 100644
index 8c3ade53fb07..000000000000
--- a/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-
-Bug: https://bugs.gentoo.org/852314
-Source: https://github.com/falcosecurity/libs/pull/411/commits/36e945af4feb31c8b875f7d4624592b0c1ff929d
-
-From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001
-From: Federico Di Pierro <nierro92@gmail.com>
-Date: Mon, 20 Jun 2022 14:26:39 +0200
-Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18.
-
-Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
----
- driver/main.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/driver/main.c b/driver/main.c
-index 6b5ae461a..e606cc2f8 100644
---- a/driver/main.c
-+++ b/driver/main.c
-@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors");
- #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data, args)
- #endif
-
--#ifndef pgprot_encrypted
--#define pgprot_encrypted(x) (x)
-+// Allow build even on arch where PAGE_ENC is not implemented
-+#ifndef _PAGE_ENC
-+#define _PAGE_ENC 0
- #endif
-
- struct ppm_device {
-@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
-
- pfn = vmalloc_to_pfn(vmalloc_area_ptr);
-
-+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- ret = remap_pfn_range(vma, useraddr, pfn,
-- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
-+ PAGE_SIZE, vma->vm_page_prot);
- if (ret < 0) {
- pr_err("remap_pfn_range failed (1)\n");
- goto cleanup_mmap;
-@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
- while (mlength > 0) {
- pfn = vmalloc_to_pfn(vmalloc_area_ptr);
-
-+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- ret = remap_pfn_range(vma, useraddr, pfn,
-- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
-+ PAGE_SIZE, vma->vm_page_prot);
- if (ret < 0) {
- pr_err("remap_pfn_range failed (1)\n");
- goto cleanup_mmap;
-@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
- while (mlength > 0) {
- pfn = vmalloc_to_pfn(vmalloc_area_ptr);
-
-+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- ret = remap_pfn_range(vma, useraddr, pfn,
-- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
-+ PAGE_SIZE, vma->vm_page_prot);
- if (ret < 0) {
- pr_err("remap_pfn_range failed (1)\n");
- goto cleanup_mmap;
diff --git a/dev-util/sysdig-kmod/metadata.xml b/dev-util/sysdig-kmod/metadata.xml
deleted file mode 100644
index 6e469632db79..000000000000
--- a/dev-util/sysdig-kmod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">draios/sysdig</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild
deleted file mode 100644
index b08faed2f3e3..000000000000
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-mod-r1
-
-MY_P=${P/-kmod}
-DESCRIPTION="Kernel module for dev-util/sysdig"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
-)
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-src_prepare() {
- cmake_src_prepare
-
- # cmake is only used to generate the Makefile for modules
- sed -i '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
-}
-
-src_compile() {
- local modlist=( sysdig-probe=:"${BUILD_DIR}"/driver/src )
- local modargs=( KERNELDIR="${KV_OUT_DIR}" )
-
- linux-mod-r1_src_compile
-}