diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
5 files changed, 36 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8bb674d..6565874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +util-linux (2.40-3) experimental; urgency=medium + + * tests: mark fadvise/drop as known failing on buildds. + Per discussion on #debian-buildd. The buildds have always used tmpfs as the + build location, and with schroot this is visible to the util-linux tests. + They in turn disable fadvise/drop, as it does not work on tmpfs. With the + unshare backend, the actual backing filesystem is hidden, so the test gets + run and fails. + * Remove build-time lsfd debugging + + -- Chris Hofstaedtler <zeha@debian.org> Tue, 02 Apr 2024 21:58:11 +0200 + util-linux (2.40-2) experimental; urgency=medium * Add upstream patch for lsfd sockdiag test diff --git a/debian/control b/debian/control index 906a28b..b760554 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: dh-package-notes, flex, gettext, - iproute2, libaudit-dev [linux-any] <!stage1>, libcap-ng-dev [linux-any] <!stage1>, libcrypt-dev <!stage1>, @@ -25,7 +24,6 @@ Build-Depends: pkgconf, po-debconf, po4a, - procps, socat <!stage1 !nocheck>, systemd [linux-any] <!stage1>, systemd-dev [linux-any] <!stage1>, diff --git a/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch b/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch new file mode 100644 index 0000000..a876211 --- /dev/null +++ b/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch @@ -0,0 +1,23 @@ +From: Chris Hofstaedtler <zeha@debian.org> +Date: Tue, 2 Apr 2024 21:52:47 +0200 +Subject: tests: mark fadvise/drop as known failing on buildds + +buildds build on a tmpfs, but this is not visible inside the build environment. +--- + tests/ts/fadvise/drop | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 45dcb91..044f33a 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -3,6 +3,9 @@ + TS_TOPDIR="${0%/*}/../.." + TS_DESC="drop page caches related to a file" + ++# fails on Debian buildds, because the buildds use tmpfs hidden behind an unshare namespace. ++TS_KNOWN_FAIL="yes" ++ + . "$TS_TOPDIR"/functions.sh + ts_init "$*" + diff --git a/debian/patches/series b/debian/patches/series index 252bb4c..77bbc87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ debian/sensible-pager.patch debian/tests-mark-lsfd-tests-failing-in-sbuild.patch upstream/lsfd-add-LSFD_DEBUG-env-var-for-debugging.patch upstream/tests-test_mkfds-sockdiag-verify-the-recived-message.patch +debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch diff --git a/debian/rules b/debian/rules index 9724ec1..b917c09 100755 --- a/debian/rules +++ b/debian/rules @@ -75,8 +75,6 @@ override_dh_autoreconf: AM_OPTS=--copy LT_OPTS=--copy dh_autoreconf ./autogen.sh override_dh_auto_configure: - ss -xp - sysctl kernel.modules_disabled dh_auto_configure -- $(CONFOPTS) override_dh_auto_install: |