[OE-core] classes/insane: add check for PN in OVERRIDES
Hello Paul,
I have a question about your commit c331f0a:
---
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 4d2392e..fb18022 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -907,6 +907,11 @@ python () {
if d.getVar('do_stage', True) is not None:
bb.fatal(Legacy staging found for %s as it has a do_stage
function. This will need conversion to a do_install or often simply
removal to work with OE-core % d.getVar(FILE, True))
+overrides = d.getVar('OVERRIDES', True).split(':')
+pn = d.getVar('PN', True)
+if pn in overrides:
+bb.warn('Recipe %s has PN of %s which is in OVERRIDES, this
can result in unexpected behaviour.' % (d.getVar(FILE, True), pn))
+
issues = []
if (d.getVar('PACKAGES', True) or ).split():
for var in 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS',
'RCONFLICTS', 'RPROVIDES', 'RREPLACES', 'FILES', 'pkg_preinst',
'pkg_postinst', 'pkg_prerm', 'pkg_postrm', 'ALLOW_EMPTY':
--
A recipe (lets say linux_git.bb) has its PN in OVERRIDES with prefix
'pn-' (pn-linux). So, if we have 'linux' in OVERRIDES then it cannot
interfere. Should we search for pn-${PN} instead? E.g.:
overrides = d.getVar('OVERRIDES', True).split(':')
pn = d.getVar('PN', True)
if (pn-%s % pn) in overrides:
bb.warn('Recipe %s has PN of %s which is in OVERRIDES, this
can result in unexpected behaviour.' % (d.getVar(FILE, True), pn))
Thanks,
Mikhail
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grep-2.5.1a: fix grep for LSB compliance
On 08/26/2013 09:32 PM, Li Zhijian wrote:
...skip... at 2013-8-27 9:00, Saul Wold wrote:
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb
b/meta/recipes-extended/grep/grep_2.5.1a.bb index
088959c..d964d84 100644 ---
a/meta/recipes-extended/grep/grep_2.5.1a.bb +++
b/meta/recipes-extended/grep/grep_2.5.1a.bb @@ -5,7 +5,7 @@
SECTION = console/utils LICENSE = GPLv2 LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3
-PR = r2 +PR = r3
SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \ @@ -13,8 +13,25 @@ SRC_URI =
${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ file://gettext.patch \
file://fix64-int-to-pointer.patch \ file://Makevars \ -
file://grep-CVE-2012-5667.patch \
Why are you removing this patch?
Will an update to 2.5.3 accomplish the same thing as these
patches?
Also all of your patches above are missing Upstream-Status and
Signed-off-by:
See the Patch Guildlines on OE-Core:
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Thanks
Sau!
...skip...
+ file://grep-CVE-2012-5667.patch \
...skip...
Thank a lots for your comments.
This patch is not removed ,it is here ↑
I don't know what's fixed bettwen 2.5.1a an 2.5.3, but grep-2.5.3
LICENSE is GPLv3+ differed from 2.5.1a(GPLv2)
The Guildlines is very helpful for me. But those patch is come from
grep-2.5.1-55.el5.src.rpm and I have not research this patch's
Upstream-Status and Signed-off-by So I am sorry about that
Please review the recipes and licenesing, since it seems the we might
have multiple versions and the license fields are incorrect for both.
If there are both v2 and v3 versions, we need to ensure which is correct.
Thanks
Sau!
Thanks Li,
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Putting fltk into oe-core (recipes-graphics)
Hi all, was this thoroughly discussed before? I think the 'fltk' graphics library is quite lightweight. We still use that instead of qt and gtk on limited embedded platforms simply because it takes 1.2 MB or a bit more rather than a full blown Qt with 10-12+ MB. If I understand correctly there were discussions that gtk should not be inside openembedded core which I agree about. However, I think it would be useful to have some lightweight library like this in. Of course, this is lacking some features that Qt has, but that is why it is lightweight after all. :-) It is currently in the openembedded layer. It has a couple of minor dependencies which should probably be moved, but I do not see anything major. I think it is a more core option for ui building than the alternatives. This also supports opengl to a certain extent. Cheers, Laszlo ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] runqemu-internal: provide more info if a preconfigured tap is used
From: Chen Qi qi.c...@windriver.com
We should provide the user more information if a preconfigured tap
is used. This is because the user might have manually set up the tap
interface to be used by other qemu binaries.
So at a minimum, we should let the user know how to make runqemu skip
that tap interface.
[YOCTO #5047]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
scripts/runqemu-internal |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 3f8674c..d6ceb28 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -211,7 +211,7 @@ else
TAP=$tap
fi
else
-echo Using preconfigured tap device '$TAP'
+echo Using preconfigured tap device '$TAP'. If this is not
intended, create $LOCKFILE.lock to make runqemu skip $TAP.
fi
cleanup() {
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] runqemu-internal: don't bring down preconfigured tap interface
From: Chen Qi qi.c...@windriver.com
runqemu-ifup and runqemu-ifdown should be pairs. If we're using a
preconfigured tap interface, the runqemu-ifdown should not be invoked
to bring it down.
Signed-off-by: Chen Qi qi.c...@windriver.com
---
scripts/runqemu-internal |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 8a6e551..8165e13 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -175,12 +175,14 @@ else
POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
TAP=
LOCKFILE=
+USE_PRECONF_TAP=no
for tap in $POSSIBLE; do
LOCKFILE=$LOCKDIR/$tap
echo Acquiring lockfile for $tap...
acquire_lock $LOCKFILE
if [ $? -eq 0 ]; then
TAP=$tap
+USE_PRECONF_TAP=yes
break
fi
done
@@ -215,7 +217,7 @@ else
fi
cleanup() {
-if [ ! -e $NOSUDO_FLAG ]; then
+if [ ! -e $NOSUDO_FLAG -a $USE_PRECONF_TAP = no ]; then
# Redirect stderr since we could see a LD_PRELOAD warning here
if pseudo is loaded
# but inactive. This looks scary but is harmless
sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT 2 /dev/null
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] runqemu fixes about iptables rules and preconfigured tap
From: Chen Qi qi.c...@windriver.com The following changes since commit 44c3f72684c5c920ce8af1da54a2268047342589: lib/oeqa/runtime: smart: add checks for smart output (2013-08-26 16:29:18 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/runqemu-fixes http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/runqemu-fixes Chen Qi (4): runqemu-ifdown: clean up the remaining iptables rules runqemu-internal: don't bring down preconfigured tap interface runqemu-internal: change the lock acquire/release logic runqemu-internal: provide more info if a preconfigured tap is used scripts/runqemu-ifdown | 14 ++ scripts/runqemu-internal | 20 ++-- 2 files changed, 24 insertions(+), 10 deletions(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] runqemu-internal: change the lock acquire/release logic
From: Chen Qi qi.c...@windriver.com
Checking whether the lock file exists is sufficient for runqemu.
The contents of the lock file is not important.
This patch simplifies the lock acquire/release logic by removing the
flock mechanism. Also, we give more information to user indicating
why a tap interface is skipped.
As a side effect, the user now can easily create a lock file to
make runqemu skip a specific tap interface.
[YOCTO #5048]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
scripts/runqemu-internal | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 8165e13..3f8674c 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -135,15 +135,12 @@ else
return 1
fi
-touch $lockfile.lock
-exec 8$lockfile.lock
-flock -n -x 8
-if [ $? -ne 0 ]; then
-exec 8-
+if [ -e $lockfile.lock ]; then
return 1
+else
+touch $lockfile.lock
+return 0
fi
-
-return 0
}
release_lock() {
@@ -154,7 +151,6 @@ else
fi
rm -f $lockfile.lock
-exec 8-
}
LOCKDIR=/tmp/qemu-tap-locks
@@ -184,6 +180,8 @@ else
TAP=$tap
USE_PRECONF_TAP=yes
break
+else
+echo Skipping $tap as it's locked by $LOCKFILE.lock
fi
done
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] runqemu-ifdown: clean up the remaining iptables rules
From: Chen Qi qi.c...@windriver.com The iptables rules for the tap interface are added by runqemu-ifup everytime we use runqemu to start a qemu target. But it's not cleaned up when runqemu exits. This patch cleans up the remaining iptables rules for the tap interface in runqemu-ifdown. [YOCTO #5047] Signed-off-by: Chen Qi qi.c...@windriver.com --- scripts/runqemu-ifdown | 14 ++ 1 file changed, 14 insertions(+) diff --git a/scripts/runqemu-ifdown b/scripts/runqemu-ifdown index 8b8c5a4..8f66cfa2 100755 --- a/scripts/runqemu-ifdown +++ b/scripts/runqemu-ifdown @@ -50,3 +50,17 @@ if [ ! -e $TUNCTL ]; then fi $TUNCTL -d $TAP + +# cleanup the remaining iptables rules +IPTABLES=`which iptables 2 /dev/null` +if [ x$IPTABLES = x ]; then + IPTABLES=/sbin/iptables +fi +if [ ! -x $IPTABLES ]; then + echo $IPTABLES cannot be executed + exit 1 +fi +n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] +dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ] +$IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32 +$IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] consolekit_0.4.6.bb: Fix QA error when --enable-udev-acl
Add EXTRA_OECONF += --enable-udev-acl to
consolekit_0.4.6.bb whill cause a package_qa error.
The error message looks like:
| ERROR: QA Issue: non debug package contains .debug directory:
| consolekit path consolekit/0.4.6-r0/packages-split/consolekit/lib/u
| dev/.debug/udev-acl
There is a need to add udev-acl file to package instead of ${base_libdir}
Signed-off-by: leimaohui leimao...@cn.fujitsu.com
---
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 63da028..4133f4d 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -28,9 +28,10 @@ PACKAGECONFIG[policykit] = ,,polkit
PACKAGECONFIG[systemd] = --with-systemdsystemunitdir=
${systemd_unitdir}/system/,--with-systemdsystemunitdir=
FILES_${PN} += ${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
-${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \
-${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*
-FILES_${PN}-dbg += ${base_libdir}/security/.debug
+${libdir}/ConsoleKit ${systemd_unitdir}
${base_libdir}/udev/rules.d \
+ ${base_libdir}/udev/udev-acl ${datadir}/dbus-1
${datadir}/PolicyKit \
+ ${datadir}/polkit*
+FILES_${PN}-dbg += ${base_libdir}/security/.debug /lib/udev/.debug
PACKAGES =+ pam-plugin-ck-connector
FILES_pam-plugin-ck-connector += ${base_libdir}/security/*.so
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] eglibc: nscd support depends on OPTION_EGLIBC_INET
On Tue, Aug 27, 2013 at 12:47 AM, Saul Wold s...@linux.intel.com wrote: On 08/26/2013 11:48 AM, Andrei Gherzan wrote: Add --disable-nscd if DISTRO_FEATURES does not contain ipv4. This features is mapped to OPTION_EGLIBC_INET. The default behavior is to activate nscd (if --disable-nscd is not passed to configure script). But nscd depends on OPTION_EGLIBC_INET, so compilation will fail if this option is not activated. Does this also need the Package to be set for ALLOW_EMPTY? Sau! You're right. V2 is coming. Thanks. -- *Andrei Gherzan* m: +40.744.478.414 | f: +40.31.816.28.12 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix
Could anyone look at this? It's been a long time here, but no comments and is not merged yet. Thanks, Jackie On 8/2/2013 5:46 PM, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com Tested with: require conf/multilib.conf MULTILIBS = multilib:lib32 DEFAULTTUNE_virtclass-multilib-lib32 = x86 INCOMPATIBLE_LICENSE = GPLv3 -- The following changes since commit f192c444c2d88c49738bea4ff4c3af0cc72916de: texinfo: Update to 5.1 (2013-07-31 06:56:28 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/d_gplv3_0801_2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_gplv3_0801_2 Jackie Huang (1): multilib.bbclass: Expand the WHITELISTs with multilib prefix meta/classes/multilib.bbclass |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) -- Jackie Huang WIND RIVER | China Development Center MSN:jackiel...@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 12/24] python3: Add recipes
On Mon, Aug 26, 2013 at 10:23:22PM -0700, Khem Raj wrote: On Aug 26, 2013, at 6:32 AM, Martin Jansa martin.ja...@gmail.com wrote: On Fri, Jun 28, 2013 at 03:03:57PM -0700, Khem Raj wrote: Signed-off-by: Khem Raj raj.k...@gmail.com --- .../python/python3/000-cross-compile.patch | 76 + .../python3/020-dont-compile-python-files.patch| 31 ++ .../python/python3/03-fix-tkinter-detection.patch | 42 +++ .../python/python3/030-fixup-include-dirs.patch| 36 ++ .../python/python3/04-default-is-optimized.patch | 58 .../python3/06-ctypes-libffi-fix-configure.patch | 44 +++ .../python3/070-dont-clean-ipkg-install.patch | 30 ++ .../python3/080-distutils-dont_adjust_files.patch | 86 + .../python/python3/110-enable-zlib.patch | 15 + .../python/python3/130-readline-setup.patch| 49 +++ .../python/python3/140-verbose-sharedmods.patch| 10 + .../python/python3/150-fix-setupterm.patch | 11 + .../python3/avoid_warning_about_tkinter.patch | 25 ++ meta/recipes-devtools/python/python3/cgi_py.patch | 23 ++ .../python3/fix_for_using_different_libdir.patch | 54 +++ .../python/python3/h2py-pr13032.patch | 185 +++ .../python3/host_include_contamination.patch | 28 ++ .../python/python3/python-3.3-multilib.patch | 348 .../python/python3/remove_sqlite_rpath.patch | 19 ++ .../python/python3/setuptweaks.patch | 57 .../python/python3/shutil-follow-symlink-fix.patch | 11 + .../python/python3/sitecustomize.py| 37 +++ .../sys_platform_is_now_always_linux2.patch| 29 ++ meta/recipes-devtools/python/python3_3.3.0.bb | 203 24 files changed, 1507 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/000-cross-compile.patch create mode 100644 meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch create mode 100644 meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch create mode 100644 meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch create mode 100644 meta/recipes-devtools/python/python3/04-default-is-optimized.patch create mode 100644 meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch create mode 100644 meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch create mode 100644 meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch create mode 100644 meta/recipes-devtools/python/python3/110-enable-zlib.patch create mode 100644 meta/recipes-devtools/python/python3/130-readline-setup.patch create mode 100644 meta/recipes-devtools/python/python3/140-verbose-sharedmods.patch create mode 100644 meta/recipes-devtools/python/python3/150-fix-setupterm.patch create mode 100644 meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch create mode 100644 meta/recipes-devtools/python/python3/cgi_py.patch create mode 100644 meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch create mode 100644 meta/recipes-devtools/python/python3/h2py-pr13032.patch create mode 100644 meta/recipes-devtools/python/python3/host_include_contamination.patch create mode 100644 meta/recipes-devtools/python/python3/python-3.3-multilib.patch create mode 100644 meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch create mode 100644 meta/recipes-devtools/python/python3/setuptweaks.patch create mode 100644 meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch create mode 100644 meta/recipes-devtools/python/python3/sitecustomize.py create mode 100644 meta/recipes-devtools/python/python3/sys_platform_is_now_always_linux2.patch create mode 100644 meta/recipes-devtools/python/python3_3.3.0.bb When testing this on another host I got: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/python3/3.3.2-r0.0/Python-3.3.2' ERROR: Function failed: do_qa_configure ERROR: Logfile of failure stored in: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/python3/3.3.2-r0.0/temp/log.do_configure.13003 ERROR: Task 58 (/OE/shr-core/openembedded-core/meta/recipes-devtools/python/python3_3.3.2.bb, do_configure) failed with exit code '1' configure:6972: x86_64-oe-linux-gcc -m64 -DNDEBUG -fno-inline --sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -c -O2 -pipe -g -feliminate-unused-debug-types -I/usr/include/ncursesw conftest.c 5 cc1: warning: include location /usr/include/ncursesw is unsafe for cross-compilation [-Wpoison-system-directories] conftest.c:63:19: fatal error: conio.h: No such file or directory
Re: [OE-core] [PATCH 12/24] python3: Add recipes
On Tue, Aug 27, 2013 at 09:45:31AM +0200, Martin Jansa wrote: On Mon, Aug 26, 2013 at 10:23:22PM -0700, Khem Raj wrote: On Aug 26, 2013, at 6:32 AM, Martin Jansa martin.ja...@gmail.com wrote: On Fri, Jun 28, 2013 at 03:03:57PM -0700, Khem Raj wrote: Signed-off-by: Khem Raj raj.k...@gmail.com --- .../python/python3/000-cross-compile.patch | 76 + .../python3/020-dont-compile-python-files.patch| 31 ++ .../python/python3/03-fix-tkinter-detection.patch | 42 +++ .../python/python3/030-fixup-include-dirs.patch| 36 ++ .../python/python3/04-default-is-optimized.patch | 58 .../python3/06-ctypes-libffi-fix-configure.patch | 44 +++ .../python3/070-dont-clean-ipkg-install.patch | 30 ++ .../python3/080-distutils-dont_adjust_files.patch | 86 + .../python/python3/110-enable-zlib.patch | 15 + .../python/python3/130-readline-setup.patch| 49 +++ .../python/python3/140-verbose-sharedmods.patch| 10 + .../python/python3/150-fix-setupterm.patch | 11 + .../python3/avoid_warning_about_tkinter.patch | 25 ++ meta/recipes-devtools/python/python3/cgi_py.patch | 23 ++ .../python3/fix_for_using_different_libdir.patch | 54 +++ .../python/python3/h2py-pr13032.patch | 185 +++ .../python3/host_include_contamination.patch | 28 ++ .../python/python3/python-3.3-multilib.patch | 348 .../python/python3/remove_sqlite_rpath.patch | 19 ++ .../python/python3/setuptweaks.patch | 57 .../python/python3/shutil-follow-symlink-fix.patch | 11 + .../python/python3/sitecustomize.py| 37 +++ .../sys_platform_is_now_always_linux2.patch| 29 ++ meta/recipes-devtools/python/python3_3.3.0.bb | 203 24 files changed, 1507 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/000-cross-compile.patch create mode 100644 meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch create mode 100644 meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch create mode 100644 meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch create mode 100644 meta/recipes-devtools/python/python3/04-default-is-optimized.patch create mode 100644 meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch create mode 100644 meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch create mode 100644 meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch create mode 100644 meta/recipes-devtools/python/python3/110-enable-zlib.patch create mode 100644 meta/recipes-devtools/python/python3/130-readline-setup.patch create mode 100644 meta/recipes-devtools/python/python3/140-verbose-sharedmods.patch create mode 100644 meta/recipes-devtools/python/python3/150-fix-setupterm.patch create mode 100644 meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch create mode 100644 meta/recipes-devtools/python/python3/cgi_py.patch create mode 100644 meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch create mode 100644 meta/recipes-devtools/python/python3/h2py-pr13032.patch create mode 100644 meta/recipes-devtools/python/python3/host_include_contamination.patch create mode 100644 meta/recipes-devtools/python/python3/python-3.3-multilib.patch create mode 100644 meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch create mode 100644 meta/recipes-devtools/python/python3/setuptweaks.patch create mode 100644 meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch create mode 100644 meta/recipes-devtools/python/python3/sitecustomize.py create mode 100644 meta/recipes-devtools/python/python3/sys_platform_is_now_always_linux2.patch create mode 100644 meta/recipes-devtools/python/python3_3.3.0.bb When testing this on another host I got: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/python3/3.3.2-r0.0/Python-3.3.2' ERROR: Function failed: do_qa_configure ERROR: Logfile of failure stored in: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/python3/3.3.2-r0.0/temp/log.do_configure.13003 ERROR: Task 58 (/OE/shr-core/openembedded-core/meta/recipes-devtools/python/python3_3.3.2.bb, do_configure) failed with exit code '1' configure:6972: x86_64-oe-linux-gcc -m64 -DNDEBUG -fno-inline --sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -c -O2 -pipe -g -feliminate-unused-debug-types -I/usr/include/ncursesw conftest.c 5 cc1: warning: include
Re: [OE-core] [PATCH 0/2] linux-yocto: add bc-native and linux-yocto-dependency
On Mon, Aug 26, 2013 at 06:00:11PM -0400, Bruce Ashfield wrote: Richard/Saul, As reported by Martin Jansa, the following error happens when building in a minimal environment: | BC kernel/timeconst.h | /bin/sh: bc: command not found | make[3]: *** [kernel/timeconst.h] Error 127 | make[2]: *** [kernel] Error 2 | make[2]: *** Waiting for unfinished jobs kernel commit 70730bca [kernel: Replace timeconst.pl with a bc script] added a kernel dependency on bc. To support the build of linux-yocto recipes in these configurations, we add bc-native to the common dependencies. I didn't go so far as to add the dependency to the base kernel bbclass, since not all kernels will be of the right version to trigger this dependency, but we can consider doing that in the future. I'm not packaging/native tool expert, but I think I added bc-native properly, and it worked here. But obviously, correct me if I'm wrong. I've used the same change for bc yesterday to build it, so: Acked-by: Martin Jansa martin.ja...@gmail.com Cheers, Bruce The following changes since commit dcc23c073ef936eccecdc16f973492f41c44def7: kern-tools: fix patch series to git tree validation (2013-08-26 13:57:20 -0400) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel-bc http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-bc Bruce Ashfield (2): bc: add bc-native linux-yocto: add bc-native dependency, and move to linux-yocto.inc meta/recipes-extended/bc/bc_1.06.bb|2 ++ meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |3 --- meta/recipes-kernel/linux/linux-yocto.inc |2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) -- 1.7.10.4 -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] runqemu-internal: change the lock acquire/release logic
On Tue, 2013-08-27 at 15:08 +0800, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com Checking whether the lock file exists is sufficient for runqemu. The contents of the lock file is not important. What happens if the runqemu script crashes and leaves the lockfile around? Why are we removing perfectly functional code? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] runqemu-internal: change the lock acquire/release logic
On Tue, 2013-08-27 at 15:08 +0800, qi.c...@windriver.com wrote: This patch simplifies the lock acquire/release logic by removing the flock mechanism. I'm not sure that simplifies is an accurate description of the results of removing flock. How about breaks? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grep-2.5.1a: fix grep for LSB compliance
On Mon, 2013-08-26 at 18:00 -0700, Saul Wold wrote:
On 08/27/2013 02:43 AM, Li Zhijian wrote:
add patch from grep-2.5.1-55.el5.src.rpm and
enable configration option of --without-include-regex
LSB core-tests failed at /tset/LI18NUX2K.L1/utils/grep-tp/T.grep-tp
5,T.egrep-tp 5
which is intend to verify this utility can perform pattern matching in
searches
without regard to case if -i option is specified.
Signed-off-by: Li Zhijian lizhij...@cn.fujitsu.com
SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \
@@ -13,8 +13,25 @@ SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://gettext.patch \
file://fix64-int-to-pointer.patch \
file://Makevars \
- file://grep-CVE-2012-5667.patch \
Why are you removing this patch?
He didn't actually remove it, he just moved it further down the list.
But...
file://fix-for-texinfo-5.1.patch \
+ file://grep-2.5.1-fgrep.patch \
+ file://grep-2.5.1-bracket.patch \
+ file://grep-2.5-i18n.patch \
+ file://grep-2.5.1-oi.patch \
+ file://grep-2.5.1-manpage.patch \
+ file://grep-2.5.1-color.patch \
+ file://grep-2.5.1-icolor.patch \
+ file://grep-skip.patch \
+ file://grep-2.5.1-egf-speedup.patch \
+ file://grep-2.5.1-dfa-optional.patch \
+ file://grep-2.5.1-tests.patch \
+ file://grep-2.5.1-w.patch \
+ file://grep-P.patch \
+ file://grep-CVE-2012-5667.patch \
+ file://grep-empty-pattern.patch \
+ file://grep-bz460641.patch \
+ file://grep-bz434934.patch \
+ file://grep-man-label.patch \
... it's fairly hard to believe that all these patches are really
necessary to fix the problem with grep -i that's described in the
checkin message. It looks as though a more accurate description of this
change would be something like grep-2.5.1a: import all patches from
RHEL.
Also, although adding --without-included-regex probably is a good thing
(and probably ought to be done for grep-2.14 as well) it's not very
obvious that this has anything to do with the LSB fix either.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2013.07
On Mon, Aug 26, 2013 at 6:55 PM, Saul Wold s...@linux.intel.com wrote: Thanks for the contribution. Looks my first contribution which is in then! Yay, thanks. :) -- Laszlo ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] do_root_fs failing on flock command
I'm attempting to build core-image-minimal using oe-core + meta-beagleboard on an NFS mount. I'm running into the following error: [jack@archAntec beaglebone]$ bitbake core-image-minimal Loading cache: 100% |###| ETA: 00:00:00 Loaded 1193 entries from dependency cache. Build Configuration: BB_VERSION= 1.19.1 BUILD_SYS = x86_64-linux NATIVELSBSTRING = Arch-Linux TARGET_SYS= arm-oe-linux-gnueabi MACHINE = beaglebone DISTRO_VERSION= oe-core.0 TUNE_FEATURES = armv7a vfp neon TARGET_FPU= vfp-neon meta = master:2ac7783e04f5e8e6005f967e1a6dd65d2fc6a19a common-bsp= master:f02fabd39cd49bf5932fa5f90e83084d49a8cbe2 NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: Function failed: do_rootfs (log file is located at /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520) ERROR: Logfile of failure stored in: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520 Log data follows: | DEBUG: Executing python function rootfs_process_ignore | DEBUG: Python function rootfs_process_ignore finished | DEBUG: Executing python function rootfs_runtime_mapping | DEBUG: Python function rootfs_runtime_mapping finished | DEBUG: Executing shell function do_rootfs | flock: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/deploy/ipk/Packages.flock: Bad file descriptor | WARNING: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/run.do_rootfs.19520:1 exit 65 from | flock $pkgdir/Packages.flock -c opkg-make-index -r $pkgdir/Packages -p $pkgdir/Packages -m $pkgdir/ | ERROR: Function failed: do_rootfs (log file is located at /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520) ERROR: Task 7 (/mnt/mediaserver/Projects/oe-core/meta/recipes-core/images/core-image-minimal.bb, do_rootfs) failed with exit code '1' NOTE: Tasks Summary: Attempted 1580 tasks of which 1579 didn't need to be rerun and 1 failed. No currently running tasks (1579 of 1581) Summary: 1 task failed: /mnt/mediaserver/Projects/oe-core/meta/recipes-core/images/core-image-minimal.bb, do_rootfs Summary: There was 1 ERROR message shown, returning a non-zero exit code. Does anyone have any insight to why this may be failing. It mentions a bad file descriptor, so I assume it is related to building on an NFS mount. Cheers, Jack. -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambrideshire, UK http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] do_root_fs failing on flock command
On Tue, 2013-08-27 at 13:07 +0100, Jack Mitchell wrote: Does anyone have any insight to why this may be failing. It mentions a bad file descriptor, so I assume it is related to building on an NFS mount. There's no particular reason that flock() oughtn't to work on NFS. If you happened to be mounted with -o nolock then you wouldn't get the correct semantics versus lockers on other hosts, but you shouldn't be getting -EBADF under any circumstances that I can think of. If you run flock by hand against a file on the same mount, does it work? If it fails, what does the output from strace look like? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] do_root_fs failing on flock command
On Tue, 2013-08-27 at 13:07 +0100, Jack Mitchell wrote: I'm attempting to build core-image-minimal using oe-core + meta-beagleboard on an NFS mount. I'm running into the following error: [jack@archAntec beaglebone]$ bitbake core-image-minimal Loading cache: 100% |###| ETA: 00:00:00 Loaded 1193 entries from dependency cache. Build Configuration: BB_VERSION= 1.19.1 BUILD_SYS = x86_64-linux NATIVELSBSTRING = Arch-Linux TARGET_SYS= arm-oe-linux-gnueabi MACHINE = beaglebone DISTRO_VERSION= oe-core.0 TUNE_FEATURES = armv7a vfp neon TARGET_FPU= vfp-neon meta = master:2ac7783e04f5e8e6005f967e1a6dd65d2fc6a19a common-bsp= master:f02fabd39cd49bf5932fa5f90e83084d49a8cbe2 NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: Function failed: do_rootfs (log file is located at /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520) ERROR: Logfile of failure stored in: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520 Log data follows: | DEBUG: Executing python function rootfs_process_ignore | DEBUG: Python function rootfs_process_ignore finished | DEBUG: Executing python function rootfs_runtime_mapping | DEBUG: Python function rootfs_runtime_mapping finished | DEBUG: Executing shell function do_rootfs | flock: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/deploy/ipk/Packages.flock: Bad file descriptor | WARNING: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/run.do_rootfs.19520:1 exit 65 from | flock $pkgdir/Packages.flock -c opkg-make-index -r $pkgdir/Packages -p $pkgdir/Packages -m $pkgdir/ | ERROR: Function failed: do_rootfs (log file is located at /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520) ERROR: Task 7 (/mnt/mediaserver/Projects/oe-core/meta/recipes-core/images/core-image-minimal.bb, do_rootfs) failed with exit code '1' NOTE: Tasks Summary: Attempted 1580 tasks of which 1579 didn't need to be rerun and 1 failed. No currently running tasks (1579 of 1581) Summary: 1 task failed: /mnt/mediaserver/Projects/oe-core/meta/recipes-core/images/core-image-minimal.bb, do_rootfs Summary: There was 1 ERROR message shown, returning a non-zero exit code. Does anyone have any insight to why this may be failing. It mentions a bad file descriptor, so I assume it is related to building on an NFS mount. Correct, running builds on NFS isn't really recommended or supported (other than the downloads and sstate directories). I looks like the locking didn't work on the NFS mount and reading the man page for flock suggests that even if you do get NFS locking working, its still not recommended. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] do_root_fs failing on flock command
On 27/08/13 13:21, Richard Purdie wrote: On Tue, 2013-08-27 at 13:07 +0100, Jack Mitchell wrote: I'm attempting to build core-image-minimal using oe-core + meta-beagleboard on an NFS mount. I'm running into the following error: [jack@archAntec beaglebone]$ bitbake core-image-minimal Loading cache: 100% |###| ETA: 00:00:00 Loaded 1193 entries from dependency cache. Build Configuration: BB_VERSION= 1.19.1 BUILD_SYS = x86_64-linux NATIVELSBSTRING = Arch-Linux TARGET_SYS= arm-oe-linux-gnueabi MACHINE = beaglebone DISTRO_VERSION= oe-core.0 TUNE_FEATURES = armv7a vfp neon TARGET_FPU= vfp-neon meta = master:2ac7783e04f5e8e6005f967e1a6dd65d2fc6a19a common-bsp= master:f02fabd39cd49bf5932fa5f90e83084d49a8cbe2 NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: Function failed: do_rootfs (log file is located at /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520) ERROR: Logfile of failure stored in: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520 Log data follows: | DEBUG: Executing python function rootfs_process_ignore | DEBUG: Python function rootfs_process_ignore finished | DEBUG: Executing python function rootfs_runtime_mapping | DEBUG: Python function rootfs_runtime_mapping finished | DEBUG: Executing shell function do_rootfs | flock: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/deploy/ipk/Packages.flock: Bad file descriptor | WARNING: /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/run.do_rootfs.19520:1 exit 65 from | flock $pkgdir/Packages.flock -c opkg-make-index -r $pkgdir/Packages -p $pkgdir/Packages -m $pkgdir/ | ERROR: Function failed: do_rootfs (log file is located at /mnt/mediaserver/Projects/oe-core/beaglebone/tmp-eglibc/work/beaglebone-oe-linux-gnueabi/core-image-minimal/1.0-r0/temp/log.do_rootfs.19520) ERROR: Task 7 (/mnt/mediaserver/Projects/oe-core/meta/recipes-core/images/core-image-minimal.bb, do_rootfs) failed with exit code '1' NOTE: Tasks Summary: Attempted 1580 tasks of which 1579 didn't need to be rerun and 1 failed. No currently running tasks (1579 of 1581) Summary: 1 task failed: /mnt/mediaserver/Projects/oe-core/meta/recipes-core/images/core-image-minimal.bb, do_rootfs Summary: There was 1 ERROR message shown, returning a non-zero exit code. Does anyone have any insight to why this may be failing. It mentions a bad file descriptor, so I assume it is related to building on an NFS mount. Correct, running builds on NFS isn't really recommended or supported (other than the downloads and sstate directories). I looks like the locking didn't work on the NFS mount and reading the man page for flock suggests that even if you do get NFS locking working, its still not recommended. Cheers, Richard Indeed, I've just been doing some further research myself and it seems as though flock on NFS isn't recommended. It states using fnctl is a better alternative, so I'm looking to see if there is a way to do that natively in bash which could possibly replace the use of flock. I have done all the build on NFS and this is the only issue I have run into, so I feel it's probably worthwhile to see if there is a reasonable work around. Cheers, -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambrideshire, UK http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] do_root_fs failing on flock command
On 27/08/13 13:16, Phil Blundell wrote: On Tue, 2013-08-27 at 13:07 +0100, Jack Mitchell wrote: Does anyone have any insight to why this may be failing. It mentions a bad file descriptor, so I assume it is related to building on an NFS mount. There's no particular reason that flock() oughtn't to work on NFS. If you happened to be mounted with -o nolock then you wouldn't get the correct semantics versus lockers on other hosts, but you shouldn't be getting -EBADF under any circumstances that I can think of. If you run flock by hand against a file on the same mount, does it work? If it fails, what does the output from strace look like? p. http://pastebin.com/LB7nZs1q -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambrideshire, UK http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] python-docutils: add version 0.11 from meta-oe
Docutils is a text processing system for processing plaintext
documentation into useful formats(HTML, XML, man-pages). This is
required by the Midori web-browser.
* Update 0.5 from meta-oe to 0.11.
Signed-off-by: Mihai Prica mihai.pr...@intel.com
---
.../python/python-docutils_0.11.bb | 18 ++
1 file changed, 18 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-docutils_0.11.bb
diff --git a/meta/recipes-devtools/python/python-docutils_0.11.bb
b/meta/recipes-devtools/python/python-docutils_0.11.bb
new file mode 100644
index 000..7987244
--- /dev/null
+++ b/meta/recipes-devtools/python/python-docutils_0.11.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = Text processing system
+HOMEPAGE = http://docutils.sourceforge.net;
+SECTION = devel/python
+LICENSE = PSF BSD-2-Clause GPLv3
+LIC_FILES_CHKSUM = file://COPYING.txt;md5=da0d261d1db78ab21ce86c79364a4098
+
+DEPENDS = python
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz
+SRC_URI[md5sum] = 20ac380a18b369824276864d98ec0ad6
+SRC_URI[sha256sum] =
9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9
+
+S = ${WORKDIR}/docutils-${PV}
+
+inherit distutils
+
+BBCLASSEXTEND = native
+
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] libnotify: add version 0.6.0 from meta-oe
Libnotify is a library that can be used to send
desktop notifications to a daemon. It's required
by the Midori web-browser.
Signed-off-by: Mihai Prica mihai.pr...@intel.com
---
meta/recipes-gnome/libnotify/libnotify_0.6.0.bb | 17 +
1 file changed, 17 insertions(+)
create mode 100644 meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
new file mode 100644
index 000..0a590e3
--- /dev/null
+++ b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = Send desktop notifications to a notification daemon
+SECTION = libs
+LICENSE = LGPLv2.1
+LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34
+
+PR = r1
+
+DEPENDS = dbus gtk+
+
+inherit gnome
+SRC_URI[archive.md5sum] = 732c9d2cd5eb6a9069264a319d330516
+SRC_URI[archive.sha256sum] =
73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210
+
+do_configure_prepend() {
+sed -i /GTK3/d configure.ac
+sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/'
tests/Makefile.am
+}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] vala: add version 0.16 from meta-oe
Vala is a C#-like language dedicated to ease GObject programming.
It is required by the Midori web-browser.
Signed-off-by: Mihai Prica mihai.pr...@intel.com
---
...-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53
meta/recipes-devtools/vala/vala.inc| 20
meta/recipes-devtools/vala/vala_0.16.0.bb |8 +++
3 files changed, 81 insertions(+)
create mode 100644
meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
create mode 100644 meta/recipes-devtools/vala/vala.inc
create mode 100644 meta/recipes-devtools/vala/vala_0.16.0.bb
diff --git
a/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
b/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
new file mode 100644
index 000..e6c7941
--- /dev/null
+++
b/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
@@ -0,0 +1,53 @@
+From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
+From: Martin Jansa martin.ja...@gmail.com
+Date: Tue, 21 Feb 2012 17:12:50 +0100
+Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
+ repo
+
+* for example if we have some dirty directory and we unpack clean vala tarball
in it, then it will append -dirty
+
+Signed-off-by: Martin Jansa martin.ja...@gmail.com
+---
+ build-aux/git-version-gen | 25 ++---
+ 1 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
+index 0fa6faa..1d1f9d2 100755
+--- a/build-aux/git-version-gen
b/build-aux/git-version-gen
+@@ -126,18 +126,21 @@ fi
+
+ v=`echo $v |sed 's/^v//'`
+
+-# Don't declare a version dirty merely because a time stamp has changed.
+-git status /dev/null 21
++if test -d .git
++then
++ # Don't declare a version dirty merely because a time stamp has
changed.
++ git status /dev/null 21
+
+-dirty=`sh -c 'git diff-index --name-only HEAD' 2/dev/null` || dirty=
+-case $dirty in
+-'') ;;
+-*) # Append the suffix only if there isn't one already.
+- case $v in
+-*-dirty) ;;
+-*) v=$v-dirty ;;
+- esac ;;
+-esac
++ dirty=`sh -c 'git diff-index --name-only HEAD' 2/dev/null` || dirty=
++ case $dirty in
++ '') ;;
++ *) # Append the suffix only if there isn't one already.
++ case $v in
++*-dirty) ;;
++*) v=$v-dirty ;;
++ esac ;;
++ esac
++fi
+
+ # Omit the trailing newline, so that m4_esyscmd can use the result directly.
+ echo $v | tr -d '\012'
+--
+1.7.8.4
+
diff --git a/meta/recipes-devtools/vala/vala.inc
b/meta/recipes-devtools/vala/vala.inc
new file mode 100644
index 000..6cdc605
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = Vala is a C#-like language dedicated to ease GObject
programming. \
+Vala compiles to plain C and has no runtime environment nor penalities
whatsoever.
+SECTION = devel
+DEPENDS = glib-2.0 dbus gtk+
+BBCLASSEXTEND = native
+DEPENDS_virtclass-native = glib-2.0-native dbus-native
+HOMEPAGE = http://vala-project.org;
+LICENSE = LGPLv2.1
+LIC_FILES_CHKSUM = file://COPYING;md5=fbc093901857fcd118f065f900982c24
+INC_PR = r1
+
+SHRT_VER =
${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}
+
+SRC_URI =
http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz;
+inherit autotools
+
+EXTRA_OECONF = --disable-vapigen
+
+FILES_${PN}-doc += ${datadir}/devhelp
+FILES_${PN} += ${datadir}/${BPN}-${SHRT_VER}/vapi
diff --git a/meta/recipes-devtools/vala/vala_0.16.0.bb
b/meta/recipes-devtools/vala/vala_0.16.0.bb
new file mode 100644
index 000..92120b4
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.16.0.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+PR = ${INC_PR}.1
+
+SRC_URI +=
file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
+
+SRC_URI[md5sum] = 84b742e9cca4c90fde3026c3793c03c1
+SRC_URI[sha256sum] =
3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] vala.bbclass: add class from meta-oe
This can be used by packages written in vala.
It is required by the Midori web-browser.
Signed-off-by: Mihai Prica mihai.pr...@intel.com
---
meta/classes/vala.bbclass | 18 ++
1 file changed, 18 insertions(+)
create mode 100644 meta/classes/vala.bbclass
diff --git a/meta/classes/vala.bbclass b/meta/classes/vala.bbclass
new file mode 100644
index 000..c7db08c
--- /dev/null
+++ b/meta/classes/vala.bbclass
@@ -0,0 +1,18 @@
+# Vala has problems with multiple concurrent invocations
+PARALLEL_MAKE =
+
+# Vala needs vala-native
+DEPENDS += vala-native
+DEPENDS_virtclass-native += vala-native
+
+# Our patched version of Vala looks in STAGING_DATADIR for .vapi files
+export STAGING_DATADIR
+# Upstream Vala = 0.11 looks in XDG_DATA_DIRS for .vapi files
+export XDG_DATA_DIRS = ${STAGING_DATADIR}
+
+# Package additional files
+FILES_${PN}-dev += \
+${datadir}/vala/vapi/*.vapi \
+${datadir}/vala/vapi/*.deps \
+${datadir}/gir-1.0 \
+
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] midori: add version 0.5.5 from meta-oe
Midori is a lightweight web browser that uses the WebKit
rendering engine and the GTK interface. This allows a more
easy testing of the functionality of webkit-gtk component
that is already in oe-core.
Signed-off-by: Mihai Prica mihai.pr...@intel.com
---
meta/recipes-sato/midori/midori_0.5.5.bb | 43 ++
1 file changed, 43 insertions(+)
create mode 100644 meta/recipes-sato/midori/midori_0.5.5.bb
diff --git a/meta/recipes-sato/midori/midori_0.5.5.bb
b/meta/recipes-sato/midori/midori_0.5.5.bb
new file mode 100644
index 000..e545753
--- /dev/null
+++ b/meta/recipes-sato/midori/midori_0.5.5.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = Midori is a lightweight web browser.
+HOMEPAGE = http://www.twotoasts.de/index.php?/pages/midori_summary.html;
+LICENSE = LGPLv2.1
+LIC_FILES_CHKSUM = file://COPYING;md5=fbc093901857fcd118f065f900982c24
+DEPENDS = webkit-gtk libsoup-2.4 openssl python-native python-docutils-native
librsvg-native libnotify libunique
+
+SRC_URI = http://www.midori-browser.org/downloads/${PN}_${PV}_all_.tar.bz2 \
+
+
+SRC_URI[md5sum] = b99e87d4b73a4732ed1c1e591f0242ac
+SRC_URI[sha256sum] =
ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62
+
+inherit gtk-icon-cache pkgconfig vala pythonnative
+
+do_configure() {
+sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e
s:/usr/X11R6/lib::g wscript
+./configure \
+--prefix=${prefix} \
+--bindir=${bindir} \
+--sbindir=${sbindir} \
+--libexecdir=${libexecdir} \
+--datadir=${datadir} \
+--sysconfdir=${sysconfdir} \
+--sharedstatedir=${sharedstatedir} \
+--localstatedir=${localstatedir} \
+--libdir=${libdir} \
+--includedir=${includedir} \
+--infodir=${infodir} \
+--mandir=${mandir} \
+--disable-gtk3 \
+--disable-zeitgeist \
+}
+
+PARALLEL_MAKE =
+TARGET_CC_ARCH += ${LDFLAGS}
+
+do_install() {
+oe_runmake DESTDIR=${D} install
+}
+
+RRECOMMENDS_${PN} += glib-networking ca-certificates gnome-icon-theme
+
+FILES_${PN}-dev += ${datadir}/vala/vapi
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Add midori and dependencies
The Midori web-browser can be used to more easily test the functionality of webkit-gtk. * The midori and libnotify recipes are from meta-gnome. * The python-docutils and vala recipes are from meta-oe. * The midori and python-docutils packages have been updated to the latest upstream version. Midori also depends on ca-certificates. A patch set was sent by Christopher Larson that adds the recipe in oe-core. This series depends on his addition. The following changes since commit b467b99a5d25efe5eadfb07dbecba608575256ac: linux-yocto: switch genericx86 to use common-pc (2013-08-24 09:37:49 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mihaip/midori http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mihaip/midori Mihai Prica (5): python-docutils: add version 0.11 from meta-oe libnotify: add version 0.6.0 from meta-oe vala: add version 0.16 from meta-oe vala.bbclass: add class from meta-oe midori: add version 0.5.5 from meta-oe meta/classes/vala.bbclass | 18 +++ .../python/python-docutils_0.11.bb | 18 +++ ...-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53 meta/recipes-devtools/vala/vala.inc| 20 meta/recipes-devtools/vala/vala_0.16.0.bb |8 +++ meta/recipes-gnome/libnotify/libnotify_0.6.0.bb| 17 +++ meta/recipes-sato/midori/midori_0.5.5.bb | 43 7 files changed, 177 insertions(+) create mode 100644 meta/classes/vala.bbclass create mode 100644 meta/recipes-devtools/python/python-docutils_0.11.bb create mode 100644 meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch create mode 100644 meta/recipes-devtools/vala/vala.inc create mode 100644 meta/recipes-devtools/vala/vala_0.16.0.bb create mode 100644 meta/recipes-gnome/libnotify/libnotify_0.6.0.bb create mode 100644 meta/recipes-sato/midori/midori_0.5.5.bb -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] consolekit_0.4.6.bb: Fix QA error when --enable-udev-acl
On 08/27/2013 12:10 AM, leimaohui wrote:
Add EXTRA_OECONF += --enable-udev-acl to
consolekit_0.4.6.bb whill causea package_qa error.
The error message looks like:
|ERROR: QA Issue: non debug package contains .debug directory:
| consolekit path consolekit/0.4.6-r0/packages-split/consolekit/lib/u
| dev/.debug/udev-acl
There is a need to add udev-acl file to package instead of “${base_libdir}”
Signed-off-by: leimaohui leimao...@cn.fujitsu.com
mailto:leimao...@cn.fujitsu.com
---
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 63da028..4133f4d 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -28,9 +28,10 @@ PACKAGECONFIG[policykit] = ,,polkit
PACKAGECONFIG[systemd] = --with-systemdsystemunitdir=
${systemd_unitdir}/system/,--with-systemdsystemunitdir=
FILES_${PN} += ${localstatedir}/log/ConsoleKit
${exec_prefix}/lib/ConsoleKit \
-${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \
-${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*
-FILES_${PN}-dbg += ${base_libdir}/security/.debug
+${libdir}/ConsoleKit ${systemd_unitdir}
${base_libdir}/udev/rules.d \
+ ${base_libdir}/udev/udev-acl ${datadir}/dbus-1
${datadir}/PolicyKit \
+ ${datadir}/polkit*
+FILES_${PN}-dbg += ${base_libdir}/security/.debug /lib/udev/.debug
Please use ${base_libdir} instead of /lib here.
Thanks
Sau!
PACKAGES =+ pam-plugin-ck-connector
FILES_pam-plugin-ck-connector += ${base_libdir}/security/*.so
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Add midori and dependencies
Hi Mihai, On Tuesday 27 August 2013 17:59:34 Mihai Prica wrote: The Midori web-browser can be used to more easily test the functionality of webkit-gtk. * The midori and libnotify recipes are from meta-gnome. Can you please correct the commit messages on your branch to reflect this? Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] consolekit_0.4.6.bb: Fix QA error when --enable-udev-acl
On Tue, 2013-08-27 at 08:16 -0700, Saul Wold wrote:
On 08/27/2013 12:10 AM, leimaohui wrote:
-FILES_${PN}-dbg += ${base_libdir}/security/.debug
+${libdir}/ConsoleKit ${systemd_unitdir}
${base_libdir}/udev/rules.d \
+ ${base_libdir}/udev/udev-acl ${datadir}/dbus-1
${datadir}/PolicyKit \
+ ${datadir}/polkit*
+FILES_${PN}-dbg += ${base_libdir}/security/.debug /lib/udev/.debug
Please use ${base_libdir} instead of /lib here.
Really? Hard-coding /lib isn't all that great but I think
${base_libdir} would be even more wrong. Shouldn't it be
${nonarch_base_libdir}?
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] linux-yocto-rt: add qemumips and qemuppc to COMPATIBLE_MACHINES
Richard/Saul, Not trying to pile on more changes, since I know we are still digesting recent changes. But as promised, I continued my stability and feature testing with the 3.10 kernel and qemumips/ppc now work fine with 3.10 -rt. This won't put any more strain on the build resources, so it is worth enabling them in the 3.10 recipe. Cheers, Bruce The following changes since commit 325ee9b5fcebe902dfea78750502d8f6667d0a97: gcc-4.8.inc: Allow lto to be configurable (2013-08-27 13:48:47 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (1): linux-yocto-rt: add qemumips and qemuppc to COMPATIBLE_MACHINES meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb |5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] linux-yocto-rt: add qemumips and qemuppc to COMPATIBLE_MACHINES
3.10-rt boots and has good cyclictest results on qemuppc and qemumips, so we can now safely add them into COMPATIBLE_MACHINES. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb |5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index 4139be8..eb34491 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -17,10 +17,7 @@ KMETA = meta LINUX_KERNEL_TYPE = preempt-rt -# Omit broken machines from COMPATIBLE_MACHINE -# qemuppc hangs at boot -# qemumips panics at boot -COMPATIBLE_MACHINE = (qemux86|qemux86-64|qemuarm) +COMPATIBLE_MACHINE = (qemux86|qemux86-64|qemuarm|qemuppc|qemumips) # Functionality flags KERNEL_EXTRA_FEATURES ?= features/netfilter/netfilter.scc features/taskstats/taskstats.scc -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V4 00/20] Add python 3 support
This patchset adds python3 recipes on the same lines as python2 I have hopefully addressed all issues reported and review comments if not please let me know. One issue that I have not been able to reproduce is compiling python3 as 32bit package on x86_64 (multilib) that Saul reported. We can mark python3 as multilib broken in meantime until the issue is reproduced and fixed. The following changes since commit e4582a51a2500ad3b418e53170f5fb6b2cbd98a5: gcc-4.8.inc: Allow lto to be configurable (2013-08-27 13:48:44 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib kraj/python3 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/python3 Khem Raj (20): generate-manifest-3.3.py: Add script to generate python 3.3 manifests python-3.3-manifest: Add python3 manifest file python3native.bbclass: Add python3 abstraction class package_rpm.bbclass:Make the regexp less greedy classes/distutils: Introduce PYTHON_PN classes: Add distutils for python3 distutils: Introduce PYTHON_ABI variable distutils3: Do build_ext as separate step during compile python3: Add recipes python3: Add native recipe python_2.7.3.bb: Inherit python-dir python-distribute: Add recipes for python2 and python3 python3: Upgrade to 3.3.2 distutils3.bbclass: Fix typo and use proper values for target sysroot python3, python3-native: Consider OE staging installation python3: Fix host include contamination issue distutils3.bbclass: Use MACHINE for sysroot when not building for build host python3: Fix the compiler invocation and linker flags when cross compiling python: Add Patch description and status information python3_3.3.2.bb: Add liblzma to RDEPENDS for python3-misc meta/classes/distutils-base.bbclass| 5 +- meta/classes/distutils-native-base.bbclass | 4 +- meta/classes/distutils-tools.bbclass | 77 + meta/classes/distutils.bbclass | 23 +- meta/classes/distutils3-base.bbclass | 8 + meta/classes/distutils3-native-base.bbclass| 4 + meta/classes/distutils3.bbclass| 98 ++ meta/classes/package_rpm.bbclass | 2 +- meta/classes/python-dir.bbclass| 2 + meta/classes/python3native.bbclass | 7 + meta/classes/pythonnative.bbclass | 9 +- meta/classes/setuptools.bbclass| 3 +- meta/classes/setuptools3.bbclass | 8 + .../python/python-3.3-manifest.inc | 260 ++ .../python/python-distribute_0.6.32.bb | 47 +++ .../python/python3-distribute_0.6.32.bb| 47 +++ .../python/python3-native_3.3.2.bb | 70 .../python/python3/000-cross-compile.patch | 83 + ...sue-13032-where-it-fails-with-UnicodeDeco.patch | 37 ++ .../python3/020-dont-compile-python-files.patch| 37 ++ .../python/python3/03-fix-tkinter-detection.patch | 42 +++ .../python/python3/030-fixup-include-dirs.patch| 33 ++ .../python/python3/04-default-is-optimized.patch | 58 .../python3/06-ctypes-libffi-fix-configure.patch | 44 +++ .../python3/070-dont-clean-ipkg-install.patch | 36 ++ .../python3/080-distutils-dont_adjust_files.patch | 92 + .../python/python3/110-enable-zlib.patch | 21 ++ ...2-distutils-prefix-is-inside-staging-area.patch | 78 + .../python/python3/130-readline-setup.patch| 55 +++ .../python/python3/150-fix-setupterm.patch | 17 + .../python3/avoid_warning_about_tkinter.patch | 25 ++ meta/recipes-devtools/python/python3/cgi_py.patch | 23 ++ .../python3/fix_for_using_different_libdir.patch | 54 +++ .../python3/host_include_contamination.patch | 28 ++ .../python/python3/python-3.3-multilib.patch | 336 ++ .../python/python3/remove_sqlite_rpath.patch | 19 ++ .../python/python3/setuptweaks.patch | 57 .../python/python3/shutil-follow-symlink-fix.patch | 17 + .../python/python3/sitecustomize.py| 37 ++ .../sys_platform_is_now_always_linux2.patch| 29 ++ .../python/python3/sysroot-include-headers.patch | 35 ++ .../python/python3/unixccompiler.patch | 33 ++ meta/recipes-devtools/python/python3_3.3.2.bb | 206 +++ meta/recipes-devtools/python/python_2.7.3.bb | 2 +- scripts/contrib/python/generate-manifest-3.3.py| 376 + 45 files changed, 2561 insertions(+), 23 deletions(-) create mode 100644 meta/classes/distutils-tools.bbclass create mode 100644 meta/classes/distutils3-base.bbclass create mode 100644 meta/classes/distutils3-native-base.bbclass create mode 100644 meta/classes/distutils3.bbclass create mode 100644 meta/classes/python3native.bbclass create mode 100644
[OE-core] [PATCH 07/20] distutils: Introduce PYTHON_ABI variable
In python3 this has to be taken care of, it defines a variable to
denote ABI currently its at 'm' and it uses this to construct
the directory names for installing the python headers and library
names in sysroot. e.g. it will be something like ../python3.3m/...
We need this information when we are using distutils to cross build
python extentions and want to know the locations of python headers
and libraries install locations
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/distutils3-base.bbclass| 3 +++
meta/classes/distutils3-native-base.bbclass | 1 +
meta/classes/python-dir.bbclass | 1 +
3 files changed, 5 insertions(+)
diff --git a/meta/classes/distutils3-base.bbclass
b/meta/classes/distutils3-base.bbclass
index 82ab6a3..d4d25dc 100644
--- a/meta/classes/distutils3-base.bbclass
+++ b/meta/classes/distutils3-base.bbclass
@@ -1,5 +1,8 @@
DEPENDS += ${@[${PYTHON_PN}-native ${PYTHON_PN}, ][(d.getVar('PACKAGES',
True) == '')]}
RDEPENDS_${PN} += ${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' ==
'class-target']}
+PYTHON_BASEVERSION = 3.3
+PYTHON_ABI = m
+
inherit distutils-common-base python3native
diff --git a/meta/classes/distutils3-native-base.bbclass
b/meta/classes/distutils3-native-base.bbclass
index b4a333f..ed3fe54 100644
--- a/meta/classes/distutils3-native-base.bbclass
+++ b/meta/classes/distutils3-native-base.bbclass
@@ -1,3 +1,4 @@
PYTHON_BASEVERSION = 3.3
+PYTHON_ABI = m
inherit distutils-native-base
diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass
index b4b5ab0..ebfa4b3 100644
--- a/meta/classes/python-dir.bbclass
+++ b/meta/classes/python-dir.bbclass
@@ -1,4 +1,5 @@
PYTHON_BASEVERSION ?= 2.7
+PYTHON_ABI ?=
PYTHON_DIR = python${PYTHON_BASEVERSION}
PYTHON_PN = python${@'' if '${PYTHON_BASEVERSION}'.startswith('2') else '3'}
PYTHON_SITEPACKAGES_DIR = ${libdir}/${PYTHON_DIR}/site-packages
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/20] generate-manifest-3.3.py: Add script to generate python 3.3 manifests
Bases on python 2.7.x generator
Signed-off-by: Khem Raj raj.k...@gmail.com
---
scripts/contrib/python/generate-manifest-3.3.py | 376
1 file changed, 376 insertions(+)
create mode 100755 scripts/contrib/python/generate-manifest-3.3.py
diff --git a/scripts/contrib/python/generate-manifest-3.3.py
b/scripts/contrib/python/generate-manifest-3.3.py
new file mode 100755
index 000..b5ebb91
--- /dev/null
+++ b/scripts/contrib/python/generate-manifest-3.3.py
@@ -0,0 +1,376 @@
+#!/usr/bin/env python
+
+# generate Python Manifest for the OpenEmbedded build system
+# (C) 2002-2010 Michael 'Mickey' Lauer mla...@vanille-media.de
+# (C) 2007 Jeremy Laine
+# licensed under MIT, see COPYING.MIT
+#
+# June 22, 2011 -- Mark Hatle mark.ha...@windriver.com
+# * Updated to no longer generate special -dbg package, instead use the
+#single system -dbg
+# * Update version with .1 to indicate this change
+
+import os
+import sys
+import time
+
+VERSION = 3.3.0
+
+__author__ = Michael 'Mickey' Lauer mla...@vanille-media.de
+__version__ = 20121010
+
+class MakefileMaker:
+
+def __init__( self, outfile ):
+initialize
+self.packages = {}
+self.targetPrefix = ${libdir}/python%s/ % VERSION[:3]
+self.output = outfile
+self.out(
+# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I
regenerate the file.
+# Generator: '%s' Version %s (C) 2002-2010 Michael 'Mickey' Lauer
mla...@vanille-media.de
+# Visit the Python for Embedded Systems Site =
http://www.Vanille.de/projects/python.spy
+ % ( sys.argv[0], __version__ ) )
+
+#
+# helper functions
+#
+
+def out( self, data ):
+print a line to the output file
+self.output.write( %s\n % data )
+
+def setPrefix( self, targetPrefix ):
+set a file prefix for addPackage files
+self.targetPrefix = targetPrefix
+
+def doProlog( self ):
+self.out( )
+self.out( )
+
+def addPackage( self, name, description, dependencies, filenames ):
+add a package to the Makefile
+if type( filenames ) == type( ):
+filenames = filenames.split()
+fullFilenames = []
+for filename in filenames:
+if filename[0] != $:
+fullFilenames.append( %s%s % ( self.targetPrefix, filename )
)
+else:
+fullFilenames.append( filename )
+self.packages[name] = description, dependencies, fullFilenames
+
+def doBody( self ):
+generate body of Makefile
+
+global VERSION
+
+#
+# generate provides line
+#
+
+provideLine = 'PROVIDES+='
+for name in sorted(self.packages):
+provideLine += %s % name
+provideLine += ''
+
+self.out( provideLine )
+self.out( )
+
+#
+# generate package line
+#
+
+packageLine = 'PACKAGES=${PN}-dbg '
+for name in sorted(self.packages):
+if name.startswith(${PN}-distutils):
+if name == ${PN}-distutils:
+packageLine += %s-staticdev %s % (name, name)
+elif name != '${PN}-dbg':
+packageLine += %s % name
+packageLine += '${PN}-modules'
+
+self.out( packageLine )
+self.out( )
+
+#
+# generate package variables
+#
+
+for name, data in sorted(self.packages.iteritems()):
+desc, deps, files = data
+
+#
+# write out the description, revision and dependencies
+#
+self.out( 'DESCRIPTION_%s=%s' % ( name, desc ) )
+self.out( 'RDEPENDS_%s=%s' % ( name, deps ) )
+
+line = 'FILES_%s=' % name
+
+#
+# check which directories to make in the temporary directory
+#
+
+dirset = {} # if python had a set-datatype this would be
sufficient. for now, we're using a dict instead.
+for target in files:
+dirset[os.path.dirname( target )] = True
+
+#
+# generate which files to copy for the target (-dfR because whole
directories are also allowed)
+#
+
+for target in files:
+line += %s % target
+
+line += ''
+self.out( line )
+self.out( )
+
+self.out( 'DESCRIPTION_${PN}-modules=All Python modules' )
+line = 'RDEPENDS_${PN}-modules='
+
+for name, data in sorted(self.packages.iteritems()):
+if name not in ['${PN}-dev', '${PN}-distutils-staticdev']:
+line += %s % name
+
+self.out( %s \ % line )
+self.out( 'ALLOW_EMPTY_${PN}-modules = 1' )
+
+def doEpilog( self ):
+self.out( )
+self.out( )
+
+def make( self ):
+self.doProlog()
+self.doBody()
+self.doEpilog()
+
+if __name__ == __main__:
+
+if len( sys.argv ) 1:
+
[OE-core] [PATCH 03/20] python3native.bbclass: Add python3 abstraction class
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/python3native.bbclass | 7 +++
1 file changed, 7 insertions(+)
create mode 100644 meta/classes/python3native.bbclass
diff --git a/meta/classes/python3native.bbclass
b/meta/classes/python3native.bbclass
new file mode 100644
index 000..f86374f
--- /dev/null
+++ b/meta/classes/python3native.bbclass
@@ -0,0 +1,7 @@
+PYTHON_BASEVERSION = 3.3
+
+inherit python-dir
+
+PYTHON=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
+EXTRANATIVEPATH += ${PYTHON_PN}-native
+DEPENDS += ${PYTHON_PN}-native
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/20] python-distribute: Add recipes for python2 and python3
in python3-distribute rename easy_install to easy3_install
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../python/python-distribute_0.6.32.bb | 47 ++
.../python/python3-distribute_0.6.32.bb| 47 ++
2 files changed, 94 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-distribute_0.6.32.bb
create mode 100644 meta/recipes-devtools/python/python3-distribute_0.6.32.bb
diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
new file mode 100644
index 000..86ac871
--- /dev/null
+++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = Download, build, install, upgrade, and uninstall Python
packages
+HOMEPAGE = http://packages.python.org/distribute;
+SECTION = devel/python
+LICENSE = PSF
+LIC_FILES_CHKSUM =
file://setup.py;beginline=234;endline=234;md5=26f6b02022b737126d3c88838782dddb
+
+SRCNAME = distribute
+PR = ml5
+DEPENDS += python
+DEPENDS_virtclass-native += python-native
+
+SRC_URI = \
+ http://pypi.python.org/packages/source/d/distribute/${SRCNAME}-${PV}.tar.gz \
+
+S = ${WORKDIR}/${SRCNAME}-${PV}
+
+# http://python-distribute.org/distribute_setup.py
+
+# force the selection of python3
+#PYTHON_BASEVERSION = 3.3
+#PYTHON_MAJMIN = 3.3
+
+inherit distutils
+
+DISTUTILS_INSTALL_ARGS +=
--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages
+
+do_install_prepend() {
+install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+
+#
+# The installer puts the wrong path in the setuptools.pth file. Correct it.
+#
+do_install_append() {
+rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
+echo ./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg
${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
+}
+
+RDEPENDS_${PN} = \
+ python-distutils \
+ python-compression \
+
+
+SRC_URI[md5sum] = acb7a2da81e3612bfb1608abe4f0e568
+SRC_URI[sha256sum] =
8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df
+
+BBCLASSEXTEND = native
diff --git a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
new file mode 100644
index 000..31fc56d
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = Download, build, install, upgrade, and uninstall Python
packages
+HOMEPAGE = http://packages.python.org/distribute;
+SECTION = devel/python
+LICENSE = PSF
+LIC_FILES_CHKSUM =
file://setup.py;beginline=234;endline=234;md5=26f6b02022b737126d3c88838782dddb
+
+SRCNAME = distribute
+PR = ml5
+DEPENDS += python3
+DEPENDS_virtclass-native += python3-native
+
+SRC_URI = \
+ http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+
+S = ${WORKDIR}/${SRCNAME}-${PV}
+
+# http://python-distribute.org/distribute_setup.py
+
+# force the selection of python3
+#PYTHON_BASEVERSION = 3.3
+#PYTHON_MAJMIN = 3.3
+
+inherit distutils3
+
+DISTUTILS_INSTALL_ARGS +=
--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages
+
+do_install_prepend() {
+install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+#
+# The installer puts the wrong path in the setuptools.pth file. Correct it.
+#
+do_install_append() {
+rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
+mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
+echo ./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg
${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
+}
+
+RDEPENDS_${PN} = \
+ python3-distutils \
+ python3-compression \
+
+
+SRC_URI[md5sum] = acb7a2da81e3612bfb1608abe4f0e568
+SRC_URI[sha256sum] =
8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df
+
+BBCLASSEXTEND = native
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/20] distutils3: Do build_ext as separate step during compile
Remove PYTHON_BASEVERSION its moved to distutils3-base class
Add DISTUTILS_BUILD_EXT_ARGS for modules to pass flags to build_ext step
in setup.py
Add build_ext as sepate step during compile and add
the cross sysrooted library and headers since we are cross
compiling
Use ${PYTHON_PN} in place of hardcoding python name
Remove the /etc/share if its empty
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/distutils3.bbclass | 36 ++--
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index 602ce48..f118fa0 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -1,10 +1,7 @@
-
-PYTHON_BASEVERSION = 3.3
-
-inherit distutils3-base
-#distutils-tools
+inherit distutils3-base
DISTUTILS_BUILD_ARGS ?=
+DISTUTILS_BUILD_EXT_ARGS ?=
DISTUTILS_STAGE_HEADERS_ARGS ?= --install-dir=${STAGING_INCDIR}/${PYTHON_DIR}
DISTUTILS_STAGE_ALL_ARGS ?= --prefix=${STAGING_DIR_HOST}${prefix} \
--install-data=${STAGING_DATADIR}
@@ -15,7 +12,12 @@ distutils3_do_compile() {
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
build ${DISTUTILS_BUILD_ARGS} || \
+ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
+ build_ext --include-dirs ${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}
\
+ --library-dirs ${STAGING_LIBCDIR}/${PYTHON_DIR} \
+ ${DISTUTILS_BUILD_EXT_ARGS} \
+ build ${DISTUTILS_BUILD_ARGS} || \
+ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
build_ext ${DISTUTILS_BUILD_ARGS} || \
bbfatal ${PYTHON_PN} setup.py build_ext execution failed.
}
@@ -37,44 +39,33 @@ distutils3_stage_all() {
}
distutils3_do_install() {
-echo Beginning ${PN} Install ...
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-
-echo Step 2 of ${PN} Install ...
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install --install-lib=${D}${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS}
|| \
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS}
|| \
bbfatal ${PYTHON_PN} setup.py install execution failed.
-echo Step 3 of ${PN} Install ...
# support filenames with *spaces*
find ${D} -name *.py -print0 | while read -d $'\0' i ; do \
sed -i -e s:${D}::g $i
done
-echo Step 4 of ${PN} Install ...
if test -e ${D}${bindir} ; then
for i in ${D}${bindir}/* ; do \
-echo Processing $i; \
-sed -i \
--e s:${STAGING_BINDIR_NATIVE}/python3-native:${bindir}:g \
-$i
+sed -i -e
s:${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}:${bindir}/env\
${PYTHON_PN}:g $i
+sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
-echo Step 4 of ${PN} Install ...
if test -e ${D}${sbindir}; then
for i in ${D}${sbindir}/* ; do \
-echo Processing $i; \
-sed -i \
--e s:${STAGING_BINDIR_NATIVE}/python3-native:${bindir}:g \
-$i
+sed -i -e
s:${STAGING_BINDIR_NATIVE}/python-${PYTHON_PN}/${PYTHON_PN}:${bindir}/env\
${PYTHON_PN}:g $i
+sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
-echo Step 5 of ${PN} Install ...
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
#
@@ -82,6 +73,7 @@ distutils3_do_install() {
#
if test -e ${D}${datadir}/share; then
mv -f ${D}${datadir}/share/* ${D}${datadir}/
+rmdir ${D}${datadir}/share
fi
}
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/20] python3: Add native recipe
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../python/python3-native_3.3.0.bb | 68 ++
1 file changed, 68 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-native_3.3.0.bb
diff --git a/meta/recipes-devtools/python/python3-native_3.3.0.bb
b/meta/recipes-devtools/python/python3-native_3.3.0.bb
new file mode 100644
index 000..3486ca0
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-native_3.3.0.bb
@@ -0,0 +1,68 @@
+require recipes-devtools/python/python.inc
+
+PR = ${INC_PR}.0
+PYTHON_MAJMIN = 3.3
+DISTRO_SRC_URI ?= file://sitecustomize.py
+DISTRO_SRC_URI_linuxstdbase =
+SRC_URI = http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+file://000-cross-compile.patch \
+file://020-dont-compile-python-files.patch \
+file://030-fixup-include-dirs.patch \
+file://070-dont-clean-ipkg-install.patch \
+file://080-distutils-dont_adjust_files.patch \
+file://110-enable-zlib.patch \
+file://130-readline-setup.patch \
+file://140-verbose-sharedmods.patch \
+file://150-fix-setupterm.patch \
+file://h2py-pr13032.patch \
+file://python-3.3-multilib.patch \
+file://03-fix-tkinter-detection.patch \
+file://avoid_warning_about_tkinter.patch \
+file://06-ctypes-libffi-fix-configure.patch \
+file://shutil-follow-symlink-fix.patch \
+${DISTRO_SRC_URI} \
+
+SRC_URI[md5sum] = b3b2524f72409d919a4137826a870a8f
+SRC_URI[sha256sum] =
15c113fd6c058712f05d31b4eff149d4d823b8e39ef5e37228dc5dc4f8716df9
+
+LIC_FILES_CHKSUM = file://LICENSE;md5=d214581529e343354f8e23025bdf582d
+
+S = ${WORKDIR}/Python-${PV}
+
+EXTRANATIVEPATH += bzip2-native
+DEPENDS = openssl-native bzip2-replacement-native zlib-native readline-native
sqlite3-native
+
+inherit native
+
+RPROVIDES += python3-distutils-native python3-compression-native
python3-textutils-native python3-core-native
+
+EXTRA_OECONF_append = --bindir=${bindir}/${PN}
+
+EXTRA_OEMAKE = '\
+ BUILD_SYS= \
+ HOST_SYS= \
+ LIBC= \
+ STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
+ STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
+ LIB=${baselib} \
+ ARCH=${TARGET_ARCH} \
+'
+
+do_configure_prepend() {
+ autoreconf --verbose --install --force --exclude=autopoint
Modules/_ctypes/libffi || bbnote _ctypes failed to autoreconf
+}
+
+do_install() {
+ install -d ${D}${libdir}/pkgconfig
+ oe_runmake 'DESTDIR=${D}' install
+ if [ -e ${WORKDIR}/sitecustomize.py ]; then
+ install -m 0644 ${WORKDIR}/sitecustomize.py
${D}/${libdir}/python${PYTHON_MAJMIN}
+ fi
+ install -d ${D}${bindir}/${PN}
+ install -m 0755 Parser/pgen ${D}${bindir}/${PN}
+
+ # Make sure we use /usr/bin/env python
+ for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python
${D}${bindir}/${PN}`; do
+ sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT
+ done
+}
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/20] python-3.3-manifest: Add python3 manifest file
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../python/python-3.3-manifest.inc | 260 +
1 file changed, 260 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-3.3-manifest.inc
diff --git a/meta/recipes-devtools/python/python-3.3-manifest.inc
b/meta/recipes-devtools/python/python-3.3-manifest.inc
new file mode 100644
index 000..ad270c0
--- /dev/null
+++ b/meta/recipes-devtools/python/python-3.3-manifest.inc
@@ -0,0 +1,260 @@
+
+# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I
regenerate the file.
+# Generator: '../../../scripts/contrib/python/generate-manifest-3.3.py'
Version 20121010 (C) 2002-2010 Michael 'Mickey' Lauer mla...@vanille-media.de
+# Visit the Python for Embedded Systems Site =
http://www.Vanille.de/projects/python.spy
+
+
+
+PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression
${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db
${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils
${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email
${PN}-fcntl ${PN}-gdbm ${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
+
+PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile
${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses
${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib
${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-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}-modules
+
+DESCRIPTION_${PN}-2to3=Python Automated Python 2 to 3 code translation
+RDEPENDS_${PN}-2to3=${PN}-core
+FILES_${PN}-2to3=${bindir}/2to3 ${libdir}/python3.3/lib2to3
+
+DESCRIPTION_${PN}-audio=Python Audio Handling
+RDEPENDS_${PN}-audio=${PN}-core
+FILES_${PN}-audio=${libdir}/python3.3/wave.* ${libdir}/python3.3/chunk.*
${libdir}/python3.3/sndhdr.* ${libdir}/python3.3/lib-dynload/ossaudiodev.*.so
${libdir}/python3.3/lib-dynload/audioop.*.so ${libdir}/python3.3/audiodev.*
${libdir}/python3.3/sunaudio.* ${libdir}/python3.3/sunau.*
${libdir}/python3.3/toaiff.*
+
+DESCRIPTION_${PN}-codecs=Python Codecs, Encodings i18n Support
+RDEPENDS_${PN}-codecs=${PN}-core ${PN}-lang
+FILES_${PN}-codecs=${libdir}/python3.3/codecs.* ${libdir}/python3.3/encodings
${libdir}/python3.3/gettext.* ${libdir}/python3.3/locale.*
${libdir}/python3.3/lib-dynload/_locale.*.so
${libdir}/python3.3/lib-dynload/_codecs*
${libdir}/python3.3/lib-dynload/_multibytecodec.*.so
${libdir}/python3.3/lib-dynload/unicodedata.*.so
${libdir}/python3.3/stringprep.* ${libdir}/python3.3/xdrlib.*
+
+DESCRIPTION_${PN}-compile=Python Bytecode Compilation Support
+RDEPENDS_${PN}-compile=${PN}-core
+FILES_${PN}-compile=${libdir}/python3.3/py_compile.*
${libdir}/python3.3/compileall.*
+
+DESCRIPTION_${PN}-compression=Python High Level Compression Support
+RDEPENDS_${PN}-compression=${PN}-core ${PN}-codecs
+FILES_${PN}-compression=${libdir}/python3.3/gzip.*
${libdir}/python3.3/zipfile.* ${libdir}/python3.3/tarfile.*
${libdir}/python3.3/lib-dynload/bz2.*.so
+
+DESCRIPTION_${PN}-core=Python Interpreter and core modules (needed!)
+RDEPENDS_${PN}-core=${PN}-lang ${PN}-re
+FILES_${PN}-core=${libdir}/python3.3/__future__.*
${libdir}/python3.3/_abcoll.* ${libdir}/python3.3/abc.*
${libdir}/python3.3/copy.* ${libdir}/python3.3/copy_reg.*
${libdir}/python3.3/ConfigParser.* ${libdir}/python3.3/genericpath.*
${libdir}/python3.3/getopt.* ${libdir}/python3.3/linecache.*
${libdir}/python3.3/new.* ${libdir}/python3.3/os.*
${libdir}/python3.3/posixpath.* ${libdir}/python3.3/struct.*
${libdir}/python3.3/warnings.* ${libdir}/python3.3/site.*
${libdir}/python3.3/stat.* ${libdir}/python3.3/UserDict.*
${libdir}/python3.3/UserList.* ${libdir}/python3.3/UserString.*
${libdir}/python3.3/lib-dynload/binascii.*.so
${libdir}/python3.3/lib-dynload/_struct.*.so
${libdir}/python3.3/lib-dynload/time.*.so
[OE-core] [PATCH 17/20] distutils3.bbclass: Use MACHINE for sysroot when not building for build host
Python's machinery replaces directories in sysroot path to match OE's
staging area sysroots. Earlier we use to have HOST_SYS represent sysroot
always but now we use MACHINE to represent target sysroots but HOST_SYS
to represent host sysroot. This patch caters to that difference
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/distutils3.bbclass | 41 +
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index 9c841e4..bbd645c 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -9,40 +9,57 @@ DISTUTILS_INSTALL_ARGS ?= --prefix=${D}/${prefix} \
--install-data=${D}/${datadir}
distutils3_do_compile() {
- STAGING_INCDIR=${STAGING_INCDIR} \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
- ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
- build_ext --include-dirs ${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}
\
- --library-dirs ${STAGING_LIBDIR}/${PYTHON_DIR} \
- ${DISTUTILS_BUILD_EXT_ARGS} \
- build ${DISTUTILS_BUILD_ARGS} || \
- bbfatal ${PYTHON_PN} setup.py build_ext execution failed.
+if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
+SYS=${MACHINE}
+else
+SYS=${HOST_SYS}
+fi
+STAGING_INCDIR=${STAGING_INCDIR} \
+STAGING_LIBDIR=${STAGING_LIBDIR} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
+build ${DISTUTILS_BUILD_ARGS} || \
+bbfatal ${PYTHON_PN} setup.py build_ext execution failed.
}
distutils3_stage_headers() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
+if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
+SYS=${MACHINE}
+else
+SYS=${HOST_SYS}
+fi
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
bbfatal ${PYTHON_PN} setup.py install_headers execution failed.
}
distutils3_stage_all() {
+if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
+SYS=${MACHINE}
+else
+SYS=${HOST_SYS}
+fi
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install ${DISTUTILS_STAGE_ALL_ARGS} || \
bbfatal ${PYTHON_PN} setup.py install (stage) execution failed.
}
distutils3_do_install() {
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
+if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
+SYS=${MACHINE}
+else
+SYS=${HOST_SYS}
+fi
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS}
|| \
bbfatal ${PYTHON_PN} setup.py install execution failed.
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/20] classes: Add distutils for python3
In line with python2 add distutils and setuptools
classes for handing python3
Use python-distribute instead of python-setuptools in setuptools bbclass
Remove --single-version-externally-managed since its setuptools
specific and we dont use it anymore
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/distutils-tools.bbclass| 77
meta/classes/distutils3-base.bbclass| 5 ++
meta/classes/distutils3-native-base.bbclass | 3 +
meta/classes/distutils3.bbclass | 90 +
meta/classes/setuptools.bbclass | 3 +-
meta/classes/setuptools3.bbclass| 8 +++
6 files changed, 184 insertions(+), 2 deletions(-)
create mode 100644 meta/classes/distutils-tools.bbclass
create mode 100644 meta/classes/distutils3-base.bbclass
create mode 100644 meta/classes/distutils3-native-base.bbclass
create mode 100644 meta/classes/distutils3.bbclass
create mode 100644 meta/classes/setuptools3.bbclass
diff --git a/meta/classes/distutils-tools.bbclass
b/meta/classes/distutils-tools.bbclass
new file mode 100644
index 000..f43450e
--- /dev/null
+++ b/meta/classes/distutils-tools.bbclass
@@ -0,0 +1,77 @@
+DISTUTILS_BUILD_ARGS ?=
+DISTUTILS_STAGE_HEADERS_ARGS ?= --install-dir=${STAGING_INCDIR}/${PYTHON_DIR}
+DISTUTILS_STAGE_ALL_ARGS ?= --prefix=${STAGING_DIR_HOST}${prefix} \
+--install-data=${STAGING_DATADIR}
+DISTUTILS_INSTALL_ARGS ?= --prefix=${D}/${prefix} \
+--install-data=${D}/${datadir}
+
+distutils_do_compile() {
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
build ${DISTUTILS_BUILD_ARGS} || \
+ bbfatal ${PYTHON_PN} setup.py build_ext execution failed.
+}
+
+distutils_stage_headers() {
+install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
+bbfatal ${PYTHON_PN} setup.py install_headers execution failed.
+}
+
+distutils_stage_all() {
+STAGING_INCDIR=${STAGING_INCDIR} \
+STAGING_LIBDIR=${STAGING_LIBDIR} \
+install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
+PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install ${DISTUTILS_STAGE_ALL_ARGS} || \
+bbfatal ${PYTHON_PN} setup.py install (stage) execution failed.
+}
+
+distutils_do_install() {
+echo Beginning ${PN} Install ...
+install -d ${D}${PYTHON_SITEPACKAGES_DIR}
+echo Step 2 of ${PN} Install ...
+STAGING_INCDIR=${STAGING_INCDIR} \
+STAGING_LIBDIR=${STAGING_LIBDIR} \
+PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS}
|| \
+bbfatal ${PYTHON_PN} setup.py install execution failed.
+
+echo Step 3 of ${PN} Install ...
+# support filenames with *spaces*
+find ${D} -name *.py -print0 | while read -d $'\0' i ; do \
+sed -i -e s:${D}::g $i
+done
+
+echo Step 4 of ${PN} Install ...
+if test -e ${D}${bindir} ; then
+for i in ${D}${bindir}/* ; do \
+sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+done
+fi
+
+echo Step 4 of ${PN} Install ...
+if test -e ${D}${sbindir}; then
+for i in ${D}${sbindir}/* ; do \
+sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+done
+fi
+
+echo Step 5 of ${PN} Install ...
+rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
+
+#
+# FIXME: Bandaid against wrong datadir computation
+#
+if test -e ${D}${datadir}/share; then
+mv -f ${D}${datadir}/share/* ${D}${datadir}/
+fi
+}
+
+#EXPORT_FUNCTIONS do_compile do_install
+
+export LDSHARED=${CCLD} -shared
diff --git a/meta/classes/distutils3-base.bbclass
b/meta/classes/distutils3-base.bbclass
new file mode 100644
index 000..82ab6a3
--- /dev/null
+++ b/meta/classes/distutils3-base.bbclass
@@ -0,0 +1,5 @@
+DEPENDS += ${@[${PYTHON_PN}-native ${PYTHON_PN}, ][(d.getVar('PACKAGES',
True) == '')]}
+RDEPENDS_${PN} += ${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' ==
'class-target']}
+
+inherit distutils-common-base python3native
+
diff --git a/meta/classes/distutils3-native-base.bbclass
b/meta/classes/distutils3-native-base.bbclass
new file mode 100644
index 000..b4a333f
--- /dev/null
+++
[OE-core] [PATCH 05/20] classes/distutils: Introduce PYTHON_PN
This is needed to accomodate python3 alongside
python2
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/distutils-base.bbclass| 5 ++---
meta/classes/distutils-native-base.bbclass | 4 ++--
meta/classes/distutils.bbclass | 23 ---
meta/classes/python-dir.bbclass| 1 +
meta/classes/pythonnative.bbclass | 9 ++---
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/meta/classes/distutils-base.bbclass
b/meta/classes/distutils-base.bbclass
index 3b43e76..aa18e8b 100644
--- a/meta/classes/distutils-base.bbclass
+++ b/meta/classes/distutils-base.bbclass
@@ -1,5 +1,4 @@
-DEPENDS += ${@[python-native python, ][(d.getVar('PACKAGES', True) ==
'')]}
-RDEPENDS_${PN} += ${@['', 'python-core']['${CLASSOVERRIDE}' ==
'class-target']}
+DEPENDS += ${@[${PYTHON_PN}-native ${PYTHON_PN}, ][(d.getVar('PACKAGES',
True) == '')]}
+RDEPENDS_${PN} += ${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' ==
'class-target']}
inherit distutils-common-base pythonnative
-
diff --git a/meta/classes/distutils-native-base.bbclass
b/meta/classes/distutils-native-base.bbclass
index ceda512..509cb95 100644
--- a/meta/classes/distutils-native-base.bbclass
+++ b/meta/classes/distutils-native-base.bbclass
@@ -1,3 +1,3 @@
-DEPENDS += ${@[python-native, ][(d.getVar('PACKAGES', True) == '')]}
-
inherit distutils-common-base
+
+DEPENDS += ${@[${PYTHON_PN}-native, ][(d.getVar('PACKAGES', True) ==
'')]}
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index a0e1f50..ed2b72a 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -11,15 +11,15 @@ distutils_do_compile() {
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build
${DISTUTILS_BUILD_ARGS} || \
- bbfatal python setup.py build_ext execution failed.
+ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
build ${DISTUTILS_BUILD_ARGS} || \
+ bbfatal ${PYTHON_PN} setup.py build_ext execution failed.
}
distutils_stage_headers() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-${STAGING_BINDIR_NATIVE}/python-native/python setup.py install_headers
${DISTUTILS_STAGE_HEADERS_ARGS} || \
-bbfatal python setup.py install_headers execution failed.
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
+bbfatal ${PYTHON_PN} setup.py install_headers execution failed.
}
distutils_stage_all() {
@@ -28,21 +28,22 @@ distutils_stage_all() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-${STAGING_BINDIR_NATIVE}/python-native/python setup.py install
${DISTUTILS_STAGE_ALL_ARGS} || \
-bbfatal python setup.py install (stage) execution failed.
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install ${DISTUTILS_STAGE_ALL_ARGS} || \
+bbfatal ${PYTHON_PN} setup.py install (stage) execution failed.
}
distutils_do_install() {
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
-PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
+PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-${STAGING_BINDIR_NATIVE}/python-native/python setup.py install
--install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
-bbfatal python setup.py install execution failed.
+${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS}
|| \
+bbfatal ${PYTHON_PN} setup.py install execution failed.
-for i in `find ${D} -name *.py` ; do \
-sed -i -e s:${D}::g $i
+# support filenames with *spaces*
+find ${D} -name *.py -print0 | while read -d $'\0' i ; do \
+sed -i -e s:${D}::g $i
done
if test -e ${D}${bindir} ; then
diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass
index 0b6a33c..b4b5ab0 100644
--- a/meta/classes/python-dir.bbclass
+++ b/meta/classes/python-dir.bbclass
@@ -1,3 +1,4 @@
PYTHON_BASEVERSION ?= 2.7
PYTHON_DIR = python${PYTHON_BASEVERSION}
+PYTHON_PN = python${@'' if '${PYTHON_BASEVERSION}'.startswith('2') else '3'}
PYTHON_SITEPACKAGES_DIR = ${libdir}/${PYTHON_DIR}/site-packages
diff --git a/meta/classes/pythonnative.bbclass
b/meta/classes/pythonnative.bbclass
index 7886207..fdd22bb 100644
---
[OE-core] [PATCH 20/20] python3_3.3.2.bb: Add liblzma to RDEPENDS for python3-misc
Fixes
and from test-dependencies.sh run there is undeterministic lzma
dependency:
WARN: packages/armv5te-oe-linux-gnueabi/python3/python3-misc/latest lost
dependency on liblzma
Reported-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-devtools/python/python3_3.3.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/python/python3_3.3.2.bb
b/meta/recipes-devtools/python/python3_3.3.2.bb
index 6ff32d8..d2c7e37 100644
--- a/meta/recipes-devtools/python/python3_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3_3.3.2.bb
@@ -197,6 +197,7 @@ FILES_${PN}-dbg +=
${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug
# catch all the rest (unsorted)
PACKAGES += ${PN}-misc
FILES_${PN}-misc = ${libdir}/python${PYTHON_MAJMIN}
+RDEPENDS_${PN}-misc = liblzma
# catch manpage
PACKAGES += ${PN}-man
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/20] python: Add Patch description and status information
Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-devtools/python/python3/000-cross-compile.patch | 7 +++ .../python/python3/020-dont-compile-python-files.patch | 6 ++ meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch | 6 ++ .../python/python3/070-dont-clean-ipkg-install.patch | 6 ++ .../python/python3/080-distutils-dont_adjust_files.patch | 6 ++ meta/recipes-devtools/python/python3/110-enable-zlib.patch | 6 ++ meta/recipes-devtools/python/python3/130-readline-setup.patch | 6 ++ meta/recipes-devtools/python/python3/150-fix-setupterm.patch | 6 ++ meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 6 ++ .../python/python3/shutil-follow-symlink-fix.patch | 6 ++ 10 files changed, 61 insertions(+) diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch index 23c1755..2506a59 100644 --- a/meta/recipes-devtools/python/python3/000-cross-compile.patch +++ b/meta/recipes-devtools/python/python3/000-cross-compile.patch @@ -1,3 +1,10 @@ +We cross compile python. This patch uses tools from host/native +python instead of in-tree tools + +-Khem + +Upstream-Status: Inappropriate[Configuration Specific] + --- Makefile.pre.in | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch b/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch index 07a906e..03ef286 100644 --- a/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch +++ b/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch @@ -1,3 +1,9 @@ +Dont cross compile site packages + +-Khem + +Upstream-Status: Inappropriate[Embedded-Specific] + --- Makefile.pre.in | 16 1 file changed, 16 deletions(-) diff --git a/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch b/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch index 3e009c1..6beac7b 100644 --- a/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch +++ b/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch @@ -1,3 +1,9 @@ +Do not hardcode /usr into include paths when cross compiling + +-Khem + +Upstream-Status: Pending + --- setup.py | 15 ++- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch b/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch index 2ac85d9..789929b 100644 --- a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch +++ b/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch @@ -1,3 +1,9 @@ +consider opkg directories when cleaning up + +-Khem + +Upstream-Status: Inappropriate [OE specific] + --- Makefile.pre.in |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch b/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch index ac5450b..b96419a 100644 --- a/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch +++ b/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch @@ -1,3 +1,9 @@ +do not adjust python files before copying + +-Khem + +Upstream-Status: Inappropriate [Embedded-Specific] + --- Lib/distutils/command/build_scripts.py | 43 +++-- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/meta/recipes-devtools/python/python3/110-enable-zlib.patch b/meta/recipes-devtools/python/python3/110-enable-zlib.patch index 90c364e..fb92a19 100644 --- a/meta/recipes-devtools/python/python3/110-enable-zlib.patch +++ b/meta/recipes-devtools/python/python3/110-enable-zlib.patch @@ -1,3 +1,9 @@ +Enable zlib in python + +-Khem + +Upstream-Status: Inappropriate [OE-Specific] + --- Modules/Setup.dist |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3/130-readline-setup.patch b/meta/recipes-devtools/python/python3/130-readline-setup.patch index 3d28a19..c805652 100644 --- a/meta/recipes-devtools/python/python3/130-readline-setup.patch +++ b/meta/recipes-devtools/python/python3/130-readline-setup.patch @@ -1,3 +1,9 @@ +package python-readline + +-Khem + +Upstream-Status: Inappropriate [Embedded Specific] + --- a/setup.py +++ b/setup.py @@ -666,45 +666,7 @@ class PyBuildExt(build_ext): diff --git a/meta/recipes-devtools/python/python3/150-fix-setupterm.patch b/meta/recipes-devtools/python/python3/150-fix-setupterm.patch index db53482..78d7c78 100644 --- a/meta/recipes-devtools/python/python3/150-fix-setupterm.patch +++ b/meta/recipes-devtools/python/python3/150-fix-setupterm.patch @@ -1,3
[OE-core] [PATCH 04/20] package_rpm.bbclass:Make the regexp less greedy
This causes issues when postinstalls have ERROR keywords
its interpreted as error and image build is cancelled
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/package_rpm.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b29d3ed..a9ec9b2 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -60,7 +60,7 @@ rpm_log_check() {
lf_txt=`cat $lf_path`
for keyword_die in unpacking of archive failed Cannot find package
exit 1 ERR Fail
do
- if (echo $lf_txt | grep -v log_check | grep $keyword_die)
/dev/null 21
+ if (echo $lf_txt | grep -v log_check | grep
\$keyword_die\) /dev/null 21
then
echo log_check: There were error messages in the
logfile
printf log_check: Matched keyword: [$keyword_die]\n\n
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/20] python3, python3-native: Consider OE staging installation
We use native python in disutils bbclass and this needs
to peek into target sysroot when building plugins in cross
environment. Otherwise anything that inherits distutils3.bbclass
will not build.
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../python/python3-native_3.3.2.bb | 1 +
...2-distutils-prefix-is-inside-staging-area.patch | 78 ++
.../python/python3/python-3.3-multilib.patch | 120 +
meta/recipes-devtools/python/python3_3.3.2.bb | 1 +
4 files changed, 131 insertions(+), 69 deletions(-)
create mode 100644
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
diff --git a/meta/recipes-devtools/python/python3-native_3.3.2.bb
b/meta/recipes-devtools/python/python3-native_3.3.2.bb
index f7221ed..012deba 100644
--- a/meta/recipes-devtools/python/python3-native_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3-native_3.3.2.bb
@@ -5,6 +5,7 @@ PYTHON_MAJMIN = 3.3
DISTRO_SRC_URI ?= file://sitecustomize.py
DISTRO_SRC_URI_linuxstdbase =
SRC_URI = http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+file://12-distutils-prefix-is-inside-staging-area.patch \
file://000-cross-compile.patch \
file://020-dont-compile-python-files.patch \
file://030-fixup-include-dirs.patch \
diff --git
a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
new file mode 100644
index 000..c5846a5
--- /dev/null
+++
b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -0,0 +1,78 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+# The proper prefix is inside our staging area.
+# Signed-Off: Michael 'Mickey' Lauer mic...@vanille-media.de
+# Signed-off-by: Phil Blundell ph...@gnu.org
+# Signed-off-by: Khem Raj raj.k...@gmail.com
+
+Index: Python-3.3.2/Lib/distutils/sysconfig.py
+===
+--- Python-3.3.2.orig/Lib/distutils/sysconfig.py 2013-07-30
00:00:52.769749805 -0700
Python-3.3.2/Lib/distutils/sysconfig.py2013-07-30 00:16:22.545767248
-0700
+@@ -16,10 +16,11 @@
+ from .errors import DistutilsPlatformError
+
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+-BASE_PREFIX = os.path.normpath(sys.base_prefix)
+-BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
++PREFIX = os.path.normpath(sys.prefix).replace( os.getenv(BUILD_SYS),
os.getenv(HOST_SYS) )
++EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace(
os.getenv(BUILD_SYS), os.getenv(HOST_SYS) )
++BASE_PREFIX = os.path.normpath(sys.base_prefix).replace(
os.getenv(BUILD_SYS), os.getenv(HOST_SYS) )
++BASE_EXEC_PREFIX= os.path.normpath(sys.base_exec_prefix).replace(
os.getenv(BUILD_SYS), os.getenv(HOST_SYS) )
++
+
+ # Path to the base directory of the project. On Windows the binary may
+ # live in project/PCBuild9. If we're dealing with an x64 Windows build,
+@@ -93,7 +94,9 @@
+ If 'prefix' is supplied, use it instead of sys.base_prefix or
+ sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
+
+-if prefix is None:
++if prefix is None and os.environ['STAGING_INCDIR'] != :
++prefix = os.environ['STAGING_INCDIR'].rstrip('include')
++elif prefix is None:
+ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+ if os.name == posix:
+ if python_build:
+@@ -136,6 +139,12 @@
+ If 'prefix' is supplied, use it instead of sys.base_prefix or
+ sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
+
++if prefix is None and os.environ['STAGING_LIBDIR'] != :
++lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
++prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
++else:
++lib_basename = sys.lib
++
+ if prefix is None:
+ if standard_lib:
+ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+@@ -144,7 +153,7 @@
+
+ if os.name == posix:
+ libpython = os.path.join(prefix,
+- lib, python + get_python_version())
++ lib_basename, python +
get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+@@ -249,7 +258,7 @@
+ else:
+ # The name of the config.h file changed in 2.2
+ config_h = 'pyconfig.h'
+-return os.path.join(inc_dir, config_h)
++return os.path.join(inc_dir, config_h).replace( os.getenv(BUILD_SYS),
os.getenv(HOST_SYS) )
+
+
+ def get_makefile_filename():
+@@ -258,7 +267,7 @@
+ return os.path.join(_sys_home or project_base, Makefile)
+ lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
+ config_file = 'config-{}{}'.format(get_python_version(), build_flags)
+-return
[OE-core] [PATCH 13/20] python3: Upgrade to 3.3.2
3.3.2 is latest bugfix release in 3.3 series
License text is changed to reflect year and prev releases
+++ ../Python-3.3.2/LICENSE 2013-05-15 09:32:54.0 -0700
@@ -74,7 +74,9 @@
3.2.1 3.2 2011PSF yes
3.2.2 3.2.1 2011PSF yes
3.2.3 3.2.2 2012PSF yes
+3.2.4 3.2.3 2013PSF yes
3.3.0 3.2 2012PSF yes
+3.3.1 3.3.0 2013PSF yes
Footnotes:
@@ -110,8 +112,8 @@
distribute, and otherwise use Python alone or in any derivative
version,
provided, however, that PSF's License Agreement and PSF's notice of
copyright,
i.e., Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
2009, 2010,
-2011, 2012 Python Software Foundation; All Rights Reserved are
retained in Python
-alone or in any derivative version prepared by Licensee.
+2011, 2012, 2013 Python Software Foundation; All Rights Reserved are
retained
+in Python alone or in any derivative version prepared by Licensee.
Signed-off-by: Khem Raj raj.k...@gmail.com
---
...on3-native_3.3.0.bb = python3-native_3.3.2.bb} | 9 +-
...sue-13032-where-it-fails-with-UnicodeDeco.patch | 37 +
.../python/python3/030-fixup-include-dirs.patch| 21 +--
.../python/python3/140-verbose-sharedmods.patch| 10 --
.../python/python3/h2py-pr13032.patch | 185 -
.../python/{python3_3.3.0.bb = python3_3.3.2.bb} | 9 +-
6 files changed, 51 insertions(+), 220 deletions(-)
rename meta/recipes-devtools/python/{python3-native_3.3.0.bb =
python3-native_3.3.2.bb} (87%)
create mode 100644
meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
delete mode 100644
meta/recipes-devtools/python/python3/140-verbose-sharedmods.patch
delete mode 100644 meta/recipes-devtools/python/python3/h2py-pr13032.patch
rename meta/recipes-devtools/python/{python3_3.3.0.bb = python3_3.3.2.bb}
(96%)
diff --git a/meta/recipes-devtools/python/python3-native_3.3.0.bb
b/meta/recipes-devtools/python/python3-native_3.3.2.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-native_3.3.0.bb
rename to meta/recipes-devtools/python/python3-native_3.3.2.bb
index 3486ca0..f7221ed 100644
--- a/meta/recipes-devtools/python/python3-native_3.3.0.bb
+++ b/meta/recipes-devtools/python/python3-native_3.3.2.bb
@@ -12,20 +12,19 @@ file://070-dont-clean-ipkg-install.patch \
file://080-distutils-dont_adjust_files.patch \
file://110-enable-zlib.patch \
file://130-readline-setup.patch \
-file://140-verbose-sharedmods.patch \
file://150-fix-setupterm.patch \
-file://h2py-pr13032.patch \
file://python-3.3-multilib.patch \
file://03-fix-tkinter-detection.patch \
file://avoid_warning_about_tkinter.patch \
file://06-ctypes-libffi-fix-configure.patch \
file://shutil-follow-symlink-fix.patch \
+file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
${DISTRO_SRC_URI} \
-SRC_URI[md5sum] = b3b2524f72409d919a4137826a870a8f
-SRC_URI[sha256sum] =
15c113fd6c058712f05d31b4eff149d4d823b8e39ef5e37228dc5dc4f8716df9
+SRC_URI[md5sum] = 7dffe775f3bea68a44f762a3490e5e28
+SRC_URI[sha256sum] =
f77202fe2bbc203205d7bd6e8452567fa1d9bc97f6957c9ef753d9a36cdcbe9a
-LIC_FILES_CHKSUM = file://LICENSE;md5=d214581529e343354f8e23025bdf582d
+LIC_FILES_CHKSUM = file://LICENSE;md5=a7e738bb078a33a825ce4a0282f8cb31
S = ${WORKDIR}/Python-${PV}
diff --git
a/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
b/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
new file mode 100644
index 000..dd6b24f
--- /dev/null
+++
b/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
@@ -0,0 +1,37 @@
+From 2f5a4c708d90fa8db21f446ae879cff79387448d Mon Sep 17 00:00:00 2001
+From: Khem Raj raj.k...@gmail.com
+Date: Mon, 20 May 2013 21:03:16 -0700
+Subject: [PATCH] h2py: Fix issue 13032 where it fails with UnicodeDecodeError
+
+use utf-8 to open the files
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+
+Upstream-Status: Pending
+---
+ Tools/scripts/h2py.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py
+index 4f871d9..a53fbe0 100755
+--- a/Tools/scripts/h2py.py
b/Tools/scripts/h2py.py
+@@ -69,13 +69,13 @@ def main():
+ sys.stdout.write('# Generated by h2py from stdin\n')
+ process(sys.stdin, sys.stdout)
+ else:
+-fp = open(filename, 'r')
++fp = open(filename, 'r', encoding='utf-8')
+ outfile = os.path.basename(filename)
+ i = outfile.rfind('.')
+ if i 0: outfile = outfile[:i]
+ modname = outfile.upper()
+ outfile = modname + '.py'
+-outfp =
[OE-core] [PATCH 14/20] distutils3.bbclass: Fix typo and use proper values for target sysroot
Since OE-Core times we now have machine specific sysroots
for targets unlike before when we used arch specific sysroots
so reflect that here
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/distutils3.bbclass | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index f118fa0..9c841e4 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -11,19 +11,18 @@ DISTUTILS_INSTALL_ARGS ?= --prefix=${D}/${prefix} \
distutils3_do_compile() {
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
build_ext --include-dirs ${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}
\
- --library-dirs ${STAGING_LIBCDIR}/${PYTHON_DIR} \
+ --library-dirs ${STAGING_LIBDIR}/${PYTHON_DIR} \
${DISTUTILS_BUILD_EXT_ARGS} \
build ${DISTUTILS_BUILD_ARGS} || \
- ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
build_ext ${DISTUTILS_BUILD_ARGS} || \
bbfatal ${PYTHON_PN} setup.py build_ext execution failed.
}
distutils3_stage_headers() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
bbfatal ${PYTHON_PN} setup.py install_headers execution failed.
}
@@ -33,7 +32,7 @@ distutils3_stage_all() {
STAGING_LIBDIR=${STAGING_LIBDIR} \
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install ${DISTUTILS_STAGE_ALL_ARGS} || \
bbfatal ${PYTHON_PN} setup.py install (stage) execution failed.
}
@@ -43,7 +42,7 @@ distutils3_do_install() {
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${MACHINE} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py
install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS}
|| \
bbfatal ${PYTHON_PN} setup.py install execution failed.
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/20] python3: Fix host include contamination issue
Let compiler append sysroot to include path if it can
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../python/python3-native_3.3.2.bb | 1 +
.../python/python3/sysroot-include-headers.patch | 35 ++
meta/recipes-devtools/python/python3_3.3.2.bb | 1 +
3 files changed, 37 insertions(+)
create mode 100644
meta/recipes-devtools/python/python3/sysroot-include-headers.patch
diff --git a/meta/recipes-devtools/python/python3-native_3.3.2.bb
b/meta/recipes-devtools/python/python3-native_3.3.2.bb
index 012deba..da8dc87 100644
--- a/meta/recipes-devtools/python/python3-native_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3-native_3.3.2.bb
@@ -20,6 +20,7 @@ file://avoid_warning_about_tkinter.patch \
file://06-ctypes-libffi-fix-configure.patch \
file://shutil-follow-symlink-fix.patch \
file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
+file://sysroot-include-headers.patch \
${DISTRO_SRC_URI} \
SRC_URI[md5sum] = 7dffe775f3bea68a44f762a3490e5e28
diff --git a/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
b/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
new file mode 100644
index 000..785b556
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
@@ -0,0 +1,35 @@
+Dont search hardcoded paths, we might be doing a cross-build
+Use '=' in-front to let compiler append sysroot, if it can
+
+Should fix things like
+
+configure:6972: arm-angstrom-linux-gnueabi-gcc -march=armv7-a
-mthumb-interwork -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -DNDEBUG
-fno-inline -D__SOFTFP__
--sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone
-c -O2 -pipe -g -feliminate-unused-debug-types -I/usr/include/ncursesw
conftest.c 5
+cc1: warning: include location /usr/include/ncursesw is unsafe for
cross-compilation [-Wpoison-system-directories]
+
+
+Signed-off-by: Khem Raj
+Upstream-Status: Pending
+
+
+Index: Python-3.3.2/setup.py
+===
+--- Python-3.3.2.orig/setup.py 2013-07-30 01:30:48.0 -0700
Python-3.3.2/setup.py 2013-07-30 01:41:11.697862723 -0700
+@@ -1210,7 +1210,7 @@
+ panel_library = 'panel'
+ if curses_library == 'ncursesw':
+ curses_defines.append(('HAVE_NCURSESW', '1'))
+-curses_includes.append('/usr/include/ncursesw')
++curses_includes.append('=/usr/include/ncursesw')
+ # Bug 1464056: If _curses.so links with ncursesw,
+ # _curses_panel.so must link with panelw.
+ panel_library = 'panelw'
+@@ -1819,7 +1819,7 @@
+ if host_platform == 'darwin':
+ # OS X 10.5 comes with libffi.dylib; the include files are
+ # in /usr/include/ffi
+-inc_dirs.append('/usr/include/ffi')
++inc_dirs.append('=/usr/include/ffi')
+
+ ffi_inc = [sysconfig.get_config_var(LIBFFI_INCLUDEDIR)]
+ if not ffi_inc or ffi_inc[0] == '':
diff --git a/meta/recipes-devtools/python/python3_3.3.2.bb
b/meta/recipes-devtools/python/python3_3.3.2.bb
index 768d44b..fe423d3 100644
--- a/meta/recipes-devtools/python/python3_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3_3.3.2.bb
@@ -30,6 +30,7 @@ SRC_URI += \
file://host_include_contamination.patch \
file://python-3.3-multilib.patch \
file://shutil-follow-symlink-fix.patch \
+file://sysroot-include-headers.patch \
SRC_URI[md5sum] = 7dffe775f3bea68a44f762a3490e5e28
SRC_URI[sha256sum] =
f77202fe2bbc203205d7bd6e8452567fa1d9bc97f6957c9ef753d9a36cdcbe9a
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/20] python_2.7.3.bb: Inherit python-dir
So it can get the correct python direcotries for python2
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-devtools/python/python_2.7.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb
b/meta/recipes-devtools/python/python_2.7.3.bb
index 2e35da6..62f78dc 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -34,7 +34,7 @@ SRC_URI += \
S = ${WORKDIR}/Python-${PV}
-inherit autotools multilib_header pythonnative
+inherit autotools multilib_header python-dir pythonnative
# The 3 lines below are copied from the libffi recipe, ctypes ships its own
copy of the libffi sources
#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/20] python3: Fix the compiler invocation and linker flags when cross compiling
The details are in patch header. This should fix the QA errors about
host contamination
Add virtual/libintl to dep list
There is use of libintl.h but we dont
express the dependency
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../python/python3-native_3.3.2.bb | 1 +
.../python/python3/unixccompiler.patch | 33 ++
meta/recipes-devtools/python/python3_3.3.2.bb | 3 +-
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/python/python3/unixccompiler.patch
diff --git a/meta/recipes-devtools/python/python3-native_3.3.2.bb
b/meta/recipes-devtools/python/python3-native_3.3.2.bb
index da8dc87..d11ec51 100644
--- a/meta/recipes-devtools/python/python3-native_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3-native_3.3.2.bb
@@ -21,6 +21,7 @@ file://06-ctypes-libffi-fix-configure.patch \
file://shutil-follow-symlink-fix.patch \
file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
file://sysroot-include-headers.patch \
+file://unixccompiler.patch \
${DISTRO_SRC_URI} \
SRC_URI[md5sum] = 7dffe775f3bea68a44f762a3490e5e28
diff --git a/meta/recipes-devtools/python/python3/unixccompiler.patch
b/meta/recipes-devtools/python/python3/unixccompiler.patch
new file mode 100644
index 000..b2229b4
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/unixccompiler.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Pending
+
+The CC variable,sometimes like:x86_64-poky-linux-gcc -m64
--sysroot=/${TMPDIR}/sysroots/qemux86-64, contains option information.
+This will lead to wrong compiler name qemux86-64 rather than
x86_64-poky-linux-gcc when python finding the compiler name.
+
+Secondly add -L=path this way linker will be able to resolve /usr/lib w.r.t
sysroot and not
+use hardcoded /usr/lib to look for libs which is wrong in cross compile
environment and this will work
+ok on native systems too since sysroot for native compilers is /
+
+Signed-off-by: Mei Lei lei@intel.com
+Signed-off-by: Khem Raj raj.k...@gmail.com
+Index: Python-3.3.2/Lib/distutils/unixccompiler.py
+===
+--- Python-3.3.2.orig/Lib/distutils/unixccompiler.py 2013-05-15
09:32:54.0 -0700
Python-3.3.2/Lib/distutils/unixccompiler.py2013-08-01
00:58:18.629056286 -0700
+@@ -202,7 +202,7 @@
+ # ccompiler.py.
+
+ def library_dir_option(self, dir):
+-return -L + dir
++return -L= + dir
+
+ def _is_gcc(self, compiler_name):
+ return gcc in compiler_name or g++ in compiler_name
+@@ -221,7 +221,7 @@
+ # this time, there's no way to determine this information from
+ # the configuration data stored in the Python installation, so
+ # we use this hack.
+-compiler = os.path.basename(sysconfig.get_config_var(CC))
++compiler = sysconfig.get_config_var(CC)
+ if sys.platform[:6] == darwin:
+ # MacOSX's linker doesn't understand the -R flag at all
+ return -L + dir
diff --git a/meta/recipes-devtools/python/python3_3.3.2.bb
b/meta/recipes-devtools/python/python3_3.3.2.bb
index fe423d3..6ff32d8 100644
--- a/meta/recipes-devtools/python/python3_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3_3.3.2.bb
@@ -1,6 +1,6 @@
require recipes-devtools/python/python.inc
-DEPENDS = python3-native libffi bzip2 db gdbm openssl readline sqlite3 zlib
+DEPENDS = python3-native libffi bzip2 db gdbm openssl readline sqlite3 zlib
virtual/libintl
PR = ${INC_PR}.0
PYTHON_MAJMIN = 3.3
PYTHON_BINABI= ${PYTHON_MAJMIN}m
@@ -31,6 +31,7 @@ SRC_URI += \
file://python-3.3-multilib.patch \
file://shutil-follow-symlink-fix.patch \
file://sysroot-include-headers.patch \
+file://unixccompiler.patch \
SRC_URI[md5sum] = 7dffe775f3bea68a44f762a3490e5e28
SRC_URI[sha256sum] =
f77202fe2bbc203205d7bd6e8452567fa1d9bc97f6957c9ef753d9a36cdcbe9a
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 20/20] python3_3.3.2.bb: Add liblzma to RDEPENDS for python3-misc
On Tue, Aug 27, 2013 at 10:15:19AM -0700, Khem Raj wrote:
Fixes
and from test-dependencies.sh run there is undeterministic lzma
dependency:
WARN: packages/armv5te-oe-linux-gnueabi/python3/python3-misc/latest lost
dependency on liblzma
I've already replied in the other thread that this isn't right fix.
Reported-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-devtools/python/python3_3.3.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/python/python3_3.3.2.bb
b/meta/recipes-devtools/python/python3_3.3.2.bb
index 6ff32d8..d2c7e37 100644
--- a/meta/recipes-devtools/python/python3_3.3.2.bb
+++ b/meta/recipes-devtools/python/python3_3.3.2.bb
@@ -197,6 +197,7 @@ FILES_${PN}-dbg +=
${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug
# catch all the rest (unsorted)
PACKAGES += ${PN}-misc
FILES_${PN}-misc = ${libdir}/python${PYTHON_MAJMIN}
+RDEPENDS_${PN}-misc = liblzma
# catch manpage
PACKAGES += ${PN}-man
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 12/24] python3: Add recipes
On Aug 27, 2013, at 12:48 AM, Martin Jansa martin.ja...@gmail.com wrote:
python3_3.3.2.bb: Add liblzma to RDEPENDS for python3-misc
doesn't look like right fix, something in python3-misc is linked to
liblzma
DEBUG: calculating shlib requirements for python3-misc
DEBUG: python3-misc: Dependency libpython3.3m.so.1.0 requires package
libpython3
DEBUG: python3-misc: Dependency libc.so.6 requires package eglibc
DEBUG: python3-misc: Dependency liblzma.so.5 requires package liblzma
DEBUG: python3-misc: Dependency libbz2.so.0 requires package libbz2
DEBUG: python3-misc: Dependency libcrypt.so.1 requires package eglibc
so you should add it to DEPENDS not RDEPENDS (Adding it to RDEPENDS
hides this message from test-dependencies.sh, but support for lzma in
python3-misc would stay nondeterministic).
why ? wont RDEPENDS ask for getting it built before ?
That something is python lzmamodule packaged in python3-misc :)
setup.py:
# LZMA compression support.
if self.compiler.find_library_file(lib_dirs, 'lzma'):
exts.append( Extension('_lzma', ['_lzmamodule.c'],
libraries = ['lzma']) )
else:
missing.append('_lzma')
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 12/24] python3: Add recipes
On Tue, Aug 27, 2013 at 11:10:34AM -0700, Khem Raj wrote:
On Aug 27, 2013, at 12:48 AM, Martin Jansa martin.ja...@gmail.com wrote:
python3_3.3.2.bb: Add liblzma to RDEPENDS for python3-misc
doesn't look like right fix, something in python3-misc is linked to
liblzma
DEBUG: calculating shlib requirements for python3-misc
DEBUG: python3-misc: Dependency libpython3.3m.so.1.0 requires package
libpython3
DEBUG: python3-misc: Dependency libc.so.6 requires package eglibc
DEBUG: python3-misc: Dependency liblzma.so.5 requires package liblzma
DEBUG: python3-misc: Dependency libbz2.so.0 requires package libbz2
DEBUG: python3-misc: Dependency libcrypt.so.1 requires package eglibc
so you should add it to DEPENDS not RDEPENDS (Adding it to RDEPENDS
hides this message from test-dependencies.sh, but support for lzma in
python3-misc would stay nondeterministic).
why ? wont RDEPENDS ask for getting it built before ?
before do_package but not before do_configure
That something is python lzmamodule packaged in python3-misc :)
setup.py:
# LZMA compression support.
if self.compiler.find_library_file(lib_dirs, 'lzma'):
exts.append( Extension('_lzma', ['_lzmamodule.c'],
libraries = ['lzma']) )
else:
missing.append('_lzma')
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 04/20] package_rpm.bbclass:Make the regexp less greedy
On Tue, 2013-08-27 at 10:15 -0700, Khem Raj wrote: This causes issues when postinstalls have ERROR keywords its interpreted as error and image build is cancelled Signed-off-by: Khem Raj raj.k...@gmail.com As I mentioned before, the regexp isn't a very satisfactory description of the locus for this change, given that the file contains many regexps. I'm also not entirely convinced that this patch really makes the regexp less greedy in any meaningful way: it makes it less prone to unintended matches, but that's a different issue to greediness. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] qt4-x11-free dependence on gtk+
Since bitbake qt4-x11-free failed for me until I did bitbake gtk+,
qt4-x11-free needs some sort of dependency on gtk+ to avoid the failure
below. I'm guessing it's something like the following added to
qt4-x11-free.inc:
PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '',
d)}
PACKAGECONFIG[gtk] = -gtkstyle,-no-gtkstyle,gtk+
but since it takes about an hour to build qt4-x11-free on my system I'm
hoping somebody can tell me whether that's the right approach.
Peter
arm-poky-linux-gnueabi-g++ -march=armv7-a -mthumb-interwork
-mfloat-abi=softfp -mfpu=neon
--sysroot=/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo -c -O2 -pipe
-g -feliminate-unused-debug-types -fpermissive
-fvisibility-inlines-hidden
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/freetype2 -pthread
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/glib-2.0
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/lib/glib-2.0/include
-pthread
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/gtk-2.0
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/lib/gtk-2.0/include
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/pango-1.0 -I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/cairo
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/pixman-1
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/libpng16
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/gdk-pixbuf-2.0
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/libpng16
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/pango-1.0 -I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/harfbuzz
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/pango-1.0 -I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/freetype2
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/atk-1.0
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/glib-2.0
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/lib/glib-2.0/include
-O2 -O2 -fvisibility=hidden -fvisibility-inlines-hidden
-fvisibility=hidden -fvisibility=hidden -fvisibility-inlines-hidden
-Wall -W -Wall -W -Wall -W -D_REENTRANT
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/freetype2 -fPIC
-fPIC -fPIC -DQT_SHARED -DQT_BUILD_GUI_LIB -DQT_NO_USING_NAMESPACE
-DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT3_SUPPORT
-DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_OPENTYPE
-DQT_NO_STYLE_MAC -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP
-DQT_NO_STYLE_WINDOWSCE -DQT_NO_STYLE_WINDOWSMOBILE -DQT_NO_STYLE_S60
-DQ_INTERNAL_QAPP_SRC -DQT_HAVE_NEON -DQT_NO_DEBUG -DQT_CORE_LIB
-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -I../../mkspecs/linux-g++ -I.
-I../../include/QtCore -I../../include -I../../include/QtGui
-I.rcc/release-shared -I../3rdparty/xorg -Iimage
-I../3rdparty/harfbuzz/src -Idialogs
-I/prj/oe/omap/build-gumstix-dev/tmp/sysroots/overo/usr/include/freetype2 -I.moc/release-shared
-I.uic/release-shared -o .obj/release-shared/qx11embed_x11.o
kernel/qx11embed_x11.cpp
In file included from ../../include/QtGui/private/qgtkstyle_p.h:1:0,
from kernel/qguiplatformplugin.cpp:63:
../../include/QtGui/private/../../../src/gui/styles/qgtkstyle_p.h:69:21:
fatal error: gtk/gtk.h: No such file or directory
#include gtk/gtk.h
^
compilation terminated.
make[1]: *** [.obj/release-shared/qguiplatformplugin.o] Error 1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2013.07
On 13-08-23 05:48 AM, Laszlo Papp wrote:
Signed-off-by: Laszlo Papp lp...@kde.org
---
meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | 27 +++
meta/recipes-bsp/u-boot/u-boot_2013.07.bb | 23 +++
2 files changed, 50 insertions(+)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
create mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.07.bb
...
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 000..f3f4b62
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,23 @@
+require u-boot.inc
+
+# To build u-boot for your machine, provide the following lines in your machine
+# config, replacing the assignments as appropriate for your machine.
+# UBOOT_MACHINE = omap3_beagle_config
+# UBOOT_ENTRYPOINT = 0x80008000
+# UBOOT_LOADADDRESS = 0x80008000
+
+LICENSE = GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+
file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab
+
+# This revision corresponds to the tag v2013.07
+# We use the revision in order to avoid having to fetch it from the repo
during parse
+SRCREV = 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c
+
+PV = v2013.07+git${SRCPV}
+
+SRC_URI = git://git.denx.de/u-boot.git;branch=master;protocol=git
Just curious...
I dont' see a good reason to specify the git protocol twice:
git:// and ; protocol=git
This occurs in many recipes and we could get rid of the clutter
with a script if it bothers anyone else. :)
Am I missing something or are people just copying and pasting the text?
// Randy
+
+S = ${WORKDIR}/git
+
+PACKAGE_ARCH = ${MACHINE_ARCH}
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe-setup-rpmrepo: add native sysroot so nativepython can be found by env
From: Peter A. Bigot p...@pabigot.com
This avoids the following new behavior resulting from the create_wrapper
fixes:
llc[11]$ ../poky/scripts/oe-setup-rpmrepo
/usr/bin/env: nativepython: No such file or directory
Signed-off-by: Peter A. Bigot p...@pabigot.com
---
scripts/oe-setup-rpmrepo |1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo
index ea885f6..917b98b 100755
--- a/scripts/oe-setup-rpmrepo
+++ b/scripts/oe-setup-rpmrepo
@@ -90,6 +90,7 @@ if [ ! -e $CREATEREPO ]; then
exit 1
fi
+export PATH=${PATH}:${OECORE_NATIVE_SYSROOT}/usr/bin
$CREATEREPO $RPM_DIR
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2013.07
On Tue, Aug 27, 2013 at 8:57 PM, Randy MacLeod randy.macl...@windriver.comwrote: Am I missing something or are people just copying and pasting the text? I was just copying and pasting it. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2013.07
On Tue, Aug 27, 2013 at 03:57:09PM -0400, Randy MacLeod wrote:
On 13-08-23 05:48 AM, Laszlo Papp wrote:
Signed-off-by: Laszlo Papp lp...@kde.org
---
meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | 27
+++
meta/recipes-bsp/u-boot/u-boot_2013.07.bb | 23 +++
2 files changed, 50 insertions(+)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
create mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.07.bb
...
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 000..f3f4b62
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,23 @@
+require u-boot.inc
+
+# To build u-boot for your machine, provide the following lines in your
machine
+# config, replacing the assignments as appropriate for your machine.
+# UBOOT_MACHINE = omap3_beagle_config
+# UBOOT_ENTRYPOINT = 0x80008000
+# UBOOT_LOADADDRESS = 0x80008000
+
+LICENSE = GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+
file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab
+
+# This revision corresponds to the tag v2013.07
+# We use the revision in order to avoid having to fetch it from the repo
during parse
+SRCREV = 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c
+
+PV = v2013.07+git${SRCPV}
+
+SRC_URI = git://git.denx.de/u-boot.git;branch=master;protocol=git
Just curious...
I dont' see a good reason to specify the git protocol twice:
git:// and ; protocol=git
It's not twice, git:// is to select bitbake fetcher (git.py) and one
fetcher can support multiple protocols (e.g. over git, http or ssh)
but you're right that in most cases protocol=git isn't needed, because
it's default protocol for git fetcher when host is specified in that
SRC_URI.
bitbake/lib/bb/fetch2/git.py:
if 'protocol' in ud.parm:
ud.proto = ud.parm['protocol']
elif not ud.host:
ud.proto = 'file'
else:
ud.proto = git
And I would support removing it in one go as it clearly confuses people
:).
This occurs in many recipes and we could get rid of the clutter
with a script if it bothers anyone else. :)
Am I missing something or are people just copying and pasting the text?
// Randy
+
+S = ${WORKDIR}/git
+
+PACKAGE_ARCH = ${MACHINE_ARCH}
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core] QEMU with ARM Cortex A9 with hard float configuration - Kernel panic
On 13-08-26 03:35 PM, Elvis Dowson wrote:
Hi Bruce,
On Aug 26, 2013, at 11:08 PM, Bruce Ashfield
bruce.ashfi...@windriver.com mailto:bruce.ashfi...@windriver.com wrote:
Are you interested in something from scratch, versus something that
isn't already partially in the tree (like qemuarma9) ?
We've got a few docs and tutorials, but I can also help step you through
the process to assist the existing material.
I'd like to adapt the existing linux-yocto standard/base branch, and
build up on existing qemuarma9 support. I've included detailed patch
fragments below, so that you can replicate the current state of my work
at your end.
Not ignoring this, I've just been tied up with 3.10 kernel work. I'll
get back to this shortly.
Cheers,
Bruce
I've performed the following steps till date, but unfortunately get a
qemu ram / rom out of memory address error after doing all this. Must be
because of an incorrectly mapped KMACHINE. The vexpress device doesn't
support PCI, IDE or SCSI, only microsd card or ram devices, so the boot
method should use an initrd file, for the root filesystem, as described
here.
https://wiki.linaro.org/PeterMaydell/QemuVersatileExpress
*_Step 01.00: Clone linux-yocto-3.8 locally, create local meta branch,
create local standard/qemuarma9 branch, tracking the master branch._*
Make the following modification to the qemuarma9-standard.scc file.
From 8e9b465f242941b70d7b61045c073e82700fcd91 Mon Sep 17 00:00:00 2001
From: Elvis Dowson elvis.dow...@gmail.com mailto:elvis.dow...@gmail.com
Date: Mon, 26 Aug 2013 22:18:24 +0400
Subject: [PATCH] qemuarma9: Update branch to qemuarma9.
Signed-off-by: Elvis Dowson elvis.dow...@gmail.com
mailto:elvis.dow...@gmail.com
---
meta/cfg/kernel-cache/bsp/qemuarma9/qemuarma9-standard.scc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/cfg/kernel-cache/bsp/qemuarma9/qemuarma9-standard.scc
b/meta/cfg/kernel-cache/bsp/qemuarma9/qemuarma9-standard.scc
index c71fe1c..729125d 100644
--- a/meta/cfg/kernel-cache/bsp/qemuarma9/qemuarma9-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/qemuarma9/qemuarma9-standard.scc
@@ -3,7 +3,7 @@ define KTYPE standard
define KARCH arm
include ktypes/standard/standard.scc
-branch arm-versatile-926ejs
+branch qemuarma9
include qemuarma9.scc
--
1.7.10.4
*_Step 02.00: Create a new qemuarma9.conf machine definition._*
There is a dts file in arch/arm/boot/dts called vexpress-v2p-ca9.dts.
Q01: I guess the KMACHINE_qemuarma9 should be set to vex press ?
instead of qemuarma9 below?
#@TYPE: Machine
#@NAME: qemuarma9
#@DESCRIPTION: Machine configuration for QEMU ARM Cortex A9.
# Specify the default tune.
DEFAULTTUNE = armv7a-neon
require conf/machine/include/qemu.inc
require conf/machine/include/tune-cortexa9.inc
# Specify the preferred kernel recipe version.
PREFERRED_VERSION_linux-yocto ?= 3.8%
# Specify the machine name used by the kernel.
KMACHINE_qemuarma9 = qemuarma9 # Error?!!
# Specify the kernel image type.
KERNEL_IMAGETYPE = uImage
MACHINE_DEVICETREE := qemuarma9.dts
# Specify the serial console parameters.
SERIAL_CONSOLE = 115200 ttyAMA0
*_Step 03.00: Patch the oe-core sources._*
*Step 03.01: *Patch scripts/runqemu
@@ -37,10 +37,11 @@ usage() {
echo qemuparams=\xyz\ - specify custom parameters to QEMU
echo bootparams=\xyz\ - specify custom kernel parameters
during boot
echo
echo Examples:
echo $MYNAME qemuarm
+echo $MYNAME qemuarma9 ramfs
echo $MYNAME qemux86-64 core-image-sato ext3
echo $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/
serial
echo $MYNAME qemux86 ramfs
echo $MYNAME qemux86 iso
echo $MYNAME qemux86 qemuparams=\-m 256\
@@ -105,11 +106,11 @@ process_filename() {
# bit more complex, but offers a great user experience.
KVM_ENABLED=no
while true; do
arg=${1}
case $arg in
-qemux86 | qemux86-64 | qemuarm | qemumips |
qemumipsel | \
+qemux86 | qemux86-64 | qemuarm | qemuarma9 |qemumips
| qemumipsel | \
qemumips64 | qemush4 | qemuppc | qemumicroblaze |
qemuzynq)
[ -z $MACHINE ] MACHINE=$arg || \
error conflicting MACHINE types [$MACHINE] and [$arg]
;;
ext2 | ext3 | ext4 | jffs2 | nfs | btrfs)
@@ -222,17 +223,17 @@ if [ $FSTYPE = nfs -a -z $ROOTFS ]; then
error NFS booting without an explicit ROOTFS path is not yet
supported
fi
if [ -z $MACHINE ]; then
if [ x$FSTYPE = xvmdk ]; then
-MACHINE=`basename $VM | sed
's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'`
+MACHINE=`basename $VM | sed
's/.*\(qemux86-64\|qemux86\|qemuarm\|qemuarma9\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'`
if [ -z $MACHINE ]; then
error Unable to set MACHINE from vmdk filename [$VM]
fi
echo Set MACHINE to [$MACHINE] based on vmdk [$VM]
else
-MACHINE=`basename $KERNEL | sed
Re: [OE-core] [PATCH] u-boot: update to 2013.07
On Tue, 2013-08-27 at 22:08 +0200, Martin Jansa wrote:
On Tue, Aug 27, 2013 at 03:57:09PM -0400, Randy MacLeod wrote:
On 13-08-23 05:48 AM, Laszlo Papp wrote:
Signed-off-by: Laszlo Papp lp...@kde.org
---
meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | 27
+++
meta/recipes-bsp/u-boot/u-boot_2013.07.bb | 23
+++
2 files changed, 50 insertions(+)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
create mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.07.bb
...
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 000..f3f4b62
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,23 @@
+require u-boot.inc
+
+# To build u-boot for your machine, provide the following lines in your
machine
+# config, replacing the assignments as appropriate for your machine.
+# UBOOT_MACHINE = omap3_beagle_config
+# UBOOT_ENTRYPOINT = 0x80008000
+# UBOOT_LOADADDRESS = 0x80008000
+
+LICENSE = GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+
file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab
+
+# This revision corresponds to the tag v2013.07
+# We use the revision in order to avoid having to fetch it from the repo
during parse
+SRCREV = 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c
+
+PV = v2013.07+git${SRCPV}
+
+SRC_URI = git://git.denx.de/u-boot.git;branch=master;protocol=git
Just curious...
I dont' see a good reason to specify the git protocol twice:
git:// and ; protocol=git
It's not twice, git:// is to select bitbake fetcher (git.py) and one
fetcher can support multiple protocols (e.g. over git, http or ssh)
but you're right that in most cases protocol=git isn't needed, because
it's default protocol for git fetcher when host is specified in that
SRC_URI.
bitbake/lib/bb/fetch2/git.py:
if 'protocol' in ud.parm:
ud.proto = ud.parm['protocol']
elif not ud.host:
ud.proto = 'file'
else:
ud.proto = git
And I would support removing it in one go as it clearly confuses people
:).
The reason is that the default for the git fetcher was once rsync. Why?
The fetcher was written when git was still a new and unexplored
landscape. We decided in the end to break that insane default and fix
it.
We should kill off the now unnecessary parameters though.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] btrfs-tools: Add dependency on lzo acl e2fsprog
On 08/26/2013 06:19 PM, Rongqing Li wrote: On 08/26/2013 10:37 PM, Saul Wold wrote: Why? Still need give a better commit message about why these depends are needed. Sau! And should the acl be controlled by a PACKAGECONFIG? Can it be disabled during do_configure? Sau! btrfs-tools does not inherit autotools, and does not support the configuration. it includes sys/acl.h hard-code. The commit which includes sys/acl.h is below: commit 62a72e7d9ada7a986dd299622b2233fe2e386003 Author: Yan yanzh...@21cn.com Date: Mon Jan 14 13:35:00 2008 -0500 xattr support for the ext3-btrfs converter diff --git a/convert.c b/convert.c index beb9a96..c047620 100644 --- a/convert.c +++ b/convert.c @@ -25,6 +25,7 @@ #include stdlib.h #include sys/types.h #include sys/stat.h +#include sys/acl.h #include fcntl.h #include unistd.h #include uuid/uuid.h @@ -35,11 +36,10 @@ #include transaction.h #include crc32c.h #include utils.h -#include ext2fs/ext2_fs.h -#include ext2fs/ext2fs.h - +#include ext2fs/ext2_fs.h +#include ext2fs/ext2fs.h +#include ext2fs/ext2_ext_attr.h #define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO) - /* * Open Ext2fs in readonly mode, read block allocation bitmap and * inode bitmap into memory. @@ -446,7 +446,8 @@ static int __block_iterate_proc(ext2_filsys fs, blk_t *blocknr, static int create_file_extents(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid, struct btrfs_inode_item *btrfs_inode, - ext2_filsys ext2_fs, ext2_ino_t ext2_ino) + ext2_filsys ext2_fs, ext2_ino_t ext2_ino, + int datacsum, int packing) The btrfs-convert.c which include sys/acl.h is below: * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 021110-1307, USA. */ #define _XOPEN_SOURCE 600 #define _GNU_SOURCE 1 #include kerncompat.h #ifndef __CHECKER__ #include sys/ioctl.h #include sys/mount.h #endif #include stdio.h #include stdlib.h #include sys/types.h #include sys/stat.h #include sys/acl.h both are hard-code. -Roy On 08/26/2013 01:56 AM, rongqing...@windriver.com wrote: From: Roy.Li rongqing...@windriver.com Signed-off-by: Roy.Li rongqing...@windriver.com --- meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb index 07e8529..3ec9e8a 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb @@ -10,7 +10,7 @@ HOMEPAGE = https://btrfs.wiki.kernel.org; LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067 SECTION = base -DEPENDS = util-linux attr +DEPENDS = util-linux attr e2fsprogs lzo acl SRCREV = 194aa4a1bd6447bb545286d0bcb0b0be8204d79f SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] runqemu-internal: change the lock acquire/release logic
On 08/27/2013 06:09 PM, Richard Purdie wrote: On Tue, 2013-08-27 at 15:08 +0800, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com Checking whether the lock file exists is sufficient for runqemu. The contents of the lock file is not important. What happens if the runqemu script crashes and leaves the lockfile around? Why are we removing perfectly functional code? Cheers, Richard Yes. You're right. I'll drop this patch and send out a V2. Best Regards, Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] runqemu-internal: change the lock acquire/release logic
On 08/27/2013 06:14 PM, Phil Blundell wrote: On Tue, 2013-08-27 at 15:08 +0800, qi.c...@windriver.com wrote: This patch simplifies the lock acquire/release logic by removing the flock mechanism. I'm not sure that simplifies is an accurate description of the results of removing flock. How about breaks? p. That would be a better description. I then realized I did break the logic. I'll drop this patch and send out a v2. Best Regards, Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 2/3] runqemu-internal: don't bring down preconfigured tap interface
From: Chen Qi qi.c...@windriver.com
runqemu-ifup and runqemu-ifdown should be pairs. If we're using a
preconfigured tap interface, the runqemu-ifdown should not be invoked
to bring it down.
Signed-off-by: Chen Qi qi.c...@windriver.com
---
scripts/runqemu-internal |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 8a6e551..8165e13 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -175,12 +175,14 @@ else
POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
TAP=
LOCKFILE=
+USE_PRECONF_TAP=no
for tap in $POSSIBLE; do
LOCKFILE=$LOCKDIR/$tap
echo Acquiring lockfile for $tap...
acquire_lock $LOCKFILE
if [ $? -eq 0 ]; then
TAP=$tap
+USE_PRECONF_TAP=yes
break
fi
done
@@ -215,7 +217,7 @@ else
fi
cleanup() {
-if [ ! -e $NOSUDO_FLAG ]; then
+if [ ! -e $NOSUDO_FLAG -a $USE_PRECONF_TAP = no ]; then
# Redirect stderr since we could see a LD_PRELOAD warning here
if pseudo is loaded
# but inactive. This looks scary but is harmless
sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT 2 /dev/null
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/3] runqemu fixes about iptables rules and preconfigured tap
From: Chen Qi qi.c...@windriver.com The following changes since commit 44c3f72684c5c920ce8af1da54a2268047342589: lib/oeqa/runtime: smart: add checks for smart output (2013-08-26 16:29:18 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/runqemu-fixes http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/runqemu-fixes Chen Qi (3): runqemu-ifdown: clean up the remaining iptables rules runqemu-internal: don't bring down preconfigured tap interface runqemu-internal: provide more info if a preconfigured tap is used scripts/runqemu-ifdown | 14 ++ scripts/runqemu-internal |5 - 2 files changed, 18 insertions(+), 1 deletion(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/3] runqemu-ifdown: clean up the remaining iptables rules
From: Chen Qi qi.c...@windriver.com The iptables rules for the tap interface are added by runqemu-ifup everytime we use runqemu to start a qemu target. But it's not cleaned up when runqemu exits. This patch cleans up the remaining iptables rules for the tap interface in runqemu-ifdown. [YOCTO #5047] Signed-off-by: Chen Qi qi.c...@windriver.com --- scripts/runqemu-ifdown | 14 ++ 1 file changed, 14 insertions(+) diff --git a/scripts/runqemu-ifdown b/scripts/runqemu-ifdown index 8b8c5a4..8f66cfa2 100755 --- a/scripts/runqemu-ifdown +++ b/scripts/runqemu-ifdown @@ -50,3 +50,17 @@ if [ ! -e $TUNCTL ]; then fi $TUNCTL -d $TAP + +# cleanup the remaining iptables rules +IPTABLES=`which iptables 2 /dev/null` +if [ x$IPTABLES = x ]; then + IPTABLES=/sbin/iptables +fi +if [ ! -x $IPTABLES ]; then + echo $IPTABLES cannot be executed + exit 1 +fi +n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] +dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ] +$IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32 +$IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 3/3] runqemu-internal: provide more info if a preconfigured tap is used
From: Chen Qi qi.c...@windriver.com
We should provide the user more information if a preconfigured tap
is used. This is because the user might have manually set up the tap
interface to be used by other qemu binaries.
So at a minimum, we should let the user know how to make runqemu skip
that tap interface.
[YOCTO #5047]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
scripts/runqemu-internal |1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 8165e13..f9d8728 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -214,6 +214,7 @@ else
fi
else
echo Using preconfigured tap device '$TAP'
+echo If this is not intended, use flock on $LOCKFILE.lock to make
runqemu skip $TAP.
fi
cleanup() {
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2013.07
On 13-08-27 07:29 PM, Richard Purdie wrote:
On Tue, 2013-08-27 at 22:08 +0200, Martin Jansa wrote:
On Tue, Aug 27, 2013 at 03:57:09PM -0400, Randy MacLeod wrote:
On 13-08-23 05:48 AM, Laszlo Papp wrote:
Signed-off-by: Laszlo Papp lp...@kde.org
---
meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | 27
+++
meta/recipes-bsp/u-boot/u-boot_2013.07.bb | 23 +++
2 files changed, 50 insertions(+)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
create mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.07.bb
...
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 000..f3f4b62
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,23 @@
+require u-boot.inc
+
+# To build u-boot for your machine, provide the following lines in your machine
+# config, replacing the assignments as appropriate for your machine.
+# UBOOT_MACHINE = omap3_beagle_config
+# UBOOT_ENTRYPOINT = 0x80008000
+# UBOOT_LOADADDRESS = 0x80008000
+
+LICENSE = GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+
file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab
+
+# This revision corresponds to the tag v2013.07
+# We use the revision in order to avoid having to fetch it from the repo
during parse
+SRCREV = 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c
+
+PV = v2013.07+git${SRCPV}
+
+SRC_URI = git://git.denx.de/u-boot.git;branch=master;protocol=git
Just curious...
I dont' see a good reason to specify the git protocol twice:
git:// and ; protocol=git
It's not twice, git:// is to select bitbake fetcher (git.py) and one
fetcher can support multiple protocols (e.g. over git, http or ssh)
but you're right that in most cases protocol=git isn't needed, because
it's default protocol for git fetcher when host is specified in that
SRC_URI.
bitbake/lib/bb/fetch2/git.py:
if 'protocol' in ud.parm:
ud.proto = ud.parm['protocol']
elif not ud.host:
ud.proto = 'file'
else:
ud.proto = git
And I would support removing it in one go as it clearly confuses people
:).
The reason is that the default for the git fetcher was once rsync. Why?
The fetcher was written when git was still a new and unexplored
landscape. We decided in the end to break that insane default and fix
it.
We should kill off the now unnecessary parameters though.
Ok. Jackie will have time to make a first pass tomorrow.
Jackie, please include the replacement script in your email.
// Randy
Cheers,
Richard
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] list-packageconfig-flags.py: fix searching bitbake module failed
The following changes since commit b467b99a5d25efe5eadfb07dbecba608575256ac: linux-yocto: switch genericx86 to use common-pc (2013-08-24 09:37:49 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib hongxu/fix-list-pkgconfig http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-list-pkgconfig Hongxu Jia (1): list-packageconfig-flags.py: fix searching bitbake module failed scripts/contrib/list-packageconfig-flags.py | 32 ++--- 1 file changed, 25 insertions(+), 7 deletions(-) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] list-packageconfig-flags.py: fix searching bitbake module failed
Run list-packageconfig-flags.py on wrlinux's platform in which
the oe-core layer and bitbake layer in different directories:
../layers/oe-core/scripts/contrib/list-packageconfig-flags.py
Traceback (most recent call last):
File ../layers/oe-core/scripts/contrib/list-packageconfig-flags.py, line
28, in module
import bb.cache
ImportError: No module named bb.cache
The script import bb module from bitbake lib dir, the previous
lib dir was hardcode and only worked on poky but not for others.
In this situation, look for bitbake/bin dir in PATH could fix this issue.
[YOCTO #5060]
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
scripts/contrib/list-packageconfig-flags.py | 32 ++---
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/scripts/contrib/list-packageconfig-flags.py
b/scripts/contrib/list-packageconfig-flags.py
index 149922d..371033a 100755
--- a/scripts/contrib/list-packageconfig-flags.py
+++ b/scripts/contrib/list-packageconfig-flags.py
@@ -23,8 +23,26 @@ import sys
import getopt
import os
+def search_bitbakepath():
+bitbakepath =
+
+# Search path to bitbake lib dir in order to load bb modules
+if os.path.exists(os.path.join(os.path.dirname(sys.argv[0]),
'../../bitbake/lib/bb')):
+bitbakepath = os.path.join(os.path.dirname(sys.argv[0]),
'../../bitbake/lib')
+bitbakepath = os.path.abspath(bitbakepath)
+else:
+# Look for bitbake/bin dir in PATH
+for pth in os.environ['PATH'].split(':'):
+if os.path.exists(os.path.join(pth, '../lib/bb')):
+bitbakepath = os.path.abspath(os.path.join(pth, '../lib'))
+break
+if not bitbakepath:
+sys.stderr.write(Unable to find bitbake by searching parent
directory of this script or PATH\n)
+sys.exit(1)
+return bitbakepath
+
# For importing the following modules
-sys.path.insert(0, os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),
'../../bitbake/lib'))
+sys.path.insert(0, search_bitbakepath())
import bb.cache
import bb.cooker
import bb.providers
@@ -39,12 +57,12 @@ OPTION:
-p, --prefer list pkgs with preferred version
EXAMPLE:
-list-packageconfig-flags.py poky/meta poky/meta-yocto
-list-packageconfig-flags.py -f poky/meta poky/meta-yocto
-list-packageconfig-flags.py -a poky/meta poky/meta-yocto
-list-packageconfig-flags.py -p poky/meta poky/meta-yocto
-list-packageconfig-flags.py -f -p poky/meta poky/meta-yocto
-list-packageconfig-flags.py -a -p poky/meta poky/meta-yocto
+list-packageconfig-flags.py
+list-packageconfig-flags.py -f
+list-packageconfig-flags.py -a
+list-packageconfig-flags.py -p
+list-packageconfig-flags.py -f -p
+list-packageconfig-flags.py -a -p
'''
def usage():
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Fix for libtool-cross do_qa_configure error when building gfortran
I enabled the build of gfortran in the gcc-cross recipe using a
gcc-cross_4.7.bbappend:
# Build a gfortran cross-compiler
FORTRAN = ,fortran
The bitbake build fails in the libtool-cross do_qa_configure step. See, for
example, the report at
http://www.mail-archive.com/yocto@yoctoproject.org/msg13845.html:
configure: WARNING: unrecognized options: --disable-silent-rules, --with-
sysroot
DEBUG: Shell function do_configure finished
DEBUG: Executing python function do_qa_configure
NOTE: Checking autotools environment for common misconfiguration
ERROR: This autoconf log indicates errors, it looked at host include and/or
library paths while determining system capabilities.
Rerun configure task after fixing this. The path was
'/home/appusr/poky/build/tmp/work/armv7a-vfp-neon-poky-linux-
gnueabi/libtool-cross-2.4.2-r5.1/libtool-2.4.2'
DEBUG: Python function do_qa_configure finished
ERROR: Function failed: do_qa_configure
This is due to the incomplete support for gfortran in the bitbake recipes. It
looks like they were written for F77=g77 and have not been updated to support
FC=gfortran. The FC variable is not defined properly for cross-compiling: it
is missing the --with-sysroot= option. The result is a misconfiguration
reported by --enable-poison-system-directories and discovered by insane.bbclass
in do_qa_configure.
The patches below define the FC variables and update the default FORTRAN from
f77 to fortran. I use the DENX Yocto/ELDK-5.4 git
(http://www.denx.de/wiki/ELDK-5/EldkBuilding), so the meta layer name and the
line numbers may not be an exact match to the files in the OE git repository.
Also, I am sorry I cannot use diff --git on my CentOS development system.
Unfortunately, while these patches enable the creation of a gfortran cross
compiler, gfortran cross compiles fail due to a missing libgfortran.spec file.
In fact, there are no libgfortran files at all. I don't know why. When I
built my own gfortran cross compiler previously from the latest GCC 4.7 Code
Sourcery sources, it made all the necessary pieces. I did not have to build any
other tools, such as libtool or libgfortran. Maybe there are more bitbake
files that have to be updated to build a functioning gfortran cross compiler.
I'll keep working on that.
Larry Baker
US Geological Survey
650-329-5608
ba...@usgs.gov
--- original/eldk/meta/classes/native.bbclass
+++ patched/eldk/meta/classes/native.bbclass
@@ -61,2 +61,3 @@
export CXX = ${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}
+export FC = ${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}
export F77 = ${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}
--- original/eldk/meta/conf/bitbake.conf
+++ patched/eldk/meta/conf/bitbake.conf
@@ -448,2 +448,3 @@
export CXX = ${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}
+export FC = ${CCACHE}${HOST_PREFIX}gfortran
${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}
export F77 = ${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}
@@ -463,2 +464,3 @@
export BUILD_CXX = ${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}
+export BUILD_FC = ${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}
export BUILD_F77 = ${CCACHE}${BUILD_PREFIX}g77 ${BUILD_CC_ARCH}
--- original/eldk/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ patched/eldk/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -13,3 +13,3 @@
# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
-FORTRAN ?= ,f77
+FORTRAN ?= ,fortran
LANGUAGES ?= c,c++${FORTRAN}${JAVA}
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libsamplerate0: add PACKAGECONFIG for fftw
From: Roy.Li rongqing...@windriver.com
fftw is autodetected from sysroot, add PACKAGECONFIG to make it deterministic
Signed-off-by: Roy.Li rongqing...@windriver.com
---
meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb |2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
index 3234568..25e97b4 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
+++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
@@ -13,3 +13,5 @@ SRC_URI[sha256sum] =
93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb964
S = ${WORKDIR}/libsamplerate-${PV}
inherit autotools pkgconfig
+
+PACKAGECONFIG[fftw] = ,--disable-fftw,fftw
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grep-2.5.1a: fix grep for LSB compliance
at 2013-8-27 18:43, Phil Blundell wrote:
On Mon, 2013-08-26 at 18:00 -0700, Saul Wold wrote:
On 08/27/2013 02:43 AM, Li Zhijian wrote:
add patch from grep-2.5.1-55.el5.src.rpm and
enable configration option of --without-include-regex
LSB core-tests failed at /tset/LI18NUX2K.L1/utils/grep-tp/T.grep-tp
5,T.egrep-tp 5
which is intend to verify this utility can perform pattern matching in searches
without regard to case if -i option is specified.
Signed-off-by: Li Zhijian lizhij...@cn.fujitsu.com
SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \
@@ -13,8 +13,25 @@ SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://gettext.patch \
file://fix64-int-to-pointer.patch \
file://Makevars \
- file://grep-CVE-2012-5667.patch \
Why are you removing this patch?
He didn't actually remove it, he just moved it further down the list.
But...
file://fix-for-texinfo-5.1.patch \
+ file://grep-2.5.1-fgrep.patch \
+ file://grep-2.5.1-bracket.patch \
+ file://grep-2.5-i18n.patch \
+ file://grep-2.5.1-oi.patch \
+ file://grep-2.5.1-manpage.patch \
+ file://grep-2.5.1-color.patch \
+ file://grep-2.5.1-icolor.patch \
+ file://grep-skip.patch \
+ file://grep-2.5.1-egf-speedup.patch \
+ file://grep-2.5.1-dfa-optional.patch \
+ file://grep-2.5.1-tests.patch \
+ file://grep-2.5.1-w.patch \
+ file://grep-P.patch \
+ file://grep-CVE-2012-5667.patch \
+ file://grep-empty-pattern.patch \
+ file://grep-bz460641.patch \
+ file://grep-bz434934.patch \
+ file://grep-man-label.patch \
... it's fairly hard to believe that all these patches are really
necessary to fix the problem with grep -i that's described in the
checkin message. It looks as though a more accurate description of this
change would be something like grep-2.5.1a: import all patches from
RHEL.
Agree, you are right.
It is easier for me to import all patches from RHEL rather than analysising
which
are problem fixed patches.
Also, although adding --without-included-regex probably is a good thing
(and probably ought to be done for grep-2.14 as well) it's not very
obvious that this has anything to do with the LSB fix either.
This option --without-included-regex at grep-2.5.1a is also necessary to fix
LSB core-test
Otherwise /tset/LI18NUX2K.L1/utils/grep-tp/T.grep-tp 5,T.egrep-tp 5 would FAIL。
Thanks
Li
p.
--
Best regards.
Li Zhijian (8555)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
