diff options
author | Roland Hieber <rhi@pengutronix.de> | 2021-03-05 13:32:47 +0100 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2021-03-15 09:42:17 +0100 |
commit | a89c21d3306a2e3b4bebc9bcf28641d5ed97bec5 (patch) | |
tree | d90e7ca6254446f9bbd31be4f1a0f31f0fecebed | |
parent | ee0945e615872212ed9c74b2160a153f75d11c69 (diff) | |
download | DistroKit-a89c21d3306a2e3b4bebc9bcf28641d5ed97bec5.tar.gz DistroKit-a89c21d3306a2e3b4bebc9bcf28641d5ed97bec5.tar.xz |
libseccomp: remove old patches
The first patch was copied from upstream PTXdist when forking the patch
series, the second patch is included in libseccomp 2.5.1, which is
included in PTXdist 2020.03.0, which we migrated to in the previous
commit.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
3 files changed, 0 insertions, 77 deletions
diff --git a/patches/libseccomp-2.5.0/0001-run-time-use-a-broadly-supported-shell-interpreter.patch b/patches/libseccomp-2.5.0/0001-run-time-use-a-broadly-supported-shell-interpreter.patch deleted file mode 100644 index 9e4b6d3..0000000 --- a/patches/libseccomp-2.5.0/0001-run-time-use-a-broadly-supported-shell-interpreter.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Juergen Borleis <jbe@pengutronix.de> -Date: Fri, 25 Aug 2017 16:03:15 +0200 -Subject: [PATCH] run-time: use a broadly supported shell interpreter - -Signed-off-by: Juergen Borleis <jbe@pengutronix.de> ---- - tools/scmp_app_inspector | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/scmp_app_inspector b/tools/scmp_app_inspector -index 45b86b2ca0c5..14f3dfc07387 100755 ---- a/tools/scmp_app_inspector -+++ b/tools/scmp_app_inspector -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # - # Runtime syscall inspector diff --git a/patches/libseccomp-2.5.0/0002-build-undefine-mips-to-prevent-build-problems-for-MI.patch b/patches/libseccomp-2.5.0/0002-build-undefine-mips-to-prevent-build-problems-for-MI.patch deleted file mode 100644 index 971afb1..0000000 --- a/patches/libseccomp-2.5.0/0002-build-undefine-mips-to-prevent-build-problems-for-MI.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Paul Moore <paul@paul-moore.com> -Date: Sun, 2 Aug 2020 09:57:39 -0400 -Subject: [PATCH] build: undefine "mips" to prevent build problems for MIPS - targets - -It turns out that the MIPS GCC compiler defines a "mips" cpp macro -which was resulting in build failures on MIPS so we need to -undefine the "mips" macro during build. As this should be safe -to do in all architectures, just add it to the compiler flags by -default. - -This was reported in the following GH issue: -* https://github.com/seccomp/libseccomp/issues/274 - -Reported-by: Rongwei Zhang <pudh4418@gmail.com> -Suggested-by: Rongwei Zhang <pudh4418@gmail.com> -Acked-by: Tom Hromatka <tom.hromatka@oracle.com> -Signed-off-by: Paul Moore <paul@paul-moore.com> ---- - configure.ac | 4 +++- - src/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d47c25cabd38..7b91c7af7be3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,9 +65,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - dnl #### - dnl build flags -+dnl NOTE: the '-Umips' is here because MIPS GCC compilers "helpfully" define it -+dnl for us which wreaks havoc on the build - dnl #### - AM_CPPFLAGS="-I\${top_srcdir}/include -I\${top_builddir}/include" --AM_CFLAGS="-Wall" -+AM_CFLAGS="-Wall -Umips" - AM_LDFLAGS="-Wl,-z -Wl,relro" - AC_SUBST([AM_CPPFLAGS]) - AC_SUBST([AM_CFLAGS]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 8d8b97ff936e..10154e14fcda 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -61,7 +61,7 @@ lib_LTLIBRARIES = libseccomp.la - arch_syscall_dump_SOURCES = arch-syscall-dump.c ${SOURCES_ALL} - - arch_syscall_check_SOURCES = arch-syscall-check.c ${SOURCES_ALL} --arch_syscall_check_CFLAGS = ${CODE_COVERAGE_CFLAGS} -+arch_syscall_check_CFLAGS = ${AM_CFLAGS} ${CODE_COVERAGE_CFLAGS} - arch_syscall_check_LDFLAGS = ${CODE_COVERAGE_LDFLAGS} - - libseccomp_la_SOURCES = ${SOURCES_ALL} diff --git a/patches/libseccomp-2.5.0/series b/patches/libseccomp-2.5.0/series deleted file mode 100644 index 001c41c..0000000 --- a/patches/libseccomp-2.5.0/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-run-time-use-a-broadly-supported-shell-interpreter.patch -0002-build-undefine-mips-to-prevent-build-problems-for-MI.patch -# fd24dd7a2fec3a44bfc7cfd3acfe448d - git-ptx-patches magic |