From: Saul Wold <sgw@linux.intel.com>
To: Hongxu Jia <hongxu.jia@windriver.com>,
openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 6/6] groff: upgrade 1.22.3
Date: Wed, 24 Dec 2014 09:56:22 -0800 [thread overview]
Message-ID: <549AFE46.50303@linux.intel.com> (raw)
In-Reply-To: <960042129c61baae9bdf304c256f8d2e8dd578da.1419309149.git.hongxu.jia@windriver.com>
On 12/22/2014 09:09 PM, Hongxu Jia wrote:
> Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> ...off-1.22.2-correct-man.local-install-path.patch | 32 ---------------
> ...off-1.22.3-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++
Does it make more sense not to have the version in the patch name if we
are going to carry it forward?
> .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 6 +--
The new version of groff seems to depend on Perl now for a couple of
scripts (grog and BuildFoundries), please double check your RDEPENDS.
Thanks
Sau!
> 3 files changed, 48 insertions(+), 35 deletions(-)
> delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
> create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch
> rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (90%)
>
> diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
> deleted file mode 100644
> index f7e9a74..0000000
> --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -Correct the install path of man.local to fix following error:
> - /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
> -
> -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> -Upstream-Status: Pending
> -
> ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800
> -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800
> -@@ -114,9 +114,9 @@
> - rm -f $(DESTDIR)$(mdocdir)/$$f; \
> - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
> - done
> -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \
> -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \
> - $(INSTALL_DATA) $(srcdir)/man.local \
> -- $(DESTDIR)$(localtmacdir)/man.local
> -+ $(DESTDIR)$(tmacdir)/man.local
> - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \
> - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
> -
> -@@ -158,9 +158,9 @@
> - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
> - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
> - -rm -f $(DESTDIR)$(tmacdir)/www.tmac
> -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
> -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
> - $(srcdir)/man.local; then \
> -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \
> -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \
> - fi
> - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
> - $(srcdir)/mdoc.local; then \
> diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch
> new file mode 100644
> index 0000000..e5db6cf
> --- /dev/null
> +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch
> @@ -0,0 +1,45 @@
> +Correct the install path of man.local to fix following error:
> +
> + /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690:
> + warning: can't find macro file `man.local'
> +
> +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> +Upstream-Status: Pending
> +
> +Rebase to 1.22.3
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +---
> + tmac/Makefile.sub | 8 ++++----
> + 1 file changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
> +index 1506232..f1468c5 100644
> +--- a/tmac/Makefile.sub
> ++++ b/tmac/Makefile.sub
> +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
> + $(RM) $(DESTDIR)$(mdocdir)/$$f; \
> + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
> + done
> +- -test -f $(DESTDIR)$(localtmacdir)/man.local \
> ++ -test -f $(DESTDIR)$(tmacdir)/man.local \
> + || $(INSTALL_DATA) $(srcdir)/man.local \
> +- $(DESTDIR)$(localtmacdir)/man.local
> ++ $(DESTDIR)$(tmacdir)/man.local
> + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
> + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
> +
> +@@ -164,9 +164,9 @@ uninstall_sub:
> + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
> + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
> + $(RM) $(DESTDIR)$(tmacdir)/www.tmac
> +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
> ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
> + $(srcdir)/man.local; then \
> +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
> ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \
> + fi
> + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
> + $(srcdir)/mdoc.local; then \
> +--
> +1.9.1
> +
> diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb
> similarity index 90%
> rename from meta/recipes-extended/groff/groff_1.22.2.bb
> rename to meta/recipes-extended/groff/groff_1.22.3.bb
> index 63f0425..e0d632f 100644
> --- a/meta/recipes-extended/groff/groff_1.22.2.bb
> +++ b/meta/recipes-extended/groff/groff_1.22.3.bb
> @@ -9,11 +9,11 @@ PR = "r1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>
> SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
> - file://groff-1.22.2-correct-man.local-install-path.patch \
> + file://groff-1.22.3-correct-man.local-install-path.patch \
> "
>
> -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16"
> -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076"
> +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
> +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
>
> DEPENDS = "groff-native"
> DEPENDS_class-native = ""
>
next prev parent reply other threads:[~2014-12-24 17:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia
2014-12-23 5:09 ` [PATCH 1/6] libxml2: upgrade to 2.9.2 Hongxu Jia
2014-12-23 5:09 ` [PATCH 2/6] directfb: upgrade to 1.7.6 Hongxu Jia
2014-12-25 22:02 ` Richard Purdie
2014-12-25 22:58 ` Otavio Salvador
2014-12-26 1:42 ` Hongxu Jia
2014-12-23 5:09 ` [PATCH 3/6] apr-util: upgrade to 1.5.4 Hongxu Jia
2014-12-23 5:09 ` [PATCH 4/6] pax-utils: upgrade to 0.9.2 Hongxu Jia
2014-12-23 5:09 ` [PATCH 5/6] ppp: upgrade 2.4.7 Hongxu Jia
2014-12-23 5:09 ` [PATCH 6/6] groff: upgrade 1.22.3 Hongxu Jia
2014-12-24 17:56 ` Saul Wold [this message]
2014-12-25 1:35 ` Hongxu Jia
2014-12-25 2:19 ` [PATCH V2 " Hongxu Jia
2014-12-25 2:23 ` Hongxu Jia
2014-12-25 8:44 ` Richard Purdie
2014-12-25 9:05 ` Hongxu Jia
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=549AFE46.50303@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=hongxu.jia@windriver.com \
--cc=openembedded-core@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.