[V2] btrfs-tools: don't run autogen.sh

Message ID 1487589623-6089-1-git-send-email-ross.burton@intel.com
State Accepted
Commit 0e3a933c376b3bdb46bd3a2993932888ecfde434
Headers show

Commit Message

Ross Burton Feb. 20, 2017, 11:20 a.m.
Instead of running autogen.sh (which runs autoconf et al) before running
autoreconf (which runs autoreconf et al...) just do the one task that we need
from autogen.sh: copying install-sh from automake's libdir.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.8.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb
index 7047c43..04e1e61 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb
@@ -14,17 +14,17 @@  DEPENDS = "util-linux attr e2fsprogs lzo acl udev"
 RDEPENDS_${PN} = "libgcc"
 
 SRCREV = "144a19145e248513c7a676defad59836830535c6"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
-"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
 
 inherit autotools-brokensep pkgconfig manpages
 
 PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
 EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
 
-
 do_configure_prepend() {
-      sh autogen.sh
+	# Upstream doesn't ship this and autoreconf won't install it as automake isn't used.
+	mkdir -p ${S}/config
+	cp -f $(automake --print-libdir)/install-sh ${S}/config/
 }
 
 S = "${WORKDIR}/git"