Patchwork [3/5] help2man-native: Add 1.36.4 (GPLv2) and 1.38.2 (GPLv3)

login
register
mail settings
Submitter Tom Rini
Date July 15, 2011, 10:03 p.m.
Message ID <c7276dd332ad9e38935443d679c0296a032a511c.1310758615.git.tom_rini@mentor.com>
Download mbox | patch
Permalink /patch/7677/
State New, archived
Headers show

Comments

Tom Rini - July 15, 2011, 10:03 p.m.
These are 'side ports' of current oe.dev versions.  PR is kept in sync
but we drop out the target recipes in order to punt on potential perl
problems.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../help2man/help2man-native_1.36.4.bb             |   26 ++++++++++++++++++++
 .../help2man/help2man-native_1.38.2.bb             |   24 ++++++++++++++++++
 2 files changed, 50 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
 create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
Saul Wold - July 15, 2011, 10:24 p.m.
On 07/15/2011 03:03 PM, Tom Rini wrote:
> These are 'side ports' of current oe.dev versions.  PR is kept in sync
> but we drop out the target recipes in order to punt on potential perl
> problems.
>
> Signed-off-by: Tom Rini<tom_rini@mentor.com>
> ---
>   .../help2man/help2man-native_1.36.4.bb             |   26 ++++++++++++++++++++
>   .../help2man/help2man-native_1.38.2.bb             |   24 ++++++++++++++++++
>   2 files changed, 50 insertions(+), 0 deletions(-)
>   create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
>   create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>

Why do we need both versions?  Can't we just use the most current?

Sau!

> diff --git a/meta/recipes-devtools/help2man/help2man-native_1.36.4.bb b/meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
> new file mode 100644
> index 0000000..b2c6608
> --- /dev/null
> +++ b/meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
> @@ -0,0 +1,26 @@
> +DESCRIPTION = "GNU utility to convert program --help output to a man page"
> +HOMEPAGE    = "http://www.gnu.org/software/help2man"
> +SECTION     = "console/utils"
> +LICENSE     = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +DEPENDS     = "autoconf-native automake-native"
> +
> +TARGET_CC_ARCH += "${LDFLAGS}"
> +
> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> +SRC_URI[md5sum] = "d31a0a38c2ec71faa06723f6b8bd3076"
> +SRC_URI[sha256sum] = "a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2"
> +
> +inherit autotools native
> +
> +PR = "r5"
> +
> +# We don't want to reconfigure things
> +do_configure() {
> +	oe_runconf
> +}
> +
> +do_install_append () {
> +	# Make sure we use /usr/bin/env perl
> +	sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
> +}
> diff --git a/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
> new file mode 100644
> index 0000000..5612eda
> --- /dev/null
> +++ b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "Program to create simple man pages"
> +SECTION = "devel"
> +LICENSE = "GPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +DEPENDS = "autoconf-native automake-native"
> +PR = "r2"
> +
> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> +SRC_URI[md5sum] = "426671c6fe79e5ef2233303367eab5a6"
> +SRC_URI[sha256sum] = "952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1"
> +
> +inherit autotools native
> +
> +EXTRA_OECONF = "--disable-nls"
> +
> +# We don't want to reconfigure things
> +do_configure() {
> +	oe_runconf
> +}
> +
> +do_install_append () {
> +	# Make sure we use /usr/bin/env perl
> +	sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
> +}
Tom Rini - July 15, 2011, 10:29 p.m.
On 07/15/2011 03:24 PM, Saul Wold wrote:
> On 07/15/2011 03:03 PM, Tom Rini wrote:
>> These are 'side ports' of current oe.dev versions.  PR is kept in sync
>> but we drop out the target recipes in order to punt on potential perl
>> problems.
>>
>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>> ---
>>   .../help2man/help2man-native_1.36.4.bb             |   26
>> ++++++++++++++++++++
>>   .../help2man/help2man-native_1.38.2.bb             |   24
>> ++++++++++++++++++
>>   2 files changed, 50 insertions(+), 0 deletions(-)
>>   create mode 100644
>> meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
>>   create mode 100644
>> meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>>
> 
> Why do we need both versions?  Can't we just use the most current?

