From e2d90a7b06b5efa3d569fe4f55a82693dafd1db4 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 10 Nov 2021 10:42:17 +0100 Subject: [PATCH] procd: update to latest HEAD fixes build on wifi-5 due to missing dependencies in last update Signed-off-by: John Crispin --- backports/0020-procd-add-uxc-support.patch | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/backports/0020-procd-add-uxc-support.patch b/backports/0020-procd-add-uxc-support.patch index 6a2b16f05..b10ff3d87 100644 --- a/backports/0020-procd-add-uxc-support.patch +++ b/backports/0020-procd-add-uxc-support.patch @@ -1,17 +1,17 @@ -From 4b437c4aeffc2f4c574b5341ac81833a5b31001d Mon Sep 17 00:00:00 2001 +From 006abf1773051ad355b52d70095f63f44a496b13 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 25 Jul 2021 13:32:37 +0200 -Subject: [PATCH 09/74] procd: add uxc support +Subject: [PATCH 02/70] procd: add uxc support Signed-off-by: John Crispin --- - package/system/procd/Makefile | 12 ++--- + package/system/procd/Makefile | 15 +++--- package/system/procd/files/procd.sh | 79 +++++++++++++++++++++++++++++ package/system/procd/files/uxc.init | 4 ++ - 3 files changed, 89 insertions(+), 6 deletions(-) + 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile -index 30d5adf427..6a9d8c4618 100644 +index 30d5adf427..b831f86639 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) @@ -21,9 +21,9 @@ index 30d5adf427..6a9d8c4618 100644 -PKG_SOURCE_DATE:=2021-02-23 -PKG_SOURCE_VERSION:=37eed131e9967a35f47bacb3437a9d3c8a57b3f4 -PKG_MIRROR_HASH:=2b0131ff9055ccf987cbeb5f36c2c2585dc780999df6be312fbbbcd61ce676d4 -+PKG_SOURCE_DATE:=2021-08-15 ++PKG_MIRROR_HASH:=0d51642d82d7bb4150355a6986e54504dce171c6fcb7eeff312d20a5d106bad8 ++PKG_SOURCE_DATE:=2021-11-04 +PKG_SOURCE_VERSION:=0ee8e734a7f67220cf4a3412b60ff674b5fb20dd -+PKG_MIRROR_HASH:=a6e3c1f000b8d67533b50cbdffd9e4e218639eb2e5044deb613034137abdf960 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -36,21 +36,30 @@ index 30d5adf427..6a9d8c4618 100644 endif CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)" -@@ -82,7 +82,7 @@ endef +@@ -68,7 +68,7 @@ define Package/procd-ujail + SECTION:=base + CATEGORY:=Base system + DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS \ +- +libubox +libubus +libblobmsg-json ++ +libubox +libubus +libuci +libblobmsg-json + TITLE:=OpenWrt process jail helper + endef + +@@ -82,15 +82,14 @@ endef define Package/procd-seccomp SECTION:=base CATEGORY:=Base system - DEPENDS:=@(arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \ -+ DEPENDS:=@(aarch64||arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \ - @KERNEL_SECCOMP +libubox +libblobmsg-json +- @KERNEL_SECCOMP +libubox +libblobmsg-json ++ DEPENDS:=@SECCOMP +libubox +libblobmsg-json TITLE:=OpenWrt process seccomp helper + utrace endef -@@ -90,7 +90,7 @@ endef + define Package/uxc SECTION:=base CATEGORY:=Base system - DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json -+ DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +rpcd ++ DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +PACKAGE_uxc:rpcd TITLE:=OpenWrt container management MAINTAINER:=Daniel Golle endef