drbd,drbd-utils: Upgrade to 9.2.1 and drbd-utils to 9.22.0
PATCH 1/1 drbd,drbd-utils: Upgrade to 9.2.1 and drbd-utils to 9.22.0
Signed-off-by Khem Raj <[email protected]>
---
.../0001-replace-off64_t-with-off_t.patch | 48 ++++++++++
...-of-GLOB_MAGCHAR-use-strchr-heuristi.patch | 96 +++++++++++++++++++
...d-utils_9.20.2.bb => drbd-utils_9.22.0.bb} | 9 +-
.../drbd/{drbd_9.0.24-1.bb => drbd_9.2.1.bb} | 4 +-
4 files changed, 151 insertions(+), 6 deletions(-)
create mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-replace-off64_t-with-off_t.patch
create mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch
rename meta-networking/recipes-support/drbd/{drbd-utils_9.20.2.bb => drbd-utils_9.22.0.bb} (90%)
rename meta-networking/recipes-support/drbd/{drbd_9.0.24-1.bb => drbd_9.2.1.bb} (82%)meta-networking/recipes-support/drbd/drbd-utils/0001-replace-off64_t-with-off_t.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 5adae6737e919d957a08df437951ccb6996f9882 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 21 Dec 2022 19:16:03 -0800 +Subject: [PATCH 1/2] replace off64_t with off_t + +off_t is already 64-bits when _FILE_OFFSET_BITS=64 +using off_t also makes it portable on musl systems + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + user/v9/drbdadm_main.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/user/v9/drbdadm_main.c b/user/v9/drbdadm_main.c +index 91e9507d..2030946c 100644 +--- a/user/v9/drbdadm_main.c ++++ b/user/v9/drbdadm_main.c +@@ -1264,11 +1264,11 @@ static int adm_resource(const struct cfg_ctx *ctx) + return ex; + } + +-static off64_t read_drbd_dev_size(int minor) ++static off_t read_drbd_dev_size(int minor) + { + char *path; + FILE *file; +- off64_t val; ++ off_t val; + int r; + + m_asprintf(&path, "/sys/block/drbd%d/size", minor); +@@ -1289,9 +1289,9 @@ int adm_resize(const struct cfg_ctx *ctx) + char *argv[MAX_ARGS]; + struct d_option *opt; + bool is_resize = !strcmp(ctx->cmd->name, "resize"); +- off64_t old_size = -1; +- off64_t target_size = 0; +- off64_t new_size; ++ off_t old_size = -1; ++ off_t target_size = 0; ++ off_t new_size; + int argc = 0; + int silent; + int ex; +-- +2.39.0 +
meta-networking/recipes-support/drbd/drbd-utils/0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch new file +96 -0
96 lines not on this page · raw message
meta-networking/recipes-support/drbd/drbd-utils_9.22.0.bb renamed from meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb +5 -4
@@ -8,14 +8,15 @@ SECTION = "admin" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ +SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ + file://0001-replace-off64_t-with-off_t.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " - -SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" -SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" +SRC_URI:append:libc-musl = " file://0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch " +SRCREV_drbd-utils = "409097fe02187f83790b88ac3e0d94f3c167adab" +SRCREV_drbd-headers = "9a0f151fa0085f57910a2dcbbd658d6069554f62" SRCREV_FORMAT = "drbd-utils_drbd-headers"
meta-networking/recipes-support/drbd/drbd_9.2.1.bb renamed from meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb +2 -2
@@ -8,10 +8,10 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" DEPENDS = "virtual/kernel" -SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ +SRC_URI = "https://pkg.linbit.com//downloads/drbd/9/${BP}.tar.gz \ file://check_existence_of_modules_before_installing.patch \ " -SRC_URI[sha256sum] = "14970459f55bc465503b88b24d1a266b2ace0d69fe3cb387005b8477cd6475ed" +SRC_URI[sha256sum] = "f59ee795188f21d4a62c5319c371ebad65ab3fb9b55e5212c3f1dd558978a843" inherit module
Signature · 1 line
2.39.0