For the "I want no GPLv3" crowd.  This is a little more clear in oe.dev
where we also build for the target but yes, different legal departments
have different GPLv3 concerns so I think it makes sense in this case still.
Saul Wold - July 15, 2011, 10:41 p.m.
On 07/15/2011 03:29 PM, Tom Rini wrote:
> On 07/15/2011 03:24 PM, Saul Wold wrote:
>> On 07/15/2011 03:03 PM, Tom Rini wrote:
>>> These are 'side ports' of current oe.dev versions.  PR is kept in sync
>>> but we drop out the target recipes in order to punt on potential perl
>>> problems.
>>>
>>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>>> ---
>>>    .../help2man/help2man-native_1.36.4.bb             |   26
>>> ++++++++++++++++++++
>>>    .../help2man/help2man-native_1.38.2.bb             |   24
>>> ++++++++++++++++++
>>>    2 files changed, 50 insertions(+), 0 deletions(-)
>>>    create mode 100644
>>> meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
>>>    create mode 100644
>>> meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>>>
>>
>> Why do we need both versions?  Can't we just use the most current?
>
> For the "I want no GPLv3" crowd.  This is a little more clear in oe.dev
> where we also build for the target but yes, different legal departments
> have different GPLv3 concerns so I think it makes sense in this case still.
>
Right, I scanned this too quickly and did not see the v2 vs v3 difference.

Thanks for clarifying.

Sau!
Richard Purdie - July 15, 2011, 10:47 p.m.
On Fri, 2011-07-15 at 15:29 -0700, Tom Rini wrote:
> On 07/15/2011 03:24 PM, Saul Wold wrote:
> > On 07/15/2011 03:03 PM, Tom Rini wrote:
> >> These are 'side ports' of current oe.dev versions.  PR is kept in sync
> >> but we drop out the target recipes in order to punt on potential perl
> >> problems.
> >>
> >> Signed-off-by: Tom Rini<tom_rini@mentor.com>
> >> ---
> >>   .../help2man/help2man-native_1.36.4.bb             |   26
> >> ++++++++++++++++++++
> >>   .../help2man/help2man-native_1.38.2.bb             |   24
> >> ++++++++++++++++++
> >>   2 files changed, 50 insertions(+), 0 deletions(-)
> >>   create mode 100644
> >> meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
> >>   create mode 100644
> >> meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
> >>
> > 
> > Why do we need both versions?  Can't we just use the most current?
> 
> For the "I want no GPLv3" crowd.  This is a little more clear in oe.dev
> where we also build for the target but yes, different legal departments
> have different GPLv3 concerns so I think it makes sense in this case still.

We support limited GPLv2 functionality for the target. We don't do this
for the build tools since the compiler is GPLv3 for a start. We also
don't cover target development tools.

So I don't think we need the old version...

Cheers,

Richard
Richard Purdie - July 15, 2011, 10:48 p.m.
On Fri, 2011-07-15 at 15:03 -0700, Tom Rini wrote:
> These are 'side ports' of current oe.dev versions.  PR is kept in sync
> but we drop out the target recipes in order to punt on potential perl
> problems.
> 
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
> ---
>  .../help2man/help2man-native_1.36.4.bb             |   26 ++++++++++++++++++++
>  .../help2man/help2man-native_1.38.2.bb             |   24 ++++++++++++++++++
>  2 files changed, 50 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
>  create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
> 
[...]
> diff --git a/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
> new file mode 100644
> index 0000000..5612eda
> --- /dev/null
> +++ b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "Program to create simple man pages"
> +SECTION = "devel"
> +LICENSE = "GPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +DEPENDS = "autoconf-native automake-native"
> +PR = "r2"
> +
> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> +SRC_URI[md5sum] = "426671c6fe79e5ef2233303367eab5a6"
> +SRC_URI[sha256sum] = "952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1"
> +
> +inherit autotools native
> +
> +EXTRA_OECONF = "--disable-nls"
> +
> +# We don't want to reconfigure things
> +do_configure() {
> +	oe_runconf
> +}

