diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-04-06 03:05:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-10 23:00:43 +0100 |
commit | 607bc5958816624731ed2258dd4cdaef7d20d5df (patch) | |
tree | 301fb6917e291aeec2216f4423b677affd4c747b | |
parent | 7daf525d3772636430818c0e33befd97f03e88c6 (diff) | |
download | poky-607bc5958816624731ed2258dd4cdaef7d20d5df.tar.gz |
autogen-native: fix POSIX_SHELL and perl
The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h:
#define BINPRM_BUF_SIZE 128
So there would be errors when /path/to/hosttools/perl is longer than 128.
This patch fixes the problem when POSIX_SHELL and perl are used as the interpreters.
(From OE-Core rev: 055838283349530e6f60f4169d9190aa5b59b190)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/autogen/autogen-native_5.18.12.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb index 0004389b11..853477cf7c 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ | |||
13 | file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ | 13 | file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ |
14 | file://fix-script-err-when-processing-libguile.patch \ | 14 | file://fix-script-err-when-processing-libguile.patch \ |
15 | file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ | 15 | file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ |
16 | file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" | 19 | SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" |
@@ -30,6 +31,8 @@ inherit autotools texinfo native pkgconfig | |||
30 | export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" | 31 | export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" |
31 | export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" | 32 | export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" |
32 | 33 | ||
34 | export POSIX_SHELL = "/usr/bin/env sh" | ||
35 | |||
33 | do_install_append () { | 36 | do_install_append () { |
34 | create_wrapper ${D}/${bindir}/autogen \ | 37 | create_wrapper ${D}/${bindir}/autogen \ |
35 | GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ | 38 | GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ |
diff --git a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch new file mode 100644 index 0000000000..d5fe143ce4 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 13 Mar 2017 20:33:30 -0700 | ||
4 | Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path | ||
5 | |||
6 | Use "which perl" as shebang doesn't work when it is longer than | ||
7 | BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to | ||
8 | instead of. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | --- | ||
14 | autoopts/mk-tpl-config.sh | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh | ||
18 | index 093e808..8dfc6dd 100755 | ||
19 | --- a/autoopts/mk-tpl-config.sh | ||
20 | +++ b/autoopts/mk-tpl-config.sh | ||
21 | @@ -98,7 +98,7 @@ fix_scripts() { | ||
22 | st=`sed 1q $f` | ||
23 | |||
24 | case "$st" in | ||
25 | - *perl ) echo '#!' `which perl` | ||
26 | + *perl ) echo '#!/usr/bin/env perl' | ||
27 | sed 1d $f | ||
28 | ;; | ||
29 | |||
30 | -- | ||
31 | 2.10.2 | ||
32 | |||