Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andreas Oberritter <obi@opendreambox.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 27/33] dpkg: simplify replacing perl interpreter in scripts
Date: Tue,  6 Dec 2016 12:49:45 +0100	[thread overview]
Message-ID: <1481024991-5882-28-git-send-email-obi@opendreambox.org> (raw)
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>

Target scripts already contain the correct value.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 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



  parent reply	other threads:[~2016-12-06 11:50 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-06 11:49 [PATCH 00/33] Accumulated patches for deb packaging Andreas Oberritter
2016-12-06 11:49 ` [PATCH 01/33] dpkg: implement offline mode for update-alternatives Andreas Oberritter
2016-12-06 18:31   ` Burton, Ross
2016-12-06 11:49 ` [PATCH 02/33] dpkg: update-alternatives-dpkg should conflict with other providers Andreas Oberritter
2016-12-06 19:52   ` Burton, Ross
2016-12-07  1:30     ` Andreas Oberritter
2016-12-08 16:16       ` Burton, Ross
2016-12-08 19:22         ` Andreas Oberritter
2016-12-22 13:37           ` Andreas Oberritter
2016-12-06 11:49 ` [PATCH 03/33] dpkg-native: hardcode SYSCONFDIR to /etc in update-alternatives Andreas Oberritter
2016-12-06 15:39   ` Burton, Ross
2016-12-06 16:08     ` Andreas Oberritter
2016-12-06 16:12       ` Burton, Ross
2016-12-06 16:37         ` Andreas Oberritter
2016-12-06 17:07           ` Burton, Ross
2016-12-06 11:49 ` [PATCH 04/33] apt-native: Use option --force-script-chrootless for rootfs Andreas Oberritter
2016-12-06 11:49 ` [PATCH 05/33] package_manager/deb: pass option --force-script-chrootless to dpkg Andreas Oberritter
2016-12-06 11:49 ` [PATCH 06/33] debianutils: Allow native builds Andreas Oberritter
2016-12-06 11:49 ` [PATCH 07/33] apt-native: merge apt-native.inc into .bb Andreas Oberritter
2016-12-06 11:49 ` [PATCH 08/33] apt: merge apt-package.inc " Andreas Oberritter
2016-12-06 11:49 ` [PATCH 09/33] apt-native: use sed to prepare apt.conf.sample Andreas Oberritter
2016-12-06 11:49 ` [PATCH 10/33] apt: use default packaging rules for manpages Andreas Oberritter
2016-12-06 11:49 ` [PATCH 11/33] apt: use default packaging rules for base package, prepend apt-utils Andreas Oberritter
2016-12-06 11:49 ` [PATCH 12/33] apt: use default packaging rules for -dev package Andreas Oberritter
2016-12-06 11:49 ` [PATCH 13/33] apt: rewrite do_install Andreas Oberritter
2016-12-06 11:49 ` [PATCH 14/33] apt-native: drop obsolete patches Andreas Oberritter
2016-12-06 11:49 ` [PATCH 15/33] apt: merge with apt-native Andreas Oberritter
2016-12-06 11:49 ` [PATCH 16/33] apt: merge apt.inc into .bb Andreas Oberritter
2016-12-06 11:49 ` [PATCH 17/33] apt: group variables (license, configuration, packaging) Andreas Oberritter
2016-12-06 11:49 ` [PATCH 18/33] apt: more fine-grained packaging Andreas Oberritter
2016-12-06 11:49 ` [PATCH 19/33] apt: recommend gnupg Andreas Oberritter
2016-12-06 11:49 ` [PATCH 20/33] package_manager/deb: let apt-get handle postinst scripts Andreas Oberritter
2016-12-06 17:26   ` Burton, Ross
2016-12-06 18:20     ` Andreas Oberritter
2016-12-06 18:24       ` Burton, Ross
2016-12-06 11:49 ` [PATCH 21/33] package_manager/deb: create Packages.xz Andreas Oberritter
2016-12-06 17:22   ` Burton, Ross
2016-12-06 18:41     ` Andreas Oberritter
2016-12-06 18:46       ` Burton, Ross
2016-12-07  1:24         ` Andreas Oberritter
2016-12-06 11:49 ` [PATCH 22/33] package_manager/deb: implement BAD_RECOMMENDATIONS Andreas Oberritter
2016-12-06 11:49 ` [PATCH 23/33] dpkg: use PACKAGECONFIG Andreas Oberritter
2016-12-06 11:49 ` [PATCH 24/33] dpkg: set license field to more common "GPLv2+" Andreas Oberritter
2016-12-06 11:49 ` [PATCH 25/33] dpkg: clean-up packaging of start-stop-daemon Andreas Oberritter
2016-12-06 11:49 ` [PATCH 26/33] dpkg: remove unneeded do_configure override Andreas Oberritter
2016-12-06 11:49 ` Andreas Oberritter [this message]
2016-12-06 11:49 ` [PATCH 28/33] dpkg: update packages and files to match Debian more closely Andreas Oberritter
2016-12-06 20:13   ` Burton, Ross
2016-12-07  1:41     ` Andreas Oberritter
2016-12-06 11:49 ` [PATCH 29/33] dpkg: always install dpkg-configure.service Andreas Oberritter
2016-12-06 11:49 ` [PATCH 30/33] dpkg: use correct path for perl libraries Andreas Oberritter
2016-12-06 11:49 ` [PATCH 31/33] package_deb.bbclass: compress control.tar with the same algorithm as data.tar Andreas Oberritter
2016-12-06 11:49 ` [PATCH 32/33] apt: fix rpath error during configure Andreas Oberritter
2016-12-06 11:49 ` [PATCH 33/33] apt: dselect depends on perl Andreas Oberritter
2016-12-06 14:36 ` [PATCH 00/33] Accumulated patches for deb packaging Burton, Ross
2016-12-06 16:00   ` Andreas Oberritter
2016-12-07 12:25 ` Alexander Kanavin
2016-12-07 15:30   ` Andreas Oberritter
2016-12-07 16:02     ` Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1481024991-5882-28-git-send-email-obi@opendreambox.org \
    --to=obi@opendreambox.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox