commit: 72e52dc7ccf8b5cfd91312b9085d03cc3a539e82 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sat Aug 12 12:40:32 2023 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Aug 12 12:42:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e52dc7
dev-util/sysdig-kmod: treeclean Closes: https://bugs.gentoo.org/907486 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-util/sysdig-kmod/Manifest | 1 - .../files/0.27.1-fix-kmod-build-on-5.18+.patch | 63 ---------------------- dev-util/sysdig-kmod/metadata.xml | 8 --- dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild | 36 ------------- profiles/package.mask | 6 --- 5 files changed, 114 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 <[email protected]> -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 <[email protected]> ---- - 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 -} diff --git a/profiles/package.mask b/profiles/package.mask index f802b81a1545..38269b9befc2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -363,12 +363,6 @@ dev-python/typed-ast # See bug #909439. =dev-util/trace-cmd-3.2 -# Holger Hoffstätte <[email protected]> (2023-07-04) -# Obsolete package, replaced by dev-util/scap-driver. -# https://bugs.gentoo.org/907486 -# Masked for removal on 2023-08-04. -dev-util/sysdig-kmod - # Sam James <[email protected]> (2023-06-03) # Breaks dev-perl/Spreadsheet-ParseExcel, see bug #909564. # Please upgrade to >=dev-perl/dev-perl/OLE-StorageLite-0.220.0.
