diff options
Diffstat (limited to 'meta-oe/recipes-extended/ostree/ostree')
3 files changed, 0 insertions, 96 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch deleted file mode 100644 index 2659e4696d..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Wed, 3 Aug 2022 10:37:40 -0400 -Subject: [PATCH] Remove unused `linux/fs.h` includes - -Prep for fixing conflicts introduced by newer glibc. -cc https://github.com/ostreedev/ostree/issues/2685 - -Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libostree/ostree-repo-commit.c | 1 - - src/ostree/ot-main.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c -index afab3fdf..35b16c71 100644 ---- a/src/libostree/ostree-repo-commit.c -+++ b/src/libostree/ostree-repo-commit.c -@@ -30,7 +30,6 @@ - #include <sys/xattr.h> - #include <glib/gprintf.h> - #include <sys/ioctl.h> --#include <linux/fs.h> - #include <ext2fs/ext2_fs.h> - - #include "otutil.h" -diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c -index b7b50d67..7a4405a5 100644 ---- a/src/ostree/ot-main.c -+++ b/src/ostree/ot-main.c -@@ -28,7 +28,6 @@ - #include <string.h> - #include <sys/statvfs.h> - #include <sys/mount.h> --#include <linux/fs.h> - - #include "ot-main.h" - #include "ostree.h" --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch deleted file mode 100644 index 5c2792cf89..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7ff956e4088e0bdc6bfd429f99124a8a9256c181 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Aug 2022 21:44:11 -0700 -Subject: [PATCH] libostree: Remove including sys/mount.h - -This conflicts with linux/mount.h which is included by linux/fs.h -with glibc 2.36+ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libostree/ostree-sysroot-deploy.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index 2dc9f58b..61b19e42 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -23,7 +23,6 @@ - #include <gio/gunixoutputstream.h> - #include <glib-unix.h> - #include <stdint.h> --#include <sys/mount.h> - #include <sys/statvfs.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch deleted file mode 100644 index 5cf5784f14..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dd55633e49aa43dede3c8e1770ae8761487f050e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Aug 2022 21:52:31 -0700 -Subject: [PATCH] s390x-se-luks-gencpio: There is no bashism - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libostree/s390x-se-luks-gencpio | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio -index e821e2fe..96c1d123 100755 ---- a/src/libostree/s390x-se-luks-gencpio -+++ b/src/libostree/s390x-se-luks-gencpio -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This script creates new initramdisk with LUKS config within - set -euo pipefail - --- -2.37.1 - |