[Git][NTPsec/ntpsec][master] 2 commits: In the release script, isolate a parameter.

[Eric S. Raymond]

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


Commits:
3702be07 by Eric S. Raymond at 2017-10-02T06:28:06-04:00
In the release script, isolate a parameter.

- - - - -
403bc42c by Eric S. Raymond at 2017-10-02T06:52:49-04:00
Documentation polishing.

- - - - -


3 changed files:

- INSTALL
- devel/release
- packaging/packaging.txt


Changes:

=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -229,6 +229,12 @@ to your new location.
 You should read the section "Path problems with the test tools" in
 devel/testing.txt before setting a non-default prefix.
 
+There is a separate `--destdir' option that changes the root of the
+entire installation hierarchy, prepending all paths.  It defaults to `/'.
+You might, say, use --destdir=/tmp/ntp for a test install to see what
+the installation paths look like without running as root or touching
+system directories.
+
 == Qualification testing ==
 
 Details on how to qualify NTPsec if you've never used it before


=====================================
devel/release
=====================================
--- a/devel/release
+++ b/devel/release
@@ -3,6 +3,11 @@
 #
 # Run with no arguments to dry-run this.
 
+KEY=477C7528	# Release manager's GPG key ID
+DST=markatwood at service1.ntpsec.org:/usr/local/jail/ftp.ntpsec.org/data/ftp/pub/releases/
+
+# No user-serviceable parts below this line
+
 do="echo"
 if [ "$1" = "go" ]
 then
@@ -16,8 +21,6 @@ set -e	# Bail out if the tarball build fails
 V=`cat ../VERSION`
 UV=`cat ../VERSION | tr '.' '_'`
 
-K=477C7528	# Release manager's GPG key ID
-
 # Tag the version
 $do git tag -u ${K} -m "version ${V}" NTPsec_${UV}
 
@@ -34,7 +37,7 @@ $do git push
 $do git push --tags
 
 # Generate GPG detached signature of the release tarball.
-$do gpg -u ${K} -a --output ntpsec-${V}.tar.gz.asc --detach-sign ntpsec-${V}.tar.gz
+$do gpg -u ${KEY} -a --output ntpsec-${V}.tar.gz.asc --detach-sign ntpsec-${V}.tar.gz
 
 # Generate sha256sum file for the release tarball.
 if [ -z $do ]; then
@@ -44,14 +47,14 @@ else
 fi
 
 # GPG sign that sha256sum file.
-$do gpg -u ${K} -a --output ntpsec-${V}.tar.gz.sum.asc --clearsign ntpsec-${V}.tar.gz.sum
+$do gpg -u ${KEY} -a --output ntpsec-${V}.tar.gz.sum.asc --clearsign ntpsec-${V}.tar.gz.sum
   
 # Copy the release tarball, GPG detached signature of the release
 # tarball, and the signed sha256sum file to the ftp artifact server.
 if [ -z $do ]; then
-    scp ntpsec-${V}.tar* markatwood at service1.ntpsec.org:/usr/local/jail/ftp.ntpsec.org/data/ftp/pub/releases/
+    scp ntpsec-${V}.tar* ${DST}
 else
-    echo scp ntpsec-${V}.tar\* markatwood at service1.ntpsec.org:/usr/local/jail/ftp.ntpsec.org/data/ftp/pub/releases/
+    echo scp ntpsec-${V}.tar\* ${DST}
 fi
 
 # end


=====================================
packaging/packaging.txt
=====================================
--- a/packaging/packaging.txt
+++ b/packaging/packaging.txt
@@ -18,18 +18,20 @@ pool group of its own. This may change in the future.
 
 Thw function get_python_lib() in the Python distutils library is the
 only reliable way to know where in fact the ntp Python library can
-installed; Under Linux, it normally returns something under /usr/lib. 
+installed; under Linux, it normally returns something under /usr/lib.
+This corresponds to a system installation.
 
-Thus, if you install from the source distribution with prefix set to
-a value other than /usr - in particular, if it's the default value
-/usr/local - the ntp Python library may get dropped in /usr/lib
-anyway, violating the Linux File Hierarchy Standard.
+Thus, if you install from the source distribution with prefix set to a
+value other than /usr - in particular, if it's the default value
+/usr/local corresponding to a user installation - the ntp Python
+library may get dropped in /usr/lib anyway, violating the Linux File
+Hierarchy Standard.
 
 We say 'may' because if the Python library directory corresponding
 to the prefixed library path already exists it will be used.
 
 Your installable package should arrange library installation to comply
-with the FHS.  If you are using --prefix=/usr (or, more generally, rge
+with the FHS.  If you are using --prefix=/usr (or, more generally, the
 default sys.prefix) this should not require special action.
 
 == Platforms without Python ==



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/5ae1ace5aedd71b4ca9e2dcbd69e6f729f5f3747...403bc42ce379f05649b5355d508476a4bcf7952c

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/5ae1ace5aedd71b4ca9e2dcbd69e6f729f5f3747...403bc42ce379f05649b5355d508476a4bcf7952c
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20171002/37e56e5f/attachment.html>