Patchwork libcap, libcap2: use automatic packaging to fix QA errors

login
register
mail settings
Submitter Paul Menzel
Date Jan. 10, 2011, 11:39 a.m.
Message ID <1294659553.4342.69.camel@mattotaupa>
Download mbox | patch
Permalink /patch/218/
State Accepted
Headers show

Comments

Paul Menzel - Jan. 10, 2011, 11:39 a.m.
Date: Mon, 10 Jan 2011 12:09:26 +0100

Since commit 6883f6 [1] packages have been populated manually.

	FILES_${PN} = "${libdir}"
	FILES_${PN}-dev = "${includedir}"

This gives the following QA errors for `libcap` and `libcap2` (which is based on `libcap` [2]) [3].

• `libcap`:

	ERROR: QA Issue with libcap: non -dev package contains symlink .so: libcap path '/work/armv7a-oe-linux-uclibceabi/libcap-1.10-r2/packages-split/libcap/usr/lib/libcap.so'
	ERROR: QA Issue with libcap: non -dev package contains symlink .so: libcap path '/work/armv7a-oe-linux-uclibceabi/libcap-1.10-r2/packages-split/libcap/usr/lib/libcap.so'

• `libcap2`:

	ERROR: QA Issue with libcap2: non -dev package contains symlink .so: libcap2 path '/work/armv7a-oe-linux-uclibceabi/libcap2-2.16-r1/packages-split/libcap2/usr/lib/libcap.so'
	ERROR: QA Issue with libcap2: non -dev package contains symlink .so: libcap2 path '/work/armv7a-oe-linux-uclibceabi/libcap2-2.16-r1/packages-split/libcap2/usr/lib/libcap.so'

Using automatic packages the symlink `libcap.so -> libcap.so.1.10` is put into `libcap{,2}-dev`.

Note: The symlink `libcap.so.1 -> libcap.so.1.10` is still put into `libcap1_1.10-r2_armv7a.ipk` but does not raise a QA error.

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=6883f65588c6aa7e9780ff7c11b15a397382a422
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=c71a6ebf796df907ba0d4339e6acf66faa3c6232
[3] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-January/028557.html

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
CC: Rolf Leggewie <no2spam@nospam.arcornews.de>
---
Am Sonntag, den 09.01.2011, 10:20 -0800 schrieb Khem Raj:
> On 1/9/2011 6:56 AM, Paul Menzel wrote:

> > doing `bitbake -k libcap` with latest master (3d030f) with
> > `minimal-uclibc` for `MACHINE = "beagleboard"`
> >
> >          NOTE: package libcap-1.10-r2: task do_qa_staging: Succeeded
> >          ERROR: QA Issue with libcap: non -dev package contains symlink .so: libcap path '/work/armv7a-oe-linux-uclibceabi/libcap-1.10-r2/packages-split/libcap/usr/lib/libcap.so'
> >          ERROR: QA Issue with libcap: non -dev package contains symlink .so: libcap path '/work/armv7a-oe-linux-uclibceabi/libcap-1.10-r2/packages-split/libcap/usr/lib/libcap.so'
> >          NOTE: package libcap-1.10-r2: task do_package: Succeeded
> >
> > Is that error reasonable or are library packages not allowed to have
> > symlinks [1]?
> 
> Usually sylinks are needed for debugging and linking thats why its 
> preferred in -dev packages. But you can sort it out by removing the 
> below lines and see how the automatic package puts stuff

You are right, automatic packaging puts the symlink into `libcap-dev`,
but as noted `libcap.so.1` is still in the “main” package.

> >
> >          FILES_${PN} = "${libdir}"
> >          FILES_${PN}-dev = "${includedir}"

I am putting Rolf into CC to get the reasoning for the previous
behavior.

> > [1] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/libcap/libcap_1.10.bb?id=3d030ffa57af27275fbb42eaa0fcd611f4925348
---
 recipes/libcap/libcap2_2.16.bb |    5 +----
 recipes/libcap/libcap_1.10.bb  |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)
