[elbe-devel] [PATCH 2/3] docs: Describe the installation like on website

[Bastian Germann]

The Elbe website describes the installation process without the apt-key tool,
which is discouraged. Unify the in-tree installation documentation to match
the use of the signed-by deb flag with absolute path, the sources.list file,
and the apt frontend.

Link: https://elbe-rfs.org/download
Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 docs/elbeoverview-en.txt | 17 +++++++----------
 docs/quickstart.txt      | 16 +++++++---------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/docs/elbeoverview-en.txt b/docs/elbeoverview-en.txt
index 8d6844985a..6560d8b964 100644
--- a/docs/elbeoverview-en.txt
+++ b/docs/elbeoverview-en.txt
@@ -44,28 +44,25 @@ Installation
 Elbe is shipped as Debian package. This package will pull in the necessary
 dependencies.
 
-Configure `/etc/apt/sources.list.d` appropriately:
+Download the OpenPGP key and configure `/etc/apt/sources.list` appropriately:
 
 -----------------------------------------------------------------------------------
-echo 'deb http://debian.linutronix.de/elbe buster main' >> /etc/apt/sources.list.d/elbe.list
------------------------------------------------------------------------------------
-
-Optionally the public key for the repo can be installed:
-
------------------------------------------------------------------------------------
-wget http://debian.linutronix.de/elbe/elbe-repo.pub && apt-key add elbe-repo.pub
+su -
+apt install wget
+wget -O /usr/share/keyrings/elbe-archive-keyring.gpg http://debian.linutronix.de/elbe/elbe-repo.pub.gpg
+echo "deb [signed-by=/usr/share/keyrings/elbe-archive-keyring.gpg] http://debian.linutronix.de/elbe buster main" >> /etc/apt/sources.list
 -----------------------------------------------------------------------------------
 
 Update the package list:
 
 --------------------------------------------
-aptitude update
+apt update
 --------------------------------------------
 
 and install elbe using the following command:
 
 --------------------------------------------
-aptitude install elbe
+apt install elbe
 --------------------------------------------
 
 
diff --git a/docs/quickstart.txt b/docs/quickstart.txt
index f061ee71f8..0a15b2b344 100644
--- a/docs/quickstart.txt
+++ b/docs/quickstart.txt
@@ -49,28 +49,26 @@ The latest packages for elbe reside in the following repository
 
 --------------------------------------------------------
 http://debian.linutronix.de/elbe
-http://debian.linutronix.de/elbe-common
 --------------------------------------------------------
 
-Create the file `/etc/apt/sources.list.d/elbe.list`
-with the following contents:
+Add a repository key to the list of trusted keys (as root):
 
 --------------------------------------------------------
-deb http://debian.linutronix.de/elbe buster main
-deb http://debian.linutronix.de/elbe-common buster main
+# wget -O /usr/share/keyrings/elbe-archive-keyring.gpg http://debian.linutronix.de/elbe/elbe-repo.pub.gpg
 --------------------------------------------------------
 
-Add a repository key to the list of trusted keys (as root):
+Add the following content to
+the file `/etc/apt/sources.list`
 
 --------------------------------------------------------
-$ wget -q -O - http://debian.linutronix.de/elbe-common/elbe-repo.pub | apt-key add -
+# echo "deb [signed-by=/usr/share/keyrings/elbe-archive-keyring.gpg] http://debian.linutronix.de/elbe buster main" >> /etc/apt/sources.list
 --------------------------------------------------------
 
 Then run (as root):
 
 --------------------------------------------------------
-$ apt-get update
-$ apt-get install elbe
+$ apt update
+$ apt install elbe
 --------------------------------------------------------
 
 
-- 
2.30.2