From bf7a9b8c7a49f9d17e37ba9e5ce889a94d1a70c1 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 24 Jun 2020 14:51:36 -0700 Subject: [PATCH] d/rules: vagrant: INSTALL.md: Fix installing dependencies - Using ./run --develop ensures that the last list of dependencies are picked up from current source directory instead of list of dependencies from system configuration. - Using sudo -u plinth ensures that even if any temporary files are created, they belong to the plinth user instead of root user. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- INSTALL.md | 2 +- Vagrantfile | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index aa2b89fb7..771354100 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -16,7 +16,7 @@ FreedomBox [Manual](https://wiki.debian.org/FreedomBox/Manual/)'s ``` ``` - $ sudo apt install -y $(./run --list-dependencies) + $ sudo apt install -y $(./run --develop --list-dependencies) ``` Install additional dependencies by picking the list from debian/control file diff --git a/Vagrantfile b/Vagrantfile index bda895ea4..a6b41488d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -32,7 +32,7 @@ Vagrant.configure(2) do |config| apt-get update # In case new dependencies conflict with old dependencies apt-mark hold freedombox - DEBIAN_FRONTEND=noninteractive apt-get install --no-upgrade -y $(plinth --list-dependencies) + DEBIAN_FRONTEND=noninteractive apt-get install --no-upgrade -y $(sudo -u plinth ./run --develop --list-dependencies) apt-mark unhold freedombox # Install ncurses-term DEBIAN_FRONTEND=noninteractive apt-get install -y ncurses-term diff --git a/debian/rules b/debian/rules index b0a3a6f76..924d3b366 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export PYBUILD_DESTDIR=debian/tmp override_dh_auto_install-indep: dh_auto_install - ./run --list-dependencies 2> /dev/null | sort | tr '\n' ', ' | \ + ./run --develop --list-dependencies | sort | tr '\n' ', ' | \ sed -e 's/^/freedombox:Depends=/' >> debian/freedombox.substvars override_dh_auto_test: