forked from pool/docker
f28071cbb5
<https://docs.docker.com/engine/release-notes/24.0/#2406>. bsc#1215323 - 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 * cli-0001-docs-include-required-tools-in-source-tree.patch - Switch from disabledrun to manualrun in _service. - Add a docker.socket unit file, but with socket activation effectively disabled to ensure that Docker will always run even if you start the socket individually. Users should probably just ignore this unit file. bsc#1210141 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=395
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From fd0172ba27352f397ce7ff05d5dd1ec6c80054e5 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/4] 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 d88efc4be2bb..4e976aa689cd 100644
|
|
--- a/daemon/graphdriver/btrfs/btrfs.go
|
|
+++ b/daemon/graphdriver/btrfs/btrfs.go
|
|
@@ -5,17 +5,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.42.0
|
|
|