2 files changed, 2 insertions, 41 deletions

diff --git a/recipes-containers/skopeo/files/0002-fix_workaround_field_rename_in_btrfs-progs_6_1.patch b/recipes-containers/skopeo/files/0002-fix_workaround_field_rename_in_btrfs-progs_6_1.patch
deleted file mode 100644
index cd3c70f4..00000000
--- a/recipes-containers/skopeo/files/0002-fix_workaround_field_rename_in_btrfs-progs_6_1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 246ba3062e8b551026aef2708eee747014ce5c52 Mon Sep 17 00:00:00 2001
-From: Rui Chen <rui@chenrui.dev>
-Date: Wed, 28 Dec 2022 18:26:39 -0500
-Subject: [PATCH] fix: workaround field rename in btrfs-progs 6.1
-
-same as kdave/btrfs-progs@0345143
-
-Signed-off-by: Rui Chen <rui@chenrui.dev>
-
-Upstream-Status: Backport [https://github.com/containers/storage/commit/246ba3062e8b551026aef2708eee747014ce5c52]
-Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
----
- drivers/btrfs/btrfs.go | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/btrfs/btrfs.go b/drivers/btrfs/btrfs.go
-index e8b16b858e..3d9053297b 100644
---- a/drivers/btrfs/btrfs.go
-+++ b/drivers/btrfs/btrfs.go
-@@ -6,6 +6,9 @@ package 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>
- 
-@@ -382,7 +385,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)))
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 1dfce24b..a719671c 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -24,11 +24,10 @@ SRC_URI = " \
     file://storage.conf \
     file://registries.conf \
     file://0001-makefile-add-GOBUILDFLAGS-to-go-build-call.patch \
-    file://0002-fix_workaround_field_rename_in_btrfs-progs_6_1.patch;patchdir=src/import/vendor/github.com/containers/storage \
 "
 
-SRCREV = "4517ea0b7be6a6743d854e05cd24f7354a487b60"
-PV = "v1.10.0+git${SRCPV}"
+SRCREV = "95680f3c07931ee748afbf240059a62eac6e6bed"
+PV = "v1.11.0+git${SRCPV}"
 GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"