[Pkg-gridengine-commits] [pkg-gridengine] 02/02: Generate symlinks for inst_sge based on detected architecture

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch topic/inst_sge
in repository pkg-gridengine.

commit 5fa4cbfa7e06a5bbe347da364e289292466728ff
Author: Afif Elghraoui <afif at debian.org>
Date:   Mon Aug 29 23:06:21 2016 -0700

    Generate symlinks for inst_sge based on detected architecture
    
    This is more extensible, removing the hard-coded symlinks made
    in debian/gridengine-common.links.
---
 debian/gridengine-common.links | 40 ----------------------------------------
 debian/rules                   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/debian/gridengine-common.links b/debian/gridengine-common.links
index 93c4224..8a47c77 100644
--- a/debian/gridengine-common.links
+++ b/debian/gridengine-common.links
@@ -1,43 +1,3 @@
-# it's probably better to generate this file from rules for a single arch
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-alpha
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-amd64
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-ia64
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-ppc
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-sparc
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-sparc64
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-x86
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-parisc
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-s390
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-s390x
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-armel
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-mips
-/usr/lib/gridengine	/var/lib/gridengine/bin/lx-mipsel
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-alpha
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-amd64
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-ia64
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-ppc
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-sparc
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-sparc64
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-x86
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-parisc
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-s390
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-s390x
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-armel
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-mips
-/usr/lib/gridengine	/var/lib/gridengine/utilbin/lx-mipsel
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-alpha
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-amd64
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-ia64
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-ppc
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-sparc
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-sparc64
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-x86
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-parisc
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-s390
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-s390x
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-armel
-/usr/lib/gridengine	/var/lib/gridengine/lib/lx-mips
-/usr/lib/gridengine			/var/lib/gridengine/lib/lx-mipsel
 /usr/share/gridengine/inst_sge		/var/lib/gridengine/inst_sge
 /usr/share/gridengine/install_execd	/var/lib/gridengine/install_execd
 /usr/share/gridengine/install_qmaster	/var/lib/gridengine/install_qmaster
diff --git a/debian/rules b/debian/rules
index 8b6088e..af1123f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,5 +126,17 @@ override_dh_fixperms:
 		 debian/gridengine-common/usr/share/gridengine/util/resources/scripts/README*; \
 	fi
 
+override_dh_link:
+	dh_link
+# Prepare symlinks to allow inst_sge to find executables where it expects them.
+	if [ -d debian/gridengine-common ]; then \
+		basedir=debian/gridengine-common/var/lib/gridengine; \
+		for dir_type in bin utilbin lib; \
+		do \
+			mkdir -p $$basedir/$$dir_type; \
+			ln -s /usr/lib/gridengine $$basedir/$$dir_type/$(SGE_ARCH); \
+		done; \
+	fi
+
 override_dh_installchangelogs:
 	dh_installchangelogs --keep NEWS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gridengine/pkg-gridengine.git