Perl path contamination fixes

PATCH New Richard Purdie 1 participant 4 messages Sep 26, 2011

lore

Share & tools

lore

Richard Purdie

author

2011-09-26 14:50 UTC #0 lore raw

cover Perl path contamination fixes

The following changes since commit ed2a606909b9490ac57a3ad3db7a15e83a8664f9:

neon: Add libproxy to DEPENDS to ensure determinstic builds (2011-09-25 15:54:55 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rpurdie/master2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/master2

and fix perl path contamination issues from the build system.

Richard Purdie (3):
openssl: Ensure perl scripts reference the correct perl
util-linux: Ensure perl scripts reference the correct perl
mc: Ensure perl scripts reference the correct perl

Richard Purdie

author

2011-09-26 14:50 UTC #1 lore raw

PATCH 1/3 openssl: Ensure perl scripts reference the correct perl

Without this change the perl path from the build system is used.

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-connectivity/openssl/openssl.inc      |    1 +
 .../recipes-connectivity/openssl/openssl_0.9.8r.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-connectivity/openssl/openssl.inc +1 -0

index 88d5081..f3ada13 100644
@@ -112,4 +112,5 @@ do_install () {
 	chmod 644 ${D}${libdir}/pkgconfig/openssl.pc
 	oe_libinstall -so libcrypto ${D}${libdir}
 	oe_libinstall -so libssl ${D}${libdir}
+	sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
 }

meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +1 -1

index 54bdcc2..5add70e 100644
@@ -1,6 +1,6 @@
 require openssl.inc
 
-PR = "r5"
+PR = "r6"
 SRC_URI += "file://debian/ca.patch \
             file://debian/config-hurd.patch;apply=no \
             file://debian/debian-targets.patch \

Signature · 1 line

1.7.5.4

Richard Purdie

author

2011-09-26 14:50 UTC #2 lore raw

PATCH 2/3 util-linux: Ensure perl scripts reference the correct perl

In reply to Richard Purdie

Without this change the perl path from the build system is used.

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-core/util-linux/util-linux_2.19.1.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

meta/recipes-core/util-linux/util-linux_2.19.1.bb +5 -1

index d6d6f9b..5b327cb 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r4"
+PR = "r5"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+

@@ -44,3 +44,7 @@ addtask remove_lscpu before do_configure after do_patch
 # we need to disable it for older versions
 EXTRA_OECONF += "ac_cv_func_fallocate=no"
 EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
+
+do_install_append () {
+	sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe
+}

Signature · 1 line

1.7.5.4

Richard Purdie

author

2011-09-26 14:50 UTC #3 lore raw

PATCH 3/3 mc: Ensure perl scripts reference the correct perl

In reply to Richard Purdie

Without this change the perl path from the build system is used.

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-extended/mc/mc_4.7.5.2.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

meta/recipes-extended/mc/mc_4.7.5.2.bb +6 -1

index 6b03be7..59f32ad 100644
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 DEPENDS = "ncurses glib-2.0"
 RDEPENDS_${PN} = "ncurses-terminfo"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"

@@ -18,3 +18,8 @@ inherit autotools gettext
 EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without-samba"
 
 FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
+
+do_install_append () {
+       sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/*
+       
+}

Signature · 1 line

1.7.5.4