mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-11 04:49:58 +00:00
snapper: update 0.11.2 -> 0.12.2
- remove patches that were added upstream - fix reproducibility issues Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-30
@@ -1,30 +0,0 @@
|
|||||||
From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 20 Oct 2024 07:52:33 -0700
|
|
||||||
Subject: [PATCH 1/2] Include linux/types.h for __u16/__u32/__u64 type
|
|
||||||
|
|
||||||
This header is included indirectly with glibc but when using musl
|
|
||||||
it ends up with compilation failure
|
|
||||||
|
|
||||||
BcachefsUtils.cc:85:20: error: use of undeclared identifier '__u32'
|
|
||||||
85 | args.dirfd = (__u32) fddst;
|
|
||||||
| ^
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
snapper/BcachefsUtils.cc | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc
|
|
||||||
index e9163ffb..1d328a78 100644
|
|
||||||
--- a/snapper/BcachefsUtils.cc
|
|
||||||
+++ b/snapper/BcachefsUtils.cc
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
#include <cerrno>
|
|
||||||
+#include <linux/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
From 0b39f4484553c796cb300fb4933ea314e91d913b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 20 Oct 2024 07:55:23 -0700
|
|
||||||
Subject: [PATCH 2/2] Use statvfs instead of statvfs64
|
|
||||||
|
|
||||||
when using LFS64 these functions are same and also
|
|
||||||
on 64bit systems they are same. musl is using 64bit off_t
|
|
||||||
by default and does not define LFS64 variants of these functions
|
|
||||||
and it ends up in build errors
|
|
||||||
|
|
||||||
Taken from Alpine Linux: [https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/snapper/statvfs64.patch]
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
|
|
||||||
|
|
||||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
snapper/FileUtils.cc | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
|
|
||||||
index d4034279..4c8578a1 100644
|
|
||||||
--- a/snapper/FileUtils.cc
|
|
||||||
+++ b/snapper/FileUtils.cc
|
|
||||||
@@ -387,9 +387,9 @@ namespace snapper
|
|
||||||
std::pair<unsigned long long, unsigned long long>
|
|
||||||
SDir::statvfs() const
|
|
||||||
{
|
|
||||||
- struct statvfs64 fsbuf;
|
|
||||||
- if (fstatvfs64(dirfd, &fsbuf) != 0)
|
|
||||||
- SN_THROW(IOErrorException(sformat("statvfs64 failed path:%s errno:%d (%s)", base_path.c_str(),
|
|
||||||
+ struct statvfs fsbuf;
|
|
||||||
+ if (fstatvfs(dirfd, &fsbuf) != 0)
|
|
||||||
+ SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),
|
|
||||||
errno, stringerror(errno).c_str())));
|
|
||||||
|
|
||||||
// f_bavail is used (not f_bfree) since df seems to do the
|
|
||||||
+9
-11
@@ -8,13 +8,8 @@ DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib
|
|||||||
# Build separation is slightly broken
|
# Build separation is slightly broken
|
||||||
inherit autotools-brokensep pkgconfig gettext
|
inherit autotools-brokensep pkgconfig gettext
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master"
|
||||||
git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
|
SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7"
|
||||||
file://0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch \
|
|
||||||
file://0002-Use-statvfs-instead-of-statvfs64.patch \
|
|
||||||
"
|
|
||||||
SRCREV = "6c603565f36e9996d85045c8012cd04aba5f3708"
|
|
||||||
|
|
||||||
|
|
||||||
EXTRA_OECONF += "--disable-zypp"
|
EXTRA_OECONF += "--disable-zypp"
|
||||||
|
|
||||||
@@ -24,10 +19,13 @@ PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
|
|||||||
PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
|
PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
|
||||||
|
|
||||||
# Avoid HOSTTOOLS path in binaries
|
# Avoid HOSTTOOLS path in binaries
|
||||||
export DIFFBIN = "${bindir}/diff"
|
export DIFF_BIN = "${bindir}/diff"
|
||||||
export RMBIN = "${bindir}/rm"
|
export RM_BIN = "${bindir}/rm"
|
||||||
export TOUCHBIN = "${bindir}/touch"
|
export RMDIR_BIN = "${bindir}/rmdir"
|
||||||
export CPBIN = "${bindir}/cp"
|
export MKDIR_BIN = "${bindir}/mkdir"
|
||||||
|
export TOUCH_BIN = "${bindir}/touch"
|
||||||
|
export CP_BIN = "${bindir}/cp"
|
||||||
|
export REALPATH_BIN = "${bindir}/realpath"
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
install -d ${D}${sysconfdir}/sysconfig
|
install -d ${D}${sysconfdir}/sysconfig
|
||||||
Reference in New Issue
Block a user