Patchwork prelink: Add lib64 dirs to prelink.conf

login
register
mail settings
Submitter Kumar Gala
Date Aug. 4, 2011, 6:05 a.m.
Message ID <1312437938-29860-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/9293/
State New, archived
Headers show

Comments

Kumar Gala - Aug. 4, 2011, 6:05 a.m.
Handle multlib or cases that baselib is lib64.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/recipes-devtools/prelink/prelink/prelink.conf |    8 ++++----
 meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
Mark Hatle - Aug. 4, 2011, 3:07 p.m.
On 8/4/11 1:05 AM, Kumar Gala wrote:
> Handle multlib or cases that baselib is lib64.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Acked-by: Mark Hatle <mark.hatle@windriver.com>

(BTW I think as we move more into the multilib stuff, we'll likely want to
generate this list from the final multilib configuration.. but for now this
should be good.)

> ---
>  meta/recipes-devtools/prelink/prelink/prelink.conf |    8 ++++----
>  meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
> index c5a4f4a..ed30c28 100644
> --- 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
> --l /lib
> --l /usr/lib
> --l /usr/X11R6/lib
> +-l /usr/local/lib{,64}
> +-l /lib{,64}
> +-l /usr/lib{,64}
> +-l /usr/X11R6/lib{,64}
> diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
> index c653d4d..bb95da7 100644
> --- 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 = "ac461e73b17253a4da25c5aafeac7193b553156c"
>  PV = "1.0+git${SRCPV}"
> -PR = "r4"
> +PR = "r5"
>  
>  #
>  # The cron script attempts to re-prelink the system daily -- on
Saul Wold - Aug. 5, 2011, 9:27 p.m.
On 08/03/2011 11:05 PM, Kumar Gala wrote:
> Handle multlib or cases that baselib is lib64.
>
> Signed-off-by: Kumar Gala<galak@kernel.crashing.org>
> ---
>   meta/recipes-devtools/prelink/prelink/prelink.conf |    8 ++++----
>   meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
> index c5a4f4a..ed30c28 100644
> --- 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
> --l /lib
> --l /usr/lib
> --l /usr/X11R6/lib
> +-l /usr/local/lib{,64}
> +-l /lib{,64}
> +-l /usr/lib{,64}
> +-l /usr/X11R6/lib{,64}
> diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
> index c653d4d..bb95da7 100644
> --- 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 = "ac461e73b17253a4da25c5aafeac7193b553156c"
>   PV = "1.0+git${SRCPV}"
> -PR = "r4"
> +PR = "r5"
>
>   #
>   # The cron script attempts to re-prelink the system daily -- on

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
index c5a4f4a..ed30c28 100644
--- 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
--l /lib
--l /usr/lib
--l /usr/X11R6/lib
+-l /usr/local/lib{,64}
+-l /lib{,64}
+-l /usr/lib{,64}
+-l /usr/X11R6/lib{,64}
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index c653d4d..bb95da7 100644
--- 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 = "ac461e73b17253a4da25c5aafeac7193b553156c"
 PV = "1.0+git${SRCPV}"
-PR = "r4"
+PR = "r5"
 
 #
 # The cron script attempts to re-prelink the system daily -- on