The test suite of PRoot makes many FHS assumptions, such as assuming that /bin, /bin/true, and /usr exist. This patch fixes these assumptions. --- source/tests/GNUmakefile 2017-05-11 15:26:36.899115484 +0200 +++ source/tests/GNUmakefile 2017-05-11 15:26:46.143063166 +0200 @@ -121,7 +121,7 @@ $(ROOTFS_DIR): setup: $(ROOTFS_BIN) $(ROOTFS)/bin/abs-true: - @ln -fs /bin/true $@ + @ln -fs `which true` $@ $(ROOTFS)/bin/rel-true: @ln -fs ./true $@ --- source/tests/test-d2175fc3.sh 2017-05-11 15:36:53.727617010 +0200 +++ source/tests/test-d2175fc3.sh 2017-05-11 15:37:10.155523637 +0200 @@ -2,8 +2,8 @@ if [ ! -x ${ROOTFS}/bin/readlink ] || [ exit 125; fi -${PROOT} -r ${ROOTFS} /bin/readlink /bin/abs-true | grep '^/bin/true$' +${PROOT} -r ${ROOTFS} /bin/readlink /bin/abs-true | grep "`which true`" ${PROOT} -r ${ROOTFS} /bin/readlink /bin/rel-true | grep '^\./true$' -${PROOT} -b /:/host-rootfs -r ${ROOTFS} /bin/readlink /bin/abs-true | grep '^/bin/true$' +${PROOT} -b /:/host-rootfs -r ${ROOTFS} /bin/readlink /bin/abs-true | grep "`which true`" ${P
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/display-managers.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index f6c9283a29..327a29aa9e 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -421,7 +421,7 @@ display manager which supports different greeters.")
bash-minimal ;for wrap-program
gtk+
guile-3.0
- librsvg
+ (librsvg-for-system)
libxklavier
lightdm
shared-mime-info))