Skip to contentSkip to conversation

Fixed packaging warnings

PATCH Applied Lianhao Lu 2 participants 7 messages Mar 23, 2012

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Fixed packaging warnings

This patch set fixed misc packaging warnings.

The following changes since commit b92aaf764e6de94fb9fdee610e8f6643ccf74894:
Richard Purdie (1):
gst-plugins-bluetooth: Don't install headers, man pages or .pc files

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/warningfix2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/warningfix2

Lianhao Lu (5):
pseudo: package the var/pseudo directory.
gdb-cross-canadian: not shipping libiberty.
ncurses: ship clear/reset in package.
nativesdk/misc: set PKGSUFFIX for correct variable name expansion.
libgcc: corrected -nativesdk package namings.

 meta/classes/nativesdk.bbclass                     |    2 ++
 meta/recipes-core/eglibc/eglibc-locale.inc         |    2 +-
 meta/recipes-core/eglibc/eglibc_2.13.bb            |    2 +-
 meta/recipes-core/eglibc/eglibc_2.15.bb            |    2 +-
 meta/recipes-core/ncurses/ncurses.inc              |    6 +++---
 meta/recipes-devtools/gcc/gcc-4.6.inc              |    2 +-
 meta/recipes-devtools/gcc/libgcc_4.6.bb            |   11 +++++++----
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |    6 ++++++
 .../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb |    2 +-
 meta/recipes-devtools/opkg/opkg.inc                |    2 +-
 meta/recipes-devtools/pseudo/pseudo.inc            |    2 +-
 meta/recipes-devtools/pseudo/pseudo_1.2.bb         |    2 +-
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    2 +-
 meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb    |    2 +-
 meta/recipes-support/sqlite/sqlite3_3.7.10.bb      |    2 +-
 15 files changed, 29 insertions(+), 18 deletions(-)
author
#1 lore raw

PATCH 1/5 pseudo: package the var/pseudo directory.

Fixed the "not shipped" packaging warnings.

WARNING: For recipe pseudo-nativesdk, the following files/directories were installed but not shipped in any package:
WARNING: /opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/var
WARNING:
/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/var/pseudo

---
 meta/recipes-devtools/pseudo/pseudo.inc    |    2 +-
 meta/recipes-devtools/pseudo/pseudo_1.2.bb |    2 +-
 meta/recipes-devtools/pseudo/pseudo_git.bb |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/pseudo/pseudo.inc +1 -1
index c2a871b..4a3ef6f 100644
@@ -9,7 +9,7 @@ SECTION = "base"
 LICENSE = "LGPL2.1"
 DEPENDS = "sqlite3"
 
-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo"
+FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
 FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
 PROVIDES += "virtual/fakeroot"
 
meta/recipes-devtools/pseudo/pseudo_1.2.bb +1 -1
index 04bcbce..9f95bd7 100644
@@ -1,6 +1,6 @@
 require pseudo.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://oe-config.patch \
meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1
index 5ed8cf7..4f8c9d6 100644
@@ -2,7 +2,7 @@ require pseudo.inc
 
 SRCREV = "17c2233f93692f79684792750001ee6d13e03925"
 PV = "1.2+git${SRCPV}"
-PR = "r20"
+PR = "r21"
 
 DEFAULT_PREFERENCE = "-1"
 
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/5 gdb-cross-canadian: not shipping libiberty.

Fixed package QA warnings.

WARNING: QA Issue: non -staticdev package contains static .a library:
gdb-cross-canadian-i586 path '/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-i586-7.4-r6.3/packages-split/gdb-cross-canadian-i586/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib/lib/libiberty.a'

---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |    6 ++++++
 .../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +6 -0
index a7cac61..47d7d28 100644
@@ -23,3 +23,9 @@ exit 0
 EOF
         chmod +x ${WORKDIR}/python
 }
+
+# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
+# right bits installed by binutils.
+do_install_append() {
+	rm -rf ${D}${exec_prefix}/lib
+}
meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb +1 -1
index dbcffde..dfb7d81 100644
@@ -1,7 +1,7 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 EXPAT = "--with-expat"
Signature · 1 line
1.7.0.4
author
#3 lore raw

PATCH 3/5 ncurses: ship clear/reset in package.

In reply to Lianhao Lu

Fixed not shipped packaging warnings.

WARNING: For recipe ncurses-nativesdk, the following files/directories were installed but not shipped in any package:
WARNING:
/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/bin/reset WARNING:
/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/bin/clear

---
 meta/recipes-core/ncurses/ncurses.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +3 -3
index 4d64f5e..ae99e2c 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 = "r7"
+INC_PR = "r8"
 
 inherit autotools binconfig multilib_header
 
@@ -245,8 +245,8 @@ FILES_${PN}-tools = "\
   ${bindir}/infotocap \
   ${bindir}/captoinfo \
   ${bindir}/infocmp \
-  ${bindir}/clear.${PN} \
-  ${bindir}/reset.${PN} \
+  ${bindir}/clear${@['', '.${PN\x7d'][d.getVar('PN', 1) == 'ncurses']} \
+  ${bindir}/reset${@['', '.${PN\x7d'][d.getVar('PN', 1) == 'ncurses']} \
   ${bindir}/tack \
   ${bindir}/tabs \
 "
Signature · 1 line
1.7.0.4
author
#4 lore raw

PATCH 4/5 nativesdk/misc: set PKGSUFFIX for correct variable name expansion.

In reply to Lianhao Lu

Set PKGSUFFIX in nativesdk.bbclass for correct variable name expansion. This would fix bunch of "not shipped" packaging warnings in "-nativesdk" recipes. And also bumping the corresponding PR.

