* dbus broken again
From: Martin Jansa @ 2011-11-02 10:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2381 bytes --]
After last attempt to fix dbus there is new issue
I have talked with Richard on IRC already, but will repeat it here just
to warn other dbus users.
Updated list of available packages in /var/lib/opkg/lists/jama-om_gta02.
Upgrading dbus-1 on root from 1.4.12-r2 to 1.4.12-r7...
Downloading
http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/dbus-1_1.4.12-r7_armv4t.ipk.
Running groupadd commands...
Note: group netdev already exists, not re-creating it
Running useradd commands...
Note: username messagebus already exists, not re-creating it
Upgrading libdbus-1-3 on root from 1.4.12-r2 to 1.4.12-r7...
Downloading
http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/libdbus-1-3_1.4.12-r7_armv4t.ipk.
Upgrading libglib-2.0-0 on root from 1:2.30.0-r2 to 1:2.30.0-r3...
Downloading
http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/libglib-2.0-0_2.30.0-r3_armv4t.ipk.
Configuring dbus-1.
System startup links for /etc/init.d/dbus-1 already exist.
Configuring libdbus-1-3.
Configuring libglib-2.0-0.
SHR root@gjama / $ ll /usr/libexec/dbus-daemon-launch-helper
-rwsr-xr-- 1 root 998 142748 Nov 2 10:12
/usr/libexec/dbus-daemon-launch-helper
SHR root@gjama / $ ll -d /var/lib/dbus
drwxr-xr-x 2 999 998 4096 Nov 2 10:12 /var/lib/dbus
SHR root@gjama / $ grep message /etc/group
messagebus:x:101:
SHR root@gjama / $ grep message /etc/passwd
messagebus:x:42:101:Linux User,,,:/var/run/dbus:/bin/sh
and that's because useradd.bbclass is using UID/GID from sysroots
OE om-gta02@shr ~/shr-core $ grep message tmp/sysroots/om-gta02/etc/group
messagebus:x:998:
OE om-gta02@shr ~/shr-core $ grep message tmp/sysroots/om-gta02/etc/passwd
messagebus:!:999:998::/var/lib/dbus:
and nothing is updating /etc/passwd /etc/group IDs on target.
The possible solution would be to force specified UID/GID in
useradd.bbclass to make it consistent during rebuild from scratch or
teach useradd postinst to update UID/GIDs and chown all runtime created
files to new values instead of skiping useradd/groupadd commnads when
user already exists, like it did now:
Note: username messagebus already exists, not re-creating it
Note: group netdev already exists, not re-creating it
Also reported here:
http://bugzilla.pokylinux.org/show_bug.cgi?id=1711
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* [PATCH] bash: Ensure we fully reautoconf the recipes so site data is used
From: Richard Purdie @ 2011-11-02 11:41 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320230106.20107.23.camel@ted>
This ensures bug 487 (missing job control functionality) really gets fixed.
[YOCTO #487]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index d55e517..876be1e 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -22,9 +22,12 @@ ALTERNATIVE_PATH = "${base_bindir}/bash"
ALTERNATIVE_LINK = "${base_bindir}/sh"
ALTERNATIVE_PRIORITY = "100"
-do_configure () {
- gnu-configize
- oe_runconf
+export AUTOHEADER = "true"
+
+do_configure_prepend () {
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
}
pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb
index 1520c4e..f2ba572 100644
--- a/meta/recipes-extended/bash/bash_3.2.48.bb
+++ b/meta/recipes-extended/bash/bash_3.2.48.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a"
DEPENDS = "ncurses"
-PR = "r7"
+PR = "r8"
SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0 \
@@ -23,9 +23,12 @@ sbindir = "/sbin"
EXTRA_OECONF = "--with-ncurses"
export CC_FOR_BUILD = "${BUILD_CC}"
-do_configure () {
- gnu-configize
- oe_runconf
+export AUTOHEADER = "true"
+
+do_configure_prepend () {
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
}
pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index a0f5e4e..8070918 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -1,6 +1,6 @@
require bash.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
^ permalink raw reply related
* [PATCH] tslib: fix the bug with loading libts-1.0.so
From: Dmitry Cherukhin @ 2011-11-02 12:03 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <6f165b27054e1895460b20a11d360ac52171ab7b>
Touchpad did not work in the qtdemoE if the library libts-1.0.so was not loaded
manually using the LD_PRELOAD variable. This problem was fixed in the tslib mainline
https://github.com/kergoth/tslib after the 1.0 release. We just import the patch.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
.../tslib/0001-Link-plugins-against-libts.patch | 57 ++++++++++++++++++++
meta/recipes-graphics/tslib/tslib_1.0.bb | 3 +-
2 files changed, 59 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
diff --git a/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch b/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
new file mode 100644
index 0000000..c6b9f59
--- /dev/null
+++ b/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
@@ -0,0 +1,57 @@
+From 9623bbedf4ff409e5036edfcfe52b2595932a6d7 Mon Sep 17 00:00:00 2001
+From: Chris Larson <clarson@kergoth.com>
+Date: Sat, 1 Nov 2008 20:46:07 +0000
+Subject: [PATCH] Link plugins against libts
+
+Some plugins use tslib functions. Link those plugins against libts.
+The problem is easy to see with LDFLAGS="-Wl,-no-undefined".
+Without this change DirectFB in unable to use tslib because symbols
+in the tslib plugins can't be resolved.
+
+Signed-off-by: Ville Syrjala <syrjala@sci.fi>
+Signed-off-by: Chris Larson <clarson@kergoth.com>
+
+The patch was imported from git server git://github.com/kergoth/tslib.git
+as of commit id 9623bbedf4ff409e5036edfcfe52b2595932a6d7.
+
+Upstream-Status: Accepted
+Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
+---
+ plugins/Makefile.am | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 3b902c2..4c4ef8b 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \
+
+ variance_la_SOURCES = variance.c
+ variance_la_LDFLAGS = -module $(LTVSN)
++variance_la_LIBADD = $(top_builddir)/src/libts.la
+
+ dejitter_la_SOURCES = dejitter.c
+ dejitter_la_LDFLAGS = -module $(LTVSN)
++dejitter_la_LIBADD = $(top_builddir)/src/libts.la
+
+ linear_la_SOURCES = linear.c
+ linear_la_LDFLAGS = -module $(LTVSN)
++linear_la_LIBADD = $(top_builddir)/src/libts.la
+
+ pthres_la_SOURCES = pthres.c
+ pthres_la_LDFLAGS = -module $(LTVSN)
++pthres_la_LIBADD = $(top_builddir)/src/libts.la
+
+ # hw access
+ corgi_la_SOURCES = corgi-raw.c
+@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN)
+
+ input_la_SOURCES = input-raw.c
+ input_la_LDFLAGS = -module $(LTVSN)
++input_la_LIBADD = $(top_builddir)/src/libts.la
+
+ linear_h2200_la_SOURCES = linear-h2200.c
+ linear_h2200_la_LDFLAGS = -module $(LTVSN)
+--
+1.7.6.4
+
diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index ad9bfa7..b2315ff 100644
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -10,10 +10,11 @@ SECTION = "base"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
-PR = "r18"
+PR = "r19"
SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
file://fix_version.patch \
+ file://0001-Link-plugins-against-libts.patch \
file://ts.conf \
file://tslib.sh"
--
1.7.6.4
^ permalink raw reply related
* [PATCH] libcense.bbclass: fix OpenSSL mapping [BUGID# 1712]
From: Martin Jansa @ 2011-11-02 12:26 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/license.bbclass | 2 +-
.../recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 3f93bf5..baf35f0 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -44,7 +44,7 @@ SPDXLICENSEMAP[MPLv1.1] = "MPL-1"
SPDXLICENSEMAP[MIT-X] = "MIT"
#Openssl variations
-SPDXLICENSEMAP[openssl] = "Openssl"
+SPDXLICENSEMAP[openssl] = "OpenSSL"
#Other variations
SPDXLICENSEMAP[AFL2.1] = "AFL-2"
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
index 5add70e..555bacf 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://debian/ca.patch \
file://debian/config-hurd.patch;apply=no \
file://debian/debian-targets.patch \
--
1.7.7.1
^ permalink raw reply related
* [PATCH] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately
From: Koen Kooi @ 2011-11-02 14:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
genext2fs only creates the minimum number of inodes, after this patch it will scale with the rootfs size
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/classes/image_types.bbclass | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 0d64705..9549a9e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -38,36 +38,36 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLO
IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
+IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
IMAGE_CMD_ext2.gz () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
}
IMAGE_CMD_ext2.bz2 () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
}
IMAGE_CMD_ext2.lzma () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
lzma -f -7 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.lzma ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.lzma
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
}
IMAGE_CMD_ext3 () {
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
}
IMAGE_CMD_ext3.gz () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
@@ -75,7 +75,7 @@ IMAGE_CMD_ext3.gz () {
}
oe_mkext4fs () {
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
tune2fs -O extents,uninit_bg,dir_index,has_journal $1
e2fsck -yfDC0 $1 || chk=$?
case $chk in
--
1.7.2.5
^ permalink raw reply related
* Re: [PATCH] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately
From: Koen Kooi @ 2011-11-02 14:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1320243402-2116-1-git-send-email-koen@dominion.thruhere.net>
[-- Attachment #1: Type: text/plain, Size: 685 bytes --]
Op 2 nov. 2011, om 15:16 heeft Koen Kooi het volgende geschreven:
> genext2fs only creates the minimum number of inodes, after this patch it will scale with the rootfs size
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
The matching OE classic commit is:
koen@dominion:/OE/org.openembedded.dev$ git show 12275a16
commit 12275a1604e2a5e9e66c7ef900c450b01e5cf622
Author: Tom Rini <tom_rini@mentor.com>
Date: Fri Dec 17 10:45:32 2010 -0700
bitbake.conf: Use normal bytes per inode param to genext2fs
Without this we get an unusably small number of inodes in
our filesystem images.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply
* Re: [PATCH] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately
From: Tom Rini @ 2011-11-02 14:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1320243402-2116-1-git-send-email-koen@dominion.thruhere.net>
On Wed, Nov 2, 2011 at 7:16 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> genext2fs only creates the minimum number of inodes, after this patch it will scale with the rootfs size
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Tom Rini <tom.rini@gmail.com>
--
Tom
^ permalink raw reply
* Re: [PATCH] Add new IMAGE_CLASSES variable for classes for image generation
From: McClintock Matthew-B29882 @ 2011-11-02 15:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4EB09538.3010701@intel.com>
On Tue, Nov 1, 2011 at 7:56 PM, Saul Wold <saul.wold@intel.com> wrote:
> Right I understood that part from before I think. But why can't you have
>
> IMAGE_CLASSES ?= "image_types"
>
> and then in the local.conf override that with
>
> IMAGE_CLASSES = "image_types_uboot"
>
> since image_types_uboot inherits image_types.
>
>> IMAGE_CLASSES += "image_types_uboot" and leave the other bit as is...
>
> I have to admit I like this a little better with the possible thought of
> breaking up image_types a little more, keep more used ones in image_types,
> but move lesser used ones to their on .bbclass
>
> Them IMAGE_CLASSES truly is a list of image_type classes.
I think this is best, let the user override IMAGE_CLASSES to
(eventually) be able to add individual image_types_XYZ. Will send new
patch.
-M
^ permalink raw reply
* Re: [PATCH 1/1] bash: make job control really work
From: Cui, Dexuan @ 2011-11-02 15:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1320230106.20107.23.camel@ted>
Richard Purdie wrote on 2011-11-02:
> On Wed, 2011-11-02 at 15:10 +0800, Cui, Dexuan wrote:
>> Richard Purdie wrote on 2011-11-01:
>>> On Tue, 2011-11-01 at 16:05 +0800, Dexuan Cui wrote:
> I had a go at this problem myself and it took a bit of figuring out.
> The problem is that bash ships "config.h.in" but autoheader overwrites it.
> This removes the start/end includes from config.h or config-bot.h and
> config-top.h. We can do something like this:
>
> export AUTOHEADER = "true"
>
> do_configure_prepend () {
> if [ ! -e acinclude.m4 ]; then
> cat aclocal.m4 > acinclude.m4
> fi
> }
>
> instead of the current do_configure override. The _prepend ensures the
> bash specific macros are preserved and the export AUTOHEADER stops
> autoheader from running at all.
>
> Could you test those changes against bash 4.x and bash 3.x (replacing
> the current do_configure in bash.inc) and then if that works send a patch please?
Looks bug 487 only happens to bash 4.x and bash 3.x doesn't have such a bug (the
recipe of bash 3.x doesn't use bash.inc, either)
RP, thanks a lot for the help! Here is the new patch:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/bug487&id=b524337ed5670de2c0d294c3f6970e24f23847eb
Thanks,
-- Dexuan
^ permalink raw reply
* [PATCH v2] Add new IMAGE_CLASSES variable for classes for image generation
From: Matthew McClintock @ 2011-11-02 16:25 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <CAEsOVNeWr9A+8e62+A7YxSNwWzDJsyxqmOnKh=+EqG+4L04YjA@mail.gmail.com>
Allows us to import classes only for images and not to the global
namespace
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
Change IMAGE_CLASSES definition to use ?= instead of =
so it's clear we want to override this variable. This worked
before because the value in my distro.conf file overwrote
this value regardless of the fact it was set with =
meta-yocto/conf/local.conf.sample | 6 ++++++
meta/classes/image.bbclass | 3 ++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index da3f8df..8177713 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -163,6 +163,12 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
USER_CLASSES ?= "image-mklibs image-prelink"
+# Additional image generation features
+#
+# The following is a list of classes to import to use in the generation of images
+# currently an example class is image_types_uboot
+# IMAGE_CLASSES = " image_types_uboot"
+
#
# Runtime testing of images
#
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 05f4331..a2770a4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -111,7 +111,8 @@ def get_devtable_list(d):
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
return str
-inherit image_types
+IMAGE_CLASSES ?= "image_types"
+inherit ${IMAGE_CLASSES}
IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""
--
1.7.6.1
^ permalink raw reply related
* Re: [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
From: McClintock Matthew-B29882 @ 2011-11-02 16:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20111102091605.GD9949@jama.jama.net>
On Wed, Nov 2, 2011 at 4:16 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Oct 11, 2011 at 08:57:47PM +0000, McClintock Matthew-B29882 wrote:
>> On Tue, Oct 11, 2011 at 3:47 PM, Saul Wold <saul.wold@intel.com> wrote:
>> > On 09/30/2011 10:21 AM, Matthew McClintock wrote:
>> >>
>> >> From: Tom Rini<tom_rini@mentor.com>
>> >>
>> >> At issue is that route/pktloc.c (not generated) depends on
>> >> route/pktloc_syntax.h (generated).
>> >>
>> >> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>> >> Signed-off-by: Matthew McClintock<msm@freescale.com>
>> >> ---
>> >> .../libnl/fix-pktloc_syntax_h-race.patch | 26
>> >> ++++++++++++++++++++
>> >
>> > I just noticed that this patch get put in the libnl directory, not the
>> > libnl-2.0 directory.
>> >
>> > Can you pull all the libnl changes together and resbumit this, also is there
>> > a reason you can not just update this to the latest libnl 3.2.1?
>>
>> Are you referring to this: http://patches.openembedded.org/patch/12749/
>
> This pach is moving fix-makefile.patch from libnl-2.0 to libnl dir as Saul mentioned
> and patch wasn't even formated with -M to make it easier to review such move, please
> move it back to libnl-2.0 and send it again.
>
> .../libnl/libnl-2.0/fix-makefile.patch | 32 --------------------
> .../recipes-support/libnl/libnl/fix-makefile.patch | 32 ++++++++++++++++++++
>
> Cheers,
I really need to defer on any changes to libnl - I have no way to test
any of this. I was just trying to fix a parallel build issues for the
lsb image. Otherwise I'm blindly making changes and more changes that
people request with no actual testing being done.
-M
^ permalink raw reply
* [PATCH 0/1] distro tracking updates for some recipes
From: Scott Garman @ 2011-11-02 16:58 UTC (permalink / raw)
To: openembedded-core
Hello,
Now that the date formatting is normalized in the distro tracking file,
here are updates for the recipes that I recently updated: sudo, mtools,
grep, and openssh.
The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgarman/distro-tracking
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/distro-tracking
Scott Garman (1):
distro_tracking_fields: updates for sudo, mtools, grep, and openssh
.../conf/distro/include/distro_tracking_fields.inc | 32 ++++++++++----------
1 files changed, 16 insertions(+), 16 deletions(-)
--
1.7.5.4
^ permalink raw reply
* [PATCH 1/1] distro_tracking_fields: updates for sudo, mtools, grep, and openssh
From: Scott Garman @ 2011-11-02 16:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320252973.git.scott.a.garman@intel.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 32 ++++++++++----------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 998eabf..b2808a5 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -813,12 +813,12 @@ RECIPE_MAINTAINER_pn-pax-utils = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-sudo = "green"
RECIPE_DEPENDENCY_CHECK_pn-sudo = "not done"
-RECIPE_LATEST_VERSION_pn-sudo = "1.8.1p2"
+RECIPE_LATEST_VERSION_pn-sudo = "1.8.3"
RECIPE_INTEL_SECTION_pn-sudo = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sudo = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-sudo = "May 16, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sudo = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-sudo = "Oct 21, 2011"
RECIPE_COMMENTS_pn-sudo = ""
-RECIPE_LAST_UPDATE_pn-sudo = "Jun 14, 2011"
+RECIPE_LAST_UPDATE_pn-sudo = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-sudo = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-blktool = "green"
@@ -1290,12 +1290,12 @@ DISTRO_PN_ALIAS_pn-msynctool = "OpenSuse=msynctool Mandriva=msynctool"
RECIPE_STATUS_pn-mtools = "green"
RECIPE_DEPENDENCY_CHECK_pn-mtools = "not done"
-RECIPE_LATEST_VERSION_pn-mtools = "4.0.16"
+RECIPE_LATEST_VERSION_pn-mtools = "4.0.17"
RECIPE_INTEL_SECTION_pn-mtools = "optional"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mtools = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-mtools = "Apr 16, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mtools = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-mtools = "Jun 28, 2011"
RECIPE_COMMENTS_pn-mtools = ""
-RECIPE_LAST_UPDATE_pn-mtools = "Jun 15, 2011"
+RECIPE_LAST_UPDATE_pn-mtools = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-mtools = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-pm-utils = "green"
@@ -2016,22 +2016,22 @@ RECIPE_MAINTAINER_pn-cronie = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-grep = "green"
RECIPE_DEPENDENCY_CHECK_pn-grep = "not done"
-RECIPE_LATEST_VERSION_pn-grep = "2.8"
+RECIPE_LATEST_VERSION_pn-grep = "2.9"
RECIPE_INTEL_SECTION_pn-grep = "base"
RECIPE_NO_OF_PATCHES_pn-grep = "0"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-grep = "8 months"
-RECIPE_LATEST_RELEASE_DATE_pn-grep = "May 01, 2011"
-RECIPE_LAST_UPDATE_pn-grep = "Jun 5, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-grep = "1 month"
+RECIPE_LATEST_RELEASE_DATE_pn-grep = "Jun 01, 2011"
+RECIPE_LAST_UPDATE_pn-grep = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-grep = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-openssh = "green"
RECIPE_DEPENDENCY_CHECK_pn-openssh = "not done"
-RECIPE_LATEST_VERSION_pn-openssh = "5.8p2"
+RECIPE_LATEST_VERSION_pn-openssh = "5.9p1"
RECIPE_INTEL_SECTION_pn-openssh = "base"
RECIPE_NO_OF_PATCHES_pn-openssh = "1"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-openssh = "May 01, 2011"
-RECIPE_LAST_UPDATE_pn-openssh = "Jun 5, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-openssh = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-openssh = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-openssh = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-tar = "green"
--
1.7.5.4
^ permalink raw reply related
* Re: how to set time zone
From: Andrea Adami @ 2011-11-02 17:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320021891.10032.56.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]
On Mon, Oct 31, 2011 at 1:44 AM, Ni Qingliang <niqingliang@insigma.com.cn>wrote:
> I'd like the 'system level configuration' solution.
>
> the /etc/localtime/ link can be done when packaging rootfs (using the
> system level configuration).
>
> On Fri, 2011-10-28 at 22:43 +0800, Mark Hatle wrote:
> > Setting the default TZ for the image is something that should be done in
> a post
> > install script for the tzdata package or something similar.
> >
> > Since the /etc/localtime is usually a copy/hardlink or symlink to the
> timezone
> > data we don't want to package it up. Instead we want to perform the
> actions
> > that a program running on the target system itself would use to change
> the timezone.
> >
> > So I think the easiest approach is to add a system level configuration
> variable
> > (set the default).
> >
> > Then use this variable to populate the configuration file that specifies
> the
> > system timezone... and then use the post install process to check the
> contents
> > of a text file.
> >
> > Alternatively do this via an initscript -- but for folks w/ read-only
> > filesystems I'm not sure that will work.
> >
> > --Mark
>
<cut>
Maybe I misunderstand "system level configuration" but in the meta-oe
recipe we have
DEFAULT_TIMEZONE ?= "Europe/London"
Maybe UTC would be better?
Note how the variable is weak thus can be overridden in local.conf.
Secondly, why do it as post-install or at image do_rootfs stage when we
have set the variable and are therefore able to provide sane defaults in
do_install?
Other points before starting to write a patch:
-why is the recipe in oe-core doing chown -R root:root ${D} ?
-the logic around # libc is removing zoneinfo files from package
Is it only eglibc?
Regards
Andrea
[-- Attachment #2: Type: text/html, Size: 2307 bytes --]
^ permalink raw reply
* Re: [Pull v2 3/4] connman: create xuser
From: Otavio Salvador @ 2011-11-02 18:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <5f42fbce6e383b6330efde454da2cfe0a38df5cf.1320183757.git.sgw@linux.intel.com>
On Tue, Nov 1, 2011 at 19:44, Saul Wold <sgw@linux.intel.com> wrote:
> We create xuser here as a backup incase that xerver-nodm-init
> is not on the system.
This is wrong. If xserver-nodm-init (btw, there's a typo on the commit
message) is not in the image user is suppose to know what he/she is
doing so we shouldn't add users not required to make their life
easier.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* Re: how to set time zone
From: Mark Hatle @ 2011-11-02 19:15 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <CAAQYJAt2ghQNxzw9EnpfChW0QrwepQLbSFcYD4AP+E32n4Wc5g@mail.gmail.com>
On 11/2/11 12:32 PM, Andrea Adami wrote:
> On Mon, Oct 31, 2011 at 1:44 AM, Ni Qingliang <niqingliang@insigma.com.cn
> <mailto:niqingliang@insigma.com.cn>> wrote:
>
> I'd like the 'system level configuration' solution.
>
> the /etc/localtime/ link can be done when packaging rootfs (using the
> system level configuration).
>
> On Fri, 2011-10-28 at 22:43 +0800, Mark Hatle wrote:
> > Setting the default TZ for the image is something that should be done in a
> post
> > install script for the tzdata package or something similar.
> >
> > Since the /etc/localtime is usually a copy/hardlink or symlink to the timezone
> > data we don't want to package it up. Instead we want to perform the actions
> > that a program running on the target system itself would use to change the
> timezone.
> >
> > So I think the easiest approach is to add a system level configuration
> variable
> > (set the default).
> >
> > Then use this variable to populate the configuration file that specifies the
> > system timezone... and then use the post install process to check the contents
> > of a text file.
> >
> > Alternatively do this via an initscript -- but for folks w/ read-only
> > filesystems I'm not sure that will work.
> >
> > --Mark
>
> <cut>
>
> Maybe I misunderstand "system level configuration" but in the meta-oe recipe we have
>
> DEFAULT_TIMEZONE ?= "Europe/London"
>
> Maybe UTC would be better?
To me no timezone (which is UTC) is preferable as the system designer can then
set the timezone, externally to the package(s).
> Note how the variable is weak thus can be overridden in local.conf.
>
> Secondly, why do it as post-install or at image do_rootfs stage when we have set
> the variable and are therefore able to provide sane defaults in do_install?
If it's done within a do_install, then the file (/etc/timezone) itself gets
placed into the package. If it's in the package, then if/when someone upgrades
the package from a feed the timezone gets reset to the previous value. That's a
bug IMHO.
If it's done as a post-install script, then the timezone configuration can be
evaluated and if one isn't set -- or there is no timezone file -- then we can
set it to UTC or a similar default timezone.. (the value in the DEFAULT_TIMEZONE
variable is reasonable in this approach.)
> Other points before starting to write a patch:
> -why is the recipe in oe-core doing chown -R root:root ${D} ?
There was an issue with the way the timezone data was extracted/constructed that
it was have all of the build system's uid/gid preserved in the copy to the final
install directory -- so when packaging incorrect usernames and groups were fed
into the process causing issues.
A simple chown -R root:root ${D} ensured that all of the timezone data was owned
by the root user (on the target).
> -the logic around # libc is removing zoneinfo files from package
> Is it only eglibc?
Timezone info is updated more often then the system libc. So the zoneinfo files
are handled externally of the libc. This allows for easier updates over time..
(This is my guess, as I'm not familiar with exactly what this comment refers to.)
> Regards
>
> Andrea
>
> |
> |
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* [PATCH 0/1] Uprev to pseudo 1.2
From: Mark Hatle @ 2011-11-02 21:11 UTC (permalink / raw)
To: openembedded-core
Uprev to pseudo 1.2.
This was heavily tested by building oe-core with numerous image
configurations. Each configuration generated the same image before and
after the change from the current to new version of pseudo.
The primary purpose of this change is to enable the PSEUDO_UNLOAD
functionality that may be used for performance enhancements in future
versions of oe-core.
The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/pseudo
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
Mark Hatle (1):
pseudo: Uprev pseudo to version 1.2
.../conf/distro/include/distro_tracking_fields.inc | 6 +-
.../pseudo/pseudo/realpath_fix.patch | 165 --------------------
.../pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} | 7 +-
meta/recipes-devtools/pseudo/pseudo_git.bb | 6 +-
4 files changed, 9 insertions(+), 175 deletions(-)
delete mode 100644 meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
rename meta/recipes-devtools/pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} (48%)
--
1.7.3.4
^ permalink raw reply
* [PATCH 1/1] pseudo: Uprev pseudo to version 1.2
From: Mark Hatle @ 2011-11-02 21:11 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320268188.git.mark.hatle@windriver.com>
This adds a new feature, PSEUDO_UNLOAD, which can be used to eliminate
overhead of LD_PRELOAD when no longer necessary.
Also the, clone(2), support on Linux has been updated to resolve some
potential defects in the previous implementation.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 6 +-
.../pseudo/pseudo/realpath_fix.patch | 165 --------------------
.../pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} | 7 +-
meta/recipes-devtools/pseudo/pseudo_git.bb | 6 +-
4 files changed, 9 insertions(+), 175 deletions(-)
delete mode 100644 meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
rename meta/recipes-devtools/pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} (48%)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 998eabf..6995abb 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5944,11 +5944,11 @@ RECIPE_LAST_UPDATE_pn-gettext = "May 24, 2011"
RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Sep 29, 2011"
RECIPE_STATUS_pn-pseudo = "green"
-RECIPE_LATEST_VERSION_pn-pseudo = "1.1.1"
-RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
+RECIPE_LATEST_VERSION_pn-pseudo = "1.2"
+RECIPE_LAST_UPDATE_pn-pseudo = "Nov 02, 2011"
RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <mark.hatle@windriver.com>"
RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
-RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Jun 06, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Nov 02, 2011"
DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
diff --git a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
deleted file mode 100644
index 4a107e0..0000000
--- a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-commit c2f7c5ad8ef0f9c94a2a8382c109c8c6e16c8b18
-Author: Peter Seebach <peter.seebach@windriver.com>
-Date: Thu Jun 9 10:53:32 2011 -0500
-
- Fix realpath(name, NULL) when PSEUDO_DISABLED=1
-
- On some Linux systems, dlsym("realpath", RTLD_NEXT) prefers
- for reasons of its own to give a symbol that is also known
- as old_realpath, which fails and yields EINVAL when called
- with a null pointer as the second argument. This can be
- avoided, on some systems, by using dlvsym() to request
- the GLIBC_2.3 version of the symbol.
-
- The wrapper logic is enhanced to allow for specifying
- versions, although this currently only works for Linux
- (Darwin has no dlvsym, apparently?). The test case is
- a trivial program which calls realpath(name, NULL) run
- with PSEUDO_DISABLED=1.
-
-diff --git a/ChangeLog.txt b/ChangeLog.txt
-index 7ffb74a..a2bbb61 100644
---- a/ChangeLog.txt
-+++ b/ChangeLog.txt
-@@ -1,3 +1,8 @@
-+2011-06-08:
-+ * (seebs) Get the modern realpath from glibc instead of the old
-+ one inexplicably proferred by RTLD_NEXT. Fixes realpath(path, NULL)
-+ when PSEUDO_DISABLED=1.
-+
- 2011-06-06:
- * (seebs) revise system() handler substantially. It now
- pollutes the environment but works.
-diff --git a/makewrappers b/makewrappers
-index 6dcf889..20bbf2b 100755
---- a/makewrappers
-+++ b/makewrappers
-@@ -211,6 +211,7 @@ class Function:
- self.flags = '0'
- self.port = port
- self.directory = ''
-+ self.version = 'NULL'
- # On Darwin, some functions are SECRETLY converted to foo$INODE64
- # when called. So we have to look those up for real_*
- self.inode64 = None
-diff --git a/ports/unix/wrapfuncs.in b/ports/unix/wrapfuncs.in
-index 74bad89..e06e404 100644
---- a/ports/unix/wrapfuncs.in
-+++ b/ports/unix/wrapfuncs.in
-@@ -18,7 +18,7 @@ int lutimes(const char *path, const struct timeval *tv);
- char *mkdtemp(char *template);
- char *mktemp(char *template);
- long pathconf(const char *path, int name);
--char *realpath(const char *name, char *resolved_name);
-+char *realpath(const char *name, char *resolved_name); /* version="GLIBC_2.3" */
- int remove(const char *path); /* flags=AT_SYMLINK_NOFOLLOW */
- DIR *opendir(const char *path);
- char *tempnam(const char *template, const char *pfx);
-diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c
-index 600a918..07a4429 100644
---- a/pseudo_wrappers.c
-+++ b/pseudo_wrappers.c
-@@ -90,6 +90,42 @@ pseudo_reinit_libpseudo(void) {
- _libpseudo_init();
- }
-
-+static void
-+pseudo_init_one_wrapper(pseudo_function *func) {
-+ int (*f)(void) = (int (*)(void)) NULL;
-+ char *e;
-+ if (*func->real != NULL) {
-+ /* already initialized */
-+ return;
-+ }
-+ dlerror();
-+
-+#if PSEUDO_PORT_LINUX
-+ if (func->version)
-+ f = dlvsym(RTLD_NEXT, func->name, func->version);
-+ /* fall through to the general case, if that failed */
-+ if (!f)
-+#endif
-+ f = dlsym(RTLD_NEXT, func->name);
-+ if (f) {
-+ *func->real = f;
-+ } else {
-+ e = dlerror();
-+#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS
-+ char *s = func->name;
-+ s += strlen(s) - 2;
-+ /* *at() don't have to exist */
-+ if (!strcmp(s, "at")) {
-+ continue;
-+ }
-+#else
-+ if (e != NULL) {
-+ pseudo_diag("No real function for %s: %s\n", func->name, e);
-+ }
-+#endif
-+ }
-+}
-+
- void
- pseudo_init_wrappers(void) {
- int i;
-@@ -103,29 +139,7 @@ pseudo_init_wrappers(void) {
- */
- if (!done) {
- for (i = 0; pseudo_functions[i].name; ++i) {
-- if (*pseudo_functions[i].real == NULL) {
-- int (*f)(void);
-- char *e;
-- dlerror();
-- f = dlsym(RTLD_NEXT, pseudo_functions[i].name);
-- if (f) {
-- *pseudo_functions[i].real = f;
-- } else {
-- e = dlerror();
--#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS
-- char *s = pseudo_functions[i].name;
-- s += strlen(s) - 2;
-- /* *at() don't have to exist */
-- if (!strcmp(s, "at")) {
-- continue;
-- }
--#else
-- if (e != NULL) {
-- pseudo_diag("No real function for %s: %s\n", pseudo_functions[i].name, e);
-- }
--#endif
-- }
-- }
-+ pseudo_init_one_wrapper(&pseudo_functions[i]);
- }
- done = 1;
- }
-diff --git a/templates/wrapper_table b/templates/wrapper_table
-index 2e79fcd..bb30530 100644
---- a/templates/wrapper_table
-+++ b/templates/wrapper_table
-@@ -4,17 +4,21 @@
-
- /* This file is generated and should not be modified. See the makewrappers
- * script if you want to modify this. */
--static struct {
-+typedef struct {
- char *name; /* the name */
- int (**real)(void); /* the underlying syscall */
- int (*wrapper)(void); /* the wrapper from guts/name.c */
--} pseudo_functions[] = {
-+ char *version; /* the version, if we know and care */
-+} pseudo_function;
-+
-+static pseudo_function pseudo_functions[] = {
- @body
- { /* ${comment}; */
- "${name}${maybe_inode64}",
- (int (**)(void)) &real_${name},
-- (int (*)(void)) wrap_${name}
-+ (int (*)(void)) wrap_${name},
-+ ${version}
- },
- @footer
-- { NULL, NULL, NULL },
-+ { NULL, NULL, NULL, NULL },
- };
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.2.bb
similarity index 48%
rename from meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
rename to meta/recipes-devtools/pseudo/pseudo_1.2.bb
index 0a61aec..1d5fe1a 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.2.bb
@@ -1,11 +1,10 @@
require pseudo.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
file://oe-config.patch \
- file://realpath_fix.patch \
file://static_sqlite.patch"
-SRC_URI[md5sum] = "dd59766c17e199fe6144fce8a2c67802"
-SRC_URI[sha256sum] = "c697f643577d661c3ce826504b9dcd11fa98e78a5d10e3c83931da8942f6bfad"
+SRC_URI[md5sum] = "a2819084bab7e991f06626d02cf55048"
+SRC_URI[sha256sum] = "4749a22df687f44d24c26e97170d4781a1bd52d5ee092364a40877e4d96ff058"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index c1f0432..5ed8cf7 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,8 +1,8 @@
require pseudo.inc
-SRCREV = "c2f7c5ad8ef0f9c94a2a8382c109c8c6e16c8b18"
-PV = "1.1.1+git${SRCPV}"
-PR = "r19"
+SRCREV = "17c2233f93692f79684792750001ee6d13e03925"
+PV = "1.2+git${SRCPV}"
+PR = "r20"
DEFAULT_PREFERENCE = "-1"
--
1.7.3.4
^ permalink raw reply related
* Re: [PATCH 0/1] Uprev to pseudo 1.2
From: Martin Jansa @ 2011-11-02 21:22 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1320268188.git.mark.hatle@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 2539 bytes --]
On Wed, Nov 02, 2011 at 04:11:57PM -0500, Mark Hatle wrote:
> Uprev to pseudo 1.2.
>
> This was heavily tested by building oe-core with numerous image
> configurations. Each configuration generated the same image before and
> after the change from the current to new version of pseudo.
>
> The primary purpose of this change is to enable the PSEUDO_UNLOAD
> functionality that may be used for performance enhancements in future
> versions of oe-core.
>
> The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
>
> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib mhatle/pseudo
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
Is there branch with pseudo-1.2 for oe-core?
I would like to try it because we have strange errors when libstc++
isn't found when building with pseudo, but same binaries are working
fine without pseudo (seems related to /etc/ld.so.cache being ignored
sometimes from pseudo env).
And while I was trying to debug it I've noticed that files.db and
pseudo.log is quite big.
-rw-r--r-- 1 bitbake bitbake 240M Aug 15 13:49 files.db
-rw-r--r-- 1 bitbake bitbake 91K Aug 15 13:50 logs.db
-rw-r--r-- 1 bitbake bitbake 305M Aug 15 13:49 pseudo.log
with pseudo.log full of errors like this
pseudo: path mismatch [12 links]: ino 39721500 db
'/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor'
req
'/OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/task-shr-feed-1.0-r96'.
Cheers,
>
> Mark Hatle (1):
> pseudo: Uprev pseudo to version 1.2
>
> .../conf/distro/include/distro_tracking_fields.inc | 6 +-
> .../pseudo/pseudo/realpath_fix.patch | 165 --------------------
> .../pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} | 7 +-
> meta/recipes-devtools/pseudo/pseudo_git.bb | 6 +-
> 4 files changed, 9 insertions(+), 175 deletions(-)
> delete mode 100644 meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> rename meta/recipes-devtools/pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} (48%)
>
> --
> 1.7.3.4
>
>
> _______________________________________________
> 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
* Re: [PATCH 0/1] Uprev to pseudo 1.2
From: Mark Hatle @ 2011-11-02 21:39 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20111102212240.GG9949@jama.jama.net>
On 11/2/11 4:22 PM, Martin Jansa wrote:
> On Wed, Nov 02, 2011 at 04:11:57PM -0500, Mark Hatle wrote:
>> Uprev to pseudo 1.2.
>>
>> This was heavily tested by building oe-core with numerous image
>> configurations. Each configuration generated the same image before and
>> after the change from the current to new version of pseudo.
>>
>> The primary purpose of this change is to enable the PSEUDO_UNLOAD
>> functionality that may be used for performance enhancements in future
>> versions of oe-core.
>>
>> The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
>>
>> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
>>
>> are available in the git repository at:
>> git://git.pokylinux.org/poky-contrib mhatle/pseudo
>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
>
> Is there branch with pseudo-1.2 for oe-core?
^^^^^^^^^^^^^^^^^^^^^^^^
git://git.pokylinux.org/poky-contrib mhatle/pseudo
Grab that -- or simply grab the top commit and add it to your oe-core checkout.
> I would like to try it because we have strange errors when libstc++
> isn't found when building with pseudo, but same binaries are working
> fine without pseudo (seems related to /etc/ld.so.cache being ignored
> sometimes from pseudo env).
>
> And while I was trying to debug it I've noticed that files.db and
> pseudo.log is quite big.
> -rw-r--r-- 1 bitbake bitbake 240M Aug 15 13:49 files.db
> -rw-r--r-- 1 bitbake bitbake 91K Aug 15 13:50 logs.db
> -rw-r--r-- 1 bitbake bitbake 305M Aug 15 13:49 pseudo.log
The files.db is based on the number of files accessed during the time pseudo is
running.
logs.db and pseudo.log are based on the debug settings of pseudo. If you don't
have debugging enabled (you would have to do this manually) and the logs are
that big, something is going seriously wrong with the path/inode translation...
It's fairly normal to have a set of logs that are in the 10-20k range for
complex packages.. (These are documenting cases where pseudo has to guess about
inode to path mapping..)
> with pseudo.log full of errors like this
> pseudo: path mismatch [12 links]: ino 39721500 db
> '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor'
> req
> '/OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/task-shr-feed-1.0-r96'.
Are you building on a NFS filesystem? NFS (and a few other filesystems) have a
habit of remapping inodes out from under the filesystem. pseudo uses the inodes
as a validation that the file hasn't changed. If these inodes are changing,
pseudo will do it's best to keep things in sync, but there is a chance it won't
always succeed.
(This is done because someone could access a file in pseudo control that was
created outside.. so pseudo could only capture the inode.. then if in a future
action the file is accessed the inode/path can be checked. If the inode matches
it assumes it's the same file and now a path name exists.. if someone makes
changes outside of pseudo control a similar check happens.. this time it'll see
the path is the same but inode has changed.. so it guesses the file was modified
and I believe resets everything based on the new inode. Each of these will
generate a warning in the logs.)
--Mark
> Cheers,
>
>
>>
>> Mark Hatle (1):
>> pseudo: Uprev pseudo to version 1.2
>>
>> .../conf/distro/include/distro_tracking_fields.inc | 6 +-
>> .../pseudo/pseudo/realpath_fix.patch | 165 --------------------
>> .../pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} | 7 +-
>> meta/recipes-devtools/pseudo/pseudo_git.bb | 6 +-
>> 4 files changed, 9 insertions(+), 175 deletions(-)
>> delete mode 100644 meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
>> rename meta/recipes-devtools/pseudo/{pseudo_1.1.1.bb => pseudo_1.2.bb} (48%)
>>
>> --
>> 1.7.3.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH 0/1] Uprev to pseudo 1.2
From: Martin Jansa @ 2011-11-02 22:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4EB1B89E.8080505@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 4878 bytes --]
On Wed, Nov 02, 2011 at 04:39:42PM -0500, Mark Hatle wrote:
> On 11/2/11 4:22 PM, Martin Jansa wrote:
> > On Wed, Nov 02, 2011 at 04:11:57PM -0500, Mark Hatle wrote:
> >> Uprev to pseudo 1.2.
> >>
> >> This was heavily tested by building oe-core with numerous image
> >> configurations. Each configuration generated the same image before and
> >> after the change from the current to new version of pseudo.
> >>
> >> The primary purpose of this change is to enable the PSEUDO_UNLOAD
> >> functionality that may be used for performance enhancements in future
> >> versions of oe-core.
> >>
> >> The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
> >>
> >> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
> >>
> >> are available in the git repository at:
> >> git://git.pokylinux.org/poky-contrib mhatle/pseudo
> >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
> >
> > Is there branch with pseudo-1.2 for oe-core?
>
> ^^^^^^^^^^^^^^^^^^^^^^^^
>
> git://git.pokylinux.org/poky-contrib mhatle/pseudo
>
> Grab that -- or simply grab the top commit and add it to your oe-core checkout.
Yes, but git cherry-pick would be faster and adding poky-contrib as
another git remote is not very efficient as it doesn't share any git
objects with oe-core repo so it checkouts "whole poky" again :/.
So I'll use 2nd easiest option "pw-am.sh 14227".
> > I would like to try it because we have strange errors when libstc++
> > isn't found when building with pseudo, but same binaries are working
> > fine without pseudo (seems related to /etc/ld.so.cache being ignored
> > sometimes from pseudo env).
> >
> > And while I was trying to debug it I've noticed that files.db and
> > pseudo.log is quite big.
> > -rw-r--r-- 1 bitbake bitbake 240M Aug 15 13:49 files.db
> > -rw-r--r-- 1 bitbake bitbake 91K Aug 15 13:50 logs.db
> > -rw-r--r-- 1 bitbake bitbake 305M Aug 15 13:49 pseudo.log
>
> The files.db is based on the number of files accessed during the time pseudo is
> running.
Ah ok, this was in sysroot which was created "Aug 9" so it gets pretty
big fast, lets hope that sqlite3 can handle it efficiently, or is there
some way to "cleanup" stale entries in files table?
ie I'm using eglibc-2.14, but files table is full of eglibc-2.13 entries
and _none_ from eglibc-2.14, is it supposed to be like this or is it
sign of some pseudo problems?
sqlite> select count(*) from files where path like '%eglibc-2.13%';
20221
sqlite> select count(*) from files where path like '%eglibc-2.14%';
0
sqlite> select count(*) from files;
1085380
> logs.db and pseudo.log are based on the debug settings of pseudo. If you don't
> have debugging enabled (you would have to do this manually) and the logs are
> that big, something is going seriously wrong with the path/inode translation...
> It's fairly normal to have a set of logs that are in the 10-20k range for
> complex packages.. (These are documenting cases where pseudo has to guess about
> inode to path mapping..)
This was generated without debug enabled.. but maybe because of rm_work,
see below...
> > with pseudo.log full of errors like this
> > pseudo: path mismatch [12 links]: ino 39721500 db
> > '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor'
> > req
> > '/OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/task-shr-feed-1.0-r96'.
>
> Are you building on a NFS filesystem? NFS (and a few other filesystems) have a
> habit of remapping inodes out from under the filesystem. pseudo uses the inodes
> as a validation that the file hasn't changed. If these inodes are changing,
> pseudo will do it's best to keep things in sync, but there is a chance it won't
> always succeed.
No I'm building on local ext3 filesystem, but I'm also using rm_work, so
/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor
is probably long gone and inode 39721500 wasn't marked as unused in
pseudo world or do I read it wrong?
> (This is done because someone could access a file in pseudo control that was
> created outside.. so pseudo could only capture the inode.. then if in a future
> action the file is accessed the inode/path can be checked. If the inode matches
> it assumes it's the same file and now a path name exists.. if someone makes
> changes outside of pseudo control a similar check happens.. this time it'll see
> the path is the same but inode has changed.. so it guesses the file was modified
> and I believe resets everything based on the new inode. Each of these will
> generate a warning in the logs.)
Thanks for clarifying that.
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [PATCH 0/1] Uprev to pseudo 1.2
From: Mark Hatle @ 2011-11-02 22:31 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20111102221116.GH9949@jama.jama.net>
On 11/2/11 5:11 PM, Martin Jansa wrote:
> On Wed, Nov 02, 2011 at 04:39:42PM -0500, Mark Hatle wrote:
>> On 11/2/11 4:22 PM, Martin Jansa wrote:
>>> On Wed, Nov 02, 2011 at 04:11:57PM -0500, Mark Hatle wrote:
>>>> Uprev to pseudo 1.2.
>>>>
>>>> This was heavily tested by building oe-core with numerous image
>>>> configurations. Each configuration generated the same image before and
>>>> after the change from the current to new version of pseudo.
>>>>
>>>> The primary purpose of this change is to enable the PSEUDO_UNLOAD
>>>> functionality that may be used for performance enhancements in future
>>>> versions of oe-core.
>>>>
>>>> The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
>>>>
>>>> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
>>>>
>>>> are available in the git repository at:
>>>> git://git.pokylinux.org/poky-contrib mhatle/pseudo
>>>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
>>>
>>> Is there branch with pseudo-1.2 for oe-core?
>>
>> ^^^^^^^^^^^^^^^^^^^^^^^^
>>
>> git://git.pokylinux.org/poky-contrib mhatle/pseudo
>>
>> Grab that -- or simply grab the top commit and add it to your oe-core checkout.
>
> Yes, but git cherry-pick would be faster and adding poky-contrib as
> another git remote is not very efficient as it doesn't share any git
> objects with oe-core repo so it checkouts "whole poky" again :/.
>
> So I'll use 2nd easiest option "pw-am.sh 14227".
>
>>> I would like to try it because we have strange errors when libstc++
>>> isn't found when building with pseudo, but same binaries are working
>>> fine without pseudo (seems related to /etc/ld.so.cache being ignored
>>> sometimes from pseudo env).
>>>
>>> And while I was trying to debug it I've noticed that files.db and
>>> pseudo.log is quite big.
>>> -rw-r--r-- 1 bitbake bitbake 240M Aug 15 13:49 files.db
>>> -rw-r--r-- 1 bitbake bitbake 91K Aug 15 13:50 logs.db
>>> -rw-r--r-- 1 bitbake bitbake 305M Aug 15 13:49 pseudo.log
>>
>> The files.db is based on the number of files accessed during the time pseudo is
>> running.
>
> Ah ok, this was in sysroot which was created "Aug 9" so it gets pretty
> big fast, lets hope that sqlite3 can handle it efficiently, or is there
> some way to "cleanup" stale entries in files table?
When you clean the build it will restart the pseudo DB.
> ie I'm using eglibc-2.14, but files table is full of eglibc-2.13 entries
> and _none_ from eglibc-2.14, is it supposed to be like this or is it
> sign of some pseudo problems?
>
> sqlite> select count(*) from files where path like '%eglibc-2.13%';
> 20221
> sqlite> select count(*) from files where path like '%eglibc-2.14%';
> 0
> sqlite> select count(*) from files;
> 1085380
The pseudo DB is specific to the tmp work directory. If the work directory
hasn't changed (i.e. you aren't updating versions and pr) then the pseudo DB
will continue to grow to accommodate the new files.
There are flags within the DB if an erase operation occurs, but entries are only
tagged as erased -- but not removed. This is due to speed issues. pseudo is
significantly slower on remove and replace operations if the DB entries are removed.
>> logs.db and pseudo.log are based on the debug settings of pseudo. If you don't
>> have debugging enabled (you would have to do this manually) and the logs are
>> that big, something is going seriously wrong with the path/inode translation...
>> It's fairly normal to have a set of logs that are in the 10-20k range for
>> complex packages.. (These are documenting cases where pseudo has to guess about
>> inode to path mapping..)
>
> This was generated without debug enabled.. but maybe because of rm_work,
> see below...
>
>>> with pseudo.log full of errors like this
>>> pseudo: path mismatch [12 links]: ino 39721500 db
>>> '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor'
>>> req
>>> '/OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/task-shr-feed-1.0-r96'.
>>
>> Are you building on a NFS filesystem? NFS (and a few other filesystems) have a
>> habit of remapping inodes out from under the filesystem. pseudo uses the inodes
>> as a validation that the file hasn't changed. If these inodes are changing,
>> pseudo will do it's best to keep things in sync, but there is a chance it won't
>> always succeed.
>
> No I'm building on local ext3 filesystem, but I'm also using rm_work, so
> /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor
> is probably long gone and inode 39721500 wasn't marked as unused in
> pseudo world or do I read it wrong?
If you use rm_work, then the pseudo DB located within the work directory will
also be removed. So I'm not sure why you would be having such a large DB.
>> (This is done because someone could access a file in pseudo control that was
>> created outside.. so pseudo could only capture the inode.. then if in a future
>> action the file is accessed the inode/path can be checked. If the inode matches
>> it assumes it's the same file and now a path name exists.. if someone makes
>> changes outside of pseudo control a similar check happens.. this time it'll see
>> the path is the same but inode has changed.. so it guesses the file was modified
>> and I believe resets everything based on the new inode. Each of these will
>> generate a warning in the logs.)
>
> Thanks for clarifying that.
>
> Cheers,
>
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH 0/1] Uprev to pseudo 1.2
From: Martin Jansa @ 2011-11-02 22:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4EB1C4DF.8070007@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 6427 bytes --]
On Wed, Nov 02, 2011 at 05:31:59PM -0500, Mark Hatle wrote:
> On 11/2/11 5:11 PM, Martin Jansa wrote:
> > On Wed, Nov 02, 2011 at 04:39:42PM -0500, Mark Hatle wrote:
> >> On 11/2/11 4:22 PM, Martin Jansa wrote:
> >>> On Wed, Nov 02, 2011 at 04:11:57PM -0500, Mark Hatle wrote:
> >>>> Uprev to pseudo 1.2.
> >>>>
> >>>> This was heavily tested by building oe-core with numerous image
> >>>> configurations. Each configuration generated the same image before and
> >>>> after the change from the current to new version of pseudo.
> >>>>
> >>>> The primary purpose of this change is to enable the PSEUDO_UNLOAD
> >>>> functionality that may be used for performance enhancements in future
> >>>> versions of oe-core.
> >>>>
> >>>> The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
> >>>>
> >>>> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
> >>>>
> >>>> are available in the git repository at:
> >>>> git://git.pokylinux.org/poky-contrib mhatle/pseudo
> >>>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
> >>>
> >>> Is there branch with pseudo-1.2 for oe-core?
> >>
> >> ^^^^^^^^^^^^^^^^^^^^^^^^
> >>
> >> git://git.pokylinux.org/poky-contrib mhatle/pseudo
> >>
> >> Grab that -- or simply grab the top commit and add it to your oe-core checkout.
> >
> > Yes, but git cherry-pick would be faster and adding poky-contrib as
> > another git remote is not very efficient as it doesn't share any git
> > objects with oe-core repo so it checkouts "whole poky" again :/.
> >
> > So I'll use 2nd easiest option "pw-am.sh 14227".
> >
> >>> I would like to try it because we have strange errors when libstc++
> >>> isn't found when building with pseudo, but same binaries are working
> >>> fine without pseudo (seems related to /etc/ld.so.cache being ignored
> >>> sometimes from pseudo env).
> >>>
> >>> And while I was trying to debug it I've noticed that files.db and
> >>> pseudo.log is quite big.
> >>> -rw-r--r-- 1 bitbake bitbake 240M Aug 15 13:49 files.db
> >>> -rw-r--r-- 1 bitbake bitbake 91K Aug 15 13:50 logs.db
> >>> -rw-r--r-- 1 bitbake bitbake 305M Aug 15 13:49 pseudo.log
> >>
> >> The files.db is based on the number of files accessed during the time pseudo is
> >> running.
> >
> > Ah ok, this was in sysroot which was created "Aug 9" so it gets pretty
> > big fast, lets hope that sqlite3 can handle it efficiently, or is there
> > some way to "cleanup" stale entries in files table?
>
> When you clean the build it will restart the pseudo DB.
>
> > ie I'm using eglibc-2.14, but files table is full of eglibc-2.13 entries
> > and _none_ from eglibc-2.14, is it supposed to be like this or is it
> > sign of some pseudo problems?
> >
> > sqlite> select count(*) from files where path like '%eglibc-2.13%';
> > 20221
> > sqlite> select count(*) from files where path like '%eglibc-2.14%';
> > 0
> > sqlite> select count(*) from files;
> > 1085380
>
> The pseudo DB is specific to the tmp work directory. If the work directory
> hasn't changed (i.e. you aren't updating versions and pr) then the pseudo DB
> will continue to grow to accommodate the new files.
>
> There are flags within the DB if an erase operation occurs, but entries are only
> tagged as erased -- but not removed. This is due to speed issues. pseudo is
> significantly slower on remove and replace operations if the DB entries are removed.
>
> >> logs.db and pseudo.log are based on the debug settings of pseudo. If you don't
> >> have debugging enabled (you would have to do this manually) and the logs are
> >> that big, something is going seriously wrong with the path/inode translation...
> >> It's fairly normal to have a set of logs that are in the 10-20k range for
> >> complex packages.. (These are documenting cases where pseudo has to guess about
> >> inode to path mapping..)
> >
> > This was generated without debug enabled.. but maybe because of rm_work,
> > see below...
> >
> >>> with pseudo.log full of errors like this
> >>> pseudo: path mismatch [12 links]: ino 39721500 db
> >>> '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor'
> >>> req
> >>> '/OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/task-shr-feed-1.0-r96'.
> >>
> >> Are you building on a NFS filesystem? NFS (and a few other filesystems) have a
> >> habit of remapping inodes out from under the filesystem. pseudo uses the inodes
> >> as a validation that the file hasn't changed. If these inodes are changing,
> >> pseudo will do it's best to keep things in sync, but there is a chance it won't
> >> always succeed.
> >
> > No I'm building on local ext3 filesystem, but I'm also using rm_work, so
> > /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/vim-7.2.446-r10.3/image/usr/share/vim/vim72/tutor
> > is probably long gone and inode 39721500 wasn't marked as unused in
> > pseudo world or do I read it wrong?
>
> If you use rm_work, then the pseudo DB located within the work directory will
> also be removed. So I'm not sure why you would be having such a large DB.
But I was talking about pseudo db here:
tmp/sysroots/x86_64-linux/var/pseudo/
now with pseudo-1.2 I still have quite a few warnings about inodes in
pseudo.log now in work directory, ie python build:
OE @ ~/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.7.2-r0.1 $
-rw-r--r-- 1 bitbake bitbake 5.2M Nov 2 23:44 files.db
-rw-r--r-- 1 bitbake bitbake 4.0K Nov 2 23:44 logs.db
-rw-r--r-- 1 bitbake bitbake 46K Nov 2 23:44 pseudo.log
pseudo: dir err : 1240102 ['/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.7.2-r0.1/deploy-ipks/armv4t/IPKG_BUILD.25064'] (db 'no path') db mode 0100644, header mode 040755 (unlinking db)
pseudo: creat for '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.7.2-r0.1/deploy-ipks/armv4t/stvITxha' replaces existing 1240107 ['no path'].
wxr-xr-x 1 bitbake bitbake 0 Nov 2 23:44 pseudo.socket
pseudo: path mismatch [2 links]: ino 1240673 db '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.7.2-r0.1/sstate-build-package/package/usr/bin/python2.7' req '/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.7.2-r0.1/sstate-build-package/package/usr/bin/python'.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* [PATCH] python: improve packaging
From: Martin Jansa @ 2011-11-02 23:01 UTC (permalink / raw)
To: openembedded-core
* move 2to3 to separate package and include lib2to3 (was in python-misc)
* fix pattern for python-unittest (was in python-misc because it's in subdirectory now)
* add pydoc_data to python-pydoc (was in python-misc)
* add more stuff to smtpd, audio, codecs, ctypes, html, io, json, mime,
pickle, stringold, xmlrpc
* move all FILES_ details from python recipe to manifest generator so it's in one place
* added manual line break in FILES_${PN}-core, because git send-email
doesn't like too long lines
$ git send-email -1 dfaae65839f0ab23e5b2ae2a68df0f370bca84d2
fatal: /tmp/k8zbDajUNP/0001-python-improve-packaging.patch: 64: patch contains a line longer than 998 characters
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../python/python-2.7-manifest.inc | 43 ++++++++++--------
meta/recipes-devtools/python/python_2.7.2.bb | 22 +---------
scripts/contrib/python/generate-manifest-2.7.py | 47 ++++++++++++-------
3 files changed, 55 insertions(+), 57 deletions(-)
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index 69cb3c7..e4017ba 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -1,17 +1,21 @@
# 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.1 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# 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
-PROVIDES+="${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 "
+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}-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 ${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"
+FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python2.7/lib2to3 "
DESCRIPTION_${PN}-audio="Python Audio Handling"
RDEPENDS_${PN}-audio="${PN}-core"
-FILES_${PN}-audio="${libdir}/python2.7/wave.* ${libdir}/python2.7/chunk.* ${libdir}/python2.7/sndhdr.* ${libdir}/python2.7/lib-dynload/ossaudiodev.so ${libdir}/python2.7/lib-dynload/audioop.so "
+FILES_${PN}-audio="${libdir}/python2.7/wave.* ${libdir}/python2.7/chunk.* ${libdir}/python2.7/sndhdr.* ${libdir}/python2.7/lib-dynload/ossaudiodev.so ${libdir}/python2.7/lib-dynload/audioop.so ${libdir}/python2.7/audiodev.* ${libdir}/python2.7/sunaudio.* ${libdir}/python2.7/sunau.* ${libdir}/python2.7/toaiff.* "
DESCRIPTION_${PN}-bsddb="Python Berkeley Database Bindings"
RDEPENDS_${PN}-bsddb="${PN}-core"
@@ -19,7 +23,7 @@ FILES_${PN}-bsddb="${libdir}/python2.7/bsddb ${libdir}/python2.7/lib-dynload/_bs
DESCRIPTION_${PN}-codecs="Python Codecs, Encodings & i18n Support"
RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang"
-FILES_${PN}-codecs="${libdir}/python2.7/codecs.* ${libdir}/python2.7/encodings ${libdir}/python2.7/gettext.* ${libdir}/python2.7/locale.* ${libdir}/python2.7/lib-dynload/_locale.so ${libdir}/python2.7/lib-dynload/unicodedata.so ${libdir}/python2.7/stringprep.* ${libdir}/python2.7/xdrlib.* "
+FILES_${PN}-codecs="${libdir}/python2.7/codecs.* ${libdir}/python2.7/encodings ${libdir}/python2.7/gettext.* ${libdir}/python2.7/locale.* ${libdir}/python2.7/lib-dynload/_locale.so ${libdir}/python2.7/lib-dynload/_codecs* ${libdir}/python2.7/lib-dynload/_multibytecodec.so ${libdir}/python2.7/lib-dynload/unicodedata.so ${libdir}/python2.7/stringprep.* ${libdir}/python2.7/xdrlib.* "
DESCRIPTION_${PN}-compile="Python Bytecode Compilation Support"
RDEPENDS_${PN}-compile="${PN}-core"
@@ -35,7 +39,8 @@ FILES_${PN}-compression="${libdir}/python2.7/gzip.* ${libdir}/python2.7/zipfile.
DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)"
RDEPENDS_${PN}-core=""
-FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so ${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig.h "
+FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so \
+${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig.h ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py "
DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support"
RDEPENDS_${PN}-crypt="${PN}-core"
@@ -43,7 +48,7 @@ FILES_${PN}-crypt="${libdir}/python2.7/hashlib.* ${libdir}/python2.7/md5.* ${lib
DESCRIPTION_${PN}-ctypes="Python C Types Support"
RDEPENDS_${PN}-ctypes="${PN}-core"
-FILES_${PN}-ctypes="${libdir}/python2.7/ctypes ${libdir}/python2.7/lib-dynload/_ctypes.so "
+FILES_${PN}-ctypes="${libdir}/python2.7/ctypes ${libdir}/python2.7/lib-dynload/_ctypes.so ${libdir}/python2.7/lib-dynload/_ctypes_test.so "
DESCRIPTION_${PN}-curses="Python Curses Support"
RDEPENDS_${PN}-curses="${PN}-core"
@@ -63,7 +68,7 @@ FILES_${PN}-debugger="${libdir}/python2.7/bdb.* ${libdir}/python2.7/pdb.* "
DESCRIPTION_${PN}-dev="Python Development Package"
RDEPENDS_${PN}-dev="${PN}-core"
-FILES_${PN}-dev="${includedir} ${libdir}/libpython2.6.so "
+FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig "
DESCRIPTION_${PN}-difflib="Python helpers for computing deltas between objects."
RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re"
@@ -99,7 +104,7 @@ FILES_${PN}-hotshot="${libdir}/python2.7/hotshot ${libdir}/python2.7/lib-dynload
DESCRIPTION_${PN}-html="Python HTML Processing"
RDEPENDS_${PN}-html="${PN}-core"
-FILES_${PN}-html="${libdir}/python2.7/formatter.* ${libdir}/python2.7/htmlentitydefs.* ${libdir}/python2.7/htmllib.* ${libdir}/python2.7/markupbase.* ${libdir}/python2.7/sgmllib.* "
+FILES_${PN}-html="${libdir}/python2.7/formatter.* ${libdir}/python2.7/htmlentitydefs.* ${libdir}/python2.7/htmllib.* ${libdir}/python2.7/markupbase.* ${libdir}/python2.7/sgmllib.* ${libdir}/python2.7/HTMLParser.* "
DESCRIPTION_${PN}-idle="Python Integrated Development Environment"
RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter"
@@ -111,11 +116,11 @@ FILES_${PN}-image="${libdir}/python2.7/colorsys.* ${libdir}/python2.7/imghdr.* $
DESCRIPTION_${PN}-io="Python Low-Level I/O"
RDEPENDS_${PN}-io="${PN}-core ${PN}-math"
-FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* "
+FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* "
DESCRIPTION_${PN}-json="Python JSON Support"
RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re"
-FILES_${PN}-json="${libdir}/python2.7/json "
+FILES_${PN}-json="${libdir}/python2.7/json ${libdir}/python2.7/lib-dynload/_json.so "
DESCRIPTION_${PN}-lang="Python Low-Level Language Support"
RDEPENDS_${PN}-lang="${PN}-core"
@@ -135,7 +140,7 @@ FILES_${PN}-math="${libdir}/python2.7/lib-dynload/cmath.so ${libdir}/python2.7/l
DESCRIPTION_${PN}-mime="Python MIME Handling APIs"
RDEPENDS_${PN}-mime="${PN}-core ${PN}-io"
-FILES_${PN}-mime="${libdir}/python2.7/mimetools.* ${libdir}/python2.7/uu.* ${libdir}/python2.7/quopri.* ${libdir}/python2.7/rfc822.* "
+FILES_${PN}-mime="${libdir}/python2.7/mimetools.* ${libdir}/python2.7/uu.* ${libdir}/python2.7/quopri.* ${libdir}/python2.7/rfc822.* ${libdir}/python2.7/MimeWriter.* "
DESCRIPTION_${PN}-mmap="Python Memory-Mapped-File Support"
RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io"
@@ -159,7 +164,7 @@ FILES_${PN}-numbers="${libdir}/python2.7/decimal.* ${libdir}/python2.7/numbers.*
DESCRIPTION_${PN}-pickle="Python Persistence Support"
RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re"
-FILES_${PN}-pickle="${libdir}/python2.7/pickle.* ${libdir}/python2.7/shelve.* ${libdir}/python2.7/lib-dynload/cPickle.so "
+FILES_${PN}-pickle="${libdir}/python2.7/pickle.* ${libdir}/python2.7/shelve.* ${libdir}/python2.7/lib-dynload/cPickle.so ${libdir}/python2.7/pickletools.* "
DESCRIPTION_${PN}-pkgutil="Python Package Extension Utility Support"
RDEPENDS_${PN}-pkgutil="${PN}-core"
@@ -175,7 +180,7 @@ FILES_${PN}-profile="${libdir}/python2.7/profile.* ${libdir}/python2.7/pstats.*
DESCRIPTION_${PN}-pydoc="Python Interactive Help Support"
RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re"
-FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.7/pydoc.* "
+FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.7/pydoc.* ${libdir}/python2.7/pydoc_data "
DESCRIPTION_${PN}-re="Python Regular Expression APIs"
RDEPENDS_${PN}-re="${PN}-core"
@@ -199,7 +204,7 @@ FILES_${PN}-shell="${libdir}/python2.7/cmd.* ${libdir}/python2.7/commands.* ${li
DESCRIPTION_${PN}-smtpd="Python Simple Mail Transport Daemon"
RDEPENDS_${PN}-smtpd="${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime"
-FILES_${PN}-smtpd="${bindir}/smtpd.* "
+FILES_${PN}-smtpd="${bindir}/smtpd.* ${libdir}/python2.7/smtpd.* "
DESCRIPTION_${PN}-sqlite3="Python Sqlite3 Database Support"
RDEPENDS_${PN}-sqlite3="${PN}-core ${PN}-datetime ${PN}-lang ${PN}-crypt ${PN}-io ${PN}-threading ${PN}-zlib"
@@ -211,7 +216,7 @@ FILES_${PN}-sqlite3-tests="${libdir}/python2.7/sqlite3/test "
DESCRIPTION_${PN}-stringold="Python String APIs [deprecated]"
RDEPENDS_${PN}-stringold="${PN}-core ${PN}-re"
-FILES_${PN}-stringold="${libdir}/python2.7/lib-dynload/strop.so ${libdir}/python2.7/string.* "
+FILES_${PN}-stringold="${libdir}/python2.7/lib-dynload/strop.so ${libdir}/python2.7/string.* ${libdir}/python2.7/stringold.* "
DESCRIPTION_${PN}-subprocess="Python Subprocess Support"
RDEPENDS_${PN}-subprocess="${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle"
@@ -243,7 +248,7 @@ FILES_${PN}-tkinter="${libdir}/python2.7/lib-dynload/_tkinter.so ${libdir}/pytho
DESCRIPTION_${PN}-unittest="Python Unit Testing Framework"
RDEPENDS_${PN}-unittest="${PN}-core ${PN}-stringold ${PN}-lang"
-FILES_${PN}-unittest="${libdir}/python2.7/unittest.* "
+FILES_${PN}-unittest="${libdir}/python2.7/unittest/ "
DESCRIPTION_${PN}-unixadmin="Python Unix Administration Support"
RDEPENDS_${PN}-unixadmin="${PN}-core"
@@ -255,14 +260,14 @@ FILES_${PN}-xml="${libdir}/python2.7/lib-dynload/pyexpat.so ${libdir}/python2.7/
DESCRIPTION_${PN}-xmlrpc="Python XMLRPC Support"
RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang"
-FILES_${PN}-xmlrpc="${libdir}/python2.7/xmlrpclib.* ${libdir}/python2.7/SimpleXMLRPCServer.* "
+FILES_${PN}-xmlrpc="${libdir}/python2.7/xmlrpclib.* ${libdir}/python2.7/SimpleXMLRPCServer.* ${libdir}/python2.7/DocXMLRPCServer.* "
DESCRIPTION_${PN}-zlib="Python zlib Support."
RDEPENDS_${PN}-zlib="${PN}-core"
FILES_${PN}-zlib="${libdir}/python2.7/lib-dynload/zlib.so "
DESCRIPTION_${PN}-modules="All Python modules"
-RDEPENDS_${PN}-modules="${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}-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 "
+RDEPENDS_${PN}-modules="${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}-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 "
ALLOW_EMPTY_${PN}-modules = "1"
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 45d8350..bb088a4 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 db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@@ -107,30 +107,10 @@ RPROVIDES_${PN}-core = "${PN}"
RRECOMMENDS_${PN}-core = "${PN}-readline"
RRECOMMENDS_${PN}-crypt = "openssl"
-# add sitecustomize
-FILES_${PN}-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
-# ship 2to3
-FILES_${PN}-core += "${bindir}/2to3"
-
# package libpython2
PACKAGES =+ "lib${BPN}2"
FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
-# additional stuff -dev
-
-FILES_${PN}-dev = "\
- ${includedir} \
- ${libdir}/lib*${SOLIBSDEV} \
- ${libdir}/*.la \
- ${libdir}/*.a \
- ${libdir}/*.o \
- ${libdir}/pkgconfig \
- ${base_libdir}/*.a \
- ${base_libdir}/*.o \
- ${datadir}/aclocal \
- ${datadir}/pkgconfig \
-"
-
# catch debug extensions (isn't that already in python-core-dbg?)
FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index b526df5..e0171f9 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -17,7 +17,7 @@ import time
VERSION = "2.7.2"
__author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20110222.1"
+__version__ = "20110222.2"
class MakefileMaker:
@@ -166,28 +166,41 @@ if __name__ == "__main__":
"lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " +
"lib-dynload/xreadlines.so types.* platform.* ${bindir}/python* " +
"_weakrefset.* sysconfig.* config/Makefile " +
- "${includedir}/python${PYTHON_MAJMIN}/pyconfig.h " )
+ "${includedir}/python${PYTHON_MAJMIN}/pyconfig.h " +
+ "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ")
m.addPackage( "${PN}-dev", "Python Development Package", "${PN}-core",
- "${includedir} ${libdir}/libpython2.6.so" ) # package
+ "${includedir} " +
+ "${libdir}/lib*${SOLIBSDEV} " +
+ "${libdir}/*.la " +
+ "${libdir}/*.a " +
+ "${libdir}/*.o " +
+ "${libdir}/pkgconfig " +
+ "${base_libdir}/*.a " +
+ "${base_libdir}/*.o " +
+ "${datadir}/aclocal " +
+ "${datadir}/pkgconfig " )
+
+ m.addPackage( "${PN}-2to3", "Python Automated Python 2 to 3 code translation", "${PN}-core",
+ "${bindir}/2to3 lib2to3" ) # package
m.addPackage( "${PN}-idle", "Python Integrated Development Environment", "${PN}-core ${PN}-tkinter",
"${bindir}/idle idlelib" ) # package
m.addPackage( "${PN}-pydoc", "Python Interactive Help Support", "${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re",
- "${bindir}/pydoc pydoc.*" )
+ "${bindir}/pydoc pydoc.* pydoc_data" )
m.addPackage( "${PN}-smtpd", "Python Simple Mail Transport Daemon", "${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime",
- "${bindir}/smtpd.*" )
+ "${bindir}/smtpd.* smtpd.*" )
m.addPackage( "${PN}-audio", "Python Audio Handling", "${PN}-core",
- "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" )
+ "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so audiodev.* sunaudio.* sunau.* toaiff.*" )
m.addPackage( "${PN}-bsddb", "Python Berkeley Database Bindings", "${PN}-core",
"bsddb lib-dynload/_bsddb.so" ) # package
m.addPackage( "${PN}-codecs", "Python Codecs, Encodings & i18n Support", "${PN}-core ${PN}-lang",
- "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
+ "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/_codecs* lib-dynload/_multibytecodec.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
m.addPackage( "${PN}-compile", "Python Bytecode Compilation Support", "${PN}-core",
"py_compile.* compileall.*" )
@@ -208,7 +221,7 @@ if __name__ == "__main__":
"curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module
m.addPackage( "${PN}-ctypes", "Python C Types Support", "${PN}-core",
- "ctypes lib-dynload/_ctypes.so" ) # directory + low level module
+ "ctypes lib-dynload/_ctypes.so lib-dynload/_ctypes_test.so" ) # directory + low level module
m.addPackage( "${PN}-datetime", "Python Calendar and Time support", "${PN}-core ${PN}-codecs",
"_strptime.* calendar.* lib-dynload/datetime.so" )
@@ -242,7 +255,7 @@ if __name__ == "__main__":
"hotshot lib-dynload/_hotshot.so" )
m.addPackage( "${PN}-html", "Python HTML Processing", "${PN}-core",
- "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " )
+ "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* HTMLParser.* " )
m.addPackage( "${PN}-gdbm", "Python GNU Database Support", "${PN}-core",
"lib-dynload/gdbm.so" )
@@ -251,11 +264,11 @@ if __name__ == "__main__":
"colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" )
m.addPackage( "${PN}-io", "Python Low-Level I/O", "${PN}-core ${PN}-math",
- "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
- "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
+ "lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
+ "pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.*" )
m.addPackage( "${PN}-json", "Python JSON Support", "${PN}-core ${PN}-math ${PN}-re",
- "json" ) # package
+ "json lib-dynload/_json.so" ) # package
m.addPackage( "${PN}-lang", "Python Low-Level Language Support", "${PN}-core",
"lib-dynload/_bisect.so lib-dynload/_collections.so lib-dynload/_heapq.so lib-dynload/_weakref.so lib-dynload/_functools.so " +
@@ -273,7 +286,7 @@ if __name__ == "__main__":
"lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" )
m.addPackage( "${PN}-mime", "Python MIME Handling APIs", "${PN}-core ${PN}-io",
- "mimetools.* uu.* quopri.* rfc822.*" )
+ "mimetools.* uu.* quopri.* rfc822.* MimeWriter.*" )
m.addPackage( "${PN}-mmap", "Python Memory-Mapped-File Support", "${PN}-core ${PN}-io",
"lib-dynload/mmap.so " )
@@ -292,7 +305,7 @@ if __name__ == "__main__":
"decimal.* numbers.*" )
m.addPackage( "${PN}-pickle", "Python Persistence Support", "${PN}-core ${PN}-codecs ${PN}-io ${PN}-re",
- "pickle.* shelve.* lib-dynload/cPickle.so" )
+ "pickle.* shelve.* lib-dynload/cPickle.so pickletools.*" )
m.addPackage( "${PN}-pkgutil", "Python Package Extension Utility Support", "${PN}-core",
"pkgutil.*")
@@ -328,7 +341,7 @@ if __name__ == "__main__":
"sqlite3/test" )
m.addPackage( "${PN}-stringold", "Python String APIs [deprecated]", "${PN}-core ${PN}-re",
- "lib-dynload/strop.so string.*" )
+ "lib-dynload/strop.so string.* stringold.*" )
m.addPackage( "${PN}-syslog", "Python Syslog Interface", "${PN}-core",
"lib-dynload/syslog.so" )
@@ -346,7 +359,7 @@ if __name__ == "__main__":
"lib-dynload/_tkinter.so lib-tk" ) # package
m.addPackage( "${PN}-unittest", "Python Unit Testing Framework", "${PN}-core ${PN}-stringold ${PN}-lang",
- "unittest.*" )
+ "unittest/" )
m.addPackage( "${PN}-unixadmin", "Python Unix Administration Support", "${PN}-core",
"lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
@@ -355,7 +368,7 @@ if __name__ == "__main__":
"lib-dynload/pyexpat.so xml xmllib.*" ) # package
m.addPackage( "${PN}-xmlrpc", "Python XMLRPC Support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang",
- "xmlrpclib.* SimpleXMLRPCServer.*" )
+ "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.*" )
m.addPackage( "${PN}-zlib", "Python zlib Support.", "${PN}-core",
"lib-dynload/zlib.so" )
--
1.7.7.1
^ permalink raw reply related
* Re: [Pull v2 3/4] connman: create xuser
From: Saul Wold @ 2011-11-02 23:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAP9ODKo+BrVout44UaDOLfk5mEz+dFA4qGvx3L-B6ZP0Bjakbg@mail.gmail.com>
On 11/02/2011 11:54 AM, Otavio Salvador wrote:
> On Tue, Nov 1, 2011 at 19:44, Saul Wold<sgw@linux.intel.com> wrote:
>> We create xuser here as a backup incase that xerver-nodm-init
>> is not on the system.
>
> This is wrong. If xserver-nodm-init (btw, there's a typo on the commit
> message) is not in the image user is suppose to know what he/she is
> doing so we shouldn't add users not required to make their life
> easier.
>
Otavio,
The situation is that when xserver-nodm-init is not installed or this is
not a ROOTLESS_X, dbus still requires the xuser be available for
connmand to run correctly.
Sau!
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox