Patchwork [CONSOLIDATED,PULL,07/29] sqlite3: Fix nativesdk packaging/QA warnings

login
register
mail settings
Submitter Saul Wold
Date Sept. 28, 2011, 7:05 a.m.
Message ID <4f5fdc4dc14d287d301069024ddec9cb65d68f7f.1317193250.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/12263/
State New, archived
Headers show

Comments

Saul Wold - Sept. 28, 2011, 7:05 a.m.
From: Richard Purdie <richard.purdie@linuxfoundation.org>

When building sqlite3-nativesdk, there was a warning about debug files in the
main package. This was due to the order of items in PACKAGES with -dbg after
the main package which breaks an assumption native.bbclass makes. Changing
the order fixes the packaging problem with no change to the normal target
packaging.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/sqlite/sqlite3.inc        |    2 +-
 meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 2a52a44..ece35c5 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -20,7 +20,7 @@  export config_TARGET_LFLAGS = "${LDFLAGS}"
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "lib${BPN}${PKGSUFFIX} lib${BPN}${PKGSUFFIX}-dev lib${BPN}${PKGSUFFIX}-doc ${PN} ${PN}-dbg"
+PACKAGES = "lib${BPN}${PKGSUFFIX} lib${BPN}${PKGSUFFIX}-dev lib${BPN}${PKGSUFFIX}-doc ${PN}-dbg ${PN}"
 FILES_${PN} = "${bindir}/*"
 FILES_lib${BPN}${PKGSUFFIX} = "${libdir}/*.so.*"
 FILES_lib${BPN}${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb b/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb
index 5651c07..fd03780 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb
@@ -4,7 +4,7 @@  LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b357
 
 SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz"
 S = "${WORKDIR}/sqlite-autoconf-3070701"
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "554026fe7fac47b1cf61c18d5fe43419"
 SRC_URI[sha256sum] = "7dcc36b25f7bcbe2938d0ea2baea5b706f0af93473d02a3f612d7ab39e386edf"