Skip to contentSkip to conversation

ncurses packaging fix

PATCH In review Scott Garman 6 participants 13 messages Mar 14, 2012

lore
Share & tools
lore

Scott Garman

author
#0 lore raw

cover ncurses packaging fix

Hello,

This fixes the ncurses library packaging. Thanks to Andreas Oberritter for pointing it out.

Scott

The following changes since commit 81379dc141e245307ca391a02b7490b199128991:

dates: Fix unpackaged files warning (2012-03-13 23:18:19 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/ncurses-pkg-fix-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/ncurses-pkg-fix-oe

Scott Garman (1):
ncurses: fix packaging of moved libraries

 meta/recipes-core/ncurses/ncurses.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/1 ncurses: fix packaging of moved libraries

The recent move of some of the ncurses libraries to base_libdir does not work with our automatic library packaging, so this explicity creates packages for libncurses, libncursesw, and libtinfo.

Signed-off-by Scott Garman <[email protected]>
---
 meta/recipes-core/ncurses/ncurses.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +16 -2
index e450868..155c0bd 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_virtclass-native = ""
-INC_PR = "r5"
+INC_PR = "r6"
 
 inherit autotools binconfig multilib_header
 

@@ -220,6 +220,9 @@ pkg_prerm_ncurses-tools () {
 BBCLASSEXTEND = "native nativesdk"
 
 PACKAGES += " \
+  ${PN}-libncurses \
+  ${PN}-libncursesw \
+  ${PN}-libtinfo \
   ${PN}-tools \
   ${PN}-terminfo \
   ${PN}-terminfo-base \

@@ -231,7 +234,18 @@ FILES_${PN} = "\
   ${bindir}/ncurses5-config \
   ${bindir}/ncursesw5-config \
   ${datadir}/tabset \
-  ${base_libdir}/* \
+"
+
+FILES_${PN}-libncurses = "\
+  ${base_libdir}/libncurses.so.* \
+"
+
+FILES_${PN}-libncursesw = "\
+  ${base_libdir}/libncursesw.so.* \
+"
+
+FILES_${PN}-libtinfo = "\
+  ${base_libdir}/libtinfo.so.* \
 "
 
 # This keeps only tput/tset in ncurses
Signature · 1 line
1.7.5.4
#2 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

Quoted 24 lines · Scott Garman

The recent move of some of the ncurses libraries to base_libdir does not work with our automatic library packaging, so this explicity creates packages for libncurses, libncursesw, and libtinfo.

Signed-off-by Scott Garman <[email protected]>
---
 meta/recipes-core/ncurses/ncurses.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +1 -1
index e450868..155c0bd 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_virtclass-native = ""
-INC_PR = "r5"
+INC_PR = "r6"
 
 inherit autotools binconfig multilib_header

meta/recipes-core/ncurses/ncurses.inc pkg_prerm_ncurses-tools () { · line 224

Quoted 5 lines
meta/recipes-core/ncurses/ncurses.inc +2 -0
@@ -220,6 +220,9 @@ pkg_prerm_ncurses-tools () {
 BBCLASSEXTEND = "native nativesdk"
 
 PACKAGES += " \
+  ${PN}-libncurses \
+  ${PN}-libncursesw \

This one needs to be dependent on ENABLE_WIDEC

Quoted 8 lines
meta/recipes-core/ncurses/ncurses.inc +1 -0
+  ${PN}-libtinfo \
   ${PN}-tools \
   ${PN}-terminfo \
   ${PN}-terminfo-base \

@@ -231,7 +234,18 @@ FILES_${PN} = "\
   ${bindir}/ncurses5-config \
   ${bindir}/ncursesw5-config \
   ${datadir}/tabset \

meta/recipes-core/ncurses/ncurses.inc FILES_${PN} = "\ · line 245

Quoted 10 lines
meta/recipes-core/ncurses/ncurses.inc +9 -1
-  ${base_libdir}/* \
+"
+
+FILES_${PN}-libncurses = "\
+  ${base_libdir}/libncurses.so.* \
+"
+
+FILES_${PN}-libncursesw = "\
+  ${base_libdir}/libncursesw.so.* \
+"

This file doesn't exist if !ENABLE_WIDEC (which is the case with poky-tiny for example).

Quoted 6 lines
meta/recipes-core/ncurses/ncurses.inc +3 -0
+
+FILES_${PN}-libtinfo = "\
+  ${base_libdir}/libtinfo.so.* \
 "
 
 # This keeps only tput/tset in ncurses
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#3 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

Quoted 26 lines · Darren Hart
Quoted 23 lines · Scott Garman

The recent move of some of the ncurses libraries to base_libdir does not work with our automatic library packaging, so this explicity creates packages for libncurses, libncursesw, and libtinfo.

Signed-off-by Scott Garman <[email protected]>
---
 meta/recipes-core/ncurses/ncurses.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +1 -1
index e450868..155c0bd 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_virtclass-native = ""
-INC_PR = "r5"
+INC_PR = "r6"
 
 inherit autotools binconfig multilib_header
Quoted 8 lines

meta/recipes-core/ncurses/ncurses.inc pkg_prerm_ncurses-tools () { · line 224

Quoted 6 lines
meta/recipes-core/ncurses/ncurses.inc +2 -0
@@ -220,6 +220,9 @@ pkg_prerm_ncurses-tools () {
 BBCLASSEXTEND = "native nativesdk"
 
 PACKAGES += " \
+  ${PN}-libncurses \
+  ${PN}-libncursesw \

This one needs to be dependent on ENABLE_WIDEC

isn't just
ALLOW_EMPTY_${PN}-libncursesw = "1"
enough?

Quoted 39 lines
Quoted 9 lines
meta/recipes-core/ncurses/ncurses.inc +1 -0
+  ${PN}-libtinfo \
   ${PN}-tools \
   ${PN}-terminfo \
   ${PN}-terminfo-base \

@@ -231,7 +234,18 @@ FILES_${PN} = "\
   ${bindir}/ncurses5-config \
   ${bindir}/ncursesw5-config \
   ${datadir}/tabset \

meta/recipes-core/ncurses/ncurses.inc FILES_${PN} = "\ · line 245

Quoted 10 lines
meta/recipes-core/ncurses/ncurses.inc +9 -1
-  ${base_libdir}/* \
+"
+
+FILES_${PN}-libncurses = "\
+  ${base_libdir}/libncurses.so.* \
+"
+
+FILES_${PN}-libncursesw = "\
+  ${base_libdir}/libncursesw.so.* \
+"

This file doesn't exist if !ENABLE_WIDEC (which is the case with poky-tiny for example).

Quoted 6 lines
meta/recipes-core/ncurses/ncurses.inc +3 -0
+
+FILES_${PN}-libtinfo = "\
+  ${base_libdir}/libtinfo.so.* \
 "
 
 # This keeps only tput/tset in ncurses
Signature · 8 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

Quoted 3 lines · On Wednesday 14 March 2012 16:00:33 Martin Jansa wrote:

isn't just
ALLOW_EMPTY_${PN}-libncursesw = "1"
enough?

I suspect we don't care if the libncursesw package isn't created when wide character support is disabled, if so, we don't even need that.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#5 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

Quoted 7 lines · Paul Eggleton
Quoted 3 lines · On Wednesday 14 March 2012 16:00:33 Martin Jansa wrote:

isn't just
ALLOW_EMPTY_${PN}-libncursesw = "1"
enough?

I suspect we don't care if the libncursesw package isn't created when wide character support is disabled, if so, we don't even need that.

OK, so if a package is defined and none of the files exist, bitbake will simply not create the package - and no errors or warnings will be raised?

If so, then kindly disregard my comments.

Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#6 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

Quoted 11 lines · On Wednesday 14 March 2012 08:18:34 Darren Hart wrote:
Quoted 7 lines · Paul Eggleton
Quoted 3 lines · On Wednesday 14 March 2012 16:00:33 Martin Jansa wrote:

isn't just
ALLOW_EMPTY_${PN}-libncursesw = "1"
enough?

I suspect we don't care if the libncursesw package isn't created when wide character support is disabled, if so, we don't even need that.

OK, so if a package is defined and none of the files exist, bitbake will simply not create the package - and no errors or warnings will be raised?

That's correct.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#7 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

In reply to Martin Jansa
Quoted 4 lines · Martin Jansa
Quoted 3 lines · Darren Hart

On 03/13/2012 05:31 PM, Scott Garman wrote:

...

Quoted 9 lines
Quoted 5 lines

meta/recipes-core/ncurses/ncurses.inc pkg_prerm_ncurses-tools () { · line 224

Quoted 3 lines

PACKAGES += " \

meta/recipes-core/ncurses/ncurses.inc +2 -0
+  ${PN}-libncurses \
+  ${PN}-libncursesw \

This one needs to be dependent on ENABLE_WIDEC

isn't just
ALLOW_EMPTY_${PN}-libncursesw = "1"
enough?

Perhaps. ALLOW_EMPTY is not defined in poky/documentation/* nor in poky/conf/documentation.conf.

(I realize this oe-core and not poky, but this is the best reference I know of)

Could you provide a terse description of how ALLOW_EMPTY* is meant to be used, its effects, and any needful cautionary text? Scott can then add it to the above documentation.

Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#8 lore raw

Re: [PATCH 1/1] ncurses: fix packaging of moved libraries

Quoted 9 lines · On Wednesday 14 March 2012 08:12:23 Darren Hart wrote:

Perhaps. ALLOW_EMPTY is not defined in poky/documentation/* nor in poky/conf/documentation.conf.

(I realize this oe-core and not poky, but this is the best reference I know of)

Could you provide a terse description of how ALLOW_EMPTY* is meant to be used, its effects, and any needful cautionary text? Scott can then add it to the above documentation.

ALLOW_EMPTY (which like all package-controlling variables should always be used in conjunction a package name override, e.g. ALLOW_EMPTY_${PN}) just specifies that empty packages are actually produced instead of the default behaviour where they are skipped. This is mostly useful where there is an RDEPENDS or other runtime hard-requirement on the package existing.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#9 lore raw
In reply to Scott Garman
Quoted 4 lines · Scott Garman

Hello,

This fixes the ncurses library packaging. Thanks to Andreas Oberritter for pointing it out.

Why not use another do_split_packages for base_libdir?

Can it be used only once per recipe? are there any libs left in libdir?

Cheers,

Quoted 25 lines

Scott

The following changes since commit 81379dc141e245307ca391a02b7490b199128991:

dates: Fix unpackaged files warning (2012-03-13 23:18:19 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/ncurses-pkg-fix-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/ncurses-pkg-fix-oe

Scott Garman (1):
ncurses: fix packaging of moved libraries

 meta/recipes-core/ncurses/ncurses.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
Signature · 7 lines
1.7.5.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#10 lore raw
Quoted 9 lines · Martin Jansa
Quoted 4 lines · Scott Garman

Hello,

This fixes the ncurses library packaging. Thanks to Andreas Oberritter for pointing it out.

Why not use another do_split_packages for base_libdir?

Can it be used only once per recipe? are there any libs left in libdir?

Hi Martin,

This is something worth looking into, but due to the amount of testing I feel it would need, I'm going to have to defer it. Our next release is coming up fast, and I've been asked to focus on recipe upgrades for the rest of this week. I have filed bug #2106 to keep track of it.

https://bugzilla.yoctoproject.org/show_bug.cgi?id=2106

Certainly anyone who has time to do proper testing on this can grab ownership of the bug in the meantime.

Scott

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
#11 lore raw
In reply to Scott Garman

Op 14 mrt. 2012, om 01:31 heeft Scott Garman het volgende geschreven:

Quoted 9 lines

Hello,

This fixes the ncurses library packaging. Thanks to Andreas Oberritter for pointing it out.

Scott

The following changes since commit 81379dc141e245307ca391a02b7490b199128991:

Quoted 8 lines

dates: Fix unpackaged files warning (2012-03-13 23:18:19 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/ncurses-pkg-fix-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/ncurses-pkg-fix-oe

Scott Garman (1):
ncurses: fix packaging of moved libraries

You're missing a PR bump for the affected packages.

regards,

Koen

author
#12 lore raw
Quoted 14 lines · Koen Kooi

Op 14 mrt. 2012, om 01:31 heeft Scott Garman het volgende geschreven:

Quoted 11 lines

Hello,

This fixes the ncurses library packaging. Thanks to Andreas Oberritter for pointing it out.

Scott

The following changes since commit 81379dc141e245307ca391a02b7490b199128991:

dates: Fix unpackaged files warning (2012-03-13 23:18:19 +0000)

Quoted 8 lines
Quoted 6 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/ncurses-pkg-fix-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/ncurses-pkg-fix-oe

Scott Garman (1):
ncurses: fix packaging of moved libraries

You're missing a PR bump for the affected packages.

My patch included incrementing INC_PR, but I'm guessing you're pointing this out because overnight Paul Eggleton got a patch into master which incremented INC_PR to the same number as I did in this patch. So I'm going to respin the branch with another increase to INC_PR.

If I'm mistaken, please let me know.

Thanks,

Scott

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center