Rolf Leggewie - Jan. 10, 2011, 1:44 p.m.
On 10.01.2011 19:39, Paul Menzel wrote
>>>          FILES_${PN} = "${libdir}"
>>>          FILES_${PN}-dev = "${includedir}"
> 
> I am putting Rolf into CC to get the reasoning for the previous
> behavior.

My commit did not change the previous behaviour as far as I can see and
thus I cannot comment on it.  Maybe you want to look deeper into the
history of that file.  Sorry.
Paul Menzel - Jan. 10, 2011, 2:45 p.m.
Am Montag, den 10.01.2011, 21:44 +0800 schrieb Rolf Leggewie:
> On 10.01.2011 19:39, Paul Menzel wrote
> >>>          FILES_${PN} = "${libdir}"
> >>>          FILES_${PN}-dev = "${includedir}"
> > 
> > I am putting Rolf into CC to get the reasoning for the previous
> > behavior.
> 
> My commit did not change the previous behaviour as far as I can see and
> thus I cannot comment on it.

Sorry, I misinterpreted `git blame`.

> Maybe you want to look deeper into the history of that file.  Sorry.

It looks Dirk committed these lines when adding 1.10 in commit b823b4
[1].

Dirk, could you please comment on [2].


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b823b49470515182cb6f7a536d6a63fac53948aa
[2] http://patches.openembedded.org/patch/218/
Dirk Opfer - Jan. 10, 2011, 9:11 p.m.
Am 10.01.2011 15:45, schrieb Paul Menzel:
> Maybe you want to look deeper into the history of that file.  Sorry.
> It looks Dirk committed these lines when adding 1.10 in commit b823b4
> [1].
>
> Dirk, could you please comment on [2].
>

No idea why this was needed in the old version.
Looks fine to me.

Acked-by: Dirk Opfer <dirk@do13.de>

Thanks,

Dirk
Dirk Opfer - Jan. 10, 2011, 9:15 p.m.
Am 10.01.2011 15:45, schrieb Paul Menzel:
> Maybe you want to look deeper into the history of that file.  Sorry.
> It looks Dirk committed these lines when adding 1.10 in commit b823b4
> [1].
>
> Dirk, could you please comment on [2].
>

No idea why this was needed in the old version.
Looks fine to me.

Acked-by: Dirk Opfer <dirk@do13.de>

Thanks,

Dirk

Patch

diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb
index 92cd50f..97b03d5 100644
--- a/recipes/libcap/libcap2_2.16.bb
+++ b/recipes/libcap/libcap2_2.16.bb
@@ -3,7 +3,7 @@  PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native attr"
-PR = "r1"
+PR = "r2"
 
 BUILD_CFLAGS += "-I${S}/libcap/include"
 CFLAGS += "-I${S}/libcap/include"
@@ -15,9 +15,6 @@  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libca
 
 S = "${WORKDIR}/libcap-${PV}"
 
-FILES_${PN} = "${libdir}"
-FILES_${PN}-dev = "${includedir}"
-
 do_install() {
 	install -d ${D}${includedir}/sys
 	install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/
diff --git a/recipes/libcap/libcap_1.10.bb b/recipes/libcap/libcap_1.10.bb
index af5600b..a9444bb 100644
--- a/recipes/libcap/libcap_1.10.bb
+++ b/recipes/libcap/libcap_1.10.bb
@@ -3,7 +3,7 @@  PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native"
-PR = "r2"
+PR = "r3"
 
 CFLAGS_append = " -I${S}/libcap/include -fPIC"
 
@@ -12,9 +12,6 @@  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${
 	   file://make.patch \
 	   file://syscall.patch"
 
-FILES_${PN} = "${libdir}"
-FILES_${PN}-dev = "${includedir}"
-
 do_install() {
 	install -d ${D}${includedir}/sys
 	install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/