Skip to contentSkip to conversation

Uprev prelink

PATCH In review Mark Hatle 2 participants 4 messages Jun 24, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Uprev prelink

Uprev prelink and fix a couple of issues noticed during the process.

The following changes since commit 3aec2fa2df9aaa883feda0d7aed85e63d01398b9:

qemuimagetest: update cvs and iptables to newer version for toolchain test (2011-06-24 11:28:28 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/prelink
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/prelink

Mark Hatle (1):
prelink: Uprev prelink to latest version

 meta/recipes-devtools/prelink/prelink_git.bb |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/1 prelink: Uprev prelink to latest version

The latest cross-prelink version tracks the prelink r190 SVN.

Fix two minor issues as well. If we remove the package, we would unprelink the filesystem after the rm was finished. This is incorrect.. we need to do this prerm.

Also disable the cron configuration file. This isn't appropriate for embedded systems, but someone might still find it useful.

---
 meta/recipes-devtools/prelink/prelink_git.bb |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
meta/recipes-devtools/prelink/prelink_git.bb +13 -5
index 1eea30a..044cb6b 100644
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "909470ee441237563d6236c505cb2d02ddc48704"
+SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
 PV = "1.0+git${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;protocol=git \
            file://prelink.conf \
@@ -35,11 +35,15 @@ do_configure_prepend () {
         echo "all:" > ${S}/doc/Makefile.am
 }
 
+# Disabled the cron and cron configuration file, isn't appropriate for
+# embedded systems.  (The script re-prelinks the system daily -- on
+# systems where users are adding applications, this might be reasonable
+# but for embedded, we should be re-running prelink -a after an update.)
 do_install_append () {
 	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm
 	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
+#	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
+#	install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
 	install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink
 }
 
@@ -53,9 +57,13 @@ fi
 prelink -a
 }
 
-pkg_postrm_prelink() {
+pkg_prerm_prelink() {
 #!/bin/sh
 
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
 prelink -au
 }
 
Signature · 1 line
1.7.3.4
#2 lore raw

Re: [PATCH 1/1] prelink: Uprev prelink to latest version

Op 24 jun 2011, om 21:10 heeft Mark Hatle het volgende geschreven:

Quoted 36 lines

The latest cross-prelink version tracks the prelink r190 SVN.

Fix two minor issues as well. If we remove the package, we would unprelink the filesystem after the rm was finished. This is incorrect.. we need to do this prerm.

Also disable the cron configuration file. This isn't appropriate for embedded systems, but someone might still find it useful.

---
meta/recipes-devtools/prelink/prelink_git.bb | 18 +++++++++++++-----

1 files changed, 13 insertions(+), 5 deletions(-)
meta/recipes-devtools/prelink/prelink_git.bb +0 -0
index 1eea30a..044cb6b 100644
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be resolved at \

runtime and thus programs come up faster."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"

meta/recipes-devtools/prelink/prelink_git.bb +1 -1
-SRCREV = "909470ee441237563d6236c505cb2d02ddc48704"
+SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"

PV = "1.0+git${SRCPV}"

meta/recipes-devtools/prelink/prelink_git.bb +1 -1
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;protocol=git \
           file://prelink.conf \
meta/recipes-devtools/prelink/prelink_git.bb +2 -0
@@ -35,11 +35,15 @@ do_configure_prepend () {
        echo "all:" > ${S}/doc/Makefile.am
 }
 
+# Disabled the cron and cron configuration file, isn't appropriate for
+# embedded systems.  (The script re-prelinks the system daily -- on

meta/recipes-devtools/prelink/prelink_git.bb do_configure_prepend () { · line 47

Quoted 10 lines
meta/recipes-devtools/prelink/prelink_git.bb +4 -2
+# systems where users are adding applications, this might be reasonable
+# but for embedded, we should be re-running prelink -a after an update.)
 do_install_append () {
 	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm
 	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
+#	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
+#	install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
 	install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink

How about PACKAGES += prelink-cron, FILES_prelink-cron = "{sysconfdir}/cron.dailly" ,etc ,etc ?

author
#3 lore raw

Re: [PATCH 1/1] prelink: Uprev prelink to latest version

Quoted 37 lines · Koen Kooi

Op 24 jun 2011, om 21:10 heeft Mark Hatle het volgende geschreven:

Quoted 34 lines

The latest cross-prelink version tracks the prelink r190 SVN.

Fix two minor issues as well. If we remove the package, we would unprelink the filesystem after the rm was finished. This is incorrect.. we need to do this prerm.

Also disable the cron configuration file. This isn't appropriate for embedded systems, but someone might still find it useful.

---
meta/recipes-devtools/prelink/prelink_git.bb | 18 +++++++++++++-----

1 files changed, 13 insertions(+), 5 deletions(-)
meta/recipes-devtools/prelink/prelink_git.bb +0 -0
index 1eea30a..044cb6b 100644
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be resolved at \

runtime and thus programs come up faster."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"

meta/recipes-devtools/prelink/prelink_git.bb +1 -1
-SRCREV = "909470ee441237563d6236c505cb2d02ddc48704"
+SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"

PV = "1.0+git${SRCPV}"

meta/recipes-devtools/prelink/prelink_git.bb +1 -1
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;protocol=git \
           file://prelink.conf \
meta/recipes-devtools/prelink/prelink_git.bb +0 -0
@@ -35,11 +35,15 @@ do_configure_prepend () {
        echo "all:" > ${S}/doc/Makefile.am
 }
 
Quoted 14 lines

meta/recipes-devtools/prelink/prelink_git.bb do_configure_prepend () { · line 47

Quoted 12 lines
meta/recipes-devtools/prelink/prelink_git.bb +6 -2
+# Disabled the cron and cron configuration file, isn't appropriate for
+# embedded systems.  (The script re-prelinks the system daily -- on
+# systems where users are adding applications, this might be reasonable
+# but for embedded, we should be re-running prelink -a after an update.)
 do_install_append () {
 	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm
 	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
+#	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
+#	install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
 	install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink

How about PACKAGES += prelink-cron, FILES_prelink-cron = "{sysconfdir}/cron.dailly" ,etc ,etc ?

I thought about that, but I'm still not sure the stuff is useful.. The default configuration actually disables prelink and on the next run of cron will un-prelink your system.

So it's really not useful from what I can tell. Of course we could easily change the default to "on" instead of off... or change the prelink.bbclass to enable the cron prelink script if it exists.... but as it stands it looks more broken then useful.

--Mark