[DistroKit] [PATCH 1/2] ptxdist: migrate to 2021.03.0

[DistroKit] [PATCH 1/2] ptxdist: migrate to 2021.03.0

[Roland Hieber]

New version came out today, but the diff is uneventful.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-mips/platformconfig   | 4 ++--
 configs/platform-rpi/platformconfig    | 4 ++--
 configs/platform-v7a/platformconfig    | 5 +++--
 configs/platform-v8a/platformconfig    | 5 +++--
 configs/platform-x86_64/platformconfig | 4 ++--
 configs/ptxconfig                      | 8 ++++----
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig
index 46271791760f..24cb89e10cbc 100644
--- a/configs/platform-mips/platformconfig
+++ b/configs/platform-mips/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.02.0
+# PTXdist 2021.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mips"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.02.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
 
 #
 # architecture                  
diff --git a/configs/platform-rpi/platformconfig b/configs/platform-rpi/platformconfig
index 90a3f7edf1c1..89fbdb299588 100644
--- a/configs/platform-rpi/platformconfig
+++ b/configs/platform-rpi/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.02.0
+# PTXdist 2021.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="rpi"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.02.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
 
 #
 # architecture                  
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 3c9312c072e1..6dbce34aa165 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.02.0
+# PTXdist 2021.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.02.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
 
 #
 # architecture                  
@@ -48,6 +48,7 @@ PTXCONF_ENDIAN_LITTLE=y
 PTXCONF_ARCH_ARM_V6=y
 # PTXCONF_ARCH_ARM_IWMMXT is not set
 PTXCONF_ARCH_ARM_NEON=y
+PTXCONF_ARCH_ARMV7_NEON=y
 PTXCONF_HAS_HARDFLOAT=y
 PTXCONF_HAS_MMU=y
 PTXCONF_SIZEOF_LONG_DOUBLE="8"
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index d65b1d94ea96..ac81bf9be6bd 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.02.0
+# PTXdist 2021.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v8a"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.02.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
 
 #
 # architecture                  
@@ -46,6 +46,7 @@ PTXCONF_ARCH_SUPPORTS_ENDIAN_BIG=y
 PTXCONF_ARCH_SUPPORTS_ENDIAN_LITTLE=y
 # PTXCONF_ENDIAN_BIG is not set
 PTXCONF_ENDIAN_LITTLE=y
+PTXCONF_ARCH_ARM_NEON=y
 PTXCONF_HAS_HARDFLOAT=y
 PTXCONF_HAS_MMU=y
 PTXCONF_SIZEOF_LONG_DOUBLE="16"
diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig
index 74033ab49038..eb45e06ca1c6 100644
--- a/configs/platform-x86_64/platformconfig
+++ b/configs/platform-x86_64/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.02.0
+# PTXdist 2021.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="x86_64"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.02.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
 
 #
 # architecture                  
diff --git a/configs/ptxconfig b/configs/ptxconfig
index af6d5b8d0cef..46fc14627008 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.02.0
+# PTXdist 2021.03.0
 #
 PTXCONF_DATAPARTITION=y
 
@@ -67,7 +67,7 @@ PTXCONF_BSP=y
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
-PTXCONF_CONFIGFILE_VERSION="2021.02.0"
+PTXCONF_CONFIGFILE_VERSION="2021.03.0"
 PTXCONF__ptxconfig_MAGIC__=y
 
 #
@@ -94,7 +94,6 @@ PTXCONF_HOST_QEMU_SYS=y
 PTXCONF_HOST_QEMU_USR=y
 # PTXCONF_HOST_TESTFRAMEWORK is not set
 PTXCONF_HOST_ACL=y
-PTXCONF_HOST_ATTR=y
 PTXCONF_HOST_CMAKE=y
 PTXCONF_HOST_FIGLET=y
 PTXCONF_HOST_FLEX=y
@@ -1764,6 +1763,7 @@ PTXCONF_IPROUTE2_IP=y
 # busybox' netcat is selected!
 #
 # PTXCONF_NETKIT_FTP is not set
+# PTXCONF_NETSNIFF_NG is not set
 PTXCONF_NETTLE=y
 # PTXCONF_NETTLE_GMP is not set
 PTXCONF_NETWORKMANAGER=y
@@ -1999,6 +1999,7 @@ PTXCONF_LIBBLKID=y
 PTXCONF_LIBCAP=y
 # PTXCONF_LIBCAP_SETCAP is not set
 # PTXCONF_LIBCGROUP is not set
+# PTXCONF_LIBCLI is not set
 # PTXCONF_LIBCONFIG is not set
 # PTXCONF_LIBCONFUSE is not set
 # PTXCONF_LIBDAEMON is not set
@@ -2080,7 +2081,6 @@ PTXCONF_LIBUSB=y
 PTXCONF_LIBUUID=y
 # PTXCONF_LIBUV is not set
 # PTXCONF_LIBWPE is not set
-# PTXCONF_LIBX86 is not set
 # PTXCONF_LIBXML2 is not set
 # PTXCONF_LIBXMLCONFIG is not set
 # PTXCONF_LIBXSLT is not set
-- 
2.29.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 2/2] libseccomp: remove old patches

[Roland Hieber]

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>
---
 ...-broadly-supported-shell-interpreter.patch | 19 -------
 ...ips-to-prevent-build-problems-for-MI.patch | 53 -------------------
 patches/libseccomp-2.5.0/series               |  5 --
 3 files changed, 77 deletions(-)
 delete mode 100644 patches/libseccomp-2.5.0/0001-run-time-use-a-broadly-supported-shell-interpreter.patch
 delete mode 100644 patches/libseccomp-2.5.0/0002-build-undefine-mips-to-prevent-build-problems-for-MI.patch
 delete mode 100644 patches/libseccomp-2.5.0/series

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 9e4b6d350c9b..000000000000
--- 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 971afb1fb2a5..000000000000
--- 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 001c41c7d9c9..000000000000
--- 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
-- 
2.29.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de