From: Jackie Huang <[email protected]> Fix configure.ac to cope with new autoconf. Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is called as late as it was, ending up thinking that the am_aux_dir is pwd at the start of the build. Move it up to under AC_INIT to fix that.
configure.ac calls AM_INIT_AUTOMAKE too late. The attached patch moves it up to just after AC_INIT, fixing the FTBFS. Signed-off-by: Hongxu Jia <[email protected]> Signed-off-by: Jackie Huang <[email protected]> --- .../resource-agents/fix-install-sh-not-found.patch | 60 ++++++++++++++++++++++ .../resource-agents_3.9.7.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch new file mode 100644 index 0000000..102b797 --- /dev/null +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch @@ -0,0 +1,60 @@ +configure.ac: fix install-sh not found + +Fix configure.ac to cope with new autoconf. +Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is +called as late as it was, ending up thinking that the am_aux_dir is pwd +at the start of the build. Move it up to under AC_INIT to fix that. + +Author: William Grant <[email protected]> + +Upstream-Status: Pending + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724116 + +Signed-off-by: Hongxu Jia <[email protected]> +--- + configure.ac | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e8e2a7b..f3c8b9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,13 +23,20 @@ AC_INIT([resource-agents], + m4_esyscmd([make/git-version-gen .tarball-version]), + [[email protected]]) + ++AC_CONFIG_AUX_DIR(.) ++ ++dnl ++dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz]) ++dnl ++ ++AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2]) ++ + AC_USE_SYSTEM_EXTENSIONS + + CRM_DTD_VERSION="1.0" + + PKG_FEATURES="" + +-AC_CONFIG_AUX_DIR(.) + AC_CANONICAL_HOST + + dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below) +@@ -56,12 +63,6 @@ AC_ARG_WITH(pkg-name, + [ --with-pkg-name=name Override package name (if you're a packager needing to pretend) ], + [ PACKAGE_NAME="$withval" ]) + +-dnl +-dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz]) +-dnl +- +-AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2]) +- + AC_DEFINE_UNQUOTED(AGENTS_VERSION, "$PACKAGE_VERSION", Current agents version) + + CC_IN_CONFIGURE=yes +-- +1.8.1.2 + diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb index 2e8b8f1..2d2dd88 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb @@ -18,6 +18,7 @@ SRC_URI = "https://codeload.github.com/ClusterLabs/resource-agents/tar.gz/v${PV} file://01-disable-doc-build.patch \ file://02-set-OCF_ROOT_DIR-to-libdir-ocf.patch \ file://03-fix-header-defs-lookup.patch \ + file://fix-install-sh-not-found.patch \ " SRC_URI[md5sum] = "c59096b1bacc704e8a5a285f15729109" -- 2.11.0 -- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
