mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 17:11:34 +02:00
sys-fs/udisks: Drop unused package and its dependencies
This commit is contained in:
Krzesimir Nowak
parent
586e4c094f
commit
aa28b134fd
@ -231,16 +231,13 @@ dev-libs/json-c
|
|||||||
dev-libs/jsoncpp
|
dev-libs/jsoncpp
|
||||||
dev-libs/libaio
|
dev-libs/libaio
|
||||||
dev-libs/libassuan
|
dev-libs/libassuan
|
||||||
dev-libs/libatasmart
|
|
||||||
dev-libs/libbsd
|
dev-libs/libbsd
|
||||||
dev-libs/libbytesize
|
|
||||||
dev-libs/libdnet
|
dev-libs/libdnet
|
||||||
dev-libs/libev
|
dev-libs/libev
|
||||||
dev-libs/libevent
|
dev-libs/libevent
|
||||||
dev-libs/libffi
|
dev-libs/libffi
|
||||||
dev-libs/libgcrypt
|
dev-libs/libgcrypt
|
||||||
dev-libs/libgpg-error
|
dev-libs/libgpg-error
|
||||||
dev-libs/libgudev
|
|
||||||
dev-libs/libksba
|
dev-libs/libksba
|
||||||
dev-libs/liblinear
|
dev-libs/liblinear
|
||||||
dev-libs/libltdl
|
dev-libs/libltdl
|
||||||
@ -655,7 +652,6 @@ sys-fs/multipath-tools
|
|||||||
sys-fs/quota
|
sys-fs/quota
|
||||||
sys-fs/squashfs-tools
|
sys-fs/squashfs-tools
|
||||||
sys-fs/squashfs-tools-ng
|
sys-fs/squashfs-tools-ng
|
||||||
sys-fs/udisks
|
|
||||||
sys-fs/xfsprogs
|
sys-fs/xfsprogs
|
||||||
sys-fs/zfs
|
sys-fs/zfs
|
||||||
sys-fs/zfs-kmod
|
sys-fs/zfs-kmod
|
||||||
@ -667,7 +663,6 @@ sys-libs/cracklib
|
|||||||
sys-libs/efivar
|
sys-libs/efivar
|
||||||
sys-libs/gdbm
|
sys-libs/gdbm
|
||||||
sys-libs/ldb
|
sys-libs/ldb
|
||||||
sys-libs/libblockdev
|
|
||||||
sys-libs/libcap
|
sys-libs/libcap
|
||||||
sys-libs/libcap-ng
|
sys-libs/libcap-ng
|
||||||
sys-libs/libnvme
|
sys-libs/libnvme
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
|
|
||||||
DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
|
|
||||||
HOMEPAGE="https://salsa.debian.org/utopia-team/libatasmart"
|
|
||||||
SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
|
|
||||||
mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1"
|
|
||||||
SLOT="0/4"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
|
||||||
IUSE="static-libs"
|
|
||||||
|
|
||||||
RDEPEND="virtual/libudev:="
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="virtual/pkgconfig"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${P/_p*}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# https://bugs.gentoo.org/470874
|
|
||||||
local d="${WORKDIR}/debian/patches"
|
|
||||||
sed -i -e '/#/d' \
|
|
||||||
-e "s|^|${d}/|" "${d}"/series || die
|
|
||||||
eapply $(<"${d}"/series)
|
|
||||||
eapply_user
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf $(use_enable static-libs static)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
if tc-is-cross-compiler; then
|
|
||||||
tc-export_build_env
|
|
||||||
emake -C strpool strpool \
|
|
||||||
CFLAGS="${BUILD_CFLAGS}" \
|
|
||||||
CPPFLAGS="${BUILD_CPPFLAGS}" \
|
|
||||||
LDFLAGS="${BUILD_LDFLAGS}"
|
|
||||||
fi
|
|
||||||
emake
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>freedesktop-bugs@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
DIST libbytesize-2.10.tar.gz 458804 BLAKE2B 413a45bebf8394e0557c2e1ef7e1f4348fa6dfa52c697599886d70292ea8b2e1b17402e787afaeb8fecd84e3a37a6c0c39440fa22a556dcaba3f419ee17e1b0e SHA512 9e52b9a756a5b4ee6e23a7a20fd0c6ca2a65ff31f38ddc7545d6838fe9a3da0ee0bd7491cb268f071c950fbeb8d65c707423d285cc3548038b3a2d3aa7f0de48
|
|
||||||
DIST libbytesize-2.11.tar.gz 459631 BLAKE2B f15b260f3abfdd876a45157281e7a3dbc33227ef0fa8096a07b254b5edf7378af0653b43b54d0d1ac780ad900644039bd73a0bc9a5c6a111fb45d69e4065cbdc SHA512 eb539c878cc0f857772b07aac4aca2732d3298fa649011f3f8a95fce83b1cc5b5b7001f6bb0c168ed47b7886d34c2e139ded9e66994a9a10784f9f7944475190
|
|
||||||
DIST libbytesize-2.9.tar.gz 458737 BLAKE2B d2e47b520cf2669131816f069d8ebeb946be02bc04acc676579f12e798fcb2aa176fd25e6bb77dd1e6b274ec0762498df5df18d88c627653accc426a7e268f36 SHA512 6def6bebe33344e6d6ce1a636bcd200a9d28ed5c4e5ce5dfbfd94c4d92ba37512ef1ee4f12716af0d6a402d5285e60df1ee629ecf31cf7d0b59990c524384fd1
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
https://bugs.gentoo.org/744286
|
|
||||||
|
|
||||||
--- libbytesize-2.4/configure.ac
|
|
||||||
+++ libbytesize-2.4/configure.ac
|
|
||||||
@@ -6,7 +6,7 @@
|
|
||||||
# This needs to be set before initializing automake
|
|
||||||
AC_DISABLE_STATIC
|
|
||||||
|
|
||||||
-AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-syntax -Wno-portability])
|
|
||||||
+AM_INIT_AUTOMAKE([foreign -Wall -Wno-syntax -Wno-portability])
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
|
|
||||||
# Check for the gettext programs
|
|
||||||
--- libbytesize-2.4/src/Makefile.am
|
|
||||||
+++ libbytesize-2.4/src/Makefile.am
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
LDADD = $(LIBINTL)
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libbytesize.la
|
|
||||||
-libbytesize_la_CFLAGS = -Wall -Wextra -Werror -Wno-overflow -D_GNU_SOURCE
|
|
||||||
+libbytesize_la_CFLAGS = -Wall -Wextra -Wno-overflow -D_GNU_SOURCE
|
|
||||||
libbytesize_la_LIBADD = -lgmp -lmpfr $(PCRE2_LIBS)
|
|
||||||
libbytesize_la_LDFLAGS = -version-info 1:0:0
|
|
||||||
libbytesize_la_SOURCES = bs_size.c bs_size.h gettext.h
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..12} )
|
|
||||||
|
|
||||||
inherit autotools python-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big byte sizes"
|
|
||||||
HOMEPAGE="https://github.com/storaged-project/libbytesize"
|
|
||||||
SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
|
|
||||||
IUSE="doc python test tools"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
python? ( ${PYTHON_REQUIRED_USE} )
|
|
||||||
tools? ( python )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/gmp:=
|
|
||||||
dev-libs/mpfr:=
|
|
||||||
dev-libs/libpcre2:=
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
sys-devel/gettext
|
|
||||||
doc? (
|
|
||||||
dev-util/gtk-doc
|
|
||||||
virtual/pkgconfig
|
|
||||||
)
|
|
||||||
test? (
|
|
||||||
dev-python/pocketlint[${PYTHON_USEDEP}]
|
|
||||||
dev-python/polib[${PYTHON_USEDEP}]
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${PN}-2.4-no_Werror.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
python_do() {
|
|
||||||
if use python ; then
|
|
||||||
python_foreach_impl run_in_build_dir "$@"
|
|
||||||
else
|
|
||||||
"$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
$(use_with doc gtk-doc)
|
|
||||||
$(use_with python python3)
|
|
||||||
$(use_with tools)
|
|
||||||
)
|
|
||||||
local ECONF_SOURCE="${S}"
|
|
||||||
python_do econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
python_do emake
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
python_do emake check
|
|
||||||
}
|
|
||||||
|
|
||||||
install_helper() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
use python && python_optimize
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
python_do install_helper
|
|
||||||
einstalldocs
|
|
||||||
find "${ED}" -name "*.la" -type f -delete || die
|
|
||||||
}
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..13} )
|
|
||||||
|
|
||||||
inherit autotools python-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big byte sizes"
|
|
||||||
HOMEPAGE="https://github.com/storaged-project/libbytesize"
|
|
||||||
SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
|
||||||
IUSE="doc python test tools"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
python? ( ${PYTHON_REQUIRED_USE} )
|
|
||||||
tools? ( python )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/gmp:=
|
|
||||||
dev-libs/mpfr:=
|
|
||||||
dev-libs/libpcre2:=
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
sys-devel/gettext
|
|
||||||
doc? (
|
|
||||||
dev-util/gtk-doc
|
|
||||||
virtual/pkgconfig
|
|
||||||
)
|
|
||||||
test? (
|
|
||||||
dev-python/pocketlint[${PYTHON_USEDEP}]
|
|
||||||
dev-python/polib[${PYTHON_USEDEP}]
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${PN}-2.4-no_Werror.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
python_do() {
|
|
||||||
if use python ; then
|
|
||||||
python_foreach_impl run_in_build_dir "$@"
|
|
||||||
else
|
|
||||||
"$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
$(use_with doc gtk-doc)
|
|
||||||
$(use_with python python3)
|
|
||||||
$(use_with tools)
|
|
||||||
)
|
|
||||||
local ECONF_SOURCE="${S}"
|
|
||||||
python_do econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
python_do emake
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
python_do emake check
|
|
||||||
}
|
|
||||||
|
|
||||||
install_helper() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
use python && python_optimize
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
python_do install_helper
|
|
||||||
einstalldocs
|
|
||||||
find "${ED}" -name "*.la" -type f -delete || die
|
|
||||||
}
|
|
||||||
@ -1,91 +0,0 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
# py3.12 blocked by the massive dependency tree of dev-python/pocketlint
|
|
||||||
PYTHON_COMPAT=( python3_{10..11} )
|
|
||||||
|
|
||||||
inherit autotools python-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big byte sizes"
|
|
||||||
HOMEPAGE="https://github.com/storaged-project/libbytesize"
|
|
||||||
SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
|
||||||
IUSE="doc python test tools"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
python? ( ${PYTHON_REQUIRED_USE} )
|
|
||||||
tools? ( python )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/gmp:=
|
|
||||||
dev-libs/mpfr:=
|
|
||||||
dev-libs/libpcre2:=
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
sys-devel/gettext
|
|
||||||
doc? (
|
|
||||||
dev-util/gtk-doc
|
|
||||||
virtual/pkgconfig
|
|
||||||
)
|
|
||||||
test? (
|
|
||||||
dev-python/pocketlint[${PYTHON_USEDEP}]
|
|
||||||
dev-python/polib[${PYTHON_USEDEP}]
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
DOCS=( README.md )
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${PN}-2.4-no_Werror.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
python_do() {
|
|
||||||
if use python ; then
|
|
||||||
python_foreach_impl run_in_build_dir "$@"
|
|
||||||
else
|
|
||||||
"$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
$(use_with doc gtk-doc)
|
|
||||||
$(use_with python python3)
|
|
||||||
$(use_with tools)
|
|
||||||
)
|
|
||||||
local ECONF_SOURCE="${S}"
|
|
||||||
python_do econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
python_do emake
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
python_do emake check
|
|
||||||
}
|
|
||||||
|
|
||||||
install_helper() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
use python && python_optimize
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
python_do install_helper
|
|
||||||
einstalldocs
|
|
||||||
find "${ED}" -name "*.la" -type f -delete || die
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<!-- maintainer-needed -->
|
|
||||||
<use>
|
|
||||||
<flag name="tools">Build bscalc python CLI tool</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">storaged-project/libbytesize</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1 +0,0 @@
|
|||||||
DIST libgudev-238.tar.xz 30548 BLAKE2B 386491e78c82081e89dad897d16ea6733430a67db3f75f2d9fdee5474b074ad6fede9f08e429f4eb6feaa9bbbb982d9d039db738aac5b5ce0ffac2d3a19430d4 SHA512 684061b4fc64a6ea3dd1ac34835279330c7eb2728fad6e3a9d34c0d501be3103d0f96c6d6866c8e257a0027e4f78a6314cb8ba81cda5ddf42ee9ea1a576ec5dc
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
From a354fcbb911220965f737d38fefe700f7b941cf8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Tue, 16 Jan 2024 12:02:46 -0800
|
|
||||||
Subject: [PATCH] meson: Pass --export-dynamic option to linker
|
|
||||||
|
|
||||||
Bypass the compiler driver trying to comprehend and translate it for
|
|
||||||
linker, since its not clear what the right behavior should be, gcc seems
|
|
||||||
to translate it into --export-dynamic but clang 18+ rejects it
|
|
||||||
|
|
||||||
| x86_64-yoe-linux-clang: error: unknown argument: '-export-dynamic'
|
|
||||||
|
|
||||||
also see [1]
|
|
||||||
|
|
||||||
This makes it work as intended across gcc and clang
|
|
||||||
|
|
||||||
[1] https://discourse.llvm.org/t/clang-option-export-dynamic-parse-to-e-xport-dynamic-error/72454
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
gudev/meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/gudev/meson.build b/gudev/meson.build
|
|
||||||
index e904203..3ed580b 100644
|
|
||||||
--- a/gudev/meson.build
|
|
||||||
+++ b/gudev/meson.build
|
|
||||||
@@ -33,7 +33,7 @@ libgudev_c_args = [
|
|
||||||
]
|
|
||||||
|
|
||||||
libgudev_link_args = [
|
|
||||||
- '-export-dynamic',
|
|
||||||
+ '-Wl,--export-dynamic',
|
|
||||||
'-Wl,--version-script,@0@/libgudev-1.0.sym'.format(top_srcdir),
|
|
||||||
]
|
|
||||||
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
# Copyright 2015-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit meson-multilib
|
|
||||||
|
|
||||||
DESCRIPTION="GObject bindings for libudev"
|
|
||||||
HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
|
|
||||||
SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1+"
|
|
||||||
SLOT="0/0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
|
||||||
IUSE="introspection test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
|
|
||||||
>=virtual/libudev-251:=[sticky-tags(+),${MULTILIB_USEDEP}]
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
test? ( dev-util/umockdev[${MULTILIB_USEDEP}] )
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
dev-util/glib-utils
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
local emesonargs=(
|
|
||||||
$(meson_native_use_feature introspection)
|
|
||||||
-Dgtk_doc=false
|
|
||||||
$(meson_feature test tests)
|
|
||||||
-Dvapi=disabled
|
|
||||||
)
|
|
||||||
meson_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
# libsandbox interferes somehow.
|
|
||||||
# There are no access violations, but tests fail.
|
|
||||||
# https://bugs.gentoo.org/805449
|
|
||||||
local -x SANDBOX_ON=0
|
|
||||||
meson-multilib_src_test
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
# Copyright 2015-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit meson-multilib
|
|
||||||
|
|
||||||
DESCRIPTION="GObject bindings for libudev"
|
|
||||||
HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
|
|
||||||
SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1+"
|
|
||||||
SLOT="0/0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
|
||||||
IUSE="introspection test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
|
|
||||||
>=virtual/libudev-251:=[sticky-tags(+),${MULTILIB_USEDEP}]
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
test? ( dev-util/umockdev[${MULTILIB_USEDEP}] )
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
dev-util/glib-utils
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PV}-clang18-export-dynamic.patch #926350
|
|
||||||
)
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
local emesonargs=(
|
|
||||||
$(meson_native_use_feature introspection)
|
|
||||||
-Dgtk_doc=false
|
|
||||||
$(meson_feature test tests)
|
|
||||||
-Dvapi=disabled
|
|
||||||
)
|
|
||||||
meson_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
# libsandbox interferes somehow.
|
|
||||||
# There are no access violations, but tests fail.
|
|
||||||
# https://bugs.gentoo.org/805449
|
|
||||||
local -x SANDBOX_ON=0
|
|
||||||
meson-multilib_src_test
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>gnome@gentoo.org</email>
|
|
||||||
<name>Gentoo GNOME Desktop</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>systemd@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="gnome-gitlab">GNOME/libgudev</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
DIST udisks-2.10.1.tar.bz2 1896207 BLAKE2B 41282e4dbbd93e6bda2a10a6ff2f2fb82bfc83b3ccbed9450cca7888c634cde9300fcd0b7d055e0d8e4c8fc0b431a75d5612a24132ea9b2677d194529732178d SHA512 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a
|
|
||||||
DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From eb1d4a2bcbb8744074d17553bd0d55ffbd76bdeb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
||||||
Date: Tue, 14 Nov 2023 13:16:39 +0000
|
|
||||||
Subject: [PATCH] udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder
|
|
||||||
|
|
||||||
For some reason even after acquiring a voluntary BSD lock on
|
|
||||||
the device the BLKRRPART ioctl still fails with EBUSY. Wait
|
|
||||||
a couple of msec and everything is fine.
|
|
||||||
|
|
||||||
So try harder, several attempts, if busy. There might be number
|
|
||||||
of things going on in the system and it's out of our control
|
|
||||||
even when holding a lock.
|
|
||||||
---
|
|
||||||
src/udiskslinuxblockobject.c | 14 +++++++++++---
|
|
||||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/udiskslinuxblockobject.c b/src/udiskslinuxblockobject.c
|
|
||||||
index d5da4bc4d9..33604df841 100644
|
|
||||||
--- a/src/udiskslinuxblockobject.c
|
|
||||||
+++ b/src/udiskslinuxblockobject.c
|
|
||||||
@@ -1098,23 +1098,31 @@ udisks_linux_block_object_reread_partition_table (UDisksLinuxBlockObject *objec
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- gint num_tries = 0;
|
|
||||||
+ gint num_tries;
|
|
||||||
|
|
||||||
/* acquire an exclusive BSD lock to prevent udev probes.
|
|
||||||
* See also https://systemd.io/BLOCK_DEVICE_LOCKING
|
|
||||||
*/
|
|
||||||
+ num_tries = 10;
|
|
||||||
while (flock (fd, LOCK_EX | LOCK_NB) != 0)
|
|
||||||
{
|
|
||||||
g_usleep (100 * 1000); /* microseconds */
|
|
||||||
- if (num_tries++ > 5)
|
|
||||||
+ if (num_tries-- < 0)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (ioctl (fd, BLKRRPART) != 0)
|
|
||||||
+ num_tries = 5;
|
|
||||||
+ while (ioctl (fd, BLKRRPART) != 0)
|
|
||||||
{
|
|
||||||
+ if (errno == EBUSY && num_tries-- >= 0)
|
|
||||||
+ {
|
|
||||||
+ g_usleep (200 * 1000); /* microseconds */
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
|
|
||||||
"Error re-reading partition table (BLKRRPART ioctl) on %s: %m", device_file);
|
|
||||||
ret = FALSE;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
close (fd);
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
Upstream: https://github.com/storaged-project/udisks/pull/1333
|
|
||||||
|
|
||||||
From d5f0bc5aa005d116b513992a6ae8ee1fd2dd65a1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Violet Purcell <vimproved@inventati.org>
|
|
||||||
Date: Sat, 7 Dec 2024 16:45:40 -0500
|
|
||||||
Subject: [PATCH] build: use -export-dynamic instead of -export_dynamic
|
|
||||||
|
|
||||||
GNU libtool accepts either, but slibtool's option parsing is more strict
|
|
||||||
and just ends up passing -export_dynamic to the compiler, which
|
|
||||||
obviously causes an error. Use -export-dynamic to fix building with
|
|
||||||
slibtool.
|
|
||||||
--- a/modules/btrfs/Makefile.am
|
|
||||||
+++ b/modules/btrfs/Makefile.am
|
|
||||||
@@ -64,7 +64,7 @@ libudisks2_btrfs_la_CFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_btrfs_la_LDFLAGS = \
|
|
||||||
- -export_dynamic \
|
|
||||||
+ -export-dynamic \
|
|
||||||
-avoid-version \
|
|
||||||
-module \
|
|
||||||
-no-undefined \
|
|
||||||
--- a/modules/iscsi/Makefile.am
|
|
||||||
+++ b/modules/iscsi/Makefile.am
|
|
||||||
@@ -68,7 +68,7 @@ libudisks2_iscsi_la_CFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_iscsi_la_LDFLAGS = \
|
|
||||||
- -export_dynamic \
|
|
||||||
+ -export-dynamic \
|
|
||||||
-avoid-version \
|
|
||||||
-module \
|
|
||||||
-no-undefined \
|
|
||||||
--- a/modules/lsm/Makefile.am
|
|
||||||
+++ b/modules/lsm/Makefile.am
|
|
||||||
@@ -62,7 +62,7 @@ libudisks2_lsm_la_CFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_lsm_la_LDFLAGS = \
|
|
||||||
- -export_dynamic \
|
|
||||||
+ -export-dynamic \
|
|
||||||
-avoid-version \
|
|
||||||
-module \
|
|
||||||
-no-undefined \
|
|
||||||
--- a/modules/lvm2/Makefile.am
|
|
||||||
+++ b/modules/lvm2/Makefile.am
|
|
||||||
@@ -67,7 +67,7 @@ libudisks2_lvm2_la_CFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_lvm2_la_LDFLAGS = \
|
|
||||||
- -export_dynamic \
|
|
||||||
+ -export-dynamic \
|
|
||||||
-avoid-version \
|
|
||||||
-module \
|
|
||||||
-no-undefined \
|
|
||||||
--
|
|
||||||
2.47.1
|
|
||||||
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
||||||
Date: Fri, 3 Nov 2023 16:40:54 +0100
|
|
||||||
Subject: [PATCH] tests: Fix targetcli_config.json
|
|
||||||
|
|
||||||
Not all attributes are available anymore in newer kernel versions.
|
|
||||||
---
|
|
||||||
src/tests/dbus-tests/targetcli_config.json | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json
|
|
||||||
index 3be9eac2be..f50bf7d4d2 100644
|
|
||||||
--- a/src/tests/dbus-tests/targetcli_config.json
|
|
||||||
+++ b/src/tests/dbus-tests/targetcli_config.json
|
|
||||||
@@ -331,7 +331,6 @@
|
|
||||||
"demo_mode_write_protect": 0,
|
|
||||||
"generate_node_acls": 1,
|
|
||||||
"login_timeout": 15,
|
|
||||||
- "netif_timeout": 2,
|
|
||||||
"prod_mode_write_protect": 0,
|
|
||||||
"t10_pi": 0,
|
|
||||||
"tpg_enabled_sendtargets": 1
|
|
||||||
@@ -393,7 +392,6 @@
|
|
||||||
"demo_mode_write_protect": 1,
|
|
||||||
"generate_node_acls": 0,
|
|
||||||
"login_timeout": 15,
|
|
||||||
- "netif_timeout": 2,
|
|
||||||
"prod_mode_write_protect": 0,
|
|
||||||
"t10_pi": 0,
|
|
||||||
"tpg_enabled_sendtargets": 1
|
|
||||||
@@ -479,7 +477,6 @@
|
|
||||||
"demo_mode_write_protect": 1,
|
|
||||||
"generate_node_acls": 0,
|
|
||||||
"login_timeout": 15,
|
|
||||||
- "netif_timeout": 2,
|
|
||||||
"prod_mode_write_protect": 0,
|
|
||||||
"t10_pi": 0,
|
|
||||||
"tpg_enabled_sendtargets": 1
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From 8f62f7c6888659f3b66d5861d46fb9b3a34ff169 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marius Vollmer <mvollmer@redhat.com>
|
|
||||||
Date: Thu, 22 Feb 2024 16:49:24 +0200
|
|
||||||
Subject: [PATCH] udiskslinuxblock: Survive a missing /etc/fstab
|
|
||||||
|
|
||||||
This is similar to b79f6840ca82551e672156153b7e13328f0ba19d, which
|
|
||||||
solved the same problem for /etc/crypttab.
|
|
||||||
---
|
|
||||||
src/udiskslinuxblock.c | 10 +++++++++-
|
|
||||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
|
|
||||||
index 829dd5f78..a3fa183be 100644
|
|
||||||
--- a/src/udiskslinuxblock.c
|
|
||||||
+++ b/src/udiskslinuxblock.c
|
|
||||||
@@ -1541,7 +1541,15 @@ add_remove_fstab_entry (UDisksBlock *block,
|
|
||||||
&contents,
|
|
||||||
NULL,
|
|
||||||
error))
|
|
||||||
- goto out;
|
|
||||||
+ {
|
|
||||||
+ if (g_error_matches (*error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
|
|
||||||
+ {
|
|
||||||
+ contents = g_strdup ("");
|
|
||||||
+ g_clear_error (error);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
lines = g_strsplit (contents, "\n", 0);
|
|
||||||
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
From 3dc036fb5045fc068c6abfbe4e62d0871d7ca82a Mon Sep 17 00:00:00 2001
|
|
||||||
From: xinpeng wang <wangxinpeng@uniontech.com>
|
|
||||||
Date: Thu, 21 Sep 2023 13:57:40 +0800
|
|
||||||
Subject: [PATCH] udiskslinuxmanager:use dbus interface after free
|
|
||||||
|
|
||||||
In handle_get_block_devices, call get_block_objects to obtain iface_block_device
|
|
||||||
of all current UDisksLinuxBlockObject, and then obtain the corresponding
|
|
||||||
UDisksLinuxBlockObject's object_path through iface_block_device.iface_block_device
|
|
||||||
is a GDBusInterfaceSkeleton, which saves the object through
|
|
||||||
g_dbus_interface_skeleton_set_object. g_object_add_weak_pointer is used here. This
|
|
||||||
function is not thread-safe.At this time, if other threads are releasing the object,
|
|
||||||
the program will crash.
|
|
||||||
This scene can be reproduced by quickly plugging and unplugging the USB disk.
|
|
||||||
The core is as follows (the redundant stack is omitted):
|
|
||||||
When accessing object in thread 1, the object is released by thread 2
|
|
||||||
info threads
|
|
||||||
Id Target Id Frame
|
|
||||||
* 1 Thread 0x7f80979e70 (LWP 24559) 0x0000007f8a48dda0 in
|
|
||||||
g_dbus_object_get_object_path (object=0x0) at ../../../gio/gdbusobject.c:109
|
|
||||||
2 Thread 0x7f88a43010 (LWP 1159) 0x0000007f8a0a6ae8 in __GI___libc_free
|
|
||||||
(mem=0x556a919c80) at malloc.c:3093
|
|
||||||
|
|
||||||
thread 1
|
|
||||||
(gdb) bt
|
|
||||||
0 0x0000007f8a48dda0 in g_dbus_object_get_object_path (object=0x0) at
|
|
||||||
../../../gio/gdbusobject.c:109
|
|
||||||
1 0x000000556a56911c in handle_get_block_devices (object=0x7f7c007ed0, invocation=
|
|
||||||
0x7f74016f20 [GDBusMethodInvocation], arg_options=<optimized out>)
|
|
||||||
at udiskslinuxmanager.c:1063
|
|
||||||
|
|
||||||
(gdb) p ((GObject*)(blocks_p->data))->ref_count
|
|
||||||
$3 = 1
|
|
||||||
(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))
|
|
||||||
$6 = {parent_instance = {g_type_instance = {g_class = 0x556a64e740
|
|
||||||
[g_type: UDisksLinuxBlock/UDisksBlockSkeleton/GDBusInterfaceSkeleton]}, ref_count = 1,
|
|
||||||
qdata = 0x0}, priv = 0x7f7c004ac0}
|
|
||||||
(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))->priv
|
|
||||||
$7 = {lock = {p = 0x0, i = {0, 0}}, object = 0x0,
|
|
||||||
flags = G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD,
|
|
||||||
connections = 0x0, object_path = 0x0, hooked_vtable = 0x556a62b9f0}
|
|
||||||
|
|
||||||
thread 2
|
|
||||||
(gdb) bt
|
|
||||||
0 0x0000007f8a0a6ae8 in __GI___libc_free (mem=0x556a919c80) at malloc.c:3093
|
|
||||||
1 0x0000007f89ff1224 in () at /lib/aarch64-linux-gnu/libudev.so.1
|
|
||||||
2 0x0000007f89ff1348 in () at /lib/aarch64-linux-gnu/libudev.so.1
|
|
||||||
3 0x0000007f89ff5520 in () at /lib/aarch64-linux-gnu/libudev.so.1
|
|
||||||
4 0x0000007f89fff878 in udev_device_unref () at /lib/aarch64-linux-gnu/libudev.so.1
|
|
||||||
5 0x0000007f8a7aeb74 in () at /lib/aarch64-linux-gnu/libgudev-1.0.so.0
|
|
||||||
6 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
|
|
||||||
../../../gobject/gobject.c:3346
|
|
||||||
7 0x0000007f8a3193f8 in g_object_unref (_object=0x7f680038a0) at
|
|
||||||
../../../gobject/gobject.c:3238
|
|
||||||
8 0x000000556a57700c in udisks_linux_device_finalize (object=0x7f5c005730
|
|
||||||
[UDisksLinuxDevice]) at udiskslinuxdevice.c:75
|
|
||||||
9 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
|
|
||||||
../../../gobject/gobject.c:3346
|
|
||||||
10 0x0000007f8a3193f8 in g_object_unref (_object=0x7f5c005730) at
|
|
||||||
../../../gobject/gobject.c:3238
|
|
||||||
11 0x000000556a55d0fc in udisks_linux_drive_object_uevent
|
|
||||||
(object=object@entry=0x556a5df370 [UDisksLinuxDriveObject],
|
|
||||||
action=action@entry=0x556a87b120
|
|
||||||
"remove",device=device@entry=0x7f74007610 [UDisksLinuxDevice])
|
|
||||||
at udiskslinuxdriveobject.c:715
|
|
||||||
12 0x000000556a54840c in handle_block_uevent_for_drive
|
|
||||||
(provider=provider@entry=0x556a5c8200 [UDisksLinuxProvider],
|
|
||||||
action=action@entry=0x556a87b120 "remove",device=device@entry=0x7f74007610
|
|
||||||
[UDisksLinuxDevice]) at udiskslinuxprovider.c:1035
|
|
||||||
13 0x000000556a548ab8 in handle_block_uevent (device=0x7f74007610 [UDisksLinuxDevice],
|
|
||||||
action=0x556a87b120 "remove", provider=0x556a5c8200 [UDisksLinuxProvider]) at
|
|
||||||
udiskslinuxprovider.c:1349
|
|
||||||
14 0x000000556a548ab8 in udisks_linux_provider_handle_uevent
|
|
||||||
(provider=0x556a5c8200 [UDisksLinuxProvider], action=0x556a87b120 "remove",
|
|
||||||
device=0x7f74007610 [UDisksLinuxDevice]) at udiskslinuxprovider.c:1399
|
|
||||||
15 0x000000556a548cac in on_idle_with_probed_uevent (user_data=0x556a7e65a0) at
|
|
||||||
udiskslinuxprovider.c:230
|
|
||||||
---
|
|
||||||
src/udiskslinuxmanager.c | 13 +++++++++----
|
|
||||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c
|
|
||||||
index 5bfeec103..491edb92b 100644
|
|
||||||
--- a/src/udiskslinuxmanager.c
|
|
||||||
+++ b/src/udiskslinuxmanager.c
|
|
||||||
@@ -1196,8 +1196,11 @@ handle_get_block_devices (UDisksManager *object,
|
|
||||||
blocks = get_block_objects (object, &num_blocks);
|
|
||||||
block_paths = g_new0 (const gchar *, num_blocks + 1);
|
|
||||||
|
|
||||||
- for (i = 0,blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next, i++)
|
|
||||||
- block_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data)));
|
|
||||||
+ for (blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next) {
|
|
||||||
+ GDBusObject * block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data));
|
|
||||||
+ if (block_object)
|
|
||||||
+ block_paths[i++] = g_dbus_object_get_object_path (block_object);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
udisks_manager_complete_get_block_devices (object,
|
|
||||||
invocation,
|
|
||||||
@@ -1284,9 +1287,11 @@ handle_resolve_device (UDisksManager *object,
|
|
||||||
}
|
|
||||||
|
|
||||||
ret_paths = g_new0 (const gchar *, num_found + 1);
|
|
||||||
- for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next, i++)
|
|
||||||
+ for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next)
|
|
||||||
{
|
|
||||||
- ret_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data)));
|
|
||||||
+ GDBusObject *block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data));
|
|
||||||
+ if (block_object)
|
|
||||||
+ ret_paths[i++] = g_dbus_object_get_object_path (block_object);
|
|
||||||
}
|
|
||||||
|
|
||||||
udisks_manager_complete_resolve_device (object,
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
Upstream-PR: https://github.com/storaged-project/udisks/pull/978
|
|
||||||
Upstream-PR: https://github.com/storaged-project/udisks/pull/979
|
|
||||||
Upstream-Commit: 362cc8f1613193f8e68d13a416421bb36fd7f713
|
|
||||||
Upstream-Commit: 6cbce6602ce447127cb4f77706870b6706bf1c5f
|
|
||||||
Upstream-Commit: 97bb17425e52ee6b2f11b13b3764d0dd6e8cfc97
|
|
||||||
From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001
|
|
||||||
From: orbea <orbea@riseup.net>
|
|
||||||
Date: Tue, 10 May 2022 09:29:10 -0700
|
|
||||||
Subject: [PATCH 1/3] modules/btrfs: Add missing dependency
|
|
||||||
|
|
||||||
When building udisks with --enable-btrfs using slibtool instead of GNU
|
|
||||||
libtool the build will fail with undefined references.
|
|
||||||
|
|
||||||
This is because of a missing dependency for libudisks2_btrfs_la_LIBADD
|
|
||||||
and GNU libtool will hide this issue by silently ignoring -no-undefined
|
|
||||||
while slibtool does not.
|
|
||||||
|
|
||||||
Gentoo Bug: https://bugs.gentoo.org/782061
|
|
||||||
---
|
|
||||||
modules/btrfs/Makefile.am | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am
|
|
||||||
index ac8c941849..f96cd16186 100644
|
|
||||||
--- a/modules/btrfs/Makefile.am
|
|
||||||
+++ b/modules/btrfs/Makefile.am
|
|
||||||
@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_btrfs_la_LIBADD = \
|
|
||||||
+ $(top_builddir)/src/libudisks-daemon.la \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(GIO_LIBS) \
|
|
||||||
$(GUDEV_LIBS) \
|
|
||||||
|
|
||||||
From 6cbce6602ce447127cb4f77706870b6706bf1c5f Mon Sep 17 00:00:00 2001
|
|
||||||
From: orbea <orbea@riseup.net>
|
|
||||||
Date: Wed, 11 May 2022 07:55:13 -0700
|
|
||||||
Subject: [PATCH 2/3] modules/bcache: Add missing dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
modules/bcache/Makefile.am | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules/bcache/Makefile.am b/modules/bcache/Makefile.am
|
|
||||||
index 571541a6d4..7509205ba2 100644
|
|
||||||
--- a/modules/bcache/Makefile.am
|
|
||||||
+++ b/modules/bcache/Makefile.am
|
|
||||||
@@ -71,6 +71,7 @@ libudisks2_bcache_la_LDFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_bcache_la_LIBADD = \
|
|
||||||
+ $(top_builddir)/src/libudisks-daemon.la \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(GIO_LIBS) \
|
|
||||||
$(GUDEV_LIBS) \
|
|
||||||
|
|
||||||
From 97bb17425e52ee6b2f11b13b3764d0dd6e8cfc97 Mon Sep 17 00:00:00 2001
|
|
||||||
From: orbea <orbea@riseup.net>
|
|
||||||
Date: Wed, 11 May 2022 07:55:25 -0700
|
|
||||||
Subject: [PATCH 3/3] modules/lvm2: Add missing dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
modules/lvm2/Makefile.am | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am
|
|
||||||
index 3342ad8e9b..67b8aa6b3f 100644
|
|
||||||
--- a/modules/lvm2/Makefile.am
|
|
||||||
+++ b/modules/lvm2/Makefile.am
|
|
||||||
@@ -76,6 +76,7 @@ libudisks2_lvm2_la_LDFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_lvm2_la_LIBADD = \
|
|
||||||
+ $(top_builddir)/src/libudisks-daemon.la \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(GIO_LIBS) \
|
|
||||||
$(GUDEV_LIBS) \
|
|
||||||
From 663f8194eeac75ec26fbfbd8855c5873315c495c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
||||||
Date: Fri, 13 May 2022 17:04:52 +0200
|
|
||||||
Subject: [PATCH 1/3] modules/iscsi: Add missing linker dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
modules/iscsi/Makefile.am | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules/iscsi/Makefile.am b/modules/iscsi/Makefile.am
|
|
||||||
index 05af5ece29..2cecc300e9 100644
|
|
||||||
--- a/modules/iscsi/Makefile.am
|
|
||||||
+++ b/modules/iscsi/Makefile.am
|
|
||||||
@@ -77,6 +77,7 @@ libudisks2_iscsi_la_LDFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_iscsi_la_LIBADD = \
|
|
||||||
+ $(top_builddir)/src/libudisks-daemon.la \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(GIO_LIBS) \
|
|
||||||
$(GUDEV_LIBS) \
|
|
||||||
|
|
||||||
From 8ff2214d740f9819d6ede02534d7d0f23d6a3818 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
||||||
Date: Fri, 13 May 2022 17:05:26 +0200
|
|
||||||
Subject: [PATCH 2/3] modules/lsm: Add missing linker dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
modules/lsm/Makefile.am | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules/lsm/Makefile.am b/modules/lsm/Makefile.am
|
|
||||||
index 2193115417..b77a9013fa 100644
|
|
||||||
--- a/modules/lsm/Makefile.am
|
|
||||||
+++ b/modules/lsm/Makefile.am
|
|
||||||
@@ -71,6 +71,7 @@ libudisks2_lsm_la_LDFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_lsm_la_LIBADD = \
|
|
||||||
+ $(top_builddir)/src/libudisks-daemon.la \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(GIO_LIBS) \
|
|
||||||
$(GUDEV_LIBS) \
|
|
||||||
|
|
||||||
From 4f59e7fd5b9ad94091230713c28f6a818269d48c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
||||||
Date: Fri, 13 May 2022 17:05:43 +0200
|
|
||||||
Subject: [PATCH 3/3] modules/zram: Add missing linker dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
modules/zram/Makefile.am | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules/zram/Makefile.am b/modules/zram/Makefile.am
|
|
||||||
index 9e5e9a6315..40f929583d 100644
|
|
||||||
--- a/modules/zram/Makefile.am
|
|
||||||
+++ b/modules/zram/Makefile.am
|
|
||||||
@@ -78,6 +78,7 @@ libudisks2_zram_la_LDFLAGS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libudisks2_zram_la_LIBADD = \
|
|
||||||
+ $(top_builddir)/src/libudisks-daemon.la \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(GIO_LIBS) \
|
|
||||||
$(GUDEV_LIBS) \
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>freedesktop-bugs@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="daemon">Build the system daemon, not just the client tool</flag>
|
|
||||||
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
|
|
||||||
<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
|
|
||||||
<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
|
|
||||||
<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
|
|
||||||
<flag name="zram">Enable ZRAM support (requires <pkg>sys-apps/systemd</pkg>).</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">storaged-project/udisks</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,150 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="Daemon providing interfaces to work with storage devices"
|
|
||||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
|
|
||||||
SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+ GPL-2+"
|
|
||||||
SLOT="2"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86"
|
|
||||||
IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
?? ( elogind systemd )
|
|
||||||
elogind? ( daemon )
|
|
||||||
systemd? ( daemon )
|
|
||||||
"
|
|
||||||
|
|
||||||
# See configure.ac file for the required min version
|
|
||||||
BLOCKDEV_MIN_VER="3.0"
|
|
||||||
|
|
||||||
COMMON_DEPEND="
|
|
||||||
>=sys-auth/polkit-0.114[daemon]
|
|
||||||
>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme]
|
|
||||||
virtual/udev
|
|
||||||
acl? ( virtual/acl )
|
|
||||||
daemon? (
|
|
||||||
>=dev-libs/glib-2.68:2
|
|
||||||
>=dev-libs/libatasmart-0.19
|
|
||||||
>=dev-libs/libgudev-165:=
|
|
||||||
)
|
|
||||||
elogind? ( >=sys-auth/elogind-219 )
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.30:= )
|
|
||||||
lvm? ( sys-fs/lvm2 )
|
|
||||||
systemd? ( >=sys-apps/systemd-209 )
|
|
||||||
"
|
|
||||||
# util-linux -> mount, umount, swapon, swapoff (see also #403073)
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-block/parted-3
|
|
||||||
>=sys-apps/util-linux-2.30
|
|
||||||
selinux? ( sec-policy/selinux-devicekit )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-kernel/linux-headers-3.1
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
>=dev-util/gdbus-codegen-2.32
|
|
||||||
>=dev-build/gtk-doc-am-1.3
|
|
||||||
virtual/pkgconfig
|
|
||||||
nls? ( >=sys-devel/gettext-0.19.8 )
|
|
||||||
dev-libs/gobject-introspection-common
|
|
||||||
dev-build/autoconf-archive
|
|
||||||
"
|
|
||||||
# If adding a eautoreconf, then these might be needed at buildtime:
|
|
||||||
# dev-libs/gobject-introspection-common
|
|
||||||
# dev-build/autoconf-archive
|
|
||||||
|
|
||||||
DOCS=( AUTHORS HACKING NEWS README.md )
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${P}-BLKRRPART_harder.patch
|
|
||||||
"${FILESDIR}"/${P}-targetcli_config.json_netif_timeout.patch
|
|
||||||
"${FILESDIR}"/${P}-udiskslinuxmanager_use_after_free.patch
|
|
||||||
"${FILESDIR}"/${P}-udiskslinuxblock_survive_missing_fstab.patch
|
|
||||||
|
|
||||||
"${FILESDIR}"/${PN}-2.10.1-slibtool-export-dynamic.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# Listing only major arch's here to avoid tracking kernel's defconfig
|
|
||||||
if use amd64 || use arm || use ppc || use ppc64 || use x86; then
|
|
||||||
CONFIG_CHECK="~!IDE" #319829
|
|
||||||
CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
|
|
||||||
CONFIG_CHECK+=" ~NLS_UTF8" #425562
|
|
||||||
kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
|
|
||||||
linux-info_pkg_setup
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
xdg_environment_reset
|
|
||||||
default
|
|
||||||
|
|
||||||
if ! use systemd ; then
|
|
||||||
sed -i -e 's:libsystemd-login:&disable:' configure || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Added for bug # 782061
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--enable-btrfs
|
|
||||||
--disable-gtk-doc
|
|
||||||
--disable-static
|
|
||||||
--localstatedir="${EPREFIX}"/var
|
|
||||||
--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
|
|
||||||
--with-modprobedir="${EPREFIX}"/lib/modprobe.d
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
|
|
||||||
--with-udevdir="${EPREFIX}$(get_udevdir)"
|
|
||||||
$(use_enable acl)
|
|
||||||
$(use_enable daemon)
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable lvm lvm2)
|
|
||||||
$(use_enable nls)
|
|
||||||
)
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
keepdir /var/lib/udisks2 #383091
|
|
||||||
|
|
||||||
rm -rf "${ED}"/usr/share/bash-completion
|
|
||||||
dobashcomp data/completions/udisksctl
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
# Remove gtk-doc symlink, #597628
|
|
||||||
if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
|
|
||||||
rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
udev_reload
|
|
||||||
|
|
||||||
# TODO: obsolete with tmpfiles_process?
|
|
||||||
# mkdir -p "${EROOT}"/run #415987
|
|
||||||
|
|
||||||
tmpfiles_process udisks2.conf
|
|
||||||
|
|
||||||
# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
|
|
||||||
if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
|
|
||||||
echo
|
|
||||||
ewarn "You should reboot the system now to get /run mounted with tmpfs!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
udev_reload
|
|
||||||
}
|
|
||||||
@ -1,141 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="Daemon providing interfaces to work with storage devices"
|
|
||||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
|
|
||||||
SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+ GPL-2+"
|
|
||||||
SLOT="2"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86"
|
|
||||||
IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
?? ( elogind systemd )
|
|
||||||
elogind? ( daemon )
|
|
||||||
systemd? ( daemon )
|
|
||||||
"
|
|
||||||
|
|
||||||
# See configure.ac file for the required min version
|
|
||||||
BLOCKDEV_MIN_VER="3.0"
|
|
||||||
|
|
||||||
COMMON_DEPEND="
|
|
||||||
>=sys-auth/polkit-0.114[daemon]
|
|
||||||
>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme]
|
|
||||||
virtual/udev
|
|
||||||
acl? ( virtual/acl )
|
|
||||||
daemon? (
|
|
||||||
>=dev-libs/glib-2.68:2
|
|
||||||
>=dev-libs/libatasmart-0.19
|
|
||||||
>=dev-libs/libgudev-165:=
|
|
||||||
)
|
|
||||||
elogind? ( >=sys-auth/elogind-219 )
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.30:= )
|
|
||||||
lvm? ( sys-fs/lvm2 )
|
|
||||||
systemd? ( >=sys-apps/systemd-209 )
|
|
||||||
"
|
|
||||||
# util-linux -> mount, umount, swapon, swapoff (see also #403073)
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-block/parted-3
|
|
||||||
>=sys-apps/util-linux-2.30
|
|
||||||
selinux? ( sec-policy/selinux-devicekit )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-kernel/linux-headers-3.1
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
>=dev-util/gdbus-codegen-2.32
|
|
||||||
>=dev-build/gtk-doc-am-1.3
|
|
||||||
virtual/pkgconfig
|
|
||||||
nls? ( >=sys-devel/gettext-0.19.8 )
|
|
||||||
dev-libs/gobject-introspection-common
|
|
||||||
dev-build/autoconf-archive
|
|
||||||
"
|
|
||||||
# If adding a eautoreconf, then these might be needed at buildtime:
|
|
||||||
# dev-libs/gobject-introspection-common
|
|
||||||
# dev-build/autoconf-archive
|
|
||||||
|
|
||||||
DOCS=( AUTHORS HACKING NEWS README.md )
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# Listing only major arch's here to avoid tracking kernel's defconfig
|
|
||||||
if use amd64 || use arm || use ppc || use ppc64 || use x86; then
|
|
||||||
CONFIG_CHECK="~!IDE" #319829
|
|
||||||
CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
|
|
||||||
CONFIG_CHECK+=" ~NLS_UTF8" #425562
|
|
||||||
kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
|
|
||||||
linux-info_pkg_setup
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
xdg_environment_reset
|
|
||||||
default
|
|
||||||
|
|
||||||
if ! use systemd ; then
|
|
||||||
sed -i -e 's:libsystemd-login:&disable:' configure || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Added for bug # 782061
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--enable-btrfs
|
|
||||||
--disable-gtk-doc
|
|
||||||
--disable-static
|
|
||||||
--localstatedir="${EPREFIX}"/var
|
|
||||||
--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
|
|
||||||
--with-modprobedir="${EPREFIX}"/lib/modprobe.d
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
|
|
||||||
--with-udevdir="${EPREFIX}$(get_udevdir)"
|
|
||||||
$(use_enable acl)
|
|
||||||
$(use_enable daemon)
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable lvm lvm2)
|
|
||||||
$(use_enable nls)
|
|
||||||
)
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
keepdir /var/lib/udisks2 #383091
|
|
||||||
|
|
||||||
rm -rf "${ED}"/usr/share/bash-completion
|
|
||||||
dobashcomp data/completions/udisksctl
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
# Remove gtk-doc symlink, #597628
|
|
||||||
if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
|
|
||||||
rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
udev_reload
|
|
||||||
|
|
||||||
# TODO: obsolete with tmpfiles_process?
|
|
||||||
# mkdir -p "${EROOT}"/run #415987
|
|
||||||
|
|
||||||
tmpfiles_process udisks2.conf
|
|
||||||
|
|
||||||
# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
|
|
||||||
if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
|
|
||||||
echo
|
|
||||||
ewarn "You should reboot the system now to get /run mounted with tmpfs!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
udev_reload
|
|
||||||
}
|
|
||||||
@ -1,150 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="Daemon providing interfaces to work with storage devices"
|
|
||||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
|
|
||||||
SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+ GPL-2+"
|
|
||||||
SLOT="2"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
|
||||||
IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
?? ( elogind systemd )
|
|
||||||
elogind? ( daemon )
|
|
||||||
systemd? ( daemon )
|
|
||||||
zram? ( systemd )
|
|
||||||
"
|
|
||||||
|
|
||||||
# See configure.ac file for the required min version
|
|
||||||
BLOCKDEV_MIN_VER="2.25"
|
|
||||||
|
|
||||||
# <libblockdev-3 dep for bug #910077, should go away with udisks-2.10
|
|
||||||
COMMON_DEPEND="
|
|
||||||
>=sys-auth/polkit-0.114
|
|
||||||
>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,vdo(-)?]
|
|
||||||
<sys-libs/libblockdev-3[cryptsetup,lvm?,vdo(-)?]
|
|
||||||
virtual/udev
|
|
||||||
acl? ( virtual/acl )
|
|
||||||
daemon? (
|
|
||||||
>=dev-libs/glib-2.50:2
|
|
||||||
>=dev-libs/libatasmart-0.19
|
|
||||||
>=dev-libs/libgudev-165:=
|
|
||||||
)
|
|
||||||
elogind? ( >=sys-auth/elogind-219 )
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.30:= )
|
|
||||||
lvm? ( sys-fs/lvm2 )
|
|
||||||
systemd? ( >=sys-apps/systemd-209 )
|
|
||||||
zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd(-)] )
|
|
||||||
"
|
|
||||||
# util-linux -> mount, umount, swapon, swapoff (see also #403073)
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-block/parted-3
|
|
||||||
>=sys-apps/util-linux-2.30
|
|
||||||
selinux? ( sec-policy/selinux-devicekit )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-kernel/linux-headers-3.1
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
>=dev-util/gdbus-codegen-2.32
|
|
||||||
>=dev-build/gtk-doc-am-1.3
|
|
||||||
virtual/pkgconfig
|
|
||||||
nls? ( >=sys-devel/gettext-0.19.8 )
|
|
||||||
"
|
|
||||||
# If adding a eautoreconf, then these might be needed at buildtime:
|
|
||||||
# dev-libs/gobject-introspection-common
|
|
||||||
# dev-build/autoconf-archive
|
|
||||||
|
|
||||||
DOCS=( AUTHORS HACKING NEWS README.md )
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${P}-undefined.patch" # 782061
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# Listing only major arch's here to avoid tracking kernel's defconfig
|
|
||||||
if use amd64 || use arm || use ppc || use ppc64 || use x86; then
|
|
||||||
CONFIG_CHECK="~!IDE" #319829
|
|
||||||
CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
|
|
||||||
CONFIG_CHECK+=" ~NLS_UTF8" #425562
|
|
||||||
kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
|
|
||||||
linux-info_pkg_setup
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
xdg_environment_reset
|
|
||||||
default
|
|
||||||
|
|
||||||
if ! use systemd ; then
|
|
||||||
sed -i -e 's:libsystemd-login:&disable:' configure || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Added for bug # 782061
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--enable-btrfs
|
|
||||||
--disable-gtk-doc
|
|
||||||
--disable-static
|
|
||||||
--localstatedir="${EPREFIX}"/var
|
|
||||||
--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
|
|
||||||
--with-modprobedir="${EPREFIX}"/lib/modprobe.d
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
|
|
||||||
--with-udevdir="${EPREFIX}$(get_udevdir)"
|
|
||||||
$(use_enable acl)
|
|
||||||
$(use_enable daemon)
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable lvm lvm2)
|
|
||||||
$(use_enable lvm lvmcache)
|
|
||||||
$(use_enable nls)
|
|
||||||
$(use_enable vdo)
|
|
||||||
$(use_enable zram)
|
|
||||||
)
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
keepdir /var/lib/udisks2 #383091
|
|
||||||
|
|
||||||
rm -rf "${ED}"/usr/share/bash-completion
|
|
||||||
dobashcomp data/completions/udisksctl
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
# Remove gtk-doc symlink, #597628
|
|
||||||
if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
|
|
||||||
rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
udev_reload
|
|
||||||
|
|
||||||
# TODO: obsolete with tmpfiles_process?
|
|
||||||
# mkdir -p "${EROOT}"/run #415987
|
|
||||||
|
|
||||||
tmpfiles_process udisks2.conf
|
|
||||||
|
|
||||||
# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
|
|
||||||
if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
|
|
||||||
echo
|
|
||||||
ewarn "You should reboot the system now to get /run mounted with tmpfs!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
udev_reload
|
|
||||||
}
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392
|
|
||||||
DIST libblockdev-2.29.tar.gz 935117 BLAKE2B 774062459602a6f3730ac6e694b3f535daf0258cc5f509ff138bb8c15f44ff46bdc08e32ae1957909b51a191726cf5e9cb418c0317e5178300687947704cf5e0 SHA512 0d9637800b189f3824483010d2ff079da11b15ed0b42c578352a0d3cd9c35dab4e5945a3cc31c17ea6f88637548151fc7cf237ac8e9c98edfc7b7bce1a756e01
|
|
||||||
DIST libblockdev-3.1.1.tar.gz 1056270 BLAKE2B b3dbdc7226524d544193b609ced8a9fee725268ba2201b639c22103fcae6d047c94fb1b848e489525300242cb235d688934193894a06279a4dc0e0b33dff6e96 SHA512 44628d9e68a467f8a5d5e65e12d5d6ffb4d9b953c846acd9f6da257eab5ccd79309651d6b20092fa700fb4340f1f718ceef11141203da676d088824aa9d03481
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
bash is fine with "test . == ." but e.g. dash fails on not having
|
|
||||||
the two dots quoted as strings.
|
|
||||||
|
|
||||||
--- a/docs/Makefile.am
|
|
||||||
+++ b/docs/Makefile.am
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
html-doc.stamp: ${srcdir}/libblockdev-docs.xml ${srcdir}/libblockdev-sections.txt $(wildcard ${srcdir}/../src/plugins/*.[ch]) $(wildcard ${srcdir}/../src/lib/*.[ch]) $(wildcard ${srcdir}/../src/utils/*.[ch])
|
|
||||||
touch ${builddir}/html-doc.stamp
|
|
||||||
- test ${builddir} == ${srcdir} || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
|
|
||||||
+ test "${builddir}" == "${srcdir}" || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
|
|
||||||
gtkdoc-scan --rebuild-types --module=libblockdev --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/
|
|
||||||
gtkdoc-mkdb --module=libblockdev --output-format=xml --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --source-suffixes=c,h
|
|
||||||
test -d ${builddir}/html || mkdir ${builddir}/html
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
-rm -rf ${builddir}/html
|
|
||||||
-rm -rf ${builddir}/xml
|
|
||||||
test ! -f ${builddir}/html-doc.stamp || rm ${builddir}/html-doc.stamp
|
|
||||||
- test ${builddir} == ${srcdir} || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml
|
|
||||||
+ test "${builddir}" == "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml
|
|
||||||
|
|
||||||
install-data-local:
|
|
||||||
test -d ${DESTDIR}${datadir}/gtk-doc/html/libblockdev || mkdir -p ${DESTDIR}${datadir}/gtk-doc/html/libblockdev
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
From ec8cab726abe60ba5c7ffcce07905b29c5376163 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alfred Wingate <parona@protonmail.com>
|
|
||||||
Date: Mon, 13 Nov 2023 16:21:44 +0200
|
|
||||||
Subject: [PATCH] Add non-systemd method to get distro name and version
|
|
||||||
|
|
||||||
--- a/tests/utils.py
|
|
||||||
+++ b/tests/utils.py
|
|
||||||
@@ -514,10 +514,16 @@ def get_version():
|
|
||||||
""" Try to get distro and version
|
|
||||||
"""
|
|
||||||
|
|
||||||
- bus = dbus.SystemBus()
|
|
||||||
+ try:
|
|
||||||
+ bus = dbus.SystemBus()
|
|
||||||
+
|
|
||||||
+ # get information about the distribution from systemd (hostname1)
|
|
||||||
+ sys_info = bus.get_object("org.freedesktop.hostname1", "/org/freedesktop/hostname1")
|
|
||||||
+ except dbus.exceptions.DBusException:
|
|
||||||
+ import platform
|
|
||||||
+ info = platform.freedesktop_os_release()
|
|
||||||
+ return (info["NAME"], info["VERSION_ID"])
|
|
||||||
|
|
||||||
- # get information about the distribution from systemd (hostname1)
|
|
||||||
- sys_info = bus.get_object("org.freedesktop.hostname1", "/org/freedesktop/hostname1")
|
|
||||||
cpe = str(sys_info.Get("org.freedesktop.hostname1", "OperatingSystemCPEName", dbus_interface=dbus.PROPERTIES_IFACE))
|
|
||||||
|
|
||||||
if cpe:
|
|
||||||
--
|
|
||||||
2.42.1
|
|
||||||
|
|
||||||
@ -1,136 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..11} )
|
|
||||||
inherit autotools python-single-r1 xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="A library for manipulating block devices"
|
|
||||||
HOMEPAGE="https://github.com/storaged-project/libblockdev"
|
|
||||||
if [[ "${PV}" == *9999 ]] ; then
|
|
||||||
inherit git-r3
|
|
||||||
EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
|
|
||||||
BDEPEND="
|
|
||||||
dev-build/autoconf-archive
|
|
||||||
"
|
|
||||||
else
|
|
||||||
MY_PV="${PV}-1"
|
|
||||||
SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
|
||||||
fi
|
|
||||||
LICENSE="LGPL-2+"
|
|
||||||
SLOT="0/2" # subslot is SOVERSION
|
|
||||||
IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
|
|
||||||
# Tests require root. In a future release, we may be able to run a smaller
|
|
||||||
# subset with new run_tests.py arguments.
|
|
||||||
RESTRICT="!test? ( test ) test"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/glib-2.42.2
|
|
||||||
dev-libs/libbytesize
|
|
||||||
>=sys-apps/kmod-19
|
|
||||||
>=sys-apps/util-linux-2.27
|
|
||||||
>=sys-block/parted-3.1
|
|
||||||
cryptsetup? (
|
|
||||||
escrow? (
|
|
||||||
>=dev-libs/nss-3.18.0
|
|
||||||
dev-libs/volume_key
|
|
||||||
)
|
|
||||||
>=sys-fs/cryptsetup-1.6.7:=
|
|
||||||
)
|
|
||||||
device-mapper? ( sys-fs/lvm2 )
|
|
||||||
dmraid? (
|
|
||||||
sys-fs/dmraid
|
|
||||||
sys-fs/lvm2
|
|
||||||
)
|
|
||||||
lvm? (
|
|
||||||
sys-fs/lvm2
|
|
||||||
virtual/udev
|
|
||||||
)
|
|
||||||
vdo? ( dev-libs/libyaml )
|
|
||||||
${PYTHON_DEPS}
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
${RDEPEND}
|
|
||||||
"
|
|
||||||
|
|
||||||
# TODO: relax libbytesize condition once it has gained py3.11 support
|
|
||||||
BDEPEND+="
|
|
||||||
dev-build/gtk-doc-am
|
|
||||||
gtk-doc? ( dev-util/gtk-doc )
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
|
|
||||||
test? (
|
|
||||||
$(python_gen_cond_dep '
|
|
||||||
dev-libs/libbytesize[python,${PYTHON_USEDEP}]
|
|
||||||
' python3_{9..10} )
|
|
||||||
sys-block/targetcli-fb
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|
||||||
escrow? ( cryptsetup )"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-2.28-sh_tests.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
python-single-r1_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
xdg_environment_reset #623992
|
|
||||||
default
|
|
||||||
|
|
||||||
# https://bugs.gentoo.org/744289
|
|
||||||
find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
|
|
||||||
| xargs --null sed "s@ -Werror@@" -i || die
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--with-btrfs
|
|
||||||
--with-fs
|
|
||||||
--with-part
|
|
||||||
--with-python3
|
|
||||||
--without-mpath
|
|
||||||
--without-nvdimm
|
|
||||||
--without-python2
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable test tests)
|
|
||||||
$(use_with bcache)
|
|
||||||
$(use_with cryptsetup crypto)
|
|
||||||
$(use_with device-mapper dm)
|
|
||||||
$(use_with dmraid)
|
|
||||||
$(use_with escrow)
|
|
||||||
$(use_with gtk-doc)
|
|
||||||
$(use_with kbd)
|
|
||||||
$(use_with lvm lvm)
|
|
||||||
$(use_with lvm lvm-dbus)
|
|
||||||
$(use_with tools)
|
|
||||||
$(use_with vdo)
|
|
||||||
)
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
# See http://storaged.org/libblockdev/ch03.html
|
|
||||||
# The 'check' target just does Pylint.
|
|
||||||
# ... but it needs root.
|
|
||||||
emake test
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
|
|
||||||
# doesn't work at all.
|
|
||||||
if ! use lvm ; then
|
|
||||||
rm -f "${ED}"/usr/bin/lvm-cache-stats || die
|
|
||||||
fi
|
|
||||||
python_optimize #718576
|
|
||||||
}
|
|
||||||
@ -1,135 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..12} )
|
|
||||||
inherit autotools python-single-r1 xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="A library for manipulating block devices"
|
|
||||||
HOMEPAGE="https://github.com/storaged-project/libblockdev"
|
|
||||||
if [[ "${PV}" == *9999 ]] ; then
|
|
||||||
inherit git-r3
|
|
||||||
EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
|
|
||||||
BDEPEND="
|
|
||||||
dev-build/autoconf-archive
|
|
||||||
"
|
|
||||||
else
|
|
||||||
MY_PV="${PV}-1"
|
|
||||||
SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
|
||||||
fi
|
|
||||||
LICENSE="LGPL-2+"
|
|
||||||
SLOT="0/2" # subslot is SOVERSION
|
|
||||||
IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
|
|
||||||
# Tests require root. In a future release, we may be able to run a smaller
|
|
||||||
# subset with new run_tests.py arguments.
|
|
||||||
RESTRICT="!test? ( test ) test"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/glib-2.42.2
|
|
||||||
dev-libs/libbytesize
|
|
||||||
>=sys-apps/kmod-19
|
|
||||||
>=sys-apps/util-linux-2.27
|
|
||||||
>=sys-block/parted-3.1
|
|
||||||
cryptsetup? (
|
|
||||||
escrow? (
|
|
||||||
>=dev-libs/nss-3.18.0
|
|
||||||
dev-libs/volume_key
|
|
||||||
)
|
|
||||||
>=sys-fs/cryptsetup-1.6.7:=
|
|
||||||
)
|
|
||||||
device-mapper? ( sys-fs/lvm2 )
|
|
||||||
dmraid? (
|
|
||||||
sys-fs/dmraid
|
|
||||||
sys-fs/lvm2
|
|
||||||
)
|
|
||||||
lvm? (
|
|
||||||
sys-fs/lvm2
|
|
||||||
virtual/udev
|
|
||||||
)
|
|
||||||
vdo? ( dev-libs/libyaml )
|
|
||||||
${PYTHON_DEPS}
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
${RDEPEND}
|
|
||||||
"
|
|
||||||
|
|
||||||
BDEPEND+="
|
|
||||||
dev-build/gtk-doc-am
|
|
||||||
gtk-doc? ( dev-util/gtk-doc )
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
|
|
||||||
test? (
|
|
||||||
$(python_gen_cond_dep '
|
|
||||||
dev-libs/libbytesize[python,${PYTHON_USEDEP}]
|
|
||||||
')
|
|
||||||
sys-block/targetcli-fb
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|
||||||
escrow? ( cryptsetup )"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-2.28-sh_tests.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
python-single-r1_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
xdg_environment_reset #623992
|
|
||||||
default
|
|
||||||
|
|
||||||
# https://bugs.gentoo.org/744289
|
|
||||||
find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
|
|
||||||
| xargs --null sed "s@ -Werror@@" -i || die
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--with-btrfs
|
|
||||||
--with-fs
|
|
||||||
--with-part
|
|
||||||
--with-python3
|
|
||||||
--without-mpath
|
|
||||||
--without-nvdimm
|
|
||||||
--without-python2
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable test tests)
|
|
||||||
$(use_with bcache)
|
|
||||||
$(use_with cryptsetup crypto)
|
|
||||||
$(use_with device-mapper dm)
|
|
||||||
$(use_with dmraid)
|
|
||||||
$(use_with escrow)
|
|
||||||
$(use_with gtk-doc)
|
|
||||||
$(use_with kbd)
|
|
||||||
$(use_with lvm lvm)
|
|
||||||
$(use_with lvm lvm-dbus)
|
|
||||||
$(use_with tools)
|
|
||||||
$(use_with vdo)
|
|
||||||
)
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
# See http://storaged.org/libblockdev/ch03.html
|
|
||||||
# The 'check' target just does Pylint.
|
|
||||||
# ... but it needs root.
|
|
||||||
emake test
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
|
|
||||||
# doesn't work at all.
|
|
||||||
if ! use lvm ; then
|
|
||||||
rm -f "${ED}"/usr/bin/lvm-cache-stats || die
|
|
||||||
fi
|
|
||||||
python_optimize #718576
|
|
||||||
}
|
|
||||||
@ -1,132 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..13} )
|
|
||||||
inherit autotools python-single-r1 xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="A library for manipulating block devices"
|
|
||||||
HOMEPAGE="https://github.com/storaged-project/libblockdev"
|
|
||||||
if [[ "${PV}" == *9999 ]] ; then
|
|
||||||
inherit git-r3
|
|
||||||
EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
|
|
||||||
BDEPEND="
|
|
||||||
dev-build/autoconf-archive
|
|
||||||
"
|
|
||||||
else
|
|
||||||
MY_PV="${PV}-1"
|
|
||||||
SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
|
|
||||||
fi
|
|
||||||
LICENSE="LGPL-2+"
|
|
||||||
SLOT="0/3" # subslot is SOVERSION
|
|
||||||
IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/glib-2.42.2
|
|
||||||
dev-libs/libbytesize
|
|
||||||
sys-apps/gptfdisk
|
|
||||||
>=sys-apps/kmod-19
|
|
||||||
>=sys-apps/util-linux-2.27
|
|
||||||
>=sys-block/parted-3.1
|
|
||||||
cryptsetup? (
|
|
||||||
escrow? (
|
|
||||||
>=dev-libs/nss-3.18.0
|
|
||||||
dev-libs/volume_key
|
|
||||||
)
|
|
||||||
>=sys-apps/keyutils-1.5.0:=
|
|
||||||
>=sys-fs/cryptsetup-2.3.0:=
|
|
||||||
)
|
|
||||||
device-mapper? ( sys-fs/lvm2 )
|
|
||||||
lvm? (
|
|
||||||
sys-fs/lvm2
|
|
||||||
virtual/udev
|
|
||||||
)
|
|
||||||
nvme? ( sys-libs/libnvme )
|
|
||||||
${PYTHON_DEPS}
|
|
||||||
$(python_gen_cond_dep '
|
|
||||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
|
||||||
')
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
|
|
||||||
BDEPEND+="
|
|
||||||
dev-build/gtk-doc-am
|
|
||||||
gtk-doc? ( dev-util/gtk-doc )
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
|
|
||||||
test? (
|
|
||||||
$(python_gen_cond_dep '
|
|
||||||
dev-libs/libbytesize[python,${PYTHON_USEDEP}]
|
|
||||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
|
||||||
')
|
|
||||||
sys-apps/lsb-release
|
|
||||||
sys-block/targetcli-fb
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|
||||||
escrow? ( cryptsetup )
|
|
||||||
test? ( introspection lvm )
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
python-single-r1_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
xdg_environment_reset #623992
|
|
||||||
default
|
|
||||||
|
|
||||||
# https://bugs.gentoo.org/744289
|
|
||||||
find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
|
|
||||||
| xargs --null sed "s@ -Werror@@" -i || die
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--with-btrfs
|
|
||||||
--with-fs
|
|
||||||
--with-part
|
|
||||||
--with-python3
|
|
||||||
--without-mpath
|
|
||||||
--without-nvdimm
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable test tests)
|
|
||||||
$(use_with cryptsetup crypto)
|
|
||||||
$(use_with device-mapper dm)
|
|
||||||
$(use_with escrow)
|
|
||||||
$(use_with gtk-doc)
|
|
||||||
$(use_with lvm lvm)
|
|
||||||
$(use_with lvm lvm-dbus)
|
|
||||||
$(use_with nvme)
|
|
||||||
$(use_with tools)
|
|
||||||
)
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
# See http://storaged.org/libblockdev/ch03.html
|
|
||||||
# Largest subset which doesn't require root priviledges
|
|
||||||
${EPYTHON} tests/run_tests.py --include-tags extradeps sourceonly || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
find "${ED}" -type f -name "*.la" -delete || die
|
|
||||||
# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
|
|
||||||
# doesn't work at all.
|
|
||||||
if ! use lvm ; then
|
|
||||||
rm -f "${ED}"/usr/bin/lvm-cache-stats || die
|
|
||||||
fi
|
|
||||||
python_optimize #718576
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<!-- maintainer-needed -->
|
|
||||||
<use>
|
|
||||||
<flag name="bcache">Enable block device cache support.</flag>
|
|
||||||
<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
|
|
||||||
<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
|
|
||||||
<flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
|
|
||||||
<flag name="escrow">Support for building crypto plugin with escrow device support</flag>
|
|
||||||
<flag name="kbd">Enable kernel block device support.</flag>
|
|
||||||
<flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
|
|
||||||
<flag name="nvme">Add nvme support via <pkg>sys-libs/libnvme</pkg></flag>
|
|
||||||
<flag name="tools">Build tools</flag>
|
|
||||||
<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">storaged-project/libblockdev</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user