[Git][NTPsec/ntpsec][master] yast support in buildprep.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
c3534546 by Eric S. Raymond at 2017-01-20T04:15:57-05:00
yast support in buildprep.

- - - - -


2 changed files:

- INSTALL
- buildprep


Changes:

=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -19,10 +19,11 @@ to run and in addition, the development headers installed to build.
 === The short version ===
 
 If you are on a Debian or Ubuntu distribution that uses apt-get, or on
-a Fedora or RedHat distribution that uses yum, you can use the
-./buildprep script.  If you are using other distributions or OSes, such
-as Gento, SuSE SLES, MacOS, Solaris, or BSD, you will have to install the
-build prerequisites by hand on your system.
+a Fedora or RedHat distribution that uses yum, or a Suse distribution
+that uses yast, you can use the ./buildprep script.  If you are using
+other distributions or OSes, such as Gentoo, MacOS, Solaris, or BSD,
+you will have to install the build prerequisites by hand on your
+system.
 
 Run ./buildprep -n to see what needs to be installed as prerequisites
 on your system.  In order that we have a single point of truth about
@@ -45,13 +46,9 @@ Python 2.x, x >= 6, or Python 3.x, x >= 3::
    installation and Python dev tools, if your OS makes such a
    distinction.
 
-   Required to build.
-   SLES: python-devel
-
 bison::
    Required to build.
    Gentoo package: sys-devel/bison
-   SLES: bison. Included in pattern `basis-devel`, which includes gcc, etc.
 
 libsodium::
    Required to build.  Used for cryptographic-quality random-number generation.
@@ -61,7 +58,6 @@ libsodium::
    against it
 
    Gentoo: dev-libs/libsodium
-   SLES: libsodium13 and libsodium-devel
    CentOS: libsodium in epel ("Extra Packages for Enterprise Linux").
    Ubuntu 14.04 LTS: and older: https://gist.github.com/jonathanpmartins/2510f38abee1e65c6d92
    Debian Wheezy and older: https://sourceforge.net/projects/debiannoofficial/files/wheezy/
@@ -69,12 +65,10 @@ libsodium::
 libcap::
    Required on Linux, to support dropping root.
    Gentoo package: sys-libs/libcap
-   SLES: libcap2 and libcap-devel
 
 gnuplot::
    Required for ntpviz.
    Gentoo: sci-visualization/gnuplot
-   SLES: gnuplot
 
 argarse::
    Required for ntpviz when using Python version 2.6
@@ -92,13 +86,11 @@ psutils::
 seccomp::
    Optional on Linux to support restricting syscalls
    Gentoo: sys-libs/libseccomp
-   SLES: libseccomp-devel
 
 OpenSSL::
    Optional, required for --enable-crypto.
    Enables encryption and authentication.
    Gentoo: dev-libs/openssl
-   SLES: openssl-libs and openssl-devel
 
 sys/timepps.h::
    If you are building to supply Stratum 1 time service (that is, with
@@ -107,12 +99,10 @@ sys/timepps.h::
    This won't be necessary for pure client (Stratum 2 or higher)
    installations.
    Gentoo: net-misc/pps-tools
-   SLES: SLES 12 and earlier do not seem to have this available.
 
 liberation::
    Optional, improves font quality in ntpviz renderings.
    Gentoo: media-fonts/liberation-fonts
-   SLES: liberation-fonts
 
 asciidoc, a2x::
    You will need asciidoc to make HTML and a2x to make manual pages from the


=====================================
buildprep
=====================================
--- a/buildprep
+++ b/buildprep
@@ -7,7 +7,7 @@
 
 cat <<EOF 
 # Preparing your system for ntpsec source build...
-# This script presently knows about Debian, Ubuntu, CentOS, and Fedora.
+# This script presently knows about Debian, Ubuntu, CentOS, Fedora, and SLES.
 # If you are running something else, such as MacOS or Solaris, please
 # follow the directions for by-hand installation in INSTALL.
 #
@@ -16,7 +16,7 @@ EOF
 if [ "$1" = "-n" ]
 then
     do=echo
-    echo "# Run this without -n, as root, for actual installation."
+    echo "# Run this without -n, as root, for actual installation.\n#"
 else
     do=""
 fi
@@ -33,10 +33,10 @@ then
     installer=yum
 elif apt-get --version >/dev/null 2>&1
 then
-    # FIXME, on MacOS and Solaris systems, apt is part of Java
-    # http://java.sun.com/j2se/1.5.0/docs/guide/apt/GettingStarted.html
-    # need a better way to determine the local system uses Debian Advanced Packaging Tool installer
     installer=apt
+elif yast -h >/dev/null 2>&1
+then
+    installer=yast
 else
     installer=unknown
 fi
@@ -63,9 +63,16 @@ case $installer in
 	$do yum libseccomp-devel install openssl-devel openssl-libs
 	$do yum pps-tools pps-tools-devel install python python-dev
 	;;
+    yast)
+	echo "# SLES versions 12 and earlier do not have pps-tools"
+	$do yast --install basis-devel gnuplot libcap-devel libcap2
+	$do yast --install liberation-fonts libseccomp-devel libsodium-devel
+	$do yast --install libsodium13 openssl-libs and openssl-devel
+	$do yast --install python-devel
+	;;
 esac
 
-echo "# libsodium is a point of pain; older distributions don't carry it."
+echo "# libsodium is a point of pain; some older distributions don't carry it."
 echo "# Watch these installations closely; if you get a failure message,"
 echo "# see INSTALL for instructions."
 case $installer in
@@ -77,4 +84,4 @@ case $installer in
 	;;
 esac
 echo ""
-echo " Done."
+echo "# Done."



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/c3534546f439bd76f52c4a9c7b1a1532e4eddf82
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170120/f43931a4/attachment.html>