---
 meta/classes/nativesdk.bbclass                  |    2 ++
 meta/recipes-core/eglibc/eglibc-locale.inc      |    2 +-
 meta/recipes-core/eglibc/eglibc_2.13.bb         |    2 +-
 meta/recipes-core/eglibc/eglibc_2.15.bb         |    2 +-
 meta/recipes-devtools/opkg/opkg.inc             |    2 +-
 meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb |    2 +-
 meta/recipes-support/sqlite/sqlite3_3.7.10.bb   |    2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)
meta/classes/nativesdk.bbclass +2 -0
index ceec53e..97c460c 100644
@@ -56,6 +56,8 @@ baselib = "lib"
 export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
 
+PKGSUFFIX = "-nativesdk"
+
 python nativesdk_virtclass_handler () {
     if not isinstance(e, bb.event.RecipePreFinalise):
         return
meta/recipes-core/eglibc/eglibc-locale.inc +1 -1
index 2e9b4d4..9d5434f 100644
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r19"
+PR = "r20"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
meta/recipes-core/eglibc/eglibc_2.13.bb +1 -1
index a4f59b6..e02c80f 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "15508"
 
 DEPENDS += "gperf-native"
-PR = "r21"
+PR = "r22"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -1
index 3820f5a..644d904 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "16540"
 
 DEPENDS += "gperf-native"
-PR = "r1"
+PR = "r2"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
meta/recipes-devtools/opkg/opkg.inc +1 -1
index 689bd4a..14083d0 100644
@@ -11,7 +11,7 @@ DEPENDS_virtclass-native = "curl-native"
 DEPENDS_virtclass-nativesdk = "curl-nativesdk"
 
 PE = "1"
-INC_PR = "r8"
+INC_PR = "r9"
 
 FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
 
meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb +1 -1
index 90b0cba..b128d77 100644
@@ -14,7 +14,7 @@ BBCLASSEXTEND = "native nativesdk"
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
            file://fix-tstamp-declaration.patch"
meta/recipes-support/sqlite/sqlite3_3.7.10.bb +1 -1
index 25e2b24..ec6ded6 100644
@@ -1,6 +1,6 @@
 require sqlite3.inc
 
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
 
Signature · 1 line
1.7.0.4
author
#5 lore raw

PATCH 5/5 libgcc: corrected -nativesdk package namings.

In reply to Lianhao Lu

1. Corrected the -nativesdk package namings.

2. Fixed package QA warnings:
WARNING: QA Issue: non -staticdev package contains static .a library:
libgcc-nativesdk-dev path '/work/x86_64-nativesdk-pokysdk-linux/libgcc-nativesdk-4.6.3+svnr184847-r23/packages-split/libgcc-nativesdk-dev/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib/x86_64-pokysdk-linux/4.6.4/libgcc.a'
WARNING: QA Issue: non -staticdev package contains static .a library:
libgcc-nativesdk-dev path '/work/x86_64-nativesdk-pokysdk-linux/libgcc-nativesdk-4.6.3+svnr184847-r23/packages-split/libgcc-nativesdk-dev/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib/x86_64-pokysdk-linux/4.6.4/libgcc_eh.a'

---
 meta/recipes-devtools/gcc/gcc-4.6.inc   |    2 +-
 meta/recipes-devtools/gcc/libgcc_4.6.bb |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
index 99c30a6..d40a534 100644
@@ -1,6 +1,6 @@
 require gcc-common.inc
 
-PR = "r23"
+PR = "r24"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/libgcc_4.6.bb +7 -4
index 04e2877..6e557d5 100644
@@ -3,11 +3,14 @@ require gcc-${PV}.inc
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
+PKGSUFFIX = ""
+PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
+
 PACKAGES = "\
   ${PN} \
   ${PN}-dev \
   ${PN}-dbg \
-  libgcov-dev \
+  libgcov${PKGSUFFIX}-dev \
   "
 
 FILES_${PN} = "${base_libdir}/libgcc*.so.*"
@@ -15,7 +18,7 @@ FILES_${PN}-dev = " \
   ${base_libdir}/libgcc*.so \
   ${libdir}/${TARGET_SYS}/${BINV}/crt* \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
-FILES_libgcov-dev = " \
+FILES_libgcov${PKGSUFFIX}-dev = " \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a"
 
 FILES_${PN}-dbg += "${base_libdir}/.debug/"
@@ -48,6 +51,6 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
 
 BBCLASSEXTEND = "nativesdk"
 
-INSANE_SKIP_libgcc-dev = "staticdev"
-INSANE_SKIP_libgcov-dev = "staticdev"
+INSANE_SKIP_${PN}-dev = "staticdev"
+INSANE_SKIP_libgcov${PKGSUFFIX}-dev = "staticdev"
 
Signature · 1 line
1.7.0.4
#6 lore raw
In reply to Lianhao Lu
Quoted 11 lines · Lianhao Lu

This patch set fixed misc packaging warnings.

The following changes since commit b92aaf764e6de94fb9fdee610e8f6643ccf74894:
Richard Purdie (1):
gst-plugins-bluetooth: Don't install headers, man pages or .pc files

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/warningfix2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/warningfix2

Quoted 6 lines

Lianhao Lu (5):
pseudo: package the var/pseudo directory.
gdb-cross-canadian: not shipping libiberty.
ncurses: ship clear/reset in package.
nativesdk/misc: set PKGSUFFIX for correct variable name expansion.
libgcc: corrected -nativesdk package namings.

Merged to master, thanks!

Richard