From a1bd0230d2412223141486192ee0d4632bfe8710 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 19 Dec 2016 19:08:11 +0100
Subject: Remove RPATH from binaries before creating .deb and .rpm packages

Change-Id: I684d4eabac03e049524204864c985e14eea8d92e
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 build-root/scripts/remove-rpath | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 build-root/scripts/remove-rpath

(limited to 'build-root/scripts/remove-rpath')

diff --git a/build-root/scripts/remove-rpath b/build-root/scripts/remove-rpath
new file mode 100755
index 00000000..bda3d60d
--- /dev/null
+++ b/build-root/scripts/remove-rpath
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ -z $1 ]; then
+	echo "Please specify path"
+	exit 1
+fi
+
+which chrpath &> /dev/null
+
+if [ $? -ne 0 ] ; then
+	echo "Please install chrpath tool"
+	exit 1
+fi
+
+libs=$(find $1 -type f -name \*.so)
+execs=$(find $1 -type f -path \*/bin/\* )
+
+for i in $libs $execs; do
+	chrpath $i 2> /dev/null | grep -q build-root
+	if [ $? -eq 0 ] ; then
+		chrpath $i
+	fi
+done
+
-- 
cgit 1.2.3-korg


From 3f1309df1b9a96a194845b297734f55db3f2c6b0 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 13 Jan 2017 20:58:19 +0100
Subject: Fix remove-rpath script

Change-Id: Ieb9ca2c5ac64dbb73de1b3dd701bb794c91aeae5
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 build-root/scripts/remove-rpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build-root/scripts/remove-rpath')

diff --git a/build-root/scripts/remove-rpath b/build-root/scripts/remove-rpath
index bda3d60d..1828ddf9 100755
--- a/build-root/scripts/remove-rpath
+++ b/build-root/scripts/remove-rpath
@@ -18,7 +18,7 @@ execs=$(find $1 -type f -path \*/bin/\* )
 for i in $libs $execs; do
 	chrpath $i 2> /dev/null | grep -q build-root
 	if [ $? -eq 0 ] ; then
-		chrpath $i
+		chrpath -d $i
 	fi
 done
 
-- 
cgit 1.2.3-korg


From 5a3a6c09f58a28fee1a673475e1c25b3aea31f60 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 13 Jan 2017 22:11:56 +0100
Subject: Fix remove-rpath script, take 2

Change-Id: If0fc5adb495b243dc9d7bfb8112ffee79ca1335e
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 build-root/scripts/remove-rpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build-root/scripts/remove-rpath')

diff --git a/build-root/scripts/remove-rpath b/build-root/scripts/remove-rpath
index 1828ddf9..3912b370 100755
--- a/build-root/scripts/remove-rpath
+++ b/build-root/scripts/remove-rpath
@@ -12,7 +12,7 @@ if [ $? -ne 0 ] ; then
 	exit 1
 fi
 
-libs=$(find $1 -type f -name \*.so)
+libs=$(find $1 -type f -name \*.so\*)
 execs=$(find $1 -type f -path \*/bin/\* )
 
 for i in $libs $execs; do
-- 
cgit 1.2.3-korg