At the very least I'd like to know why we can't do this. Its a great way
to hide bugs (such as libtool rpath injection issues, admittedly in the
target case).

Cheers,

Richard
Tom Rini - July 15, 2011, 10:53 p.m.
On 07/15/2011 03:48 PM, Richard Purdie wrote:
> On Fri, 2011-07-15 at 15:03 -0700, Tom Rini wrote:
>> These are 'side ports' of current oe.dev versions.  PR is kept in sync
>> but we drop out the target recipes in order to punt on potential perl
>> problems.
>>
>> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>> ---
>>  .../help2man/help2man-native_1.36.4.bb             |   26 ++++++++++++++++++++
>>  .../help2man/help2man-native_1.38.2.bb             |   24 ++++++++++++++++++
>>  2 files changed, 50 insertions(+), 0 deletions(-)
>>  create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
>>  create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>>
> [...]
>> diff --git a/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>> new file mode 100644
>> index 0000000..5612eda
>> --- /dev/null
>> +++ b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>> @@ -0,0 +1,24 @@
>> +DESCRIPTION = "Program to create simple man pages"
>> +SECTION = "devel"
>> +LICENSE = "GPLv3"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>> +DEPENDS = "autoconf-native automake-native"
>> +PR = "r2"
>> +
>> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
>> +SRC_URI[md5sum] = "426671c6fe79e5ef2233303367eab5a6"
>> +SRC_URI[sha256sum] = "952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1"
>> +
>> +inherit autotools native
>> +
>> +EXTRA_OECONF = "--disable-nls"
>> +
>> +# We don't want to reconfigure things
>> +do_configure() {
>> +	oe_runconf
>> +}
> 
> At the very least I'd like to know why we can't do this. Its a great way
> to hide bugs (such as libtool rpath injection issues, admittedly in the
> target case).

In oe.dev, chicken and egg problem wrt perl.  Here, I'll see if we can
drop this part too, as part of a v2 with the older help2man dropped and
per IRC, mercurial-native moved over to a meta-oe patch (but keeping the
sanity.bbclass/bitbake.conf change).
Tom Rini - July 18, 2011, 10:13 p.m.
On 07/15/2011 03:53 PM, Tom Rini wrote:
> On 07/15/2011 03:48 PM, Richard Purdie wrote:
>> On Fri, 2011-07-15 at 15:03 -0700, Tom Rini wrote:
>>> These are 'side ports' of current oe.dev versions.  PR is kept in sync
>>> but we drop out the target recipes in order to punt on potential perl
>>> problems.
>>>
>>> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>>> ---
>>>  .../help2man/help2man-native_1.36.4.bb             |   26 ++++++++++++++++++++
>>>  .../help2man/help2man-native_1.38.2.bb             |   24 ++++++++++++++++++
>>>  2 files changed, 50 insertions(+), 0 deletions(-)
>>>  create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
>>>  create mode 100644 meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>>>
>> [...]
>>> diff --git a/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>>> new file mode 100644
>>> index 0000000..5612eda
>>> --- /dev/null
>>> +++ b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
>>> @@ -0,0 +1,24 @@
>>> +DESCRIPTION = "Program to create simple man pages"
>>> +SECTION = "devel"
>>> +LICENSE = "GPLv3"
>>> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>>> +DEPENDS = "autoconf-native automake-native"
>>> +PR = "r2"
>>> +
>>> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
>>> +SRC_URI[md5sum] = "426671c6fe79e5ef2233303367eab5a6"
>>> +SRC_URI[sha256sum] = "952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1"
>>> +
>>> +inherit autotools native
>>> +
>>> +EXTRA_OECONF = "--disable-nls"
>>> +
>>> +# We don't want to reconfigure things
>>> +do_configure() {
>>> +	oe_runconf
>>> +}
>>
>> At the very least I'd like to know why we can't do this. Its a great way
>> to hide bugs (such as libtool rpath injection issues, admittedly in the
>> target case).
> 
> In oe.dev, chicken and egg problem wrt perl.  Here, I'll see if we can
> drop this part too, as part of a v2 with the older help2man dropped and
> per IRC, mercurial-native moved over to a meta-oe patch (but keeping the
> sanity.bbclass/bitbake.conf change).

OK, here's a "why" on not changing:
| configure.in:4: error: possibly undefined macro: AC_PROG_PERL
|       If this token and others are legitimate, please use
m4_pattern_allow.
|       See the Autoconf documentation.
| configure.in:7: error: possibly undefined macro: AC_PERL_MODULE

Which if we fix by building vs perlnative we then need autotools.bbclass
to inherit perlnative to make life reliable which isn't what you want
wrt perl-native in the build chain :)
Phil Blundell - July 19, 2011, 12:17 p.m.
On Mon, 2011-07-18 at 15:13 -0700, Tom Rini wrote:
> OK, here's a "why" on not changing:
> | configure.in:4: error: possibly undefined macro: AC_PROG_PERL
> |       If this token and others are legitimate, please use
> m4_pattern_allow.
> |       See the Autoconf documentation.
> | configure.in:7: error: possibly undefined macro: AC_PERL_MODULE
> 
> Which if we fix by building vs perlnative we then need autotools.bbclass
> to inherit perlnative to make life reliable which isn't what you want
> wrt perl-native in the build chain :)

How about fixing it by installing those two macros into ${S} before
running aclocal?  You could do that just as a patch, I guess.

p.
Tom Rini - July 19, 2011, 2:18 p.m.
On 07/19/2011 05:17 AM, Phil Blundell wrote:
> On Mon, 2011-07-18 at 15:13 -0700, Tom Rini wrote:
>> OK, here's a "why" on not changing:
>> | configure.in:4: error: possibly undefined macro: AC_PROG_PERL
>> |       If this token and others are legitimate, please use
>> m4_pattern_allow.
>> |       See the Autoconf documentation.
>> | configure.in:7: error: possibly undefined macro: AC_PERL_MODULE
>>
>> Which if we fix by building vs perlnative we then need autotools.bbclass
>> to inherit perlnative to make life reliable which isn't what you want
>> wrt perl-native in the build chain :)
> 
> How about fixing it by installing those two macros into ${S} before
> running aclocal?  You could do that just as a patch, I guess.

It feels like overkill just to make a perl program.  Assuming
sstate-help2man-native-x86_64-linux-1.38.2-r2-x86_64-2-<signature>_populate-sysroot.tgz
is the right file to peek at, it's just help2man and a man page.

Patch

diff --git a/meta/recipes-devtools/help2man/help2man-native_1.36.4.bb b/meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
new file mode 100644
index 0000000..b2c6608
--- /dev/null
+++ b/meta/recipes-devtools/help2man/help2man-native_1.36.4.bb
@@ -0,0 +1,26 @@ 
+DESCRIPTION = "GNU utility to convert program --help output to a man page"
+HOMEPAGE    = "http://www.gnu.org/software/help2man"
+SECTION     = "console/utils"
+LICENSE     = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS     = "autoconf-native automake-native"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "d31a0a38c2ec71faa06723f6b8bd3076"
+SRC_URI[sha256sum] = "a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2"
+
+inherit autotools native
+
+PR = "r5"
+
+# We don't want to reconfigure things
+do_configure() {
+	oe_runconf
+}
+
+do_install_append () {
+	# Make sure we use /usr/bin/env perl
+	sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
+}
diff --git a/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
new file mode 100644
index 0000000..5612eda
--- /dev/null
+++ b/meta/recipes-devtools/help2man/help2man-native_1.38.2.bb
@@ -0,0 +1,24 @@ 
+DESCRIPTION = "Program to create simple man pages"
+SECTION = "devel"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+DEPENDS = "autoconf-native automake-native"
+PR = "r2"
+
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "426671c6fe79e5ef2233303367eab5a6"
+SRC_URI[sha256sum] = "952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1"
+
+inherit autotools native
+
+EXTRA_OECONF = "--disable-nls"
+
+# We don't want to reconfigure things
+do_configure() {
+	oe_runconf
+}
+
+do_install_append () {
+	# Make sure we use /usr/bin/env perl
+	sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
+}