Patchwork coreutils: drop patch that unconditionally mangles manpages

login
register
mail settings
Submitter Paul Gortmaker
Date Aug. 6, 2014, 8:38 p.m.
Message ID <1407357515-6147-1-git-send-email-paul.gortmaker@windriver.com>
Download mbox | patch
Permalink /patch/77415/
State New
Headers show

Comments

Paul Gortmaker - Aug. 6, 2014, 8:38 p.m.
commit 841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d ("coreutils: update
to upstream version 9.21") added a patch which bypassed the check
for perl and hence defaults to using the dummy man page for all
of the coreutils manpages.  This results in all manpages looking like:

  NAME
       chmod - a GNU coreutils 8.22 program

  DESCRIPTION
       OOOPS!   Due to the lack of perl on the build system, we were unable to
       create a proper manual page for chmod.

It is unclear why the test was disabled, but since it clearly
causes the manpages to be useless, we need to drop this patch.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Koen Kooi - Aug. 7, 2014, 5:33 a.m.
Op 6 aug. 2014, om 22:38 heeft Paul Gortmaker <paul.gortmaker@windriver.com> het volgende geschreven:

> commit 841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d ("coreutils: update
> to upstream version 9.21") added a patch which bypassed the check
> for perl and hence defaults to using the dummy man page for all
> of the coreutils manpages.  This results in all manpages looking like:
> 
>  NAME
>       chmod - a GNU coreutils 8.22 program
> 
>  DESCRIPTION
>       OOOPS!   Due to the lack of perl on the build system, we were unable to
>       create a proper manual page for chmod.
> 
> It is unclear why the test was disabled, but since it clearly
> causes the manpages to be useless, we need to drop this patch.

That all might be true, but DEPENDS doesn't list 'perl' or 'perl-native', so this commit is wrong.
Qi.Chen@windriver.com - Aug. 7, 2014, 8:42 a.m.
On 08/07/2014 04:38 AM, Paul Gortmaker wrote:
> commit 841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d ("coreutils: update
> to upstream version 9.21") added a patch which bypassed the check
> for perl and hence defaults to using the dummy man page for all
> of the coreutils manpages.  This results in all manpages looking like:
>
>    NAME
>         chmod - a GNU coreutils 8.22 program
>
>    DESCRIPTION
>         OOOPS!   Due to the lack of perl on the build system, we were unable to
>         create a proper manual page for chmod.
>
> It is unclear why the test was disabled, but since it clearly
> causes the manpages to be useless, we need to drop this patch.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>
> diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
> deleted file mode 100644
> index 4757f52aa0be..000000000000
> --- a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Upstream-Status: Inappropriate [disable feature]
> -
> -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> -diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk
> ---- coreutils-8.21/man/local.mk	2013-02-05 16:01:21.000000000 +0200
> -+++ coreutils-8.21/man/local.mk	2013-03-23 09:12:53.360470192 +0200
> -@@ -19,11 +19,11 @@
> - EXTRA_DIST += man/help2man man/dummy-man
> -
> - ## Graceful degradation for systems lacking perl.
> --if HAVE_PERL
> --run_help2man = $(PERL) -- $(srcdir)/man/help2man
> --else
> -+#if HAVE_PERL
> -+#run_help2man = $(PERL) -- $(srcdir)/man/help2man
> -+#else
> - run_help2man = $(SHELL) $(srcdir)/man/dummy-man
> --endif
> -+#endif
> -
> - man1_MANS = @man1_MANS@
> - EXTRA_DIST += $(man1_MANS:.1=.x)
> diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb
> index d5373ae9d66a..b19c1691eb10 100644
> --- a/meta/recipes-core/coreutils/coreutils_8.22.bb
> +++ b/meta/recipes-core/coreutils/coreutils_8.22.bb
> @@ -14,7 +14,6 @@ inherit autotools gettext texinfo
>   
>   SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
>              file://remove-usr-local-lib-from-m4.patch \
> -           file://dummy_help2man.patch \
>              file://fix-for-dummy-man-usage.patch \
>             "
>   

There's some build failure about coreutils on autobuilder that might be 
caused by this patch.
Please take a look at it.

Below is a link to the log.
https://autobuilder.yoctoproject.org/main/builders/nightly-arm/builds/201/steps/BuildImages_1/logs/stdio

//Chen Qi
Paul Gortmaker - Aug. 7, 2014, 1:48 p.m.
On 14-08-07 01:33 AM, Koen Kooi wrote:
> 
> Op 6 aug. 2014, om 22:38 heeft Paul Gortmaker <paul.gortmaker@windriver.com> het volgende geschreven:
> 
>> commit 841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d ("coreutils: update
>> to upstream version 9.21") added a patch which bypassed the check
>> for perl and hence defaults to using the dummy man page for all
>> of the coreutils manpages.  This results in all manpages looking like:
>>
>>  NAME
>>       chmod - a GNU coreutils 8.22 program
>>
>>  DESCRIPTION
>>       OOOPS!   Due to the lack of perl on the build system, we were unable to
>>       create a proper manual page for chmod.
>>
>> It is unclear why the test was disabled, but since it clearly
>> causes the manpages to be useless, we need to drop this patch.
> 
> That all might be true, but DEPENDS doesn't list 'perl' or 'perl-native', so this commit is wrong.

Wrong might be overstated.  The patch unconditionally disables a
_check_ for perl.  So if perl is there, it is used; if it is absent,
it is not.  Given that there really is no excuse for shipping
broken manpages, one could argue that a DEPENDS on perl-native
is sensible, and if that is what it takes to get the broken patch
dropped, I'll add one.

P.
--

>
Martin Jansa - Aug. 7, 2014, 5:35 p.m.
On Thu, Aug 07, 2014 at 09:48:26AM -0400, Paul Gortmaker wrote:
> On 14-08-07 01:33 AM, Koen Kooi wrote:
> > 
> > Op 6 aug. 2014, om 22:38 heeft Paul Gortmaker <paul.gortmaker@windriver.com> het volgende geschreven:
> > 
> >> commit 841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d ("coreutils: update
> >> to upstream version 9.21") added a patch which bypassed the check
> >> for perl and hence defaults to using the dummy man page for all
> >> of the coreutils manpages.  This results in all manpages looking like:
> >>
> >>  NAME
> >>       chmod - a GNU coreutils 8.22 program
> >>
> >>  DESCRIPTION
> >>       OOOPS!   Due to the lack of perl on the build system, we were unable to
> >>       create a proper manual page for chmod.
> >>
> >> It is unclear why the test was disabled, but since it clearly
> >> causes the manpages to be useless, we need to drop this patch.
> > 
> > That all might be true, but DEPENDS doesn't list 'perl' or 'perl-native', so this commit is wrong.
> 
> Wrong might be overstated.  The patch unconditionally disables a
> _check_ for perl.  So if perl is there, it is used; if it is absent,
> it is not.  Given that there really is no excuse for shipping
> broken manpages, one could argue that a DEPENDS on perl-native
> is sensible, and if that is what it takes to get the broken patch
> dropped, I'll add one.

undeterministic build results mean it's broken

Patch

diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
deleted file mode 100644
index 4757f52aa0be..000000000000
--- a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
+++ /dev/null
@@ -1,22 +0,0 @@ 
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk
---- coreutils-8.21/man/local.mk	2013-02-05 16:01:21.000000000 +0200
-+++ coreutils-8.21/man/local.mk	2013-03-23 09:12:53.360470192 +0200
-@@ -19,11 +19,11 @@
- EXTRA_DIST += man/help2man man/dummy-man
-
- ## Graceful degradation for systems lacking perl.
--if HAVE_PERL
--run_help2man = $(PERL) -- $(srcdir)/man/help2man
--else
-+#if HAVE_PERL
-+#run_help2man = $(PERL) -- $(srcdir)/man/help2man
-+#else
- run_help2man = $(SHELL) $(srcdir)/man/dummy-man
--endif
-+#endif
-
- man1_MANS = @man1_MANS@
- EXTRA_DIST += $(man1_MANS:.1=.x)
diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb
index d5373ae9d66a..b19c1691eb10 100644
--- a/meta/recipes-core/coreutils/coreutils_8.22.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.22.bb
@@ -14,7 +14,6 @@  inherit autotools gettext texinfo
 
 SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://remove-usr-local-lib-from-m4.patch \
-           file://dummy_help2man.patch \
            file://fix-for-dummy-man-usage.patch \
           "