diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-01 10:27:11 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:39 -0400 |
commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 (patch) | |
tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 /import-layers/yocto-poky/meta/recipes-devtools/autogen | |
parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 (diff) | |
download | blackbird-openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.tar.gz blackbird-openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.zip |
Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/autogen')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb (renamed from import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb) | 8 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch | 39 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 |
3 files changed, 77 insertions, 2 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb index 274427c7e..853477cf7 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb @@ -12,10 +12,12 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://increase-timeout-limit.patch \ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ file://fix-script-err-when-processing-libguile.patch \ + file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ + file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \ " -SRC_URI[md5sum] = "2d1b5226e1929d0680011df631289571" -SRC_URI[sha256sum] = "0b8681d9724c481d3b726b5a9e81d3d09dc7f307d1a801c76d0a30d8f843d20a" +SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" +SRC_URI[sha256sum] = "805c20182f3cb0ebf1571d3b01972851c56fb34348dfdc38799fd0ec3b2badbe" UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/" UPSTREAM_CHECK_REGEX = "rel(?P<pver>\d+(\.\d+)+)/" @@ -29,6 +31,8 @@ inherit autotools texinfo native pkgconfig export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" +export POSIX_SHELL = "/usr/bin/env sh" + do_install_append () { create_wrapper ${D}/${bindir}/autogen \ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch new file mode 100644 index 000000000..a14018e33 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch @@ -0,0 +1,39 @@ +From 45040e7d268329ebc40e6cb237c64a6637cfab5c Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 13 Mar 2017 20:22:10 -0700 +Subject: [PATCH] config/libopts.m4: regenerate it from config/libopts.def + +It was out of date compared to config/libopts.def, so regenerate it via +"autogen config/libopts.def" command. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + config/libopts.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/config/libopts.m4 b/config/libopts.m4 +index c7ba4f3..51e6a39 100644 +--- a/config/libopts.m4 ++++ b/config/libopts.m4 +@@ -2,7 +2,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro: + dnl + dnl DO NOT EDIT THIS FILE (libopts.m4) + dnl +-dnl It has been AutoGen-ed ++dnl It has been AutoGen-ed March 13, 2017 at 08:21:21 PM by AutoGen 5.18 + dnl From the definitions libopts.def + dnl and the template file conftest.tpl + dnl +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash` +-- +2.10.2 + diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch new file mode 100644 index 000000000..d5fe143ce --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch @@ -0,0 +1,32 @@ +From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 13 Mar 2017 20:33:30 -0700 +Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path + +Use "which perl" as shebang doesn't work when it is longer than +BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to +instead of. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 093e808..8dfc6dd 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -98,7 +98,7 @@ fix_scripts() { + st=`sed 1q $f` + + case "$st" in +- *perl ) echo '#!' `which perl` ++ *perl ) echo '#!/usr/bin/env perl' + sed 1d $f + ;; + +-- +2.10.2 + |