b3cb6fc020
- Update to Docker 26.1.0-ce. See upstream changelog online at <https://docs.docker.com/engine/release-notes/26.1/#2610> - Rebase patches: * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch * 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch * 0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch * cli-0001-docs-include-required-tools-in-source-tree.patch OBS-URL: https://build.opensuse.org/request/show/1170079 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=403
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 4acaea4383cbc5961175a4dfb95b56924376cdbc Mon Sep 17 00:00:00 2001
|
|
From: Aleksa Sarai <asarai@suse.de>
|
|
Date: Mon, 22 May 2023 15:44:54 +1000
|
|
Subject: [PATCH 3/5] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI
|
|
headers"
|
|
|
|
This reverts commit 3208dcabdc8997340b255f5b880fef4e3f54580d.
|
|
|
|
On SLE 12, our UAPI headers are too old, resulting in us being unable to
|
|
build the btrfs driver with the new headers. This patch is only needed
|
|
for SLE-12.
|
|
|
|
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
|
|
---
|
|
daemon/graphdriver/btrfs/btrfs.go | 13 ++++---------
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
|
|
index 6aaa33cf7622..7264d4036427 100644
|
|
--- a/daemon/graphdriver/btrfs/btrfs.go
|
|
+++ b/daemon/graphdriver/btrfs/btrfs.go
|
|
@@ -4,17 +4,12 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
|
|
|
|
/*
|
|
#include <stdlib.h>
|
|
-#include <stdio.h>
|
|
#include <dirent.h>
|
|
|
|
-#include <linux/version.h>
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
|
|
- #error "Headers from kernel >= 4.12 are required to build with Btrfs support."
|
|
- #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs."
|
|
-#endif
|
|
-
|
|
-#include <linux/btrfs.h>
|
|
-#include <linux/btrfs_tree.h>
|
|
+// keep struct field name compatible with btrfs-progs < 6.1.
|
|
+#define max_referenced max_rfer
|
|
+#include <btrfs/ioctl.h>
|
|
+#include <btrfs/ctree.h>
|
|
|
|
static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct, const char* value) {
|
|
snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value);
|
|
--
|
|
2.44.0
|
|
|