From 5bdc48852ff026a53bfb9a6fe2abd325e9be4356 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 25 Nov 2015 21:19:35 -0500 Subject: [PATCH] Make sure install instructions target LTTng 2.7 Signed-off-by: Philippe Proulx --- .../installing-lttng/building-from-source.md | 43 ------------------- .../desktop-distributions/archlinux.md | 9 +--- .../desktop-distributions/debian.md | 12 +++--- .../desktop-distributions/fedora.md | 27 ------------ .../desktop-distributions/intro.md | 12 +++--- .../desktop-distributions/opensuse.md | 28 ------------ .../ubuntu/official-repositories.md | 3 +- .../embedded-distributions/buildroot.md | 23 ---------- .../embedded-distributions/intro.md | 7 --- .../embedded-distributions/oe-yocto.md | 22 ---------- contents/installing-lttng/intro.md | 6 ++- contents/nuts-and-bolts/lttng-alternatives.md | 4 +- toc/docs.yml | 11 ----- 13 files changed, 21 insertions(+), 186 deletions(-) delete mode 100644 contents/installing-lttng/desktop-distributions/fedora.md delete mode 100644 contents/installing-lttng/desktop-distributions/opensuse.md delete mode 100644 contents/installing-lttng/embedded-distributions/buildroot.md delete mode 100644 contents/installing-lttng/embedded-distributions/intro.md delete mode 100644 contents/installing-lttng/embedded-distributions/oe-yocto.md diff --git a/contents/installing-lttng/building-from-source.md b/contents/installing-lttng/building-from-source.md index 0638424..b5d3c9e 100644 --- a/contents/installing-lttng/building-from-source.md +++ b/contents/installing-lttng/building-from-source.md @@ -22,46 +22,3 @@ are rendered as rich text when viewed on GitHub.

- -If you're using Ubuntu, executing the following Bash script -installs the appropriate dependencies, clones the LTTng -Git repositories, builds the projects, and installs them. The sources -are cloned into `~/src`. Your user needs to be a sudoer for the install -steps to be completed. - -~~~ text -#!/bin/bash - -mkdir ~/src -cd ~/src -sudo apt-get update -sudo apt-get -y install build-essential libtool flex bison \ - libpopt-dev uuid-dev libglib2.0-dev autoconf \ - git libxml2-dev -git clone git://git.lttng.org/lttng-ust.git -git clone git://git.lttng.org/lttng-modules.git -git clone git://git.lttng.org/lttng-tools.git -git clone git://git.lttng.org/userspace-rcu.git -git clone http://git.linuxfoundation.org/diamon/babeltrace.git - -cd userspace-rcu -./bootstrap && ./configure && make -j 4 && sudo make install -sudo ldconfig - -cd ../lttng-ust -./bootstrap && ./configure && make -j 4 && sudo make install -sudo ldconfig - -cd ../lttng-modules -make && sudo make modules_install -sudo depmod -a - -cd ../lttng-tools -./bootstrap && ./configure && make -j 4 && sudo make install -sudo ldconfig -sudo cp extras/lttng-bash_completion /etc/bash_completion.d/lttng - -cd ../babeltrace -./bootstrap && ./configure && make -j 4 && sudo make install -sudo ldconfig -~~~ diff --git a/contents/installing-lttng/desktop-distributions/archlinux.md b/contents/installing-lttng/desktop-distributions/archlinux.md index bf3bbd3..42d8915 100644 --- a/contents/installing-lttng/desktop-distributions/archlinux.md +++ b/contents/installing-lttng/desktop-distributions/archlinux.md @@ -2,7 +2,7 @@ id: archlinux --- -LTTng packages are available in the +LTTng 2.7 packages are currently available in the AUR under the following names: lttng-tools, lttng-modules @@ -17,10 +17,3 @@ yaourt -S lttng-tools yaourt -S lttng-modules yaourt -S lttng-ust - -If you're living on the edge, the AUR also contains the latest Git master branch -for each of those packages: -lttng-tools-git, -lttng-modules-git -and -lttng-ust-git. diff --git a/contents/installing-lttng/desktop-distributions/debian.md b/contents/installing-lttng/desktop-distributions/debian.md index dfab0cd..d0e4e3b 100644 --- a/contents/installing-lttng/desktop-distributions/debian.md +++ b/contents/installing-lttng/desktop-distributions/debian.md @@ -2,15 +2,13 @@ id: debian --- -Debian "wheezy" (stable) and previous versions are not supported; you -need to build and install LTTng packages -[from source](#doc-building-from-source) for those. - -Starting from Debian "jessie", packages are officially available -using Apt: +Debian "stretch" and Debian "sid" have LTTng-modules 2.7 and +LTTng-UST 2.7 packages: 
-sudo apt-get install lttng-tools
 sudo apt-get install lttng-modules-dkms
 sudo apt-get install liblttng-ust-dev
+ +LTTng-tools 2.7 still needs to be +[built from source](#doc-building-from-source). diff --git a/contents/installing-lttng/desktop-distributions/fedora.md b/contents/installing-lttng/desktop-distributions/fedora.md deleted file mode 100644 index e08832d..0000000 --- a/contents/installing-lttng/desktop-distributions/fedora.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -id: fedora ---- - -Starting from Fedora 17, LTTng-tools and LTTng-UST packages are officially -available using `yum`: - -
-sudo yum install lttng-tools
-sudo yum install lttng-ust
-sudo yum install lttng-ust-devel
-
- -LTTng-modules still needs to be built and installed from source. For that, -make sure that the `kernel-devel` package is already installed beforehand: - -
-sudo yum install kernel-devel
-
- -Proceed on to fetch [LTTng-modules' source](#doc-building-from-source). -Build and install it as follows: - -
-KERNELDIR=/usr/src/kernels/$(uname -r) make
-sudo make modules_install
-
diff --git a/contents/installing-lttng/desktop-distributions/intro.md b/contents/installing-lttng/desktop-distributions/intro.md index 76e5efc..e5f73ad 100644 --- a/contents/installing-lttng/desktop-distributions/intro.md +++ b/contents/installing-lttng/desktop-distributions/intro.md @@ -2,10 +2,12 @@ id: desktop-distributions --- -Official and unofficial LTTng packages are available for the major -Linux desktop distributions: [Ubuntu](#doc-ubuntu), -[Fedora](#doc-fedora), [Debian](#doc-debian), [openSUSE](#doc-opensuse) -(and other RPM-based distributions) and [Arch Linux](#doc-archlinux). -LTTng is regularly tested on those. Should any issue arise when +Official and unofficial LTTng 2.7 packages are available for +[Ubuntu](#doc-ubuntu), [Debian](#doc-debian), +and [Arch Linux](#doc-archlinux). + +Older versions of LTTng are available for Fedora and openSUSE. + +Should any issue arise when following the procedures below, please inform the community about it. diff --git a/contents/installing-lttng/desktop-distributions/opensuse.md b/contents/installing-lttng/desktop-distributions/opensuse.md deleted file mode 100644 index 57c0d9f..0000000 --- a/contents/installing-lttng/desktop-distributions/opensuse.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -id: opensuse ---- - -openSUSE has had LTTng packages since version 12.3. To install LTTng, you -first need to add an entry to your repository configuration. All LTTng repositories -are available -here. -For example, the following commands adds the LTTng repository for -openSUSE 13.1: - -
-sudo zypper addrepo http://download.opensuse.org/repositories/devel:/tools:/lttng/openSUSE_13.1/devel:tools:lttng.repo
-
- -Then, refresh the package database: - -
-sudo zypper refresh
-
- -and install `lttng-tools`, `lttng-modules` and `lttng-ust-devel`: - -
-sudo zypper install lttng-tools
-sudo zypper install lttng-modules
-sudo zypper install lttng-ust-devel
-
diff --git a/contents/installing-lttng/desktop-distributions/ubuntu/official-repositories.md b/contents/installing-lttng/desktop-distributions/ubuntu/official-repositories.md index ba78ad3..f07311c 100644 --- a/contents/installing-lttng/desktop-distributions/ubuntu/official-repositories.md +++ b/contents/installing-lttng/desktop-distributions/ubuntu/official-repositories.md @@ -2,7 +2,8 @@ id: ubuntu-official-repositories --- -To install LTTng from the official Ubuntu repositories, simply use `apt-get`: +To install LTTng 2.7 from the official Ubuntu repositories, simply +use `apt-get`: 
 sudo apt-get install lttng-tools
diff --git a/contents/installing-lttng/embedded-distributions/buildroot.md b/contents/installing-lttng/embedded-distributions/buildroot.md
deleted file mode 100644
index 5fe4776..0000000
--- a/contents/installing-lttng/embedded-distributions/buildroot.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-id: buildroot
----
-
-LTTng packages in Buildroot are `lttng-tools`, `lttng-modules` and
-`lttng-libust`.
-
-To enable them, start the Buildroot configuration menu as usual:
-
-
-make menuconfig
-

-
-In:
-
-  * _Kernel_: make sure _Linux kernel_ is enabled
-  * _Toolchain_: make sure the following options are enabled:
-    * _Enable large file (files > 2GB) support_
-    * _Enable WCHAR support_
-
-In _Target packages_/_Debugging, profiling and benchmark_, enable
-_lttng-modules_ and _lttng-tools_. In
-_Target packages_/_Libraries_/_Other_, enable _lttng-libust_.
diff --git a/contents/installing-lttng/embedded-distributions/intro.md b/contents/installing-lttng/embedded-distributions/intro.md
deleted file mode 100644
index 4d7f944..0000000
--- a/contents/installing-lttng/embedded-distributions/intro.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-id: embedded-distributions
----
-
-LTTng is packaged by two popular
-embedded Linux distributions: [Buildroot](#doc-buildroot) and
-[OpenEmbedded/Yocto](#doc-oe-yocto).
diff --git a/contents/installing-lttng/embedded-distributions/oe-yocto.md b/contents/installing-lttng/embedded-distributions/oe-yocto.md
deleted file mode 100644
index 60462a0..0000000
--- a/contents/installing-lttng/embedded-distributions/oe-yocto.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-id: oe-yocto
----
-
-LTTng recipes are available in the
-openembedded-core layer of OpenEmbedded:
-
-  * `lttng-tools`
-  * `lttng-modules`
-  * `lttng-ust`
-
-Using BitBake, the simplest way to include LTTng recipes in your
-target image is to add them to `IMAGE_INSTALL_append` in
-`conf/local.conf`:
-
-~~~ text
-IMAGE_INSTALL_append = " lttng-tools lttng-modules lttng-ust"
-~~~
-
-If you're using Hob, click _Edit image recipe_ once you have selected
-a machine and an image recipe. Then, under the _All recipes_ tab, search
-for `lttng` and include the three LTTng recipes.
diff --git a/contents/installing-lttng/intro.md b/contents/installing-lttng/intro.md
index fc34ed5..a41431f 100644
--- a/contents/installing-lttng/intro.md
+++ b/contents/installing-lttng/intro.md
@@ -21,8 +21,10 @@ you intend to trace user space applications.
 
 This chapter shows how to install the above packages on a Linux
 system. The easiest way is to use the package manager of the system's
-distribution ([desktop](#doc-desktop-distributions) or
-[embedded](#doc-embedded-distributions)). Support is also available for
+[distribution](#doc-desktop-distributions. Embedded distributions
+(Buildroot and OpenEmbedded/Yocto) currently have no packages of
+LTTng 2.7 (LTTng 2.6 is available for both of them). Support is also
+available for
 [enterprise distributions](#doc-enterprise-distributions), such as
 Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES).
 Otherwise, you can
diff --git a/contents/nuts-and-bolts/lttng-alternatives.md b/contents/nuts-and-bolts/lttng-alternatives.md
index 43f5664..01f814e 100644
--- a/contents/nuts-and-bolts/lttng-alternatives.md
+++ b/contents/nuts-and-bolts/lttng-alternatives.md
@@ -38,8 +38,8 @@ overhead amongst other solutions. It produces trace files in the
 CTF
 format, an optimized file format for production and analyses of
 multi-gigabyte data. LTTng is the result of close to 10 years of
-active development by a community of passionate developers. It is
-currently available on all major desktop, server, and embedded Linux
+active development by a community of passionate developers. LTTng 2.7
+is currently available on some major desktop and server Linux
 distributions.
 
 The main interface for tracing control is a single command line tool
diff --git a/toc/docs.yml b/toc/docs.yml
index 14c8394..5168098 100644
--- a/toc/docs.yml
+++ b/toc/docs.yml
@@ -22,21 +22,10 @@ cats:
                 title: Official repositories
               - id: ubuntu-ppa
                 title: PPA
-          - id: fedora
-            title: Fedora
           - id: debian
             title: Debian
-          - id: opensuse
-            title: openSUSE/RPM
           - id: archlinux
             title: Arch Linux
-      - id: embedded-distributions
-        title: Embedded distributions
-        cats:
-          - id: buildroot
-            title: Buildroot
-          - id: oe-yocto
-            title: OpenEmbedded/Yocto
       - id: enterprise-distributions
         title: "Enterprise distributions (RHEL, SLES)"
       - id: building-from-source
-- 
2.34.1