]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
dpkg: drop the usage of create_wrapper
authorRoss Burton <ross.burton@intel.com>
Wed, 12 Jun 2013 16:21:29 +0000 (17:21 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 13 Jun 2013 16:37:58 +0000 (17:37 +0100)
create_wrapper was previously abused to invoke the Perl interpretter directly
instead of relying on #! parsing, which is read into a 128 byte buffer so breaks
with deep build directories.

However we already install a "nativeperl" binary into the native sysroot, so
use sed to change the #! line to /usr/bin/env nativeperl.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-devtools/dpkg/dpkg.inc

index 28c4f89d5caa3a9e1f2b38ef94a93ce7212de782..b9d4da18f344328c4536c781b1eeebdbaec2b626 100644 (file)
@@ -45,21 +45,13 @@ 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|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-*
        else
                mv ${D}${bindir}/update-alternatives ${D}${sbindir}
                sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-*
        fi
 }
 
-# Create a wrapper for the perl script to avoid the "bad interpreter"
-# error when the tmpdir is longer than 150.
-do_install_append_class-native () {
-       tmp=`find ${D}${bindir} -type f -exec grep -m 1 -l '#!/.*/perl-native/perl' {} \;`
-       for i in $tmp; do
-               create_wrapper $i ${STAGING_BINDIR_NATIVE}/perl-native/perl
-       done
-}
-
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ] && [ -f $D/var/lib/dpkg/status ]; then