From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.saftware.de (mail.saftware.de [83.141.3.46]) by mail.openembedded.org (Postfix) with ESMTP id 105CC6059F for ; Tue, 6 Dec 2016 11:50:12 +0000 (UTC) Received: by t510.zcs.saftware.de (Postfix, from userid 1000) id 7AA26B89009; Tue, 6 Dec 2016 12:49:54 +0100 (CET) From: Andreas Oberritter To: openembedded-core@lists.openembedded.org Date: Tue, 6 Dec 2016 12:49:45 +0100 Message-Id: <1481024991-5882-28-git-send-email-obi@opendreambox.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org> References: <1481024991-5882-1-git-send-email-obi@opendreambox.org> Subject: [PATCH 27/33] dpkg: simplify replacing perl interpreter in scripts X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2016 11:50:12 -0000 Target scripts already contain the correct value. Signed-off-by: Andreas Oberritter --- meta/recipes-devtools/dpkg/dpkg.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index ff59f50..5e838ed 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -41,13 +41,11 @@ do_configure_prepend_class-native() { sed -i -e 's|SYSCONFDIR|"/etc"|' ${S}/utils/update-alternatives.c } -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 ${@bb.utils.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/ -- 2.7.4