aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2014-08-28 16:04:21 +0200
committerAndreas Oberritter <obi@opendreambox.org>2015-02-23 17:15:50 +0100
commitdf7aec18f2c6c89e09c8dbca1c757ea794b70869 (patch)
treef5adfeb5f46f2d311875af8b06aa7bd192ed9b15
parent1632da8948d3d29f89ff1c43163dcf4d361a2124 (diff)
downloadopenembedded-core-contrib-df7aec18f2c6c89e09c8dbca1c757ea794b70869.tar.gz
dpkg: simplify replacing perl interpreter in scripts
Target scripts already contain the correct value. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index b010979f5a..d35982e651 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -39,13 +39,11 @@ DPKG_DEB_COMPRESSOR ?= "${@base_contains('PACKAGECONFIG', 'xz', 'xz', 'gzip', d)
EXTRA_OECONF += "--sbindir=${base_sbindir} --with-dpkg-deb-compressor=${DPKG_DEB_COMPRESSOR}"
-do_install_append () {
- if [ "${PN}" = "dpkg-native" ]; then
- sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-*
- else
- sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-*
- fi
+do_install_append_class-native() {
+ sed -i -e 's|^#!${PERL}|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-*
+}
+do_install_append () {
if ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/