* [PATCH 00/14] Warning Fixes and some Updates
@ 2012-03-14 8:33 Saul Wold
2012-03-14 8:33 ` [PATCH 01/14] owl-video: Fix unpackaged file warning Saul Wold
` (14 more replies)
0 siblings, 15 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
Richard,
This has some warning fixes along with some update.
Biggest change is to bitbake.conf, which re-orders PACKAGE and addes
${libdir}/${BPN}/*.a to the staticdev list, this was seen in a number
of packages and seems to make sense. But I would understand if there
are other issues I am not aware of.
The FILES_${PN} was grabbing from ${libdir}/${BPN}/* so we needed to
get the staticdev in before that.
Other thoughts?
Sau!
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.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Saul Wold (14):
owl-video: Fix unpackaged file warning
ltp: Package static library in -staticdev
quilt: Fix docs packaging warnings
autoconf: remove emacs mode files to fix warnings
qt4: package static libraries correctly to fix warnings
rpm: Package python-rpm static archive correctly
python: package static libraries correctly in -staticdev
distro_tracking: Updates for manual checks
avahi: Update to 0.6.31
man-pages: Update to 3.36
libgalago: Fix package warnings by not packaging autopackage
gpgme: fix packaging warnings
man: fix configure issue to solve warnings
bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file
before PN
meta/conf/bitbake.conf | 4 +-
.../conf/distro/include/distro_tracking_fields.inc | 36 ++++++++++++++++----
.../{avahi-ui_0.6.30.bb => avahi-ui_0.6.31.bb} | 8 ++--
meta/recipes-connectivity/avahi/avahi.inc | 6 ++--
.../avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb} | 6 ++--
.../recipes-connectivity/galago/libgalago_0.5.2.bb | 5 +++
meta/recipes-devtools/autoconf/autoconf.inc | 4 ++
meta/recipes-devtools/autoconf/autoconf_2.68.bb | 2 +-
.../python/python-2.7-manifest.inc | 6 +++-
meta/recipes-devtools/python/python_2.7.2.bb | 2 +-
meta/recipes-devtools/quilt/quilt-0.51.inc | 2 +-
meta/recipes-devtools/quilt/quilt_0.51.bb | 2 +-
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 5 ++-
meta/recipes-extended/ltp/ltp_20120104.bb | 4 ++
.../{man-pages_3.32.bb => man-pages_3.36.bb} | 8 ++--
meta/recipes-extended/man/man_1.6f.bb | 4 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 19 +++++++++--
.../recipes-sato/owl-video-widget/owl-video_git.bb | 4 ++-
meta/recipes-support/gpgme/gpgme_1.3.1.bb | 6 +++-
20 files changed, 97 insertions(+), 38 deletions(-)
rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.30.bb => avahi-ui_0.6.31.bb} (93%)
rename meta/recipes-connectivity/avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb} (80%)
rename meta/recipes-extended/man-pages/{man-pages_3.32.bb => man-pages_3.36.bb} (80%)
--
1.7.7.6
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 01/14] owl-video: Fix unpackaged file warning
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 02/14] ltp: Package static library in -staticdev Saul Wold
` (13 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe owl-video, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/video
WARNING: /usr/share/video/gtk-fullscreen.png
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-sato/owl-video-widget/owl-video_git.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
index 3ecb82e..bc63273 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -10,7 +10,7 @@ DEPENDS = "libowl-av"
SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
S = "${WORKDIR}/git"
@@ -39,3 +39,5 @@ do_install_append () {
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications
}
+
+FILES_${PN} += "${datadir}/video"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 02/14] ltp: Package static library in -staticdev
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
2012-03-14 8:33 ` [PATCH 01/14] owl-video: Fix unpackaged file warning Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 03/14] quilt: Fix docs packaging warnings Saul Wold
` (12 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: QA Issue: non -staticdev package contains static .a library: ltp path '/work/i586-poky-linux/ltp-20120104-r0/packages-split/ltp/opt/ltp/lib/libmem.a'
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/ltp/ltp_20120104.bb | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-extended/ltp/ltp_20120104.bb b/meta/recipes-extended/ltp/ltp_20120104.bb
index 07e1fcc..c82203a 100644
--- a/meta/recipes-extended/ltp/ltp_20120104.bb
+++ b/meta/recipes-extended/ltp/ltp_20120104.bb
@@ -19,6 +19,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
"
+PR = "r1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
file://uclibc-getcontext.patch \
"
@@ -39,6 +41,8 @@ FILES_${PN}-dbg += "/opt/ltp/scenario_groups/.debug"
FILES_${PN}-dbg += "/opt/ltp/testscripts/.debug"
FILES_${PN}-dbg += "/opt/ltp/testscripts/open_posix_testsuite/.debug"
+FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a"
+
FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*"
TARGET_CC_ARCH += "${LDFLAGS}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 03/14] quilt: Fix docs packaging warnings
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
2012-03-14 8:33 ` [PATCH 01/14] owl-video: Fix unpackaged file warning Saul Wold
2012-03-14 8:33 ` [PATCH 02/14] ltp: Package static library in -staticdev Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 04/14] autoconf: remove emacs mode files to fix warnings Saul Wold
` (11 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe quilt, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/doc
WARNING: /usr/share/doc/quilt
WARNING: /usr/share/doc/quilt/README
WARNING: /usr/share/doc/quilt/quilt.pdf
WARNING: /usr/share/doc/quilt/README.MAIL
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/quilt/quilt-0.51.inc | 2 +-
meta/recipes-devtools/quilt/quilt_0.51.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/quilt/quilt-0.51.inc b/meta/recipes-devtools/quilt/quilt-0.51.inc
index c41e25e..e89013a 100644
--- a/meta/recipes-devtools/quilt/quilt-0.51.inc
+++ b/meta/recipes-devtools/quilt/quilt-0.51.inc
@@ -16,7 +16,7 @@ PACKAGES += "guards guards-doc"
FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
${bindir}/quilt ${libdir}/quilt"
FILES_guards = "${bindir}/guards"
-FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
+FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
FILES_guards-doc = "${mandir}/man1/guards.1"
RDEPENDS_${PN} = "bash"
diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb
index 1c6ca73..bc62161 100644
--- a/meta/recipes-devtools/quilt/quilt_0.51.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.51.bb
@@ -4,4 +4,4 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
SRC_URI += "file://aclocal.patch \
file://gnu_patch_test_fix_target.patch \
"
-PR = "r1"
+PR = "r2"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 04/14] autoconf: remove emacs mode files to fix warnings
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (2 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 03/14] quilt: Fix docs packaging warnings Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 05/14] qt4: package static libraries correctly " Saul Wold
` (10 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe autoconf, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/emacs
WARNING: /usr/share/emacs/site-lisp
WARNING: /usr/share/emacs/site-lisp/autotest-mode.elc
WARNING: /usr/share/emacs/site-lisp/autotest-mode.el
WARNING: /usr/share/emacs/site-lisp/autoconf-mode.el
WARNING: /usr/share/emacs/site-lisp/autoconf-mode.elc
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/autoconf/autoconf.inc | 4 ++++
meta/recipes-devtools/autoconf/autoconf_2.68.bb | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index e7ae339..80a5d92 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -16,3 +16,7 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
file://program_prefix.patch"
inherit autotools
+
+do_install_append() {
+ rm -rf ${D}${datadir}/emacs
+}
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index 63db7d1..f1b506a 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
require autoconf.inc
-PR = "r5"
+PR = "r6"
PARALLEL_MAKE = ""
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 05/14] qt4: package static libraries correctly to fix warnings
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (3 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 04/14] autoconf: remove emacs mode files to fix warnings Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 11:39 ` Martin Jansa
2012-03-14 8:33 ` [PATCH 06/14] rpm: Package python-rpm static archive correctly Saul Wold
` (9 subsequent siblings)
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a'
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 56f349a..e1bef64 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r39"
+INC_PR = "r40"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 77fb06f..8f2cbd5 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -45,30 +45,33 @@ python __anonymous () {
lib_packages = []
dev_packages = []
dbg_packages = []
+ staticdev_packages = []
for name in d.getVar("QT_LIB_NAMES", True).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
# NOTE: the headers for QtAssistantClient are different
incname = name.replace("QtAssistantClient", "QtAssistant")
d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
- ${libdir}/lib%(name)s${QT_LIBINFIX}.a
${libdir}/lib%(name)s${QT_LIBINFIX}.la
${libdir}/lib%(name)s${QT_LIBINFIX}.so
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
+ d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
+ staticdev_packages.append("%s-staticdev" % pkg)
for name in d.getVar("OTHER_PACKAGES", True).split():
dbg_packages.append("%s-dbg" % name)
+ dbg_packages.append("%s-staticdev" % name)
for name in d.getVar("QT_EXTRA_LIBS", True).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
+ d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
- ${libdir}/lib%(name)s.a
${libdir}/lib%(name)s.la
${libdir}/lib%(name)s.so
${includedir}/${QT_DIR_NAME}/%(incname)s
@@ -78,10 +81,12 @@ python __anonymous () {
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
+ staticdev_packages.append("%s-staticdev" % pkg)
d.setVar("LIB_PACKAGES", " ".join(lib_packages))
d.setVar("DEV_PACKAGES", " ".join(dev_packages))
d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
+ d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
}
OTHER_PACKAGES = "\
@@ -109,7 +114,13 @@ OTHER_PACKAGES = "\
#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
-PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
+PACKAGES += " \
+ ${LIB_PACKAGES} \
+ ${DEV_PACKAGES} \
+ ${DBG_PACKAGES} \
+ ${STATICDEV_PACKAGES} \
+ ${OTHER_PACKAGES}"
+
PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
ALLOW_EMPTY_${PN} = "1"
@@ -153,10 +164,12 @@ FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
+FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/shared/libdemo_shared.a"
FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 06/14] rpm: Package python-rpm static archive correctly
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (4 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 05/14] qt4: package static libraries correctly " Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 07/14] python: package static libraries correctly in -staticdev Saul Wold
` (8 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: QA Issue: non -staticdev package contains static .a library: python-rpm path '/work/i586-poky-linux/rpm-5.4.0-r34/packages-split/python-rpm/usr/lib/python2.7/rpm/_rpmmodule.a'
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 2441380..0df107d 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl"
extrarpmdeps_virtclass-native = "file-native"
-PR = "r34"
+PR = "r35"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -174,7 +174,7 @@ EXTRA_OECONF = "--verbose \
CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
SOLIBS = "5.4.so"
@@ -302,6 +302,7 @@ RDEPENDS_${PN}-build = "file"
#%rpmattr %{_rpmhome}/symclash.*
FILES_python-rpm-dbg = "${libdir}/python*/rpm/.debug/_*"
+FILES_python-rpm-staticdev = "${libdir}/python*/rpm/*.a"
FILES_python-rpm = "${libdir}/python*/rpm"
FILES_perl-module-rpm = "${libdir}/perl/*/* \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 07/14] python: package static libraries correctly in -staticdev
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (5 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 06/14] rpm: Package python-rpm static archive correctly Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:43 ` Martin Jansa
2012-03-14 8:33 ` [PATCH 08/14] distro_tracking: Updates for manual checks Saul Wold
` (7 subsequent siblings)
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: QA Issue: non -staticdev package contains static .a library: python-distutils path '/work/i586-poky-linux/python-2.7.2-r1.7/packages-split/python-distutils/usr/lib/python2.7/config/libpython2.7.a'
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../python/python-2.7-manifest.inc | 6 +++++-
meta/recipes-devtools/python/python_2.7.2.bb | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index e4017ba..5f8b7cf 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -7,7 +7,7 @@
PROVIDES+="${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
-PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
+PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
DESCRIPTION_${PN}-2to3="Python Automated Python 2 to 3 code translation"
RDEPENDS_${PN}-2to3="${PN}-core"
@@ -78,6 +78,10 @@ DESCRIPTION_${PN}-distutils="Python Distribution Utilities"
RDEPENDS_${PN}-distutils="${PN}-core"
FILES_${PN}-distutils="${libdir}/python2.7/config ${libdir}/python2.7/distutils "
+DESCRIPTION_${PN}-distutils-staticdev="Python Distribution Utilities (Static Libraries)"
+RDEPENDS_${PN}-distutils-staticdev="${PN}-distutils"
+FILES_${PN}-distutils-staticdev="${libdir}/python2.7/config/lib*.a"
+
DESCRIPTION_${PN}-doctest="Python framework for running examples in docstrings."
RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib"
FILES_${PN}-doctest="${libdir}/python2.7/doctest.* "
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index b14b82e..d2100be 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 08/14] distro_tracking: Updates for manual checks
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (6 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 07/14] python: package static libraries correctly in -staticdev Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 09/14] avahi: Update to 0.6.31 Saul Wold
` (6 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 36 ++++++++++++++++----
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index d8cb150..ee5fac3 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -636,8 +636,8 @@ DISTRO_PN_ALIAS_pn-augeas = "Ubuntu=libaugeas0 Debian=libaugeas0"
RECIPE_STATUS_pn-sat-solver = "green"
RECIPE_DEPENDENCY_CHECK_pn-sat-solver = "done"
-RECIPE_LATEST_VERSION_pn-sat-solver = "git"
-RECIPE_MANUAL_CHECK_DATE_pn-sat-solver = "Dec 01, 2011"
+RECIPE_LATEST_VERSION_pn-sat-solver = "0.0-git1+e74e0bfd23e4e95064d08e13efb5de9caf433f40"
+RECIPE_MANUAL_CHECK_DATE_pn-sat-solver = "Mar 12, 2012"
RECIPE_INTEL_SECTION_pn-sat-solver = "base libs"
DISTRO_PN_ALIAS_pn-sat-solver = "OSPDT OpenSuSE=satsolver-tools"
RECIPE_COMMENTS_pn-sat-solver = ""
@@ -1681,15 +1681,25 @@ RECIPE_LATEST_RELEASE_DATE_pn-hal-info = "Nov 01, 2009"
RECIPE_COMMENTS_pn-hal-info = ""
RECIPE_STATUS_pn-avahi = "green"
-RECIPE_LAST_UPDATE_pn-avahi = "Nov 19, 2010"
+RECIPE_LATEST_VERSION_pn-avahi = "0.6.31"
+RECIPE_LATEST_RELEASE_DATE_pn-avahi = "Oct 01, 2010"
+RECIPE_LAST_UPDATE_pn-avahi = "Mar 12, 2012"
RECIPE_MAINTAINER_pn-avahi = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-avahi = "not done"
-RECIPE_LATEST_VERSION_pn-avahi = "0.6.28"
RECIPE_INTEL_SECTION_pn-avahi = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-avahi = "3 month"
-RECIPE_LATEST_RELEASE_DATE_pn-avahi = "Oct 01, 2010"
RECIPE_COMMENTS_pn-avahi = ""
+RECIPE_STATUS_pn-avahi-ui = "green"
+RECIPE_LATEST_VERSION_pn-avahi-ui = "0.6.31"
+RECIPE_LATEST_RELEASE_DATE_pn-avahi-ui = "Oct 01, 2010"
+RECIPE_LAST_UPDATE_pn-avahi-ui = "Mar 12, 2012"
+RECIPE_MAINTAINER_pn-avahi-ui = "Zhai Edwin <edwin.zhai@intel.com>"
+RECIPE_DEPENDENCY_CHECK_pn-avahi-ui = "not done"
+RECIPE_INTEL_SECTION_pn-avahi-ui = "base utils"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-avahi-ui = "3 month"
+RECIPE_COMMENTS_pn-avahi-ui = ""
+
RECIPE_STATUS_pn-js = "yellow" # may not work for platforms other than 32bit x86
RECIPE_LAST_UPDATE_pn-js = "Jul 5, 2010"
RECIPE_MAINTAINER_pn-js = "Saul Wold <sgw@linux.intel.com>"
@@ -3146,7 +3156,7 @@ RECIPE_MANUAL_CHECK_DATE_pn-perl = "Nov 16, 2011"
RECIPE_MAINTAINER_pn-perl = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-prelink="green"
-RECIPE_LATEST_VERSION_pn-prelink="1.0+git0+0x7b47f2f8a15ed13b7905bc120bb2586f3e164f7d"
+RECIPE_LATEST_VERSION_pn-prelink="1.0+git1+9552f214c7faa816fdb55b289a457f0cab034f00"
RECIPE_LAST_UPDATE_pn-prelink = "Jan 13, 2012"
RECIPE_MANUAL_CHECK_DATE_pn-prelink = "Jan 13, 2012"
RECIPE_MAINTAINER_pn-prelink = "Mark Hatle <mark.hatle@windriver.com>"
@@ -4632,7 +4642,7 @@ RECIPE_INTEL_SECTION_pn-pixman = "x11/libs"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pixman = "2 months"
RECIPE_LATEST_RELEASE_DATE_pn-pixman = "Jan 18, 2012"
RECIPE_COMMENTS_pn-pixman = ""
-RECIPE_LAST_UPDATE_pn-pixman = "Jan 22, 2012"
+RECIPE_LAST_UPDATE_pn-pixman = "Feb 29, 2012"
RECIPE_MAINTAINER_pn-pixman = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-xtrans = "green"
@@ -6215,6 +6225,18 @@ RECIPE_MANUAL_CHECK_DATE_pn-libiconv = "Nov 22, 2011"
DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
RECIPE_MAINTAINER_pn-libiconv = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_STATUS_pn-xinput = "green"
+RECIPE_LATEST_VERSION_pn-xinput = "1.14"
+RECIPE_LATEST_RELEASE_DATE_pn-xinput = "Aug 07, 2011"
+RECIPE_MAINTAINER_pn-xinput = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_NO_UPDATE_REASON_pn-xinput = "Don't Update to unstable 1.5.99.1"
+
+RECIPE_STATUS_pn-socat = "green"
+RECIPE_LATEST_VERSION_pn-socat = "2.0.0"
+RECIPE_LATEST_RELEASE_DATE_pn-socat = "Aug 07, 2011"
+RECIPE_LAST_UPDATE_pn-socat = "Mar 12, 2012"
+RECIPE_MAINTAINER_pn-socat = "Saul Wold <sgw@linux.intel.com>"
+
RECIPE_STATUS_pn-ltp = "green"
RECIPE_LATEST_VERSION_pn-ltp = "20110915"
RECIPE_LATEST_RELEASE_DATE_pn-ltp = "Sep 15, 2011"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 09/14] avahi: Update to 0.6.31
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (7 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 08/14] distro_tracking: Updates for manual checks Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 10/14] man-pages: Update to 3.36 Saul Wold
` (5 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
Removed unneeded patch, because the issue was fixed upstream
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{avahi-ui_0.6.30.bb => avahi-ui_0.6.31.bb} | 8 ++++----
meta/recipes-connectivity/avahi/avahi.inc | 6 +++---
.../avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb} | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.30.bb => avahi-ui_0.6.31.bb} (93%)
rename meta/recipes-connectivity/avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb} (80%)
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
similarity index 93%
rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
rename to meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index d7b9ed8..2c12053 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
@@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
require avahi.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
DEPENDS += "avahi gtk+ libglade"
@@ -34,9 +37,6 @@ RDEPENDS_avahi-discover = "python-avahi python-pygtk"
RDEPENDS_python-avahi = "python-dbus"
-SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
-SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
-
do_install_append () {
rm ${D}${sysconfdir} -rf
rm ${D}${base_libdir} -rf
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5e29b9c..0308095 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,15 +14,14 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r11"
+INC_PR = "r0"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd \
file://99avahi-autoipd \
- file://initscript.patch \
- file://fix_for_automake_1.11.2.patch"
+ file://initscript.patch"
USERADD_PACKAGES = "avahi-daemon"
USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
@@ -113,6 +112,7 @@ do_install() {
# if /var/run become non-empty in the future, need to install it via volatile
rm -rf ${D}/var/run
rm -rf ${D}${datadir}/dbus-1/interfaces
+ rm -rf ${D}/usr/lib/avahi
}
do_install_avahi-autoipd() {
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
similarity index 80%
rename from meta/recipes-connectivity/avahi/avahi_0.6.30.bb
rename to meta/recipes-connectivity/avahi/avahi_0.6.31.bb
index 692a5df..e56bb1d 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
PR = "${INC_PR}.0"
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
+
DEPENDS += "intltool-native"
PACKAGES =+ "libavahi-gobject"
-
-SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
-SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 10/14] man-pages: Update to 3.36
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (8 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 09/14] avahi: Update to 0.6.31 Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 11/14] libgalago: Fix package warnings by not packaging autopackage Saul Wold
` (4 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{man-pages_3.32.bb => man-pages_3.36.bb} | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-extended/man-pages/{man-pages_3.32.bb => man-pages_3.36.bb} (80%)
diff --git a/meta/recipes-extended/man-pages/man-pages_3.32.bb b/meta/recipes-extended/man-pages/man-pages_3.36.bb
similarity index 80%
rename from meta/recipes-extended/man-pages/man-pages_3.32.bb
rename to meta/recipes-extended/man-pages/man-pages_3.36.bb
index 26e64e4..4e888dc 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.32.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.36.bb
@@ -2,14 +2,14 @@ SUMMARY = "Linux man-pages"
DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs"
SECTION = "console/utils"
HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
-LICENSE = "GPL"
-PR = "r1"
+LICENSE = "GPLv2+"
+PR = "r0"
LIC_FILES_CHKSUM = "file://README;md5=0422377a748010b2b738342e24f141c1"
SRC_URI = "${KERNELORG_MIRROR}/linux/docs/man-pages/Archive/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "cc6c2d4d4eb364fd8da718c412db09d4"
-SRC_URI[sha256sum] = "61ef2fc36421e72eb92d1f533576a439a2fcdae20269393f740dd98abd8be519"
+SRC_URI[md5sum] = "cfe991b1ce9e0ea5355f29ff9fcac125"
+SRC_URI[sha256sum] = "c0575e31f73cd9dc2761c274217e06e7130fdfee510170957a9d72d012a5437c"
RDEPENDS_${PN} = "man"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 11/14] libgalago: Fix package warnings by not packaging autopackage
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (9 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 10/14] man-pages: Update to 3.36 Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 12/14] gpgme: fix packaging warnings Saul Wold
` (3 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe libgalago, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/autopackage
WARNING: /usr/share/autopackage/skeletons
WARNING: /usr/share/autopackage/skeletons/@galago.info
WARNING: /usr/share/autopackage/skeletons/@galago.info/libgalago
WARNING: /usr/share/autopackage/skeletons/@galago.info/libgalago/skeleton.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-connectivity/galago/libgalago_0.5.2.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
index f5aba54..1a5dd23 100644
--- a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
+++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
@@ -22,3 +22,8 @@ EXTRA_OECONF = "--disable-tests --disable-check"
do_configure_prepend_libc-uclibc() {
touch ${S}/config.rpath
}
+
+do_install_append() {
+ # We don't package autopackage files
+ rm -rf ${D}${datadir}/autopackage
+}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 12/14] gpgme: fix packaging warnings
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (10 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 11/14] libgalago: Fix package warnings by not packaging autopackage Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 12:49 ` Richard Purdie
2012-03-14 8:33 ` [PATCH 13/14] man: fix configure issue to solve warnings Saul Wold
` (2 subsequent siblings)
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/gpgme/gpgme_1.3.1.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
index 9ffedba..33858bf 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
@@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
SRC_URI[md5sum] = "90afa8436ce2b2683c001c824bd22601"
SRC_URI[sha256sum] = "15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4"
DEPENDS = "libgpg-error libassuan pth"
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
--with-gpg=${bindir}/gpg --without-gpgsm"
@@ -26,3 +26,7 @@ FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
FILES_${PN} = "${libdir}/libgpgme.so.*"
FILES_${PN}-dev += "${bindir}/gpgme-config ${datadir}/common-lisp/source/gpgme/*"
+
+do_install_append() {
+ rm -rf ${D}/usr/libexec
+}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 13/14] man: fix configure issue to solve warnings
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (11 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 12/14] gpgme: fix packaging warnings Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 8:33 ` [PATCH 14/14] bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file before PN Saul Wold
2012-03-14 13:26 ` [PATCH 00/14] Warning Fixes and some Updates Richard Purdie
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe man, the following files/directories were installed but not shipped in any package:
WARNING: /intel
WARNING: /intel/poky
WARNING: /intel/poky/builds
WARNING: /intel/poky/builds/world
WARNING: /intel/poky/builds/world/tmp
WARNING: /intel/poky/builds/world/tmp/work
WARNING: /intel/poky/builds/world/tmp/work/i586-poky-linux
WARNING: /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1
WARNING: /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1/image
WARNING: /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1/image/etc
WARNING: /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1/image/etc/man.config
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/man/man_1.6f.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index c98c920..ee3d648 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
SECTION = "console/utils"
HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
DEPENDS = "groff less"
@@ -42,7 +42,7 @@ SRC_URI[sha256sum] = "9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9
do_configure () {
- ${S}/configure -default -confdir ${D}/etc +sgid +fhs +lang all
+ ${S}/configure -default -confdir /etc +sgid +fhs +lang all
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 14/14] bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file before PN
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (12 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 13/14] man: fix configure issue to solve warnings Saul Wold
@ 2012-03-14 8:33 ` Saul Wold
2012-03-14 12:45 ` Richard Purdie
2012-03-14 13:26 ` [PATCH 00/14] Warning Fixes and some Updates Richard Purdie
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2012-03-14 8:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/conf/bitbake.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 216da75..d4357d1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -253,7 +253,7 @@ SOLIBSDEV_darwin = ".dylib"
SOLIBSDEV_darwin8 = ".dylib"
SOLIBSDEV_darwin9 = ".dylib"
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
PACKAGES_DYNAMIC = "${PN}-locale-*"
FILES = ""
@@ -277,7 +277,7 @@ SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
-FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"
+FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a"
SECTION_${PN}-staticdev = "devel"
RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 07/14] python: package static libraries correctly in -staticdev
2012-03-14 8:33 ` [PATCH 07/14] python: package static libraries correctly in -staticdev Saul Wold
@ 2012-03-14 8:43 ` Martin Jansa
0 siblings, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2012-03-14 8:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 5705 bytes --]
On Wed, Mar 14, 2012 at 01:33:18AM -0700, Saul Wold wrote:
> WARNING: QA Issue: non -staticdev package contains static .a library: python-distutils path '/work/i586-poky-linux/python-2.7.2-r1.7/packages-split/python-distutils/usr/lib/python2.7/config/libpython2.7.a'
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../python/python-2.7-manifest.inc | 6 +++++-
> meta/recipes-devtools/python/python_2.7.2.bb | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
> index e4017ba..5f8b7cf 100644
> --- a/meta/recipes-devtools/python/python-2.7-manifest.inc
> +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
Please change this in scripts/contrib/python/generate-manifest-2.7.py
and regenerate python-2.7-manifest.inc with that
python-2.7-manifest.inc:
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
# Generator: 'scripts/contrib/python/generate-manifest-2.7.py' Version 20110222.2 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
> @@ -7,7 +7,7 @@
>
> PROVIDES+="${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
>
> -PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
> +PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
>
> DESCRIPTION_${PN}-2to3="Python Automated Python 2 to 3 code translation"
> RDEPENDS_${PN}-2to3="${PN}-core"
> @@ -78,6 +78,10 @@ DESCRIPTION_${PN}-distutils="Python Distribution Utilities"
> RDEPENDS_${PN}-distutils="${PN}-core"
> FILES_${PN}-distutils="${libdir}/python2.7/config ${libdir}/python2.7/distutils "
>
> +DESCRIPTION_${PN}-distutils-staticdev="Python Distribution Utilities (Static Libraries)"
> +RDEPENDS_${PN}-distutils-staticdev="${PN}-distutils"
> +FILES_${PN}-distutils-staticdev="${libdir}/python2.7/config/lib*.a"
> +
> DESCRIPTION_${PN}-doctest="Python framework for running examples in docstrings."
> RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib"
> FILES_${PN}-doctest="${libdir}/python2.7/doctest.* "
> diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
> index b14b82e..d2100be 100644
> --- a/meta/recipes-devtools/python/python_2.7.2.bb
> +++ b/meta/recipes-devtools/python/python_2.7.2.bb
> @@ -1,7 +1,7 @@
> require python.inc
> DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
> DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
> -PR = "${INC_PR}.7"
> +PR = "${INC_PR}.8"
>
> DISTRO_SRC_URI ?= "file://sitecustomize.py"
> DISTRO_SRC_URI_linuxstdbase = ""
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 05/14] qt4: package static libraries correctly to fix warnings
2012-03-14 8:33 ` [PATCH 05/14] qt4: package static libraries correctly " Saul Wold
@ 2012-03-14 11:39 ` Martin Jansa
2012-03-14 14:44 ` [PATCHv2] " Saul Wold
2012-03-14 14:46 ` [PATCHv3] " Martin Jansa
0 siblings, 2 replies; 24+ messages in thread
From: Martin Jansa @ 2012-03-14 11:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 7576 bytes --]
On Wed, Mar 14, 2012 at 01:33:16AM -0700, Saul Wold wrote:
> WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
> WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a'
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Does this depend on 14/14?
Because even with this patch I still get the first warning about
/libdemo_shared.a (libpnp_basictools.a warning is gone)
WARNING: QA Issue: non -staticdev package contains static .a library:
qt4-demos path '/work/armv4t-oe-linux-gnueabi/qt4-x11-free/qt4-x11-free-4.8.0-r41.1/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
Or maybe demos dir is missing?
-FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/shared/libdemo_shared.a"
+FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/demos/shared/libdemo_shared.a"
Cheers,
> ---
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 19 ++++++++++++++++---
> 2 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index 56f349a..e1bef64 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
>
> -INC_PR = "r39"
> +INC_PR = "r40"
>
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 77fb06f..8f2cbd5 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -45,30 +45,33 @@ python __anonymous () {
> lib_packages = []
> dev_packages = []
> dbg_packages = []
> + staticdev_packages = []
> for name in d.getVar("QT_LIB_NAMES", True).split():
> pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
> # NOTE: the headers for QtAssistantClient are different
> incname = name.replace("QtAssistantClient", "QtAssistant")
> d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
> d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
> - ${libdir}/lib%(name)s${QT_LIBINFIX}.a
> ${libdir}/lib%(name)s${QT_LIBINFIX}.la
> ${libdir}/lib%(name)s${QT_LIBINFIX}.so
> ${includedir}/${QT_DIR_NAME}/%(incname)s
> ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
> + d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
> d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
> d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
> lib_packages.append(pkg)
> dev_packages.append("%s-dev" % pkg)
> dbg_packages.append("%s-dbg" % pkg)
> + staticdev_packages.append("%s-staticdev" % pkg)
> for name in d.getVar("OTHER_PACKAGES", True).split():
> dbg_packages.append("%s-dbg" % name)
> + dbg_packages.append("%s-staticdev" % name)
>
> for name in d.getVar("QT_EXTRA_LIBS", True).split():
> pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
> d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
> + d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
> d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
> - ${libdir}/lib%(name)s.a
> ${libdir}/lib%(name)s.la
> ${libdir}/lib%(name)s.so
> ${includedir}/${QT_DIR_NAME}/%(incname)s
> @@ -78,10 +81,12 @@ python __anonymous () {
> lib_packages.append(pkg)
> dev_packages.append("%s-dev" % pkg)
> dbg_packages.append("%s-dbg" % pkg)
> + staticdev_packages.append("%s-staticdev" % pkg)
>
> d.setVar("LIB_PACKAGES", " ".join(lib_packages))
> d.setVar("DEV_PACKAGES", " ".join(dev_packages))
> d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
> + d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
> }
>
> OTHER_PACKAGES = "\
> @@ -109,7 +114,13 @@ OTHER_PACKAGES = "\
>
> #We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
> PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
> -PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
> +PACKAGES += " \
> + ${LIB_PACKAGES} \
> + ${DEV_PACKAGES} \
> + ${DBG_PACKAGES} \
> + ${STATICDEV_PACKAGES} \
> + ${OTHER_PACKAGES}"
> +
> PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
>
> ALLOW_EMPTY_${PN} = "1"
> @@ -153,10 +164,12 @@ FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
> FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
> FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
> FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
> +FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/shared/libdemo_shared.a"
> FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
> FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
> FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
> +FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
> FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
> FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
> FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 14/14] bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file before PN
2012-03-14 8:33 ` [PATCH 14/14] bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file before PN Saul Wold
@ 2012-03-14 12:45 ` Richard Purdie
0 siblings, 0 replies; 24+ messages in thread
From: Richard Purdie @ 2012-03-14 12:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-03-14 at 01:33 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/conf/bitbake.conf | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 216da75..d4357d1 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -253,7 +253,7 @@ SOLIBSDEV_darwin = ".dylib"
> SOLIBSDEV_darwin8 = ".dylib"
> SOLIBSDEV_darwin9 = ".dylib"
>
> -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale"
> +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
> PACKAGES_DYNAMIC = "${PN}-locale-*"
> FILES = ""
>
> @@ -277,7 +277,7 @@ SECTION_${PN}-dev = "devel"
> ALLOW_EMPTY_${PN}-dev = "1"
> RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
>
> -FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"
> +FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a"
> SECTION_${PN}-staticdev = "devel"
> RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
This is a major change at this point in the release cycle. I'd at least
want to see a "bitbake world" compared before and after using
buildhistory.
There are reasons we might want to do this with other packages such as
the -dbg and -dev too. It is a serious change though and we've never
dared with the other packages due to not knowing exactly what we were
changing.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 12/14] gpgme: fix packaging warnings
2012-03-14 8:33 ` [PATCH 12/14] gpgme: fix packaging warnings Saul Wold
@ 2012-03-14 12:49 ` Richard Purdie
0 siblings, 0 replies; 24+ messages in thread
From: Richard Purdie @ 2012-03-14 12:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-03-14 at 01:33 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-support/gpgme/gpgme_1.3.1.bb | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
> index 9ffedba..33858bf 100644
> --- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
> +++ b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
> @@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
> SRC_URI[md5sum] = "90afa8436ce2b2683c001c824bd22601"
> SRC_URI[sha256sum] = "15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4"
> DEPENDS = "libgpg-error libassuan pth"
> -PR = "r0"
> +PR = "r1"
>
> EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
> --with-gpg=${bindir}/gpg --without-gpgsm"
> @@ -26,3 +26,7 @@ FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
> FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
> FILES_${PN} = "${libdir}/libgpgme.so.*"
> FILES_${PN}-dev += "${bindir}/gpgme-config ${datadir}/common-lisp/source/gpgme/*"
> +
> +do_install_append() {
> + rm -rf ${D}/usr/libexec
> +}
Since this is an empty directory, could you just do a rmdir here please?
The reason is that if the package then does start installing files
there, we'd hit a build failure.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/14] Warning Fixes and some Updates
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
` (13 preceding siblings ...)
2012-03-14 8:33 ` [PATCH 14/14] bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file before PN Saul Wold
@ 2012-03-14 13:26 ` Richard Purdie
2012-03-14 16:09 ` Saul Wold
14 siblings, 1 reply; 24+ messages in thread
From: Richard Purdie @ 2012-03-14 13:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-03-14 at 01:33 -0700, Saul Wold wrote:
> Richard,
>
> This has some warning fixes along with some update.
>
> Biggest change is to bitbake.conf, which re-orders PACKAGE and addes
> ${libdir}/${BPN}/*.a to the staticdev list, this was seen in a number
> of packages and seems to make sense. But I would understand if there
> are other issues I am not aware of.
>
> The FILES_${PN} was grabbing from ${libdir}/${BPN}/* so we needed to
> get the staticdev in before that.
I replied to this patch. If we do take it in, it needs some very
specific testing data.
> Saul Wold (14):
> owl-video: Fix unpackaged file warning
> ltp: Package static library in -staticdev
> quilt: Fix docs packaging warnings
> autoconf: remove emacs mode files to fix warnings
> rpm: Package python-rpm static archive correctly
> distro_tracking: Updates for manual checks
> avahi: Update to 0.6.31
> man-pages: Update to 3.36
> libgalago: Fix package warnings by not packaging autopackage
> man: fix configure issue to solve warnings
I took these, thank.
> gpgme: fix packaging warnings
I'd like to see a small tweak to this one (I've replied to the patch)
> python: package static libraries correctly in -staticdev
I meant not to take this after the comment from Martin but accidentally
did. I therefore followed up with a fix to the generator script so this
one is merged and dealt with.
> bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file
> before PN
I've replied about this one.
> qt4: package static libraries correctly to fix warnings
I've held off this one as Martin reported an issue.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCHv2] qt4: package static libraries correctly to fix warnings
2012-03-14 11:39 ` Martin Jansa
@ 2012-03-14 14:44 ` Saul Wold
2012-03-14 14:46 ` Martin Jansa
2012-03-14 14:46 ` [PATCHv3] " Martin Jansa
1 sibling, 1 reply; 24+ messages in thread
From: Saul Wold @ 2012-03-14 14:44 UTC (permalink / raw)
To: openembedded-core
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a'
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 56f349a..e1bef64 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r39"
+INC_PR = "r40"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 77fb06f..7f1f6f0 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -45,30 +45,33 @@ python __anonymous () {
lib_packages = []
dev_packages = []
dbg_packages = []
+ staticdev_packages = []
for name in d.getVar("QT_LIB_NAMES", True).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
# NOTE: the headers for QtAssistantClient are different
incname = name.replace("QtAssistantClient", "QtAssistant")
d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
- ${libdir}/lib%(name)s${QT_LIBINFIX}.a
${libdir}/lib%(name)s${QT_LIBINFIX}.la
${libdir}/lib%(name)s${QT_LIBINFIX}.so
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
+ d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
+ staticdev_packages.append("%s-staticdev" % pkg)
for name in d.getVar("OTHER_PACKAGES", True).split():
dbg_packages.append("%s-dbg" % name)
+ dbg_packages.append("%s-staticdev" % name)
for name in d.getVar("QT_EXTRA_LIBS", True).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
+ d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
- ${libdir}/lib%(name)s.a
${libdir}/lib%(name)s.la
${libdir}/lib%(name)s.so
${includedir}/${QT_DIR_NAME}/%(incname)s
@@ -78,10 +81,12 @@ python __anonymous () {
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
+ staticdev_packages.append("%s-staticdev" % pkg)
d.setVar("LIB_PACKAGES", " ".join(lib_packages))
d.setVar("DEV_PACKAGES", " ".join(dev_packages))
d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
+ d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
}
OTHER_PACKAGES = "\
@@ -109,7 +114,13 @@ OTHER_PACKAGES = "\
#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
-PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
+PACKAGES += " \
+ ${LIB_PACKAGES} \
+ ${DEV_PACKAGES} \
+ ${DBG_PACKAGES} \
+ ${STATICDEV_PACKAGES} \
+ ${OTHER_PACKAGES}"
+
PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
ALLOW_EMPTY_${PN} = "1"
@@ -153,10 +164,12 @@ FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
+FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/demos/shared/libdemo_shared.a"
FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
--
1.7.8.5
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCHv2] qt4: package static libraries correctly to fix warnings
2012-03-14 14:44 ` [PATCHv2] " Saul Wold
@ 2012-03-14 14:46 ` Martin Jansa
0 siblings, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2012-03-14 14:46 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 7055 bytes --]
Ah.. gmail doesn't like my From: to keep sgw credit
Who should the emails appear to be from? [Martin Jansa <Martin.Jansa@gmail.com>] Saul Wold <sgw@linux.intel.com>
and then arrived as From: Saul Wold <Martin.Jansa@gmail.com>
Will send v3
On Wed, Mar 14, 2012 at 03:44:17PM +0100, Saul Wold wrote:
> WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
> WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a'
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 19 ++++++++++++++++---
> 2 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index 56f349a..e1bef64 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
>
> -INC_PR = "r39"
> +INC_PR = "r40"
>
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 77fb06f..7f1f6f0 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -45,30 +45,33 @@ python __anonymous () {
> lib_packages = []
> dev_packages = []
> dbg_packages = []
> + staticdev_packages = []
> for name in d.getVar("QT_LIB_NAMES", True).split():
> pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
> # NOTE: the headers for QtAssistantClient are different
> incname = name.replace("QtAssistantClient", "QtAssistant")
> d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
> d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
> - ${libdir}/lib%(name)s${QT_LIBINFIX}.a
> ${libdir}/lib%(name)s${QT_LIBINFIX}.la
> ${libdir}/lib%(name)s${QT_LIBINFIX}.so
> ${includedir}/${QT_DIR_NAME}/%(incname)s
> ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
> + d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
> d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
> d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
> lib_packages.append(pkg)
> dev_packages.append("%s-dev" % pkg)
> dbg_packages.append("%s-dbg" % pkg)
> + staticdev_packages.append("%s-staticdev" % pkg)
> for name in d.getVar("OTHER_PACKAGES", True).split():
> dbg_packages.append("%s-dbg" % name)
> + dbg_packages.append("%s-staticdev" % name)
>
> for name in d.getVar("QT_EXTRA_LIBS", True).split():
> pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
> d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
> + d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
> d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
> - ${libdir}/lib%(name)s.a
> ${libdir}/lib%(name)s.la
> ${libdir}/lib%(name)s.so
> ${includedir}/${QT_DIR_NAME}/%(incname)s
> @@ -78,10 +81,12 @@ python __anonymous () {
> lib_packages.append(pkg)
> dev_packages.append("%s-dev" % pkg)
> dbg_packages.append("%s-dbg" % pkg)
> + staticdev_packages.append("%s-staticdev" % pkg)
>
> d.setVar("LIB_PACKAGES", " ".join(lib_packages))
> d.setVar("DEV_PACKAGES", " ".join(dev_packages))
> d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
> + d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
> }
>
> OTHER_PACKAGES = "\
> @@ -109,7 +114,13 @@ OTHER_PACKAGES = "\
>
> #We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
> PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
> -PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
> +PACKAGES += " \
> + ${LIB_PACKAGES} \
> + ${DEV_PACKAGES} \
> + ${DBG_PACKAGES} \
> + ${STATICDEV_PACKAGES} \
> + ${OTHER_PACKAGES}"
> +
> PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
>
> ALLOW_EMPTY_${PN} = "1"
> @@ -153,10 +164,12 @@ FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
> FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
> FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
> FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
> +FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/demos/shared/libdemo_shared.a"
> FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
> FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
> FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
> +FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
> FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
> FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
> FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
> --
> 1.7.8.5
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCHv3] qt4: package static libraries correctly to fix warnings
2012-03-14 11:39 ` Martin Jansa
2012-03-14 14:44 ` [PATCHv2] " Saul Wold
@ 2012-03-14 14:46 ` Martin Jansa
1 sibling, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2012-03-14 14:46 UTC (permalink / raw)
To: openembedded-core
From: Saul Wold <sgw@linux.intel.com>
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a'
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 56f349a..e1bef64 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r39"
+INC_PR = "r40"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 77fb06f..7f1f6f0 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -45,30 +45,33 @@ python __anonymous () {
lib_packages = []
dev_packages = []
dbg_packages = []
+ staticdev_packages = []
for name in d.getVar("QT_LIB_NAMES", True).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
# NOTE: the headers for QtAssistantClient are different
incname = name.replace("QtAssistantClient", "QtAssistant")
d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
- ${libdir}/lib%(name)s${QT_LIBINFIX}.a
${libdir}/lib%(name)s${QT_LIBINFIX}.la
${libdir}/lib%(name)s${QT_LIBINFIX}.so
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
+ d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
+ staticdev_packages.append("%s-staticdev" % pkg)
for name in d.getVar("OTHER_PACKAGES", True).split():
dbg_packages.append("%s-dbg" % name)
+ dbg_packages.append("%s-staticdev" % name)
for name in d.getVar("QT_EXTRA_LIBS", True).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
+ d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
- ${libdir}/lib%(name)s.a
${libdir}/lib%(name)s.la
${libdir}/lib%(name)s.so
${includedir}/${QT_DIR_NAME}/%(incname)s
@@ -78,10 +81,12 @@ python __anonymous () {
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
+ staticdev_packages.append("%s-staticdev" % pkg)
d.setVar("LIB_PACKAGES", " ".join(lib_packages))
d.setVar("DEV_PACKAGES", " ".join(dev_packages))
d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
+ d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
}
OTHER_PACKAGES = "\
@@ -109,7 +114,13 @@ OTHER_PACKAGES = "\
#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
-PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
+PACKAGES += " \
+ ${LIB_PACKAGES} \
+ ${DEV_PACKAGES} \
+ ${DBG_PACKAGES} \
+ ${STATICDEV_PACKAGES} \
+ ${OTHER_PACKAGES}"
+
PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
ALLOW_EMPTY_${PN} = "1"
@@ -153,10 +164,12 @@ FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
+FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/demos/shared/libdemo_shared.a"
FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
--
1.7.8.5
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 00/14] Warning Fixes and some Updates
2012-03-14 13:26 ` [PATCH 00/14] Warning Fixes and some Updates Richard Purdie
@ 2012-03-14 16:09 ` Saul Wold
0 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2012-03-14 16:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 03/14/2012 06:26 AM, Richard Purdie wrote:
> On Wed, 2012-03-14 at 01:33 -0700, Saul Wold wrote:
>> Richard,
>>
>> This has some warning fixes along with some update.
>>
>> Biggest change is to bitbake.conf, which re-orders PACKAGE and addes
>> ${libdir}/${BPN}/*.a to the staticdev list, this was seen in a number
>> of packages and seems to make sense. But I would understand if there
>> are other issues I am not aware of.
>>
>> The FILES_${PN} was grabbing from ${libdir}/${BPN}/* so we needed to
>> get the staticdev in before that.
>
> I replied to this patch. If we do take it in, it needs some very
> specific testing data.
>
The problem with sending patches late! I thought about this around
6:00am and would deal with it when I woke! I will run a world build
with package history enabled before and after this change and see what
the output is like.
>> Saul Wold (14):
>> owl-video: Fix unpackaged file warning
>> ltp: Package static library in -staticdev
>> quilt: Fix docs packaging warnings
>> autoconf: remove emacs mode files to fix warnings
>> rpm: Package python-rpm static archive correctly
>> distro_tracking: Updates for manual checks
>> avahi: Update to 0.6.31
>> man-pages: Update to 3.36
>> libgalago: Fix package warnings by not packaging autopackage
>> man: fix configure issue to solve warnings
>
> I took these, thank.
>
>> gpgme: fix packaging warnings
>
> I'd like to see a small tweak to this one (I've replied to the patch)
>
Tweak sent to the list.
>> python: package static libraries correctly in -staticdev
>
> I meant not to take this after the comment from Martin but accidentally
> did. I therefore followed up with a fix to the generator script so this
> one is merged and dealt with.
>
Thanks, I had not noticed that this was auto-generated.
>> bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file
>> before PN
>
> I've replied about this one.
>
>> qt4: package static libraries correctly to fix warnings
>
> I've held off this one as Martin reported an issue.
>
I think Martin provided a fix for this on the list, it looks fine.
We are getting there with warnings, my last world build was down to
around 260 warnings.
Thanks
Sau!
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2012-03-14 16:19 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-14 8:33 [PATCH 00/14] Warning Fixes and some Updates Saul Wold
2012-03-14 8:33 ` [PATCH 01/14] owl-video: Fix unpackaged file warning Saul Wold
2012-03-14 8:33 ` [PATCH 02/14] ltp: Package static library in -staticdev Saul Wold
2012-03-14 8:33 ` [PATCH 03/14] quilt: Fix docs packaging warnings Saul Wold
2012-03-14 8:33 ` [PATCH 04/14] autoconf: remove emacs mode files to fix warnings Saul Wold
2012-03-14 8:33 ` [PATCH 05/14] qt4: package static libraries correctly " Saul Wold
2012-03-14 11:39 ` Martin Jansa
2012-03-14 14:44 ` [PATCHv2] " Saul Wold
2012-03-14 14:46 ` Martin Jansa
2012-03-14 14:46 ` [PATCHv3] " Martin Jansa
2012-03-14 8:33 ` [PATCH 06/14] rpm: Package python-rpm static archive correctly Saul Wold
2012-03-14 8:33 ` [PATCH 07/14] python: package static libraries correctly in -staticdev Saul Wold
2012-03-14 8:43 ` Martin Jansa
2012-03-14 8:33 ` [PATCH 08/14] distro_tracking: Updates for manual checks Saul Wold
2012-03-14 8:33 ` [PATCH 09/14] avahi: Update to 0.6.31 Saul Wold
2012-03-14 8:33 ` [PATCH 10/14] man-pages: Update to 3.36 Saul Wold
2012-03-14 8:33 ` [PATCH 11/14] libgalago: Fix package warnings by not packaging autopackage Saul Wold
2012-03-14 8:33 ` [PATCH 12/14] gpgme: fix packaging warnings Saul Wold
2012-03-14 12:49 ` Richard Purdie
2012-03-14 8:33 ` [PATCH 13/14] man: fix configure issue to solve warnings Saul Wold
2012-03-14 8:33 ` [PATCH 14/14] bitbake.conf: Modify PACKAGE list ordering to insert -staticdev file before PN Saul Wold
2012-03-14 12:45 ` Richard Purdie
2012-03-14 13:26 ` [PATCH 00/14] Warning Fixes and some Updates Richard Purdie
2012-03-14 16:09 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox