[Git][NTPsec/ntpsec][master] 2 commits: buildprep: partly fix for Ubuntu 16.

[Gary E. Miller]

Gary E. Miller pushed to branch master at NTPsec / ntpsec


Commits:
cebe998a by Gary E. Miller at 2017-01-20T19:40:22-08:00
buildprep: partly fix for Ubuntu 16.

The root check still broken.  For debian and ubuntu

- - - - -
6440615f by Gary E. Miller at 2017-01-20T20:12:01-08:00
buildprep: partly fix for CentOS 7.  No libsodium on CentOS 7

- - - - -


1 changed file:

- buildprep


Changes:

=====================================
buildprep
=====================================
--- a/buildprep
+++ b/buildprep
@@ -51,24 +51,27 @@ case $installer in
     apt)
 	$do apt-get install bison libcap-dev libcap2 libseccomp-dev
 	$do apt-get install libssl-dev libssl1.0.0 python-dev
+	$do apt-get install pps-tools
+	$do apt-get install fonts-liberation
 	distro=`lsb_release -i -s`
 	if [ "$distro" = "Ubuntu" ]
 	then
 	    echo "# Looks like an Ubuntu system"
 	    $do apt-get install gnuplot5
-	    $do apt-get install ppstools
-	    $do apt-get install liberation
 	else
 	    echo "# Looks like a generic Debian system"
 	    $do apt-get install gnuplot
-	    $do apt-get install pps-tools
-	    $do apt-get install fonts-liberation
 	fi
 	;;
     yum)
-	$do yum install bison gnuplot libcap libcap-devel liberation
-	$do yum libseccomp-devel install openssl-devel openssl-libs
-	$do yum pps-tools pps-tools-devel install python python-dev
+	$do yum install bison gnuplot libcap libcap-devel
+        $do yum install liberation-fonts-common.noarch
+	$do yum install liberation-mono-fonts.noarch
+	$do yum install liberation-narrow-fonts.noarch
+        $do yum install liberation-sans-fonts.noarch
+        $do yum install liberation-serif-fonts.noarch
+	$do yum install libseccomp-devel install openssl-devel openssl-libs
+	$do yum install pps-tools pps-tools-devel install python python-dev
 	;;
     yast|zypper)
 	echo "# SLES versions 12 and earlier do not have pps-tools"
@@ -85,10 +88,11 @@ echo "# Watch these installations closely; if you get a failure message,"
 echo "# see INSTALL for instructions."
 case $installer in
     apt)
-	# no libsodium on wheezy
+	# no libsodium on Debian wheezy
 	$do apt-get install libsodium-dev
 	;;
     yum)
+        # no libsodium on CentOS 7
 	$do yum install libsodium-dev libsodium-devel
 	;;
 esac



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/8aa6514eec8c23900791445b04b741400a7336d4...6440615f13182915b6779156a82d632f1300799a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170121/6ab8a063/attachment.html>