[med-svn] [Git][med-team/sra-sdk][master] sra-sdk 2.10.6+dfsg-4: Account for new sratools setup (#961256).

[Aaron M. Ucko]

Aaron M. Ucko pushed to branch master at Debian Med / sra-sdk


Commits:
94b390d0 by Aaron M. Ucko at 2020-05-22T09:25:14-04:00
sra-sdk 2.10.6+dfsg-4: Account for new sratools setup (#961256).

* debian/rules: Rework deversioning logic to account for sratools and
  *-orig.* while still keeping hardcoding to a minimum; formally
  supply a hardcoded but originally random standard installation ID in
  a new /etc/ncbi/debian.kfg.
* debian/patches/use_unversioned_tools.patch (new): Have sratools look
  for executable names without version extensions.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/use_unversioned_tools.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+sra-sdk (2.10.6+dfsg-4) unstable; urgency=medium
+
+  * Account for new sratools setup.  (Closes: #961256.)
+    - debian/rules: Rework deversioning logic to account for sratools and
+      *-orig.* while still keeping hardcoding to a minimum; formally
+      supply a hardcoded but originally random standard installation ID in
+      a new /etc/ncbi/debian.kfg.
+    - debian/patches/use_unversioned_tools.patch (new): Have sratools look
+      for executable names without version extensions.
+
+ -- Aaron M. Ucko <ucko at debian.org>  Fri, 22 May 2020 09:25:13 -0400
+
 sra-sdk (2.10.6+dfsg-3) unstable; urgency=medium
 
   * Also exclude sra-pileup check_skiplist test per network access.


=====================================
debian/patches/series
=====================================
@@ -18,3 +18,4 @@ drop_tests.patch
 ignore_failing_test_for_the_moment_FIXME.patch
 python3
 use_exposed_headers.patch
+use_unversioned_tools.patch


=====================================
debian/patches/use_unversioned_tools.patch
=====================================
@@ -0,0 +1,13 @@
+Index: b/tools/driver-tool/tool-path.hpp
+===================================================================
+--- a/tools/driver-tool/tool-path.hpp
++++ b/tools/driver-tool/tool-path.hpp
+@@ -71,7 +71,7 @@ public:
+ #if WINDOWS
+         return path_ + ToolPath::seperator + basename_ + ".exe";
+ #else // POSIX
+-        return path_ + ToolPath::seperator + basename_ + '.' + version_;
++        return path_ + ToolPath::seperator + basename_ /* + '.' + version_ */;
+ #endif
+     }
+     bool executable() const {


=====================================
debian/rules
=====================================
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Pregenerated with uuidgen -r
+DEBIAN_GUID = 806b5c3b-0088-4732-8359-51630950d723
+
 # +pie breaks the build
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -46,15 +49,29 @@ override_dh_auto_install:
 
 override_dh_install:
 	# upstream installs versioned *.a libs - we only want a single version
-	for bin in debian/tmp/usr/bin/*[a-z] ; do \
-	    mv debian/tmp/usr/bin/`readlink $$bin` $$bin ; \
-	    mv debian/tmp/usr/bin/`readlink $$bin` $$bin ; \
+	ls -l debian/tmp/usr/bin
+	cd debian/tmp/usr/bin && \
+	for bin in *-orig.* ; do \
+	    base=$${bin%-orig.*} && \
+	    vbase=$$(readlink "$$(readlink $$base)") && \
+	    vdriver=$$(readlink "$$vbase") && \
+	    mv -v $$bin $$base-orig && \
+	    ln -snfv $${vdriver%%.[0-9]*} $$vbase || exit $$? ; \
+	done && \
+	for bin in *[a-z] ; do \
+	    bin2=$$(readlink $$bin) ; \
+	    bin3=$$(readlink "$$bin2") ; \
+	    case $$bin2 in \
+	        $$bin.* ) rm -v $$bin2 && mv -v $$bin3 $$bin || exit $$? ;; \
+	    esac ; \
 	done
 	dh_install
 	# remove susipcious file which is not executable and conflicts with package magic
 	rm -f debian/*/usr/bin/magic
 	# rename kget which conflicts with kget download manager (see #851219)
 	mv debian/$(pkg)/usr/bin/kget debian/$(pkg)/usr/bin/vdb-get
+	# Formally supply a standard installation ID to satisfy sratools
+	echo '/LIBS/GUID = "$(DEBIAN_GUID)"' >debian/$(pkg)/etc/ncbi/debian.kfg
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))



View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/commit/94b390d077a614d371d2c5727498f89b979e6333

-- 
View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/commit/94b390d077a614d371d2c5727498f89b979e6333
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200522/7124d028/attachment-0001.html>