From: Joe MacDonald <joe@deserted.net>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-networking][PATCH] lowpan-tools: fix do_install failure
Date: Mon, 25 Nov 2013 21:53:39 -0500 [thread overview]
Message-ID: <20131126025337.GA5596@deserted.net> (raw)
In-Reply-To: <1384878348-16319-1-git-send-email-paul.eggleton@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 3449 bytes --]
Merged, thanks.
-J.
[[oe] [meta-networking][PATCH] lowpan-tools: fix do_install failure] On 13.11.19 (Tue 16:25) Paul Eggleton wrote:
> We don't have a proper help2man so building the manpages fails; just
> disable building them to fix this as we do elsewhere.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> .../lowpan-tools/lowpan-tools/no-help2man.patch | 41 ++++++++++++++++++++++
> .../lowpan-tools/lowpan-tools_git.bb | 3 +-
> 2 files changed, 43 insertions(+), 1 deletion(-)
> create mode 100644 meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
>
> diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
> new file mode 100644
> index 0000000..9ecd707
> --- /dev/null
> +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
> @@ -0,0 +1,41 @@
> +Disable building manpages so that make install doesn't fail due to lack of help2man
> +
> +Upstream-Status: Inappropriate [config]
> +
> +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> +
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 46c4017..d6ed312 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -9,11 +9,6 @@ izcoordinator_DESC = "simple coordinator for IEEE 802.15.4 network"
> + iz_DESC = "configure an IEEE 802.15.4 interface"
> + izchat_DESC = "simple chat program using IEEE 802.15.4"
> +
> +-if MANPAGES
> +-dist_man_MANS = $(manpages)
> +-endif
> +-EXTRA_DIST = $(manpages)
> +-
> + izattach_SOURCES = serial.c
> +
> + iz_SOURCES = iz.c iz-common.c iz-mac.c iz-phy.c
> +@@ -27,18 +22,6 @@ izcoordinator_LDADD = ../addrdb/libaddrdb.la $(LDADD) $(NL_LIBS) $(LEXLIB)
> + iz_CFLAGS = $(AM_CFLAGS) $(NL_CFLAGS) -D_GNU_SOURCE
> + iz_LDADD = $(LDADD) $(NL_LIBS)
> +
> +-izattach.8: $(izattach_SOURCES) $(top_srcdir)/configure.ac
> +- -$(HELP2MAN) -o $@ -s 8 -N -n $(izattach_DESC) $(builddir)/izattach
> +-
> +-izcoordinator.8: $(izcoordinator_SOURCES) $(top_srcdir)/configure.ac
> +- -$(HELP2MAN) -o $@ -s 8 -N -n $(izcoordinator_DESC) $(builddir)/izcoordinator
> +-
> +-iz.8: $(iz_SOURCES) $(top_srcdir)/configure.ac
> +- -$(HELP2MAN) -o $@ -s 8 -N -n $(iz_DESC) $(builddir)/iz
> +-
> +-izchat.1: $(izchat_SOURCES) $(top_srcdir)/configure.ac
> +- -$(HELP2MAN) -o $@ -s 1 -N -n $(izchat_DESC) $(builddir)/izchat
> +-
> + install-data-hook:
> + $(mkinstalldirs) $(DESTDIR)`dirname $(leasefile)`
> + $(mkinstalldirs) $(DESTDIR)`dirname $(pidfile)`
> diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
> index 152ee49..5fc0de3 100644
> --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
> +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
> @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> DEPENDS = "libnl python"
>
> PV = "0.3+git${SRCPV}"
> -SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee"
> +SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee \
> + file://no-help2man.patch"
> SRCREV = "a1d9615adde6d1a568813c24a128273ed755af04"
>
> S = "${WORKDIR}/git"
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
prev parent reply other threads:[~2013-11-26 2:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-19 16:25 [meta-networking][PATCH] lowpan-tools: fix do_install failure Paul Eggleton
2013-11-26 2:53 ` Joe MacDonald [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131126025337.GA5596@deserted.net \
--to=joe@deserted.net \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.