d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump systemd to latest stable release 246.10 (#1205)

Browse Source
This commit is contained in:
Stefan Agner
2021-02-03 17:41:51 +01:00
committed by GitHub
parent 825ef58f85
commit 8aabf65bb7
11 changed files with 108 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
buildroot-patches/0001-docker-add-AppArmor-support.patch
View File

@@ -1,8 +1,8 @@
From dd83e231779b8daaeaa0a78d6686b80eeb49c12b Mon Sep 17 00:00:00 2001
Message-Id: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1607000394.git.stefan@agner.ch>
From 53aff7f049c974ab861db563c24d31c5512d1fbc Mon Sep 17 00:00:00 2001
Message-Id: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 13 Jan 2020 12:27:06 +0000
Subject: [PATCH 1/7] docker: add AppArmor support
Subject: [PATCH 1/9] docker: add AppArmor support
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
Signed-off-by: Stefan Agner <stefan@agner.ch>
@@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
3 files changed, 15 insertions(+)
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index d9a0eb28a6..c68e3818a8 100644
index 6b79bd14ae..2eed6e346b 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -18,6 +18,11 @@ DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
@@ -45,11 +45,11 @@ index 8cedf307ba..7f898680b7 100644
DOCKER_ENGINE_TAGS += seccomp
DOCKER_ENGINE_DEPENDENCIES += libseccomp
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index 3d177d23d5..c559244e83 100644
index 393bd7b22f..45fe1442ad 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -12,6 +12,11 @@ RUNC_LICENSE_FILES = LICENSE
RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION)
RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION)
RUNC_TAGS = cgo static_build
+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
@@ -61,5 +61,5 @@ index 3d177d23d5..c559244e83 100644
RUNC_TAGS += seccomp
RUNC_DEPENDENCIES += libseccomp host-pkgconf
--
2.29.2
2.30.0