Openembedded Devel Discussions
 help / color / mirror / Atom feed
* Re: [PATCH] prelink: Added prelink-20100106, which works on ARM.
@ 2011-06-15  9:18 James Limbouris
  2011-06-15 14:08 ` Mark Hatle
  0 siblings, 1 reply; 9+ messages in thread
From: James Limbouris @ 2011-06-15  9:18 UTC (permalink / raw)
  To: openembedded-devel@lists.openembedded.org

On Tue, 14 Jun 2011 22:20:18 -0500, Mark Hatle wrote:
> On 6/14/11 10:02 PM, Mark Hatle wrote:
> > Have you looked at:
> >
> > http://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/
> >
> > As far as I'm aware, this version works properly for all of the expected
> > targets, including ARM.
> >
> > If it doesn't work, someone should submit a patch to the maintainer (me)
> and
> > we'll get things resolved.
> >
> > The Yocto prelinker contains both local (on-target) as well as cross-
> prelinking
> > support... (This is already integrated into oe-core)
> 
> Forgot to note, look at the cross_prelink branch.  This is the head of tree for
> the embedded items.  The "master" is a mirror of the current SVN tree from
> Jakub
> Jelinek.
> 
> The ld-linux... patch hunk is already there, and in a better shape then the one
> proposed.  Both the ld-linux.so.2 and ld-linux.so.3 are supported.
> 
> > --Mark

Hi,

Thanks for the link - looks like the right way to go. Would it be a waste of time to copy
the oe-core prelink and elfutils to vanilla oe? I'm a little confused about the relationship
between the two branches, and the status of oe-core. Should I be working with local
overlays, until things stabilise, or trying to push changes across?

James




^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] prelink: Added prelink-20100106, which works on ARM.
@ 2011-06-15  1:33 James Limbouris
  0 siblings, 0 replies; 9+ messages in thread
From: James Limbouris @ 2011-06-15  1:33 UTC (permalink / raw)
  To: openembedded-devel@lists.openembedded.org

On Tue, 14 Jun 2011 14:37:53 +0200, Paul Menzel wrote:
> Am Dienstag, den 14.06.2011, 15:49 +0800 schrieb James Limbouris:
> > This version of prelink, together with a patch by
> > Carsten Munk <carsten@maemo.org>, taken from MeeGo,
> > fixes an ARM incompatibility with 20090925.
> >
> > Signed-off-by: James Limbouris <james@digitalmatter.com.au>
> 
> What build configuration do you use for testing? Using `angstrom-2010.x`
> or `minimal{,-uclibc}` for `MACHINE = "beagleboard"` `elfutils_0.143.bb`
> does not even compile.
> 
> With ?ngstr?m the error is the following.
> 
> | strip.c: In function 'process_file':
> | strip.c:301:7: error: implicit declaration of function 'stat64'
> | strip.c:335:3: error: implicit declaration of function 'fstat64'
> | strip.c:356:63: error: 'ACCESSPERMS' undeclared (first use in this function)
> | strip.c:356:63: note: each undeclared identifier is reported only once for
> each function it appears in
> | strip.c: In function 'handle_elf':
> | strip.c:1641:4: error: implicit declaration of function 'fchmod'
> | make[2]: *** [strip.o] Error 1
> 
> 
> Thanks,
> 
> Paul

Hi,

I had the same problem, but I thought it might just be my build system so I didn't supply a patch.
The solution was to use elfutils from oe-core. I've just submitted a patch for it now.

I'm using angstrom-2010.x on a Freescale iMX25 based machine.
Is there a suggested / required testing config for submitting patches?

Regards,
James



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] prelink: Added prelink-20100106, which works on ARM.
@ 2011-06-14  7:49 James Limbouris
  2011-06-14  9:16 ` Phil Blundell
  2011-06-14 12:37 ` Paul Menzel
  0 siblings, 2 replies; 9+ messages in thread
From: James Limbouris @ 2011-06-14  7:49 UTC (permalink / raw)
  To: openembedded-devel; +Cc: James Limbouris

This version of prelink, together with a patch by
Carsten Munk <carsten@maemo.org>, taken from MeeGo,
fixes an ARM incompatibility with 20090925.

Signed-off-by: James Limbouris <james@digitalmatter.com.au>
---
 .../prelink-20100106-arm-fix.patch                 |   86 ++++++++++++++++++++
 recipes/prelink/prelink_20100106.bb                |   53 ++++++++++++
 2 files changed, 139 insertions(+), 0 deletions(-)
 create mode 100755 recipes/prelink/prelink-20100106/prelink-20100106-arm-fix.patch
 create mode 100644 recipes/prelink/prelink_20100106.bb

diff --git a/recipes/prelink/prelink-20100106/prelink-20100106-arm-fix.patch b/recipes/prelink/prelink-20100106/prelink-20100106-arm-fix.patch
new file mode 100755
index 0000000..a694541
--- /dev/null
+++ b/recipes/prelink/prelink-20100106/prelink-20100106-arm-fix.patch
@@ -0,0 +1,86 @@
+diff -ru prelink-old/src/arch-arm.c prelink/src/arch-arm.c
+--- prelink-old/src/arch-arm.c	2009-06-15 07:37:50.000000000 -0400
++++ prelink/src/arch-arm.c	2010-08-17 03:35:05.000000000 -0400
+@@ -832,7 +832,7 @@
+   .R_COPY = R_ARM_COPY,
+   .R_RELATIVE = R_ARM_RELATIVE,
+   .rtype_class_valid = RTYPE_CLASS_VALID,
+-  .dynamic_linker = "/lib/ld-linux.so.2",
++  .dynamic_linker = "/lib/ld-linux.so.3",
+   .adjust_dyn = arm_adjust_dyn,
+   .adjust_rel = arm_adjust_rel,
+   .adjust_rela = arm_adjust_rela,
+diff -ru prelink-old/src/execle_open.c prelink/src/execle_open.c
+--- prelink-old/src/execle_open.c	2006-08-13 11:18:17.000000000 -0400
++++ prelink/src/execle_open.c	2010-08-18 03:52:51.000000000 -0400
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ static pid_t pid;
+ 
+@@ -32,6 +33,7 @@
+ 
+   if (f != NULL)
+     fclose (f);
++    
+   while ((p = waitpid (pid, &status, 0)) == -1 && errno == EINTR);
+   if (p == -1 || ! WIFEXITED (status))
+     return -1;
+@@ -50,7 +52,7 @@
+       return NULL;
+     }
+ 
+-  switch (vfork ())
++  switch (pid=fork ())
+     {
+     case -1:
+       error (0, errno, "Could not run %s", path);
+@@ -63,7 +65,9 @@
+ 	  close (p[1]);
+ 	}
+       dup2 (1, 2);
+-      execve (path, argv, envp);
++      while (*envp) 
++        putenv(*envp++);
++      execv (path, argv);
+       _exit (127);
+     }
+ 
+diff -ru prelink-old/src/gather.c prelink/src/gather.c
+--- prelink-old/src/gather.c	2008-10-09 16:31:03.000000000 -0400
++++ prelink/src/gather.c	2010-08-17 04:45:53.000000000 -0400
+@@ -208,7 +208,8 @@
+ 		      goto error_out;
+ 		    }
+ 		}
+-	      error (0, 0, "%s: Could not parse `%s'", ent->filename, line);
++	      /* This is not an error situation: error (0, 0, "%s: Could7 not parse `%s'", ent->filename, line); */
++	      continue;
+ 	    }
+ 	  goto error_out;
+ 	}
+diff -ru prelink-old/src/get.c prelink/src/get.c
+--- prelink-old/src/get.c	2009-06-12 08:01:48.000000000 -0400
++++ prelink/src/get.c	2010-08-17 04:29:14.000000000 -0400
+@@ -30,6 +30,7 @@
+ is_ldso_soname (const char *soname)
+ {
+   if (! strcmp (soname, "ld-linux.so.2")
++      || ! strcmp (soname, "ld-linux.so.3")
+       || ! strcmp (soname, "ld.so.1")
+       || ! strcmp (soname, "ld-linux-ia64.so.2")
+       || ! strcmp (soname, "ld-linux-x86-64.so.2")
+diff -ru prelink-old/testsuite/movelibs.sh prelink/testsuite/movelibs.sh
+--- prelink-old/testsuite/movelibs.sh	2009-12-16 06:57:31.000000000 -0500
++++ prelink/testsuite/movelibs.sh	2010-08-18 03:10:19.000000000 -0400
+@@ -6,6 +6,7 @@
+ > syslib.list
+ > syslnk.list
+ for i in `LD_TRACE_PRELINKING=1 LD_WARN= LD_TRACE_LOADED_OBJECTS=1 ./movelibs \
++	  | grep " => " \
+ 	  | awk '$1 !~ /^\.\/movelibs/ { print $3 } '`; do
+   k=`basename $i`
+   if [ -L $i ]; then
diff --git a/recipes/prelink/prelink_20100106.bb b/recipes/prelink/prelink_20100106.bb
new file mode 100644
index 0000000..3fd9f64
--- /dev/null
+++ b/recipes/prelink/prelink_20100106.bb
@@ -0,0 +1,53 @@
+SECTION = "devel"
+DEPENDS = "elfutils"
+DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \
+and executables, so that far fewer relocations need to be resolved at \
+runtime and thus programs come up faster."
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://people.redhat.com/jakub/prelink/${P}.tar.bz2 \
+           file://prelink.conf \
+           file://prelink.cron.daily \
+           file://prelink.default \
+           file://prelink-20100106-arm-fix.patch \
+"
+
+S = "${WORKDIR}/prelink"
+
+EXTRA_OECONF = "--disable-64bit"
+
+inherit autotools
+
+do_compile_prepend () {
+	sed -i -e 's:prelink_LDFLAGS = -all-static:#prelink_LDFLAGS = -all-static:g' src/Makefile
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
+	install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
+	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
+	install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
+}
+
+pkg_postinst_prelink() {
+#!/bin/sh
+
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+. ${sysconfdir}/cron.daily/prelink
+}
+
+pkg_prerm_prelink() {
+#!/bin/sh
+
+if [ -f ${sysconfdir}/prelink.cache ]; then
+    prelink -au
+    rm -f ${sysconfdir}/prelink.cache
+fi
+}
+
+SRC_URI[md5sum] = "56e2a1b5a478795352bf6e4d2bc6e0ab"
+SRC_URI[sha256sum] = "6aea85b672f2689b52a75e36a5e06fdc9b338e8d2935692dbb0fc61c83491125"
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-06-15 14:12 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15  9:18 [PATCH] prelink: Added prelink-20100106, which works on ARM James Limbouris
2011-06-15 14:08 ` Mark Hatle
  -- strict thread matches above, loose matches on Subject: below --
2011-06-15  1:33 James Limbouris
2011-06-14  7:49 James Limbouris
2011-06-14  9:16 ` Phil Blundell
2011-06-15  1:16   ` James Limbouris
2011-06-15  3:02     ` Mark Hatle
2011-06-15  3:20       ` Mark Hatle
2011-06-14 12:37 ` Paul Menzel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox