Skip to contentSkip to conversation

Minor fixes

PATCH Applied Tom Rini 2 participants 4 messages May 16, 2011 – May 17, 2011

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

cover Minor fixes

The following series brings in two minor fixups I've pushed into openembedded master recently. openssh was being silly and using ${libdir}exec rather than ${libexecdir} and we weren't wrapping perl${PV} which breaks relocated caches where perl-native exists and perl doesn't.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: trini/minor-fixes-16may2011
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/minor-fixes-16may2011

Thanks,
Tom Rini <[email protected]>
---

Tom Rini (2):
openssh: Don't use ${libdir}exec
perl-native: create_wrapper on perl${PV} too

 meta/recipes-connectivity/openssh/openssh_5.6p1.bb |    4 ++--
 meta/recipes-devtools/perl/perl-native_5.12.3.bb   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
author
#1 lore raw

PATCH 1/2 openssh: Don't use ${libdir}exec

This is 1259e0289ce53198cc6c57a9616c8a1623be502a in OE.

Signed-off-by Tom Rini <[email protected]>
---
 meta/recipes-connectivity/openssh/openssh_5.6p1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssh/openssh_5.6p1.bb +2 -2
index d93a773..df7fcad 100644
@@ -75,8 +75,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
 FILES_${PN}-sftp = "${bindir}/sftp"
-FILES_${PN}-sftp-server = "${libdir}exec/sftp-server"
-FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
+FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
+FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
 FILES_${PN}-keygen = "${bindir}/ssh-keygen"
 
 RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/2 perl-native: create_wrapper on perl${PV} too

In reply to Tom Rini

perl${PV} becomes hostperl when building for the target so we need a wrapper on that too.

This is 1e255fbd296e95ff178d66c4a1fe4875a988d7e1 in OE.

Signed-off-by Tom Rini <[email protected]>
---
 meta/recipes-devtools/perl/perl-native_5.12.3.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-devtools/perl/perl-native_5.12.3.bb +2 -1
index 0476bdf..c5cd13c 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"

@@ -97,6 +97,7 @@ do_install () {
 	done
 
 	create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
+	create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
 }
 do_install_append_nylon() {
 	# get rid of definitions not supported by the gcc version we use for nylon...
Signature · 1 line
1.7.0.4
Applied
#3 lore raw
In reply to Tom Rini
Quoted 23 lines · Tom Rini

The following series brings in two minor fixups I've pushed into openembedded master recently. openssh was being silly and using ${libdir}exec rather than ${libexecdir} and we weren't wrapping perl${PV} which breaks relocated caches where perl-native exists and perl doesn't.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: trini/minor-fixes-16may2011
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/minor-fixes-16may2011

Thanks,
Tom Rini<[email protected]>
---

Tom Rini (2):

   openssh: Don't use ${libdir}exec
   perl-native: create_wrapper on perl${PV} too
  meta/recipes-connectivity/openssh/openssh_5.6p1.bb |    4 ++--
  meta/recipes-devtools/perl/perl-native_5.12.3.bb   |    3 ++-
  2 files changed, 4 insertions(+), 3 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!