From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8EA4B158091 for ; Sun, 19 Jun 2022 17:45:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CBBCE0BD3; Sun, 19 Jun 2022 17:45:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C38EE0BD3 for ; Sun, 19 Jun 2022 17:45:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A663341496 for ; Sun, 19 Jun 2022 17:45:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CF2C448 for ; Sun, 19 Jun 2022 17:45:29 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1655660723.d2c74fe1c6bd290617186d2cd4992f005a288ca2.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/, sys-cluster/ploop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ploop/files/ploop-1.14-musl.patch sys-cluster/ploop/ploop-1.14.1-r1.ebuild X-VCS-Directories: sys-cluster/ploop/files/ sys-cluster/ploop/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: d2c74fe1c6bd290617186d2cd4992f005a288ca2 X-VCS-Branch: master Date: Sun, 19 Jun 2022 17:45:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c724af7a-4b05-434c-b9f1-2c16cfd4b19f X-Archives-Hash: ee73f719ffb09749ad94bcc75d7bf759 commit: d2c74fe1c6bd290617186d2cd4992f005a288ca2 Author: Stephan Hartmann gentoo org> AuthorDate: Sun Jun 19 17:45:12 2022 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Sun Jun 19 17:45:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c74fe1 sys-cluster/ploop: fix building on musl Closes: https://bugs.gentoo.org/832965 Signed-off-by: Stephan Hartmann gentoo.org> sys-cluster/ploop/files/ploop-1.14-musl.patch | 78 +++++++++++++++++++++++++++ sys-cluster/ploop/ploop-1.14.1-r1.ebuild | 1 + 2 files changed, 79 insertions(+) diff --git a/sys-cluster/ploop/files/ploop-1.14-musl.patch b/sys-cluster/ploop/files/ploop-1.14-musl.patch new file mode 100644 index 000000000000..693135123c55 --- /dev/null +++ b/sys-cluster/ploop/files/ploop-1.14-musl.patch @@ -0,0 +1,78 @@ +--- a/lib/balloon_util.c ++++ b/lib/balloon_util.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "ploop.h" + +--- a/lib/delta_read.c ++++ b/lib/delta_read.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "ploop.h" + +--- a/lib/delta_sysfs.c ++++ b/lib/delta_sysfs.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "ploop.h" + +@@ -238,7 +239,7 @@ static int get_dev_num(const char *path, dev_t *dev_num) + ploop_err(0, "Unexpected format of %s: %s", path, nbuf); + return -1; + } +- *dev_num = gnu_dev_makedev(maj, min); ++ *dev_num = makedev(maj, min); + return 0; + } + +--- a/lib/merge.c ++++ b/lib/merge.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "ploop.h" + +--- a/lib/ploop.c ++++ b/lib/ploop.c +@@ -1087,7 +1087,7 @@ static int get_mount_dir(const char *device, char *out, int size) + + if (get_dev_by_name(device, &dev)) + return -1; +- minor = gnu_dev_minor(dev); ++ minor = minor(dev); + + fp = fopen("/proc/self/mountinfo", "r"); + if (fp == NULL) { +@@ -1719,7 +1719,7 @@ static int create_ploop_dev(int minor) + make_sysfs_dev_name(minor, device + 5, sizeof(device) - 5); + /* Create pair /dev/ploopN & /dev/ploopNp1 */ + if (access(device, F_OK)) { +- if (mknod(device, S_IFBLK, gnu_dev_makedev(PLOOP_DEV_MAJOR, minor))) { ++ if (mknod(device, S_IFBLK, makedev(PLOOP_DEV_MAJOR, minor))) { + ploop_err(errno, "mknod %s", device); + return SYSEXIT_MKNOD; + } +@@ -1730,7 +1730,7 @@ static int create_ploop_dev(int minor) + } + snprintf(devicep1, sizeof(devicep1), "%sp1", device); + if (access(devicep1, F_OK)) { +- if (mknod(devicep1, S_IFBLK, gnu_dev_makedev(PLOOP_DEV_MAJOR, minor+1))) { ++ if (mknod(devicep1, S_IFBLK, makedev(PLOOP_DEV_MAJOR, minor+1))) { + ploop_err(errno, "mknod %s", devicep1); + return SYSEXIT_MKNOD; + } diff --git a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild index b8086d22b8d8..1dfbcff162dc 100644 --- a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild +++ b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild @@ -24,6 +24,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/disable_create_run_dir.patch + "${FILESDIR}"/${PN}-1.14-musl.patch ) DOCS=( tools/README )