install_linux_distro.rst: Ostree is no longer a core dependencyphil/436-add-ubuntu-install-intructions

This commit resolves issue #492

1 files changed, 21 insertions, 19 deletions

diff --git a/doc/source/install_linux_distro.rst b/doc/source/install_linux_distro.rst
index db0afc57c..831720d6f 100644
--- a/doc/source/install_linux_distro.rst
+++ b/doc/source/install_linux_distro.rst
@@ -6,7 +6,6 @@ Installing BuildStream on a Linux distro
 BuildStream requires the following base system requirements:
 
 * python3 >= 3.5
-* libostree >= v2017.8 with introspection data
 * bubblewrap >= 0.1.2
 * fuse2
 * PyGObject introspection bindings
@@ -22,6 +21,7 @@ The default plugins with extra host dependencies are:
 * git
 * patch
 * tar
+* ostree
 
 If you intend to push built artifacts to a remote artifact server,
 which requires special permissions, you will also need:
@@ -52,13 +52,13 @@ Arch Linux
 Install the dependencies with::
 
   sudo pacman -S \
-      python fuse2 ostree bubblewrap python-gobject \
+      python fuse2 bubblewrap python-gobject \
       python-pip git
 
 For the default plugins::
 
   sudo pacman -S \
-      lzip git bzr patch python-arpy
+      lzip git bzr patch python-arpy ostree 
 
 
 Debian
@@ -67,7 +67,19 @@ Debian
 
 Stretch
 ^^^^^^^
-With stretch, you first need to ensure that you have the backports repository
+
+At this point you should be able to get the system requirements with::
+
+  sudo apt-get install \
+      python3 fuse ostree gir1.2-ostree-1.0 bubblewrap python3-gi \
+      python3-pip python3-dev git
+
+For the default plugins::
+
+  sudo apt-get install \
+      lzip git bzr patch python3-arpy
+
+For the os tree plugin, you'll need to add the backports repository
 setup as described `here <https://backports.debian.org/Instructions/>`_
 
 By adding the following line to your sources.list::
@@ -78,32 +90,23 @@ And then running::
 
   sudo apt-get update
 
-At this point you should be able to get the system requirements with::
+Then you can do::
 
-  sudo apt-get install \
-      python3 fuse ostree gir1.2-ostree-1.0 bubblewrap python3-gi \
-      python3-pip python3-dev git
   sudo apt-get install -t stretch-backports \
       gir1.2-ostree-1.0 ostree
 
-For the default plugins::
-
-  sudo apt-get install \
-      lzip git bzr patch python3-arpy
-
 Buster or Sid
 ^^^^^^^^^^^^^
 For debian unstable or testing, only the following line should be enough
 to get the base system requirements installed::
 
   sudo apt-get install \
-      python3 fuse ostree gir1.2-ostree-1.0 bubblewrap python3-gi \
-      python3-pip python3-dev git
+      python3 fuse bubblewrap python3-gi python3-pip python3-dev git
 
 For the default plugins::
 
   sudo apt-get install \
-      lzip git bzr patch python3-arpy
+      lzip git bzr patch python3-arpy ostree gir1.2-ostree-1.0 
 
 Ubuntu
 ++++++
@@ -137,13 +140,12 @@ For recent fedora systems, the following line should get you the system
 requirements you need::
 
   dnf install -y \
-      python3 fuse ostree bubblewrap python3-gobject \
-      python3-pip python3-devel git
+      python3 fuse bubblewrap python3-gobject python3-pip python3-devel git
 
 For the default plugins::
 
   dnf install -y \
-      lzip git bzr patch python3-arpy
+      lzip git bzr patch python3-arpy ostree 
 
 
 Installing