mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 05:56:58 +02:00
sys-apps/util-linux: Sync with Gentoo
It's from Gentoo commit 13688d9b6994558d6e78d6f9a80da685d8bd299b.
This commit is contained in:
parent
c4feedbfb8
commit
3cc77ef13d
@ -0,0 +1,23 @@
|
|||||||
|
https://bugs.gentoo.org/627532
|
||||||
|
https://github.com/util-linux/util-linux/commit/f5715c117e727d4ff45e0d8568f188753620356e
|
||||||
|
|
||||||
|
From f5715c117e727d4ff45e0d8568f188753620356e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
|
||||||
|
Date: Mon, 13 Nov 2023 21:05:59 +0100
|
||||||
|
Subject: [PATCH] fincore: (tests) also use nosize error file
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.camel@physik.fu-berlin.de/
|
||||||
|
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
|
||||||
|
--- a/tests/ts/fincore/count
|
||||||
|
+++ b/tests/ts/fincore/count
|
||||||
|
@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then
|
||||||
|
OUT_COLUMNS="PAGES,SIZE,FILE"
|
||||||
|
else
|
||||||
|
TS_EXPECTED+=".nosize"
|
||||||
|
+ TS_EXPECTED_ERR+=".nosize"
|
||||||
|
OUT_COLUMNS="PAGES,FILE"
|
||||||
|
fi
|
||||||
|
|
@ -95,6 +95,10 @@ fi
|
|||||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
|
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-2.39.2-fincore-test.patch
|
||||||
|
)
|
||||||
|
|
||||||
pkg_pretend() {
|
pkg_pretend() {
|
||||||
if use su && ! use suid ; then
|
if use su && ! use suid ; then
|
||||||
elog "su will be installed as suid despite USE=-suid (bug #832092)"
|
elog "su will be installed as suid despite USE=-suid (bug #832092)"
|
||||||
@ -141,6 +145,8 @@ src_prepare() {
|
|||||||
|
|
||||||
lsfd/mkfds-symlink
|
lsfd/mkfds-symlink
|
||||||
lsfd/mkfds-rw-character-device
|
lsfd/mkfds-rw-character-device
|
||||||
|
# Fails with network-sandbox at least in nspawn
|
||||||
|
lsfd/option-inet
|
||||||
)
|
)
|
||||||
|
|
||||||
local known_failing_test
|
local known_failing_test
|
||||||
|
@ -141,6 +141,8 @@ src_prepare() {
|
|||||||
|
|
||||||
lsfd/mkfds-symlink
|
lsfd/mkfds-symlink
|
||||||
lsfd/mkfds-rw-character-device
|
lsfd/mkfds-rw-character-device
|
||||||
|
# Fails with network-sandbox at least in nspawn
|
||||||
|
lsfd/option-inet
|
||||||
)
|
)
|
||||||
|
|
||||||
local known_failing_test
|
local known_failing_test
|
||||||
|
Loading…
Reference in New Issue
Block a user