prelink: also look at nonstandard lib paths

Prelinking for x32 image showed that it was ignoring libraries
located at locations like /usr/libx32. Like that mips n32 has
library locations set as lib32
  This commit modifies prelink.conf to look at libraries also
located at libx32 & lib32 locations.
  Thanks to Mark Hatle for suggesting the fix.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
index ed30c286f2f92519040afccc0bb5ee1cec95209a..562f23c59d21872a2339ec92ed00dda49317c213 100644 (file)
--- a/meta/recipes-devtools/prelink/prelink/prelink.conf
+++ b/meta/recipes-devtools/prelink/prelink/prelink.conf
@@ -12,7 +12,7 @@
 -l /usr/bin
 -l /usr/X11R6/bin
 -l /usr/games
--l /usr/local/lib{,64}
--l /lib{,64}
--l /usr/lib{,64}
--l /usr/X11R6/lib{,64}
+-l /usr/local/lib{,32,64,x32}
+-l /lib{,32,64,x32}
+-l /usr/lib{,32,64,x32}
+-l /usr/X11R6/lib{,32,64,x32}

diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 31c22efe510e97c16d8ac8f0fb758ffe5c2acd3b..17141e9b06a8ff7b76959e1fa4da7b494f55e390 100644 (file)
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 SRCREV = "bb1b660c5e3859b6c5a2ac8d739713e9989a4dd7"
 PV = "1.0+git${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 #
 # The cron script attempts to re-prelink the system daily -- on