diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-24 09:08:18 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-25 21:53:44 +0000 |
| commit | b9751b21f4234854f8750f1048bb54f578bd95d3 (patch) | |
| tree | ee51129d491ec0373fe1aec551fa7925a615c8aa | |
| parent | 54ddaef8eb90998c3256a3454450fd2e1aa250d2 (diff) | |
| download | openembedded-core-contrib-b9751b21f4234854f8750f1048bb54f578bd95d3.tar.gz | |
dpkg: replace a patch with a tweak to an already existing sed fixup
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 2 insertions, 26 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 74074cfdd7..80865a31a1 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -49,9 +49,9 @@ do_install:append () { if [ "${PN}" = "dpkg-native" ]; then # update-alternatives doesn't have an offline mode rm ${D}${bindir}/update-alternatives - sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* ${D}${sbindir}/dpkg-* else - sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* ${D}${sbindir}/dpkg-* fi } diff --git a/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch b/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch deleted file mode 100644 index 292b72ab5d..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0decc62904571582147f2273fa1b521e00485dda Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 3 Feb 2021 20:47:58 +0100 -Subject: [PATCH] scripts/dpkg-fsys-usrunmess.pl: correct shebang - -Otherwise automake will write the full native perl path into it. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - scripts/dpkg-fsys-usrunmess.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/dpkg-fsys-usrunmess.pl b/scripts/dpkg-fsys-usrunmess.pl -index 9220df3c0..9ce368955 100755 ---- a/scripts/dpkg-fsys-usrunmess.pl -+++ b/scripts/dpkg-fsys-usrunmess.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/env perl - # - # dpkg-fsys-usrunmess - Undoes the merged-/usr-via-aliased-dirs mess - # diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb index 34b6bfe0a8..4c587f2bf2 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb @@ -14,7 +14,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20. file://0001-dpkg-Support-muslx32-build.patch \ file://pager.patch \ file://0001-Add-support-for-riscv32-CPU.patch \ - file://0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch \ file://0014-arch-Add-support-for-ARCv2-CPU.patch \ " |