moby: update to 20.10.23.

This commit is contained in:
Michal Vasilek 2023-02-16 06:03:17 +01:00
parent c8fc3bcdbd
commit 2d19bf14f5
2 changed files with 5 additions and 41 deletions

View File

@ -1,36 +0,0 @@
From ffbbe3d103b045c3f8ec5f74aa71b7a314fd57fe Mon Sep 17 00:00:00 2001
From: Shengjing Zhu <zhsj@debian.org>
Date: Thu, 29 Dec 2022 02:37:39 +0800
Subject: [PATCH] daemon/graphdriver/btrfs: workaround field rename in
btrfs-progs 6.1
Closes: #44698
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
---
daemon/graphdriver/btrfs/btrfs.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
index 720f1ab0cd43..f2f6bf9e975b 100644
--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@@ -6,6 +6,9 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
/*
#include <stdlib.h>
#include <dirent.h>
+
+// keep struct field name compatible with btrfs-progs < 6.1.
+#define max_referenced max_rfer
#include <btrfs/ioctl.h>
#include <btrfs/ctree.h>
@@ -395,7 +398,7 @@ func subvolLimitQgroup(path string, size uint64) error {
defer closeDir(dir)
var args C.struct_btrfs_ioctl_qgroup_limit_args
- args.lim.max_referenced = C.__u64(size)
+ args.lim.max_rfer = C.__u64(size)
args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER
_, _, errno := unix.Syscall(unix.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT,
uintptr(unsafe.Pointer(&args)))

View File

@ -1,10 +1,10 @@
# Template file for 'moby' # Template file for 'moby'
# should be kept in sync with docker-cli # should be kept in sync with docker-cli
pkgname=moby pkgname=moby
version=20.10.22 version=20.10.23
revision=1 revision=1
# libnetwork commit is mentioned in vendor.conf # libnetwork commit is mentioned in vendor.conf
_libnetwork_commit=dcdf8f176d1e13ad719e913e796fb698d846de98 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
create_wrksrc=yes create_wrksrc=yes
build_style=go build_style=go
go_import_path="github.com/docker/docker" go_import_path="github.com/docker/docker"
@ -15,12 +15,12 @@ short_desc="Container engine for the Docker ecosystem"
maintainer="PWA COLLECTIVE <pwa@cya.cx>" maintainer="PWA COLLECTIVE <pwa@cya.cx>"
license="Apache-2.0" license="Apache-2.0"
homepage="https://www.docker.com" homepage="https://www.docker.com"
changelog="https://github.com/moby/moby/releases"
distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz" https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
checksum="ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 checksum="61bb3f4f0c935ac9a719adbac69fca0d727b6b5c3eb889571e00b1cc3ff1e368
dbe30210e00fd4fcc63ade49ab3b00ba8fa5a1e90d34b92c1ecc25f8b78149ba" 5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b"
system_groups="docker" system_groups="docker"
patch_args="-Np1 --directory=moby-$version"
_moby_builddir="moby-$version" _moby_builddir="moby-$version"
_libnetwork_builddir="libnetwork-$_libnetwork_commit" _libnetwork_builddir="libnetwork-$_libnetwork_commit"