mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
sys-cluster/ploop: drop 1.14.1-r1
Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
This commit is contained in:
Stephan Hartmann
parent
a3fb4e80e8
commit
1ab8ef8505
@ -1,2 +1 @@
|
||||
DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
|
||||
DIST ploop-1.15.tar.bz2 125618 BLAKE2B ad7d06865606c20bdd9601ce343817a332653f3f7544dd27f08d3fb5ff2ee8112ef1ae0217546c28fde3dba076b0703b5881e8a019eec663964dd39885c5524c SHA512 07a691aeed949971534dcf9bb5138defacf25d7c437336df84a5ec3759cba0c20f6724660b7c8a204b3f455d15a892e20b060b0e0ea27280eeba738c36f280cb
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
--- a/lib/balloon_util.c
|
||||
+++ b/lib/balloon_util.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <string.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/fiemap.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
#include "ploop.h"
|
||||
|
||||
--- a/lib/delta_read.c
|
||||
+++ b/lib/delta_read.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <malloc.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
#include "ploop.h"
|
||||
|
||||
--- a/lib/delta_sysfs.c
|
||||
+++ b/lib/delta_sysfs.c
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <linux/fs.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/utsname.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
|
||||
#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 <linux/types.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
#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;
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit tmpfiles toolchain-funcs
|
||||
|
||||
DESCRIPTION="openvz tool and a library to control ploop block devices"
|
||||
HOMEPAGE="https://wiki.openvz.org/Download/ploop"
|
||||
SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="debug"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
DEPEND="dev-libs/libxml2"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-block/parted
|
||||
sys-fs/e2fsprogs
|
||||
sys-process/lsof
|
||||
sys-apps/findutils"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/disable_create_run_dir.patch
|
||||
"${FILESDIR}"/${PN}-1.14-musl.patch
|
||||
)
|
||||
|
||||
DOCS=( tools/README )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Respect CFLAGS and CC, do not add debug by default
|
||||
sed -i \
|
||||
-e 's|CFLAGS =|CFLAGS +=|' \
|
||||
-e '/CFLAGS/s/-g -O0 //' \
|
||||
-e '/CFLAGS/s/-O2//' \
|
||||
-e 's|CC=|CC?=|' \
|
||||
-e 's/-Werror//' \
|
||||
-e '/DEBUG=yes/d' \
|
||||
-e '/LOCKDIR/s/var/run/' \
|
||||
Makefile.inc || die 'sed on Makefile.inc failed'
|
||||
# Avoid striping of binaries
|
||||
sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
|
||||
|
||||
# respect AR and RANLIB, bug #452092
|
||||
tc-export AR RANLIB
|
||||
sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '')
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install
|
||||
rm "${ED}"/usr/$(get_libdir)/*.a || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process ploop.conf
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user