diff options
| -rw-r--r-- | meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch | 16 | ||||
| -rw-r--r-- | meta-filesystems/recipes-filesystems/zfs/zfs_2.1.5.bb (renamed from meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb) | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch index 8bb8b9479a..80955b3ca0 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch @@ -1,4 +1,4 @@ -From 54883e714b7fd1e7f4ce47eb1fc09adff35d561e Mon Sep 17 00:00:00 2001 +From cc0cd6f71f6ef96fca2d7b730a3f0f6722fec696 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 7 May 2022 12:15:22 -0700 Subject: [PATCH] Define strndupa if it does not exist @@ -7,17 +7,18 @@ musl e.g. does not supply strndupa, unlike glibc Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- etc/systemd/system-generators/zfs-mount-generator.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/systemd/system-generators/zfs-mount-generator.c b/etc/systemd/system-generators/zfs-mount-generator.c -index b806339..592d2f9 100644 +index f4c6c26..255bee4 100644 --- a/etc/systemd/system-generators/zfs-mount-generator.c +++ b/etc/systemd/system-generators/zfs-mount-generator.c -@@ -47,6 +47,15 @@ - #define STRCMP ((int(*)(const void *, const void *))&strcmp) - #define PID_T_CMP ((int(*)(const void *, const void *))&pid_t_cmp) +@@ -193,6 +193,15 @@ fopenat(int dirfd, const char *pathname, int flags, + return (fdopen(fd, stream_mode)); + } +#ifndef strndupa +#define strndupa(s, n) \ @@ -29,8 +30,5 @@ index b806339..592d2f9 100644 +#endif + static int - pid_t_cmp(const pid_t *lhs, const pid_t *rhs) + line_worker(char *line, const char *cachefile) { --- -2.36.0 - diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.5.bb index dd676c945c..6aa674c790 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb +++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.5.bb @@ -7,7 +7,7 @@ HOMEPAGE ="https://github.com/openzfs/zfs" SRC_URI = "https://github.com/openzfs/zfs/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Define-strndupa-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6" +SRC_URI[sha256sum] = "1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c" # Using both 'module' and 'autotools' classes seems a bit odd, they both # define a do_compile function. |