gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-01-10 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

dockerd: Updated to 20.10.0

Browse Source 
* SELinux and Seccomp are now enabled via the kernel options themselves
* Config.in now uses CGroupsV2 by default but optionally allows V1

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
This commit is contained in:
Gerard Ryan
2020-11-08 12:31:38 +10:00
committed by Daniel Golle
parent 404b917183
commit 3d8d2bd083
4 changed files with 107 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/dockerd/patches/001-libdevmapper_name_fix.patch
View File

@@ -1,13 +1,13 @@
Index: docker-ce-18.09.0/components/engine/hack/make.sh
Index: docker-ce-20.10.0/hack/make.sh
===================================================================
--- docker-ce-18.09.0.orig/components/engine/hack/make.sh
+++ docker-ce-18.09.0/components/engine/hack/make.sh
@@ -129,7 +129,7 @@ fi
--- docker-ce-20.10.0.orig/hack/make.sh
+++ docker-ce-20.10.0/hack/make.sh
@@ -95,7 +95,7 @@ fi
# with a newer libdevmapper than the one it was built with.
if \
if
command -v gcc &> /dev/null \
- && ! ( echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null $(pkg-config --libs devmapper) &> /dev/null ) \
+ && ! ( echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null $(pkg-config --libs libdevmapper) &> /dev/null ) \
; then
- && ! (echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(pkg-config --libs devmapper) &> /dev/null) \
+ && ! (echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(pkg-config --libs libdevmapper) &> /dev/null) \
;
then
add_buildtag libdm dlsym_deferred_remove
fi