| Submitter | Kumar Gala |
|---|---|
| Date | Aug. 4, 2011, 4:03 a.m. |
| Message ID | <1312430603-5629-1-git-send-email-galak@kernel.crashing.org> |
| Download | mbox | patch |
| Permalink | /patch/9291/ |
| State | New, archived |
| Headers | show |
Comments
On 8/3/11 11:03 PM, Kumar Gala wrote: > We might redefine ${base_libdir} from being set to just /lib. > > Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Only tangentially related to this patch.. It doesn't appear mklibs has knowledge of multilibs.. but I don't think anyone would use mklibs with a multilib environment. So something we might want to add is a warning that mklibs and multilibs don't work together. --Mark > --- > meta/classes/image-mklibs.bbclass | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass > index d6630c4..69dac2f 100644 > --- a/meta/classes/image-mklibs.bbclass > +++ b/meta/classes/image-mklibs.bbclass > @@ -17,19 +17,19 @@ mklibs_optimize_image_doit() { > > case ${TARGET_ARCH} in > powerpc | mips | microblaze ) > - dynamic_loader="/lib/ld.so.1" > + dynamic_loader="${base_libdir}/ld.so.1" > ;; > powerpc64) > dynamic_loader="${base_libdir}/ld64.so.1" > ;; > x86_64) > - dynamic_loader="/lib/ld-linux-x86-64.so.2" > + dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" > ;; > i586 ) > - dynamic_loader="/lib/ld-linux.so.2" > + dynamic_loader="${base_libdir}/ld-linux.so.2" > ;; > arm ) > - dynamic_loader="/lib/ld-linux.so.3" > + dynamic_loader="${base_libdir}/ld-linux.so.3" > ;; > * ) > dynamic_loader="/unknown_dynamic_linker"
On 08/03/2011 09:03 PM, Kumar Gala wrote: > We might redefine ${base_libdir} from being set to just /lib. > > Signed-off-by: Kumar Gala<galak@kernel.crashing.org> > --- > meta/classes/image-mklibs.bbclass | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass > index d6630c4..69dac2f 100644 > --- a/meta/classes/image-mklibs.bbclass > +++ b/meta/classes/image-mklibs.bbclass > @@ -17,19 +17,19 @@ mklibs_optimize_image_doit() { > > case ${TARGET_ARCH} in > powerpc | mips | microblaze ) > - dynamic_loader="/lib/ld.so.1" > + dynamic_loader="${base_libdir}/ld.so.1" > ;; > powerpc64) > dynamic_loader="${base_libdir}/ld64.so.1" > ;; > x86_64) > - dynamic_loader="/lib/ld-linux-x86-64.so.2" > + dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" > ;; > i586 ) > - dynamic_loader="/lib/ld-linux.so.2" > + dynamic_loader="${base_libdir}/ld-linux.so.2" > ;; > arm ) > - dynamic_loader="/lib/ld-linux.so.3" > + dynamic_loader="${base_libdir}/ld-linux.so.3" > ;; > * ) > dynamic_loader="/unknown_dynamic_linker" Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index d6630c4..69dac2f 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -17,19 +17,19 @@ mklibs_optimize_image_doit() { case ${TARGET_ARCH} in powerpc | mips | microblaze ) - dynamic_loader="/lib/ld.so.1" + dynamic_loader="${base_libdir}/ld.so.1" ;; powerpc64) dynamic_loader="${base_libdir}/ld64.so.1" ;; x86_64) - dynamic_loader="/lib/ld-linux-x86-64.so.2" + dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" ;; i586 ) - dynamic_loader="/lib/ld-linux.so.2" + dynamic_loader="${base_libdir}/ld-linux.so.2" ;; arm ) - dynamic_loader="/lib/ld-linux.so.3" + dynamic_loader="${base_libdir}/ld-linux.so.3" ;; * ) dynamic_loader="/unknown_dynamic_linker"
We might redefine ${base_libdir} from being set to just /lib. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/classes/image-mklibs.bbclass | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)