[OE-core] Feedback on HOB (new image creator GUI)
Hi, As you may already know, a new GUI has been added to bitbake recently, i.e. HOB (Human Oriented Builder). It is a graphical image creator that allows user to freely choose which packages to be built in the image. The wiki https://wiki.yoctoproject.org/wiki/BitBake/GUI/Hob has more detail. This email is to collect your feedback on the HOB. Current HOB is our first version, and it surely has many place to improve. We has the plan to enhance it in Yocto 1.2. So we really hope that you can use it and provide your valuable feedback . We do think user's feedback/requirement is the right way to go. Looking forward your valuable input. Best Regards Ke Ps. The simple way to run hob is: # touch conf/hob-pre.conf conf/hob-post.conf # bitbake -u hob -r conf/hob-pre.conf -R conf/hob-post.conf Where conf/hob-pre.conf conf/hob-post.conf is the configuration file, which can be empty in above case. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Feedback on HOB (new image creator GUI)
-Original Message- From: Gary Thomas [mailto:g...@mlbassoc.com] Sent: Saturday, October 01, 2011 5:56 AM To: Patches and discussions about the oe-core layer Cc: Yu, Ke; bitbake-de...@lists.openembedded.org; Lock, Joshua Subject: Re: [OE-core] Feedback on HOB (new image creator GUI) On 2011-09-30 08:36, Yu Ke wrote: Hi, As you may already know, a new GUI has been added to bitbake recently, i.e. HOB (Human Oriented Builder). It is a graphical image creator that allows user to freely choose which packages to be built in the image. The wiki https://wiki.yoctoproject.org/wiki/BitBake/GUI/Hob has more detail. This email is to collect your feedback on the HOB. Current HOB is our first version, and it surely has many place to improve. We has the plan to enhance it in Yocto 1.2. So we really hope that you can use it and provide your valuable feedback . We do think user's feedback/requirement is the right way to go. Looking forward your valuable input. Best Regards Ke Ps. The simple way to run hob is: # touch conf/hob-pre.conf conf/hob-post.conf # bitbake -u hob -r conf/hob-pre.conf -R conf/hob-post.conf Where conf/hob-pre.conf conf/hob-post.conf is the configuration file, which can be empty in above case. I build images which are not based on any of the core-XXX images listed by HOB. How can I get them into the drop-down base list? Is there a way I can filter out some of the base images? tasks? Gary, thanks for trying and giving out the input. It is helpful. For the base image list, HOB generate it by searching all the task whose name containing image, and we plan to improve it in Yocto 1.2 by searching task who inherits image.bbclass. So currently, if you name your own image with XXX-image, HOB should be able to automatically add it in the drop-down list. And yes, it is helpful to allow user adding item into base image list. it can be done by adding one item in Edit-Preference. I will add this requirement to my plan. For base image filtering, I am not sure if it is necessary, since base image list is not that long. How do you think? Regards Ke I ask these questions because in particular, I use a lot of the recipes in meta and meta-yocto, but none of the images or tasks (because they don't really address my needs, don't take offense, I just want more control than they offer) -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Feedback on HOB (new image creator GUI)
-Original Message- From: Koen Kooi [mailto:k...@dominion.thruhere.net] Sent: Saturday, October 01, 2011 12:33 AM To: Patches and discussions about the oe-core layer Cc: Yu, Ke; bitbake-de...@lists.openembedded.org; openembedded-core Subject: Re: [OE-core] Feedback on HOB (new image creator GUI) Op 30 sep. 2011 om 10:49 heeft Joshua Lock j...@linux.intel.com het volgende geschreven: On Fri, 2011-09-30 at 08:36 -0600, Yu, Ke wrote: Hi, As you may already know, a new GUI has been added to bitbake recently, i.e. HOB (Human Oriented Builder). It's not an acronym, it's just a name - Hob. It is a graphical image creator that allows user to freely choose which packages to be built in the image. The wiki https://wiki.yoctoproject.org/wiki/BitBake/GUI/Hob has more detail. I'll be changing this page and adding more user-centric info in the coming weeks. This email is to collect your feedback on the HOB. Current HOB is our first version, and it surely has many place to improve. We has the plan to enhance it in Yocto 1.2. So we really hope that you can use it and provide your valuable feedback . We do think user's feedback/requirement is the right way to go. Looking forward your valuable input. Best Regards Ke Ps. The simple way to run hob is: # touch conf/hob-pre.conf conf/hob-post.conf # bitbake -u hob -r conf/hob-pre.conf -R conf/hob-post.conf In oe-core (and therefore Poky) we have a wrapper script so from an oe-init-build-env'd build directory you can just call hob. The script will create the required configuration files with some required values. Can we have it use local.conf by default please? I hate having to put the same info in multiple places Yes, this is valid. We should be able to use local.conf as pre and post conf file, if they are not specified by user. Thanks for the input. I will add it to my plan. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] qt4.inc: revise RRECOMMENDS
using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist this patch fix it by using ${PN} Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-qt/qt4/qt4.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 881b445..4d26c64 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -51,7 +51,7 @@ python __anonymous () { ${includedir}/${QT_DIR_NAME}/%(incname)s ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc % locals(), d) bb.data.setVar(FILES_%s-dbg % pkg, ${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.* % locals(), d) -bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${QT_BASE_NAME}-dbg, d) +bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${PN}-dbg, d) lib_packages.append(pkg) dev_packages.append(%s-dev % pkg) dbg_packages.append(%s-dbg % pkg) @@ -68,7 +68,7 @@ python __anonymous () { ${includedir}/${QT_DIR_NAME}/%(incname)s ${libdir}/pkgconfig/%(name)s.pc % locals(), d) bb.data.setVar(FILES_%s-dbg % pkg, ${libdir}/.debug/lib%(name)s.so.* % locals(), d) -bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${QT_BASE_NAME}-dbg, d) +bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${PN}-dbg, d) lib_packages.append(pkg) dev_packages.append(%s-dev % pkg) dbg_packages.append(%s-dbg % pkg) -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qt4.inc: expand the package name for multilib case, fix bug 1344
in the qt4.inc python annomyous code, there is case where package name is set to ${QT_BASE_LIB}-tool, and FILE_${QT_BASE_LIB}-tool is set to xxx. here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined. to fix this issue, this patch expand the QT_BASE_LIB when assigning the package name. FIX [YOCTO #1344] Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-qt/qt4/qt4.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 4d26c64..1f4e012 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -40,7 +40,7 @@ python __anonymous () { dev_packages = [] dbg_packages = [] for name in bb.data.getVar(QT_LIB_NAMES, d, 1).split(): -pkg = ${QT_BASE_LIB} + name.lower().replace(qt, ).replace(_, -) + 4 +pkg = bb.data.getVar(QT_BASE_LIB,d, True) + name.lower().replace(qt, ).replace(_, -) + 4 # NOTE: the headers for QtAssistantClient are different incname = name.replace(QtAssistantClient, QtAssistant) bb.data.setVar(FILES_%s % pkg, ${libdir}/lib%(name)s${QT_LIBINFIX}.so.* % locals(), d) @@ -59,7 +59,7 @@ python __anonymous () { dbg_packages.append(%s-dbg % name) for name in bb.data.getVar(QT_EXTRA_LIBS, d, 1).split(): -pkg = ${QT_BASE_LIB} + name.lower().replace(qt, ).replace(_, -) + 4 +pkg = bb.data.getVar(QT_BASE_LIB,d, True) + name.lower().replace(qt, ).replace(_, -) + 4 bb.data.setVar(FILES_%s % pkg, ${libdir}/lib%(name)s.so.* % locals(), d) bb.data.setVar(FILES_%s-dev % pkg, ${libdir}/lib%(name)s.prl ${libdir}/lib%(name)s.a -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] two qt fix
The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: Darren Hart (1): rt-tests: use an explicit commit ID are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/bug-1344 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug-1344 Yu Ke (2): qt4.inc: revise RRECOMMENDS qt4.inc: expand the package name for multilib case meta/recipes-qt/qt4/qt4.inc |8 1 files changed, 4 insertions(+), 4 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On 2011/8/14 23:18, Khem Raj wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/14/2011 06:32 AM, Yu Ke wrote: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. I think similar patch should be done to ppc and mips as well. According to Kumar, current ppc works just fine in multilib 64bit case. so ppc may not need this kind of patch. I am not sure how is mips. Since i am not familar with mips, i'd like to leave it to other mips expert. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On 2011/8/15 1:31, Koen Kooi wrote: Op 14 aug. 2011, om 15:32 heeft Yu Ke het volgende geschreven: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. CC: Kumar Galaga...@kernel.crashing.org CC: Richard Purdierichard.pur...@linuxfoundation.org Signed-off-by: Yu Keke...@intel.com --- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 16 +--- wouldn't gcc 4.5 need a similar change? yes, gcc 4.5 should also has this change. I will sent out another patch for this. just curious question, what is gcc 4.5 for, since gcc 4.6 is already there? Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On 2011/8/15 21:16, Richard Purdie wrote: On Mon, 2011-08-15 at 20:48 +0800, Yu Ke wrote: On 2011/8/15 1:31, Koen Kooi wrote: Op 14 aug. 2011, om 15:32 heeft Yu Ke het volgende geschreven: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. CC: Kumar Galaga...@kernel.crashing.org CC: Richard Purdierichard.pur...@linuxfoundation.org Signed-off-by: Yu Keke...@intel.com --- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 16 +--- wouldn't gcc 4.5 need a similar change? yes, gcc 4.5 should also has this change. I will sent out another patch for this. Please take a look at: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/ml4id=4de8e0e9c286ff64f1b7fd2e695fe2d62fdadfbd Thanks. it is more comprehensive. just a small issue, the parentheses looks mismatching in ++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir) ../$(shell basename $(base_libdir) I've updated the patch header and ensured that whichever compiler options are used, the compiler works as expected and also applied this to mips and pcc. Could you also please open a bug about target gcc multilib as mentioned in the patch header (targeted at post 1.1). done. http://bugzilla.yoctoproject.org/show_bug.cgi?id=1369 just curious question, what is gcc 4.5 for, since gcc 4.6 is already there? Some people are still using gcc 4.5 for various reasons. It is getting to the point we should probably move that to meta-oe though? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Bug fix for 1362
Per discussion in mailing list, This patch make gcc honouring libdir, to fix the bug 1362. it has been tested for qemux86, qemux86-64, qemuarm, qemuppc Signed-off-by: Yu Ke ke...@intel.com The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: Darren Hart (1): rt-tests: use an explicit commit ID are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/bug-1362 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug-1362 Yu Ke (1): gcc-cross-intermediate: revise the 64bithack.patch for multilib case meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 16 +--- 2 files changed, 10 insertions(+), 8 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts/combo-layer: a simple way to script the como-layer conf
It looks good to me. You may also want to update the config file description in the class Configuration. So that user will be aware of the usage. Regards Ke -Original Message- From: Leandro Dorileo [mailto:ldori...@gmail.com] Sent: Wednesday, August 10, 2011 3:44 AM To: openembedded-core@lists.openembedded.org Cc: Yu, Ke; Leandro Dorileo Subject: [PATCH] scripts/combo-layer: a simple way to script the como-layer conf This small patch introduces a a very simple and basic way to script the combo- layer conf file. With that a combo can be shared with no need to change its config - associated to the use of environment variables for example. *Similar* to bitbake it considers every value starting with @ to be a python script. So local_repo could be easily configured as: [bitbake] local_repo = @os.getenv(LOCAL_REPO_DIR) + /bitbake or any more sophisticated python syntax. Signed-off-by: Leandro Dorileo ldori...@gmail.com --- scripts/combo-layer |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index d129175..3dadf4a 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -91,6 +91,9 @@ last_revision = for repo in self.parser.sections(): self.repos[repo] = {} for (name, value) in self.parser.items(repo): + if value.startswith(@): +self.repos[repo][name] = eval(value.strip(@)) + else: self.repos[repo][name] = value def update(self, repo, option, value): -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix rpm typo for multilib
The following changes since commit f94b781695cd8fa387daff16ecbf3987a0883018: Bruce Ashfield (1): poky.conf: explicitly referenced preferred linux-yocto version are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/ml-rpm http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/ml-rpm Yu Ke (1): package_rpm.bbclass: fix one typo meta/classes/package_rpm.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] package_rpm.bbclass: fix one typo
fix the MLPREFIX referrence typo which cause multilib rpm do_rootfs failure CC: Mark Hatle mark.ha...@windriver.com Signed-off-by: Yu Ke ke...@intel.com --- meta/classes/package_rpm.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 0377100..ded744b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -248,7 +248,7 @@ package_install_internal_rpm () { echo Processing $pkg... archvar=base_package_archs - ml_pkg=$(echo ${pkg} | sed s,$^{MLPREFIX}\(.*\),\1,) + ml_pkg=$(echo ${pkg} | sed s,^${MLPREFIX}\(.*\),\1,) if [ ${ml_pkg} != ${pkg} ]; then archvar=ml_package_archs fi -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] Fix rpm typo for multilib
On 2011/8/1 20:05, Koen Kooi wrote: Op 1 aug. 2011, om 13:54 heeft Yu Ke het volgende geschreven: The following changes since commit f94b781695cd8fa387daff16ecbf3987a0883018: Bruce Ashfield (1): poky.conf: explicitly referenced preferred linux-yocto version are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/ml-rpm http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/ml-rpm When submitting patches to oe-core please base them against oe-core, not poky. Fair enough. here is the new branch: http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=kyu3/oecore/ml-rpm Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] replace PN with BPN in SRC_URI and S for multilib
in multilibcase, PN has multilib prefix, so it is not correct to use PN in SRC_URI and S. instead, we've dedicately pruned multilib prefix in BPN, so BPN is the right alternative for PN. The following changes since commit f94b781695cd8fa387daff16ecbf3987a0883018: Bruce Ashfield (1): poky.conf: explicitly referenced preferred linux-yocto version are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/src-uri http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/src-uri Yu Ke (1): SRC_URI, S: use BPN instead of PN for multilib case .../farsight/farsight2_0.0.9.bb|2 +- .../loudmouth/loudmouth_1.4.0.bb |2 +- .../opensync/libopensync-plugin_0.36.inc |2 +- .../telepathy/telepathy-farsight_0.0.7.bb |2 +- .../telepathy/telepathy-gabble_0.7.8.bb|2 +- .../recipes-connectivity/wbxml/wbxml2_0.9.2.bb |2 +- .../recipes-gnome/gcalctool/gcalctool_5.7.32.bb|2 +- .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb|2 +- .../recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb |2 +- meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb |2 +- meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb|2 +- .../matchbox-themes-extra_git.bb |2 +- .../recipes-support/poppler/poppler-data_0.1.bb|2 +- meta-demoapps/recipes-support/poppler/poppler.inc |2 +- .../omap3-sgx-modules_1.3.13.1397.bb |4 ++-- meta/recipes-bsp/zaurusd/zaurusd_svn.bb|2 +- .../galago/galago-daemon_0.5.1.bb |2 +- .../iproute2/iproute2_2.6.38.bb|2 +- meta/recipes-connectivity/ofono/ofono_0.50.bb |2 +- .../telepathy/telepathy-glib_0.14.3.bb |2 +- .../telepathy/telepathy-idle_0.1.8.bb |2 +- .../telepathy/telepathy-python_0.15.19.bb |2 +- meta/recipes-core/dbus-wait/dbus-wait_svn.bb |2 +- .../glib-networking/glib-networking_2.28.7.bb |2 +- meta/recipes-devtools/distcc/distcc_2.18.3.bb |2 +- .../subversion/subversion_1.6.15.bb|2 +- meta/recipes-extended/blktool/blktool_4-6.bb |2 +- .../recipes-extended/chkconfig/chkconfig_1.3.52.bb |2 +- meta/recipes-extended/libidn/libidn_0.6.14.bb |2 +- meta/recipes-extended/libidn/libidn_1.22.bb|2 +- meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb |4 ++-- meta/recipes-extended/mktemp/mktemp_1.7.bb |2 +- meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb |2 +- .../ttf-fonts/liberation-fonts_1.06.bb |2 +- .../xorg-driver/xf86-driver-common.inc |2 +- meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb |2 +- meta/recipes-sato/eds/eds-tools_bzr.bb |2 +- meta/recipes-sato/gaku/gaku_svn.bb |2 +- meta/recipes-sato/libical/libical_0.46.bb |2 +- meta/recipes-sato/libowl/libowl_svn.bb |2 +- .../recipes-sato/owl-video-widget/libowl-av_svn.bb |2 +- meta/recipes-sato/puzzles/oh-puzzles_svn.bb|2 +- meta/recipes-sato/puzzles/puzzles_r9175.bb |2 +- meta/recipes-sato/screenshot/screenshot_svn.bb |2 +- meta/recipes-support/apr/apr-util_1.3.10.bb|2 +- meta/recipes-support/apr/apr_1.4.2.bb |2 +- meta/recipes-support/liboil/liboil_0.3.17.bb |2 +- meta/recipes-support/neon/neon_0.29.5.bb |2 +- 48 files changed, 50 insertions(+), 50 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] SRC_URI, S: use BPN instead of PN for multilib case
in multilibcase, PN has multilib prefix, so it is not correct to use PN in SRC_URI and S. instead, we've dedicately pruned multilib prefix in BPN, so BPN is the right alternative for PN. Signed-off-by: Yu Ke k...@intel.com --- .../farsight/farsight2_0.0.9.bb|2 +- .../loudmouth/loudmouth_1.4.0.bb |2 +- .../opensync/libopensync-plugin_0.36.inc |2 +- .../telepathy/telepathy-farsight_0.0.7.bb |2 +- .../telepathy/telepathy-gabble_0.7.8.bb|2 +- .../recipes-connectivity/wbxml/wbxml2_0.9.2.bb |2 +- .../recipes-gnome/gcalctool/gcalctool_5.7.32.bb|2 +- .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb|2 +- .../recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb |2 +- meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb |2 +- meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb|2 +- .../matchbox-themes-extra_git.bb |2 +- .../recipes-support/poppler/poppler-data_0.1.bb|2 +- meta-demoapps/recipes-support/poppler/poppler.inc |2 +- .../omap3-sgx-modules_1.3.13.1397.bb |4 ++-- meta/recipes-bsp/zaurusd/zaurusd_svn.bb|2 +- .../galago/galago-daemon_0.5.1.bb |2 +- .../iproute2/iproute2_2.6.38.bb|2 +- meta/recipes-connectivity/ofono/ofono_0.50.bb |2 +- .../telepathy/telepathy-glib_0.14.3.bb |2 +- .../telepathy/telepathy-idle_0.1.8.bb |2 +- .../telepathy/telepathy-python_0.15.19.bb |2 +- meta/recipes-core/dbus-wait/dbus-wait_svn.bb |2 +- .../glib-networking/glib-networking_2.28.7.bb |2 +- meta/recipes-devtools/distcc/distcc_2.18.3.bb |2 +- .../subversion/subversion_1.6.15.bb|2 +- meta/recipes-extended/blktool/blktool_4-6.bb |2 +- .../recipes-extended/chkconfig/chkconfig_1.3.52.bb |2 +- meta/recipes-extended/libidn/libidn_0.6.14.bb |2 +- meta/recipes-extended/libidn/libidn_1.22.bb|2 +- meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb |4 ++-- meta/recipes-extended/mktemp/mktemp_1.7.bb |2 +- meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb |2 +- .../ttf-fonts/liberation-fonts_1.06.bb |2 +- .../xorg-driver/xf86-driver-common.inc |2 +- meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb |2 +- meta/recipes-sato/eds/eds-tools_bzr.bb |2 +- meta/recipes-sato/gaku/gaku_svn.bb |2 +- meta/recipes-sato/libical/libical_0.46.bb |2 +- meta/recipes-sato/libowl/libowl_svn.bb |2 +- .../recipes-sato/owl-video-widget/libowl-av_svn.bb |2 +- meta/recipes-sato/puzzles/oh-puzzles_svn.bb|2 +- meta/recipes-sato/puzzles/puzzles_r9175.bb |2 +- meta/recipes-sato/screenshot/screenshot_svn.bb |2 +- meta/recipes-support/apr/apr-util_1.3.10.bb|2 +- meta/recipes-support/apr/apr_1.4.2.bb |2 +- meta/recipes-support/liboil/liboil_0.3.17.bb |2 +- meta/recipes-support/neon/neon_0.29.5.bb |2 +- 48 files changed, 50 insertions(+), 50 deletions(-) diff --git a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb index 483a767..a7bdc97 100644 --- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb +++ b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = FarSight is an audio/video conferencing framework specifically designed for Instant Messengers. HOMEPAGE = http://farsight.sf.net; -SRC_URI = http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz; +SRC_URI = http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz; LICENSE = GPLv2.1 DEPENDS = libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base diff --git a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb index e20c417..b6af11d 100644 --- a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb +++ b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb @@ -5,6 +5,6 @@ LICENSE = LGPL DEPENDS = glib-2.0 gnutls libcheck PR = r2 -SRC_URI = http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.bz2; +SRC_URI = http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2; inherit autotools pkgconfig diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc index 147fcfb..cde4779 100644 --- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc +++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc @@ -2,7 +2,7 @@ DEPENDS = libopensync (= 0.36) DESCRIPTION ?= OpenSync plugin
[OE-core] [PATCH 0/1] add upstream status field for some recipe
Hi Saul, this patch add upstream status for libsdl and xserver patches. Regards Ke The following changes since commit 819f18f8bc000f13b644edc194d2a12b4ea5fecf: Richard Purdie (1): Move architecture specific TARGET_OS mangling into tune files are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/upstream-status http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upstream-status Yu Ke (1): upstream status: add for libsdl and xserver patches .../libsdl/files/directfb_obsolete_calls.patch |2 ++ .../recipes-graphics/libsdl/files/extra-keys.patch |2 ++ .../libsdl/files/kernel-asm-page.patch |2 ++ meta/recipes-graphics/mesa/mesa-dri/uclibc.patch |2 ++ .../xorg-xserver/files/macro_tweak.patch |2 ++ .../xserver-kdrive/fbdev_xrandr_ioctl.patch|2 ++ 6 files changed, 12 insertions(+), 0 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] add upstream status info
The following changes since commit 7354fc9213f27aa1b643dbe88070437f1ee4c063: Paul Eggleton (1): insane.bbclass: skip rdepends QA checks for kernel / modules are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/xserver-kdrive http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/xserver-kdrive Yu Ke (1): xserver-kdrive: add patch upstream status info .../enable-builtin-fonts.patch | 12 - .../xserver-kdrive-1.3.0.0/enable-epson.patch | 11 - .../xserver-kdrive-1.3.0.0/enable-tslib.patch | 12 - .../xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | 110 - .../xserver-kdrive-1.3.0.0/fbdev_use_current.patch | 41 -- .../fix-newer-xorg-headers.patch | 18 - .../hide-cursor-and-ppm-root.patch | 307 .../xserver-kdrive-1.3.0.0/kdrive-evdev.patch | 515 .../xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch | 54 -- .../xserver-kdrive-1.3.0.0/optional-xkb.patch | 58 --- .../report-correct-randr12.patch | 29 -- .../xserver-kdrive-1.3.0.0/scheduler.patch | 151 -- .../xserver-kdrive-1.3.0.0/xcalibrate_coords.patch | 122 - .../xserver-kdrive-1.7.99.2/crosscompile.patch |4 + .../xserver-kdrive-1.7.99.2/disable-apm.patch |4 + .../enable-builtin-fonts.patch |4 + .../enable-xcalibrate.patch|4 + .../xserver-kdrive-1.7.99.2/extra-kmodes.patch |4 + .../fbdev_xrandr_ioctl.patch |4 + .../fix-newer-xorg-headers.patch |4 + .../hide-cursor-and-ppm-root.patch |4 + .../xserver-kdrive-1.7.99.2/kdrive-evdev.patch |5 + .../xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch |4 + .../keyboard-resume-workaround.patch |4 + .../no-serial-probing.patch|4 + .../xserver-kdrive-1.7.99.2/nodolt.patch |4 + .../xserver-kdrive-1.7.99.2/optional-xkb.patch |4 + .../xorg-xserver/xserver-kdrive/disable-apm.patch |4 + .../xserver-kdrive/disable-xf86-dga-xorgcfg.patch |4 + .../xorg-xserver/xserver-kdrive/extra-kmodes.patch |4 + .../xserver-kdrive/no-serial-probing.patch |4 + 31 files changed, 73 insertions(+), 1440 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] extra fix for non /usr/lib libdir
sta-solver and libzypp also need fix to pass the build with non /usr/lib libdir e.g. libdir=/usr/lib64 The following changes since commit 7354fc9213f27aa1b643dbe88070437f1ee4c063: Paul Eggleton (1): insane.bbclass: skip rdepends QA checks for kernel / modules are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/libdir-fix-v3 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/libdir-fix-v3 Yu Ke (2): sat-solver: fix for non /usr/lib libdir case libzypp: fix for non /usr/lib libdir case meta/classes/cmake.bbclass |4 +++ .../libzypp/libzypp/hardcode-lib-fix.patch | 22 meta/recipes-extended/libzypp/libzypp_git.bb |5 ++- meta/recipes-extended/sat-solver/sat-solver_git.bb |6 +++- 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libzypp: fix for non /usr/lib libdir case
this patch has two fixes: 1. the src tool/CMakeLists.txt has hardcode lib, so add a patch to fix it 2. the recipe has hardcode -DLIB=lib, so replace it with libdir Signed-off-by: Yu Ke ke...@intel.com --- .../libzypp/libzypp/hardcode-lib-fix.patch | 22 meta/recipes-extended/libzypp/libzypp_git.bb |5 ++- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch diff --git a/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch b/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch new file mode 100644 index 000..c11f5c5 --- /dev/null +++ b/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch @@ -0,0 +1,22 @@ +tools/CMakeLists.txt: replace the hardcode lib + +replace the hardcode lib with LIB_INSTALL_DIR +this will work with non /usr/lib libdir case + +Upstream-Status: Pending + +Signed-off-by: Yu Ke ke...@intel.com + +Index: libzypp/tools/CMakeLists.txt +=== +--- libzypp.orig/tools/CMakeLists.txt libzypp/tools/CMakeLists.txt +@@ -1,7 +1,7 @@ + + ADD_SUBDIRECTORY( package-manager ) + +-INSTALL( FILES notify-message DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/zypp ) ++INSTALL( FILES notify-message DESTINATION ${LIB_INSTALL_DIR}/zypp ) + + ## + diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 824f7a1..6555bd4 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb @@ -14,7 +14,7 @@ RDEPENDS_${PN} = sat-solver S = ${WORKDIR}/git SRCREV = 15b6c52260bbc52b3d8e585e271b67e10cc7c433 PV = 0.0-git${SRCPV} -PR = r10 +PR = r11 SRC_URI = git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \ @@ -23,6 +23,7 @@ SRC_URI = git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://config-release.patch \ file://libzypp-pokyarch.patch \ file://fix_for_compile_wth_gcc-4.6.0.patch \ + file://hardcode-lib-fix.patch \ SRC_URI_append_mips = file://mips-workaround-gcc-tribool-error.patch @@ -33,7 +34,7 @@ SRC_URI_append_arm = file://arm-workaround-global-constructor.patch FILES_${PN} += ${libdir}/zypp ${datadir}/zypp ${datadir}/icons FILES_${PN}-dev += ${datadir}/cmake -EXTRA_OECMAKE += -DLIB=lib +EXTRA_OECMAKE += -DLIB=${@os.path.basename('${libdir}')} PACKAGE_ARCH = ${MACHINE_ARCH} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] python-native: fix for non /usr/lib libdir case
the get_python_lib() use hard code lib. when other recipe building use python-native, the STAGING_LIBDIR is non /usr/lib, so the hard code lib will break the build This patch replace the hardcoded lib with value from libdir to fix this issue. Signed-off-by: Yu Ke ke...@intel.com --- ...2-distutils-prefix-is-inside-staging-area.patch | 15 +++ .../recipes-devtools/python/python-native_2.6.6.bb |2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch index 9532eb3..8e721fe 100644 --- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch @@ -30,19 +30,26 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py if os.name == posix: if python_build: -@@ -116,7 +119,10 @@ def get_python_lib(plat_specific=0, stan +@@ -115,12 +118,16 @@ def get_python_lib(plat_specific=0, stan + If 'prefix' is supplied, use it instead of sys.prefix or sys.exec_prefix -- i.e., ignore 'plat_specific'. ++lib_basename = os.getenv(libdir).split('/')[-1] if prefix is None: -prefix = plat_specific and EXEC_PREFIX or PREFIX +if plat_specific: -+prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') ++prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename) +else: +prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == posix: libpython = os.path.join(prefix, -@@ -216,7 +222,7 @@ def get_config_h_filename(): +- lib, python + get_python_version()) ++ lib_basename, python + get_python_version()) + if standard_lib: + return libpython + else: +@@ -216,7 +223,7 @@ def get_config_h_filename(): else: # The name of the config.h file changed in 2.2 config_h = 'pyconfig.h' @@ -51,7 +58,7 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py def get_makefile_filename(): -@@ -225,7 +231,7 @@ def get_makefile_filename(): +@@ -225,7 +232,7 @@ def get_makefile_filename(): return os.path.join(os.path.dirname(os.path.realpath(sys.executable)), Makefile) lib_dir = get_python_lib(plat_specific=1, standard_lib=1) diff --git a/meta/recipes-devtools/python/python-native_2.6.6.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb index 0f9ae10..fa943f4 100644 --- a/meta/recipes-devtools/python/python-native_2.6.6.bb +++ b/meta/recipes-devtools/python/python-native_2.6.6.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = openssl-native bzip2-full-native zlib-native readline-native sqlite3-native -PR = ${INC_PR}.1 +PR = ${INC_PR}.2 LIC_FILES_CHKSUM = file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] native.bbclass: generate libdir from libdir_native
currently, the libdir in native.bbclass is inherited from target libdir defined in bitbake.conf. This is not correct in concept, instead, it should be inherited from libdir_native. Current code works because both the target libdir and libdir_native are the same value /usr/lib. But if libdir changes (e.g. to /usr/lib64), then build will break. This patch make libdir generated from libdir_native to fix this issue. Signed-off-by: Yu Ke ke...@intel.com --- meta/classes/native.bbclass |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 90fcd13..d34d1e5 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -67,6 +67,8 @@ base_prefix = ${STAGING_DIR_NATIVE} prefix = ${STAGING_DIR_NATIVE}${prefix_native} exec_prefix = ${STAGING_DIR_NATIVE}${prefix_native} +libdir = ${STAGING_DIR_NATIVE}${libdir_native} + NATIVE_PACKAGE_PATH_SUFFIX = bindir .= ${NATIVE_PACKAGE_PATH_SUFFIX} libdir .= ${NATIVE_PACKAGE_PATH_SUFFIX} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/10] [RFC] patch for non /usr/lib libdir - V2
This is the V2 patches. the changes compared to V1 are: - revise python patch to make the sys.lib deriving from libdir, instead of hardcode to lib64 - add two more fixes: sat-solver and libzypp, with these two more fixes, i can build qemux86-64 core-image-sato and core-image-sato-sdk with libdir=/usr/lib64 Next step, I will do through test to make sure it does not impact normal libdir=/usr/lib case The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b: Tom Zanussi (1): systemtap: remove non-core COMPATIBLE_MACHINES are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/libdir-fix-v2 http://git.pokylinux.org/cgit.cgi//log/?h=kyu3/libdir-fix-v2 Yu Ke (10): native.bbclass: generate libdir from libdir_native openssl: fix for non /usr/lib libdir case libc-package.bbclass: fix for non /usr/lib libdir case python: fix for libdir=/usr/lib64 case python-native: fix for non /usr/lib libdir case perl: fix for non /usr/lib libdir case libcap: fix for non /usr/lib libdir case rpm: fix for non /usr/lib libdir case sat-solver: fix for non /usr/lib libdir case libzypp: fix for non /usr/lib libdir case meta/classes/cmake.bbclass |4 + meta/classes/libc-package.bbclass |4 +- meta/classes/native.bbclass|2 + meta/recipes-connectivity/openssl/openssl.inc |2 +- .../recipes-connectivity/openssl/openssl_0.9.8r.bb |2 +- meta/recipes-devtools/perl/perl_5.12.3.bb |3 +- ...2-distutils-prefix-is-inside-staging-area.patch | 15 +- .../recipes-devtools/python/python-native_2.6.6.bb |2 +- meta/recipes-devtools/python/python/multilib.patch | 250 meta/recipes-devtools/python/python_2.6.6.bb |3 +- meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 +- .../libzypp/libzypp/hardcode-lib-fix.patch | 22 ++ meta/recipes-extended/libzypp/libzypp_git.bb |5 +- meta/recipes-extended/sat-solver/sat-solver_git.bb |6 +- meta/recipes-support/libcap/libcap.inc |5 +- meta/recipes-support/libcap/libcap_2.20.bb |2 +- 16 files changed, 311 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-devtools/python/python/multilib.patch create mode 100644 meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] openssl: fix for non /usr/lib libdir case
if libdir is not /usr/lib, e.g /usr/lib64, openssl build will fail because it still use /usr/lib as library dir. this patch appends the configure option --libdir to specify the correct library directory Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-connectivity/openssl/openssl.inc |2 +- .../recipes-connectivity/openssl/openssl_0.9.8r.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index a338f0e..d42ae1c 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -93,7 +93,7 @@ do_configure () { if [ x$useprefix = x ]; then useprefix=/ fi - perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target + perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target } do_compile () { diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb index 48ec995..c95b1f1 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb @@ -1,6 +1,6 @@ require openssl.inc -PR = r1 +PR = r2 SRC_URI += file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \ -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/10] libc-package.bbclass: fix for non /usr/lib libdir case
if libdir is not /usr/lib, e.g. libdir=/usr/lib64, eglibc will have build failure: cross-localedef --uint32-align=4 --little-endian --force --old-style --no-archive --prefix=/home/kyu3/sdb/lib64/tmp/work/x86_64-poky-linux/eglibc-2.13-r2+svnr14157/locale-tree --inputfile=/home/kyu3/sdb/lib64/tmp/work/x86_64-poky-linux/eglibc-2.13-r2+svnr14157/locale-tree//usr/share/i18n/locales/es_NI --charmap=UTF-8 /home/kyu3/sdb/lib64/tmp/work/x86_64-poky-linux/eglibc-2.13-r2+svnr14157/locale-tree/usr/lib/locale/es_NI NOTE: stdout: NOTE: NOTE: stderr: NOTE: cannot write output files to `(null)': No such file or directory ERROR: Function 'localedef returned an error' failed the reason is that libc-package.bbclass has hard code /usr/lib. This patch fix it by using libdir variable. Signed-off-by: Yu Ke ke...@intel.com --- meta/classes/libc-package.bbclass |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 55e3d48..2ece9ae 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -300,8 +300,8 @@ python package_do_split_gconvs () { raise bb.build.FuncFailed(unknown arch: + target_arch + for locale_arch_options) localedef_opts += --force --old-style --no-archive --prefix=%s \ - --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/usr/lib/locale/%s \ - % (treedir, treedir, datadir, locale, encoding, treedir, name) + --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s%s/locale/%s \ + % (treedir, treedir, datadir, locale, encoding, treedir, libdir, name) cmd = PATH=\%s\ I18NPATH=\%s\ GCONV_PATH=\%s\ cross-localedef %s % \ (path, i18npath, gconvpath, localedef_opts) -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/10] sat-solver: fix for non /usr/lib libdir case
when libdir set to non /usr/lib like /usr/lib64, there is do_configure error: -- Libraries will be installed in /usr/lib CMake Error at /home/kyu3/sdb/lib64/tmp/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:91 (MESSAGE): Please install 'check' and 'check-devel' packages (missing: CHECK_LIBRARY) Call Stack (most recent call first): /home/kyu3/sdb/lib64/tmp/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:252 (_FPHSA_FAILURE_MESSAGE) cmake/modules/FindCheck.cmake:17 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) CMakeLists.txt:35 (FIND_PACKAGE) -- Configuring incomplete, errors occurred! The reason is that cmake did not search /usr/lib64 for libcheck, thus report error add ${libdir} to the CMAKE_SYSTEM_LIBRARY_PATH can fix this issue. Signed-off-by: Yu Ke ke...@intel.com --- meta/classes/cmake.bbclass |4 meta/recipes-extended/sat-solver/sat-solver_git.bb |6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 011c232..7ef6948 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -55,6 +55,10 @@ set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} ) # Use native cmake modules set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ ) + +# add for non /usr/lib libdir, e.g. /usr/lib64 +LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${libdir}) + EOF } diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb index c608bb7..9b212db 100644 --- a/meta/recipes-extended/sat-solver/sat-solver_git.bb +++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb @@ -8,7 +8,7 @@ DEPENDS = libcheck rpm zlib expat db SRCREV = 0a7378d5f482f477a01cf1690d76871ab8bdcc32 PV = 0.0-git${SRCPV} -PR = r10 +PR = r11 PARALLEL_MAKE= @@ -23,7 +23,9 @@ SRC_URI = git://gitorious.org/opensuse/sat-solver.git;protocol=git \ S = ${WORKDIR}/git -EXTRA_OECMAKE += -DLIB=lib -DRPM5=RPM5 -DOE_CORE=OE_CORE +EXTRA_OECMAKE += -DRPM5=RPM5 -DOE_CORE=OE_CORE + +EXTRA_OECMAKE += -DLIB=${@os.path.basename('${libdir}')} inherit cmake pkgconfig -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] python: fix for libdir=/usr/lib64 case
python has several place hard code lib which breaks build when libdir=/usr/lib64. SUSE has a patch to fix this issue. So this patch add the SUSE patch to address this issue Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-devtools/python/python/multilib.patch | 250 meta/recipes-devtools/python/python_2.6.6.bb |3 +- 2 files changed, 252 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/python/python/multilib.patch diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch new file mode 100644 index 000..e8689e4 --- /dev/null +++ b/meta/recipes-devtools/python/python/multilib.patch @@ -0,0 +1,250 @@ +commit 248279e54467a8cd5cde98fc124d1d1384703513 +Author: Yu Ke ke...@intel.com +Date: Tue Jun 28 21:21:29 2011 +0800 + +SUSE patch for the lib64 issue + +see detail in http://bugs.python.org/issue1294959 + +also rebased a bit for Yocto python 2.6.6 + +Picked-by: Yu Ke ke...@intel.com + +Index: Python-2.6.6/Include/pythonrun.h +=== +--- Python-2.6.6.orig/Include/pythonrun.h Python-2.6.6/Include/pythonrun.h +@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); + /* In their own files */ + PyAPI_FUNC(const char *) Py_GetVersion(void); + PyAPI_FUNC(const char *) Py_GetPlatform(void); ++PyAPI_FUNC(const char *) Py_GetLib(void); + PyAPI_FUNC(const char *) Py_GetCopyright(void); + PyAPI_FUNC(const char *) Py_GetCompiler(void); + PyAPI_FUNC(const char *) Py_GetBuildInfo(void); +Index: Python-2.6.6/Lib/distutils/command/install.py +=== +--- Python-2.6.6.orig/Lib/distutils/command/install.py Python-2.6.6/Lib/distutils/command/install.py +@@ -22,6 +22,8 @@ from site import USER_BASE + from site import USER_SITE + + ++libname = sys.lib ++ + if sys.version 2.2: + WINDOWS_SCHEME = { + 'purelib': '$base', +@@ -42,7 +44,7 @@ else: + INSTALL_SCHEMES = { + 'unix_prefix': { + 'purelib': '$base/lib/python$py_version_short/site-packages', +-'platlib': '$platbase/lib/python$py_version_short/site-packages', ++'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +Index: Python-2.6.6/Lib/distutils/sysconfig.py +=== +--- Python-2.6.6.orig/Lib/distutils/sysconfig.py Python-2.6.6/Lib/distutils/sysconfig.py +@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == posix: +-libpython = os.path.join(prefix, +- lib, python + get_python_version()) ++if plat_specific or standard_lib: ++lib = sys.lib ++else: ++lib = lib ++libpython = os.path.join(prefix, lib, python + get_python_version()) + if standard_lib: + return libpython + else: +Index: Python-2.6.6/Lib/pydoc.py +=== +--- Python-2.6.6.orig/Lib/pydoc.py Python-2.6.6/Lib/pydoc.py +@@ -349,7 +349,7 @@ class Doc: + + docloc = os.environ.get(PYTHONDOCS, + http://docs.python.org/library;) +-basedir = os.path.join(sys.exec_prefix, lib, ++basedir = os.path.join(sys.exec_prefix, sys.lib, +python+sys.version[0:3]) + if (isinstance(object, type(os)) and + (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', +Index: Python-2.6.6/Lib/site.py +=== +--- Python-2.6.6.orig/Lib/site.py Python-2.6.6/Lib/site.py +@@ -265,13 +265,19 @@ def addsitepackages(known_paths): + if sys.platform in ('os2emx', 'riscos'): + sitedirs.append(os.path.join(prefix, Lib, site-packages)) + elif os.sep == '/': +-sitedirs.append(os.path.join(prefix, lib, ++sitedirs.append(os.path.join(prefix, sys.lib, + python + sys.version[:3], + site-packages)) +-sitedirs.append(os.path.join(prefix, lib, site-python)) ++if sys.lib != lib: ++sitedirs.append(os.path.join(prefix, lib, ++python + sys.version[:3], ++site-packages)) ++sitedirs.append(os.path.join(prefix, sys.lib, site-python)) ++if sys.lib != lib: ++sitedirs.append(os.path.join(prefix, lib, site-python)) + else: + sitedirs.append(prefix) +-sitedirs.append
[OE-core] [PATCH 07/10] libcap: fix for non /usr/lib libdir case
the recipe has hardcoded lib=lib, which does not work in libdir=/usr/lib64 case where should be lib=lib64, So this patch fix it by replacing lib with libdir Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-support/libcap/libcap.inc |5 +++-- meta/recipes-support/libcap/libcap_2.20.bb |2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 93bdf95..3bff3b9 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -20,8 +20,9 @@ do_configure() { sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } -EXTRA_OEMAKE = LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no -EXTRA_OEMAKE_virtclass-native = LIBATTR=no PAM_CAP=no INDENT= lib=lib +EXTRA_OEMAKE = LIBATTR=yes PAM_CAP=yes INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no +EXTRA_OEMAKE_virtclass-native = LIBATTR=no PAM_CAP=no INDENT= +EXTRA_OEMAKE += lib=${@os.path.basename('${libdir}')} do_compile() { oe_runmake diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb index ab3638a..c9741c2 100644 --- a/meta/recipes-support/libcap/libcap_2.20.bb +++ b/meta/recipes-support/libcap/libcap_2.20.bb @@ -1,6 +1,6 @@ require libcap.inc -PR = r1 +PR = r2 SRC_URI[md5sum] = 10e47ed32ca2214eb0e58780282d27b4 SRC_URI[sha256sum] = 20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/10] [RFC] patch for non /usr/lib libdir - V2
on 2011-7-11 15:40, Koen Kooi wrote: Op 11 jul 2011, om 09:23 heeft Yu Ke het volgende geschreven: This is the V2 patches. the changes compared to V1 are: - revise python patch to make the sys.lib deriving from libdir, instead of hardcode to lib64 - add two more fixes: sat-solver and libzypp, with these two more fixes, i can build qemux86-64 core-image-sato and core-image-sato-sdk with libdir=/usr/lib64 Next step, I will do through test to make sure it does not impact normal libdir=/usr/lib case The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b: Tom Zanussi (1): systemtap: remove non-core COMPATIBLE_MACHINES are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/libdir-fix-v2 Do you also have patches against oe-core instead of poky? Not yet. But I assume the difference between poky and oe-core is very small. do you see issue of applying these patches to oe-core? if so, I am happy to rebase this patch against oe-core. http://git.pokylinux.org/cgit.cgi//log/?h=kyu3/libdir-fix-v2 That one doesn't exist oh, this URL is generated by the create-pull-request script. seems there is some issue. Here is the correct URL: http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=kyu3/libdir-fix-v2 Yu Ke (10): native.bbclass: generate libdir from libdir_native openssl: fix for non /usr/lib libdir case libc-package.bbclass: fix for non /usr/lib libdir case python: fix for libdir=/usr/lib64 case python-native: fix for non /usr/lib libdir case perl: fix for non /usr/lib libdir case libcap: fix for non /usr/lib libdir case rpm: fix for non /usr/lib libdir case sat-solver: fix for non /usr/lib libdir case libzypp: fix for non /usr/lib libdir case meta/classes/cmake.bbclass |4 + meta/classes/libc-package.bbclass |4 +- meta/classes/native.bbclass|2 + meta/recipes-connectivity/openssl/openssl.inc |2 +- .../recipes-connectivity/openssl/openssl_0.9.8r.bb |2 +- meta/recipes-devtools/perl/perl_5.12.3.bb |3 +- ...2-distutils-prefix-is-inside-staging-area.patch | 15 +- .../recipes-devtools/python/python-native_2.6.6.bb |2 +- meta/recipes-devtools/python/python/multilib.patch | 250 meta/recipes-devtools/python/python_2.6.6.bb |3 +- meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 +- .../libzypp/libzypp/hardcode-lib-fix.patch | 22 ++ meta/recipes-extended/libzypp/libzypp_git.bb |5 +- meta/recipes-extended/sat-solver/sat-solver_git.bb |6 +- meta/recipes-support/libcap/libcap.inc |5 +- meta/recipes-support/libcap/libcap_2.20.bb |2 +- 16 files changed, 311 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-devtools/python/python/multilib.patch create mode 100644 meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] libc-package.bbclass: fix for non /usr/lib libdir case
if libdir is not /usr/lib, e.g. libdir=/usr/lib64, eglibc will have build failure: cross-localedef --uint32-align=4 --little-endian --force --old-style --no-archive --prefix=/home/kyu3/sdb/lib64/tmp/work/x86_64-poky-linux/eglibc-2.13-r2+svnr14157/locale-tree --inputfile=/home/kyu3/sdb/lib64/tmp/work/x86_64-poky-linux/eglibc-2.13-r2+svnr14157/locale-tree//usr/share/i18n/locales/es_NI --charmap=UTF-8 /home/kyu3/sdb/lib64/tmp/work/x86_64-poky-linux/eglibc-2.13-r2+svnr14157/locale-tree/usr/lib/locale/es_NI NOTE: stdout: NOTE: NOTE: stderr: NOTE: cannot write output files to `(null)': No such file or directory ERROR: Function 'localedef returned an error' failed the reason is that libc-package.bbclass has hard code /usr/lib. This patch fix it by using libdir variable. Signed-off-by: Yu Ke ke...@intel.com --- meta/classes/libc-package.bbclass |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 55e3d48..2ece9ae 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -300,8 +300,8 @@ python package_do_split_gconvs () { raise bb.build.FuncFailed(unknown arch: + target_arch + for locale_arch_options) localedef_opts += --force --old-style --no-archive --prefix=%s \ - --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/usr/lib/locale/%s \ - % (treedir, treedir, datadir, locale, encoding, treedir, name) + --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s%s/locale/%s \ + % (treedir, treedir, datadir, locale, encoding, treedir, libdir, name) cmd = PATH=\%s\ I18NPATH=\%s\ GCONV_PATH=\%s\ cross-localedef %s % \ (path, i18npath, gconvpath, localedef_opts) -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] openssl: fix for non /usr/lib libdir case
if libdir is not /usr/lib, e.g /usr/lib64, openssl build will fail because it still use /usr/lib as library dir. this patch appends the configure option --libdir to specify the correct library directory Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-connectivity/openssl/openssl.inc |2 +- .../recipes-connectivity/openssl/openssl_0.9.8r.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index a338f0e..d42ae1c 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -93,7 +93,7 @@ do_configure () { if [ x$useprefix = x ]; then useprefix=/ fi - perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target + perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target } do_compile () { diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb index 48ec995..c95b1f1 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb @@ -1,6 +1,6 @@ require openssl.inc -PR = r1 +PR = r2 SRC_URI += file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \ -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8] python: fix for libdir=/usr/lib64 case
python has several place hard code lib which breaks build when libdir=/usr/lib64. SUSE has a patch to fix this issue. So this patch add the SUSE patch to address this issue Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-devtools/python/python/multilib.patch | 295 meta/recipes-devtools/python/python_2.6.6.bb |3 +- 2 files changed, 297 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/python/python/multilib.patch diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch new file mode 100644 index 000..71c890b --- /dev/null +++ b/meta/recipes-devtools/python/python/multilib.patch @@ -0,0 +1,295 @@ +commit 248279e54467a8cd5cde98fc124d1d1384703513 +Author: Yu Ke ke...@intel.com +Date: Tue Jun 28 21:21:29 2011 +0800 + +SUSE patch for the lib64 issue + +see detail in http://bugs.python.org/issue1294959 + +also rebased a bit for Yocto python 2.6.6 + +Picked-by: Yu Ke ke...@intel.com + +diff --git a/Include/pythonrun.h b/Include/pythonrun.h +index 039b498..e8ee59a 100644 +--- a/Include/pythonrun.h b/Include/pythonrun.h +@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void); + /* In their own files */ + PyAPI_FUNC(const char *) Py_GetVersion(void); + PyAPI_FUNC(const char *) Py_GetPlatform(void); ++PyAPI_FUNC(const char *) Py_GetArch(void); ++PyAPI_FUNC(const char *) Py_GetLib(void); + PyAPI_FUNC(const char *) Py_GetCopyright(void); + PyAPI_FUNC(const char *) Py_GetCompiler(void); + PyAPI_FUNC(const char *) Py_GetBuildInfo(void); +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index 76efe3b..2a9913f 100644 +--- a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +@@ -22,6 +22,8 @@ from site import USER_BASE + from site import USER_SITE + + ++libname = sys.lib ++ + if sys.version 2.2: + WINDOWS_SCHEME = { + 'purelib': '$base', +@@ -42,7 +44,7 @@ else: + INSTALL_SCHEMES = { + 'unix_prefix': { + 'purelib': '$base/lib/python$py_version_short/site-packages', +-'platlib': '$platbase/lib/python$py_version_short/site-packages', ++'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 350e48c..13bb5da 100644 +--- a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == posix: +-libpython = os.path.join(prefix, +- lib, python + get_python_version()) ++if plat_specific or standard_lib: ++lib = sys.lib ++else: ++lib = lib ++libpython = os.path.join(prefix, lib, python + get_python_version()) + if standard_lib: + return libpython + else: +diff --git a/Lib/pydoc.py b/Lib/pydoc.py +index 20f4952..4ffb644 100755 +--- a/Lib/pydoc.py b/Lib/pydoc.py +@@ -349,7 +349,7 @@ class Doc: + + docloc = os.environ.get(PYTHONDOCS, + http://docs.python.org/library;) +-basedir = os.path.join(sys.exec_prefix, lib, ++basedir = os.path.join(sys.exec_prefix, sys.lib, +python+sys.version[0:3]) + if (isinstance(object, type(os)) and + (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', +diff --git a/Lib/site.py b/Lib/site.py +index 66c56c2..12b1c8e 100644 +--- a/Lib/site.py b/Lib/site.py +@@ -265,13 +265,19 @@ def addsitepackages(known_paths): + if sys.platform in ('os2emx', 'riscos'): + sitedirs.append(os.path.join(prefix, Lib, site-packages)) + elif os.sep == '/': +-sitedirs.append(os.path.join(prefix, lib, ++sitedirs.append(os.path.join(prefix, sys.lib, + python + sys.version[:3], + site-packages)) +-sitedirs.append(os.path.join(prefix, lib, site-python)) ++if sys.lib != lib: ++sitedirs.append(os.path.join(prefix, lib, ++python + sys.version[:3], ++site-packages)) ++sitedirs.append(os.path.join(prefix, sys.lib, site-python)) ++if sys.lib != lib: ++sitedirs.append(os.path.join(prefix, lib, site-python)) + else: + sitedirs.append(prefix) +-sitedirs.append(os.path.join(prefix, lib, site-packages)) ++sitedirs.append(os.path.join(prefix, sys.lib, site-packages)) + + if sys.platform == darwin
[OE-core] [PATCH 0/8] [RFC] patch for non /usr/lib libdir
in multilib case, libdir is usually not standard /usr/lib, so this series of patches are addressing some recipes's build failure when libdir is not /usr/lib, for example, libdir=/usr/lib64. All the patches have no impact to current libdir=/usr/lib situation, since they just replace the hardcode /usr/lib with libdir. Signed-off-by: Yu Ke ke...@intel.com The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b: Tom Zanussi (1): systemtap: remove non-core COMPATIBLE_MACHINES are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/libdir-fix http://git.pokylinux.org/cgit.cgi//log/?h=kyu3/libdir Yu Ke (8): native.bbclass: generate libdir from libdir_native openssl: fix for non /usr/lib libdir case libc-package.bbclass: fix for non /usr/lib libdir case python: fix for libdir=/usr/lib64 case python-native: fix for non /usr/lib libdir case perl: fix for non /usr/lib libdir case libcap: fix for non /usr/lib libdir case rpm: fix for non /usr/lib libdir case meta/classes/libc-package.bbclass |4 +- meta/classes/native.bbclass|2 + meta/recipes-connectivity/openssl/openssl.inc |2 +- .../recipes-connectivity/openssl/openssl_0.9.8r.bb |2 +- meta/recipes-devtools/perl/perl_5.12.3.bb |3 +- ...2-distutils-prefix-is-inside-staging-area.patch | 15 +- .../recipes-devtools/python/python-native_2.6.6.bb |2 +- meta/recipes-devtools/python/python/multilib.patch | 295 meta/recipes-devtools/python/python_2.6.6.bb |3 +- meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 +- meta/recipes-support/libcap/libcap.inc |5 +- meta/recipes-support/libcap/libcap_2.20.bb |2 +- 12 files changed, 323 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-devtools/python/python/multilib.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] perl: fix for non /usr/lib libdir case
the config.sh is hardcoded to be /usr/lib, which does not work in non /usr/lib libdir case. This patch replace the hard code /usr/lib with ${libdir} to fix this issue Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-devtools/perl/perl_5.12.3.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb index b053482..88dcfdd 100644 --- a/meta/recipes-devtools/perl/perl_5.12.3.bb +++ b/meta/recipes-devtools/perl/perl_5.12.3.bb @@ -8,7 +8,7 @@ PRIORITY = optional # We need gnugrep (for -I) DEPENDS = virtual/db grep-native DEPENDS += gdbm zlib -PR = r1 +PR = r2 # 5.10.1 has Module::Build built-in PROVIDES += libmodule-build-perl @@ -150,6 +150,7 @@ do_configure() { -e 's,@ARCH@-thread-multi,,g' \ -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ -e s%/usr/include%${STAGING_INCDIR}%g \ + -e 's,/usr/lib/,${libdir}/,g' \ -e 's,/usr/,${exec_prefix}/,g' \ -e 's,/perl5,/perl,g' \ config.sh-${TARGET_ARCH}-${TARGET_OS} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] native.bbclass: generate libdir from libdir_native
currently, the libdir in native.bbclass is inherited from target libdir defined in bitbake.conf. This is not correct in concept, instead, it should be inherited from libdir_native. Current code works because both the target libdir and libdir_native are the same value /usr/lib. But if libdir changes (e.g. to /usr/lib64), then build will break. This patch make libdir generated from libdir_native to fix this issue. Signed-off-by: Yu Ke ke...@intel.com --- meta/classes/native.bbclass |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 90fcd13..d34d1e5 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -67,6 +67,8 @@ base_prefix = ${STAGING_DIR_NATIVE} prefix = ${STAGING_DIR_NATIVE}${prefix_native} exec_prefix = ${STAGING_DIR_NATIVE}${prefix_native} +libdir = ${STAGING_DIR_NATIVE}${libdir_native} + NATIVE_PACKAGE_PATH_SUFFIX = bindir .= ${NATIVE_PACKAGE_PATH_SUFFIX} libdir .= ${NATIVE_PACKAGE_PATH_SUFFIX} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] python-native: fix for non /usr/lib libdir case
the get_python_lib() use hard code lib. when other recipe building use python-native, the STAGING_LIBDIR is non /usr/lib, so the hard code lib will break the build This patch replace the hardcoded lib with value from libdir to fix this issue. Signed-off-by: Yu Ke ke...@intel.com --- ...2-distutils-prefix-is-inside-staging-area.patch | 15 +++ .../recipes-devtools/python/python-native_2.6.6.bb |2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch index 9532eb3..8e721fe 100644 --- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch @@ -30,19 +30,26 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py if os.name == posix: if python_build: -@@ -116,7 +119,10 @@ def get_python_lib(plat_specific=0, stan +@@ -115,12 +118,16 @@ def get_python_lib(plat_specific=0, stan + If 'prefix' is supplied, use it instead of sys.prefix or sys.exec_prefix -- i.e., ignore 'plat_specific'. ++lib_basename = os.getenv(libdir).split('/')[-1] if prefix is None: -prefix = plat_specific and EXEC_PREFIX or PREFIX +if plat_specific: -+prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') ++prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename) +else: +prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == posix: libpython = os.path.join(prefix, -@@ -216,7 +222,7 @@ def get_config_h_filename(): +- lib, python + get_python_version()) ++ lib_basename, python + get_python_version()) + if standard_lib: + return libpython + else: +@@ -216,7 +223,7 @@ def get_config_h_filename(): else: # The name of the config.h file changed in 2.2 config_h = 'pyconfig.h' @@ -51,7 +58,7 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py def get_makefile_filename(): -@@ -225,7 +231,7 @@ def get_makefile_filename(): +@@ -225,7 +232,7 @@ def get_makefile_filename(): return os.path.join(os.path.dirname(os.path.realpath(sys.executable)), Makefile) lib_dir = get_python_lib(plat_specific=1, standard_lib=1) diff --git a/meta/recipes-devtools/python/python-native_2.6.6.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb index 0f9ae10..fa943f4 100644 --- a/meta/recipes-devtools/python/python-native_2.6.6.bb +++ b/meta/recipes-devtools/python/python-native_2.6.6.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = openssl-native bzip2-full-native zlib-native readline-native sqlite3-native -PR = ${INC_PR}.1 +PR = ${INC_PR}.2 LIC_FILES_CHKSUM = file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] rpm: fix for non /usr/lib libdir case
rpm default will use /usr/lib if the --with-path-lib is not specified. this will not work in non /usr/lib libdir case. so this patch add the --with-path-lib to fix this issue. Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 0c88f91..075c91a 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 DEPENDS = bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps} extrarpmdeps = python perl extrarpmdeps_virtclass-native = -PR = r17 +PR = r18 # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -162,6 +162,7 @@ EXTRA_OECONF = --verbose \ --enable-build-debug \ --enable-maintainer-mode \ --with-path-macros=${rpm_macros} \ + --with-path-lib=${libdir}/rpm \ --with-bugreport=http://bugzilla.yoctoproject.org; CFLAGS_append = -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] libcap: fix for non /usr/lib libdir case
the recipe has hardcoded lib=lib, which does not work in libdir=/usr/lib64 case where should be lib=lib64, So this patch fix it by replacing lib with libdir Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-support/libcap/libcap.inc |5 +++-- meta/recipes-support/libcap/libcap_2.20.bb |2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 93bdf95..3bff3b9 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -20,8 +20,9 @@ do_configure() { sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } -EXTRA_OEMAKE = LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no -EXTRA_OEMAKE_virtclass-native = LIBATTR=no PAM_CAP=no INDENT= lib=lib +EXTRA_OEMAKE = LIBATTR=yes PAM_CAP=yes INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no +EXTRA_OEMAKE_virtclass-native = LIBATTR=no PAM_CAP=no INDENT= +EXTRA_OEMAKE += lib=${@os.path.basename('${libdir}')} do_compile() { oe_runmake diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb index ab3638a..c9741c2 100644 --- a/meta/recipes-support/libcap/libcap_2.20.bb +++ b/meta/recipes-support/libcap/libcap_2.20.bb @@ -1,6 +1,6 @@ require libcap.inc -PR = r1 +PR = r2 SRC_URI[md5sum] = 10e47ed32ca2214eb0e58780282d27b4 SRC_URI[sha256sum] = 20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sato-sdk: add clutter for sato-sdk image
Yocto ADT has Eclips clutter template, so it is better to have clutter in SDK image to support ADT. this patch add clutter and clutter-box2d app to sato-sdk image for this purpose Fix [YOCTO #891] Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-core/tasks/task-core-tools.bb |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb index 4a98b0f..44520a7 100644 --- a/meta/recipes-core/tasks/task-core-tools.bb +++ b/meta/recipes-core/tasks/task-core-tools.bb @@ -82,4 +82,6 @@ RDEPENDS_task-core-tools-testapps = \ xrestop \ xwininfo \ xprop \ -xvideo-tests +xvideo-tests \ +clutter-box2d-1.6 \ + -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] sato-sdk: add clutter to fix bug 891
The following changes since commit ad2363278f0ea86fcf3464f8f6073d3a3d06be63: Khem Raj (1): uclibc: Fix compilation in thumb mode are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/bug891 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug891 Yu Ke (1): sato-sdk: add clutter for sato-sdk image meta/recipes-core/tasks/task-core-tools.bb |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/8] python: fix for libdir=/usr/lib64 case
on 2011-7-8 3:22, Richard Purdie wrote: On Thu, 2011-07-07 at 22:10 +0800, Yu Ke wrote: python has several place hard code lib which breaks build when libdir=/usr/lib64. SUSE has a patch to fix this issue. So this patch add the SUSE patch to address this issue Signed-off-by: Yu Keke...@intel.com [...] ++AC_SUBST(LIB) ++AC_MSG_CHECKING(LIB) ++case $ac_sys_system in ++Linux*) ++ # Test if the compiler is 64bit ++ echo 'int i;' conftest.$ac_ext ++ python_cv_cc_64bit_output=no ++ if AC_TRY_EVAL(ac_compile); then ++case `/usr/bin/file conftest.$ac_objext` in ++*ELF 64*) ++ python_cv_cc_64bit_output=yes ++ ;; ++esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++case $ARCH:$python_cv_cc_64bit_output in ++ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++ LIB=lib64 ++ ;; ++*:*) ++ LIB=lib ++ ;; ++esac ++AC_MSG_RESULT($LIB) + This patch is good apart from this bit. I think we need to be able to pass in our own string to use here which we derive from the libdir variable... Yes, indeed. I will revise it to use libdir instead of hardcode lib/lib64. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] sqlite: upgrade from 3.7.6.2 to 3.7.7.1
Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb | 10 -- meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb | 10 ++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb deleted file mode 100644 index 34d1653..000 --- a/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require sqlite3.inc - -LIC_FILES_CHKSUM = file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0 - -SRC_URI = http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz; -S = ${WORKDIR}/sqlite-autoconf-3070602 -PR = r0 - -SRC_URI[md5sum] = f16c08617968b4087b3d591fd575f59f -SRC_URI[sha256sum] = 53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81 diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb b/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb new file mode 100644 index 000..5651c07 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb @@ -0,0 +1,10 @@ +require sqlite3.inc + +LIC_FILES_CHKSUM = file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0 + +SRC_URI = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz; +S = ${WORKDIR}/sqlite-autoconf-3070701 +PR = r0 + +SRC_URI[md5sum] = 554026fe7fac47b1cf61c18d5fe43419 +SRC_URI[sha256sum] = 7dcc36b25f7bcbe2938d0ea2baea5b706f0af93473d02a3f612d7ab39e386edf -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] xauth: upgrade from 1.05 to 1.06
Signed-off-by: Yu Ke ke...@intel.com --- .../xorg-app/{xauth_1.0.5.bb = xauth_1.0.6.bb}|4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-app/{xauth_1.0.5.bb = xauth_1.0.6.bb} (68%) diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.5.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.6.bb similarity index 68% rename from meta/recipes-graphics/xorg-app/xauth_1.0.5.bb rename to meta/recipes-graphics/xorg-app/xauth_1.0.6.bb index 23986ac..f00d30a 100644 --- a/meta/recipes-graphics/xorg-app/xauth_1.0.5.bb +++ b/meta/recipes-graphics/xorg-app/xauth_1.0.6.bb @@ -9,5 +9,5 @@ DEPENDS += libxau libxext libxmu PR = r0 PE = 1 -SRC_URI[md5sum] = 46fc44e5e947d3720f3be5054044ff0e -SRC_URI[sha256sum] = 6d139500ff1daf806525adf071f8c1778ad138a0378c73ea831ad18847ad746c +SRC_URI[md5sum] = 105f5b00bb9293b3db36f7e500d4f950 +SRC_URI[sha256sum] = a686406951f0ed6be45bc26182a1423e2cdffad2d492b33ff3fbf72f7bcb6b0b -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] upgrade recipes
upgrade the recipe libidn, libdrm, xauth, sqlite, also update the manual check field in distro_tracking_field The following changes since commit ad2363278f0ea86fcf3464f8f6073d3a3d06be63: Khem Raj (1): uclibc: Fix compilation in thumb mode are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/upgrade-0701 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-0701 Yu Ke (5): libidn: upgrade from 1.20 to 1.22 libdrm: upgrade to 2.4.26 xauth: upgrade from 1.05 to 1.06 sqlite: upgrade from 3.7.6.2 to 3.7.7.1 distro_tracking_field: update the manually check field .../conf/distro/include/distro_tracking_fields.inc |6 +- .../libidn/{libidn_1.20.bb = libidn_1.22.bb} |5 + meta/recipes-graphics/drm/libdrm.inc |3 +++ .../{libdrm-2.4.25 = libdrm}/installtests.patch |0 .../drm/{libdrm_2.4.25.bb = libdrm_2.4.26.bb} |4 ++-- .../xorg-app/{xauth_1.0.5.bb = xauth_1.0.6.bb}|4 ++-- meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb | 10 -- meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb | 10 ++ 8 files changed, 23 insertions(+), 19 deletions(-) rename meta/recipes-extended/libidn/{libidn_1.20.bb = libidn_1.22.bb} (79%) rename meta/recipes-graphics/drm/{libdrm-2.4.25 = libdrm}/installtests.patch (100%) rename meta/recipes-graphics/drm/{libdrm_2.4.25.bb = libdrm_2.4.26.bb} (54%) rename meta/recipes-graphics/xorg-app/{xauth_1.0.5.bb = xauth_1.0.6.bb} (68%) delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] libidn: upgrade from 1.20 to 1.22
- update the license checksum due to some text indent change Signed-off-by: Yu Ke ke...@intel.com --- .../libidn/{libidn_1.20.bb = libidn_1.22.bb} |5 + 1 files changed, 1 insertions(+), 4 deletions(-) rename meta/recipes-extended/libidn/{libidn_1.20.bb = libidn_1.22.bb} (79%) diff --git a/meta/recipes-extended/libidn/libidn_1.20.bb b/meta/recipes-extended/libidn/libidn_1.22.bb similarity index 79% rename from meta/recipes-extended/libidn/libidn_1.20.bb rename to meta/recipes-extended/libidn/libidn_1.22.bb index fa8953b..cf08eaf 100644 --- a/meta/recipes-extended/libidn/libidn_1.20.bb +++ b/meta/recipes-extended/libidn/libidn_1.22.bb @@ -4,7 +4,7 @@ HOMEPAGE = http://www.gnu.org/software/libidn/; SECTION = libs LICENSE = LGPLv2.1+ GPLv3+ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://lib/idna.h;endline=21;md5=dbd4426bbc38846d5a6b94c3570fd756 \ file://src/idn.c;endline=20;md5=e7bc77cab53f7367b7e381aaa546e76c PR = r0 @@ -13,9 +13,6 @@ inherit pkgconfig autotools gettext SRC_URI = ${GNU_MIRROR}/libidn/${P}.tar.gz -SRC_URI[md5sum] = 03996d474a696e59fdddbee87fc9519c -SRC_URI[sha256sum] = e1bff472e8dce11064508ef5acbd6ac72371d0028f15c65f4a91ed157bfca8b1 - # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ # so package command into a separate package PACKAGES =+ idn -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] distro_tracking_field: update the manually check field
sqlite3 qemugl console-tools gconf-dbus Signed-off-by: Yu Ke ke...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index ad64581..5af3c73 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -492,11 +492,12 @@ RECIPE_STATUS_pn-sqlite3 = green # need upgrade RECIPE_LAST_UPDATE_pn-sqlite3 = Nov 24, 2010 RECIPE_MAINTAINER_pn-sqlite3 = Yu Ke ke...@intel.com RECIPE_DEPENDENCY_CHECK_pn-sqlite3 = not done -RECIPE_LATEST_VERSION_pn-sqlite3 = 3.7.3 +RECIPE_LATEST_VERSION_pn-sqlite3 = 3.7.7.1 RECIPE_INTEL_SECTION_pn-sqlite3 = base libs RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sqlite3 = 1 month RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = 10/2010 RECIPE_COMMENTS_pn-sqlite3 = +RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= Jul 01, 2011 RECIPE_STATUS_pn-libpthread-stubs = green RECIPE_LAST_UPDATE_pn-libpthread-stubs = Jul 6, 2010 @@ -1249,6 +1250,7 @@ RECIPE_LATEST_VERSION_pn-console-tools = 0.3.2 RECIPE_LAST_UPDATE_pn-console-tools = Jul 21, 2006 RECIPE_MAINTAINER_pn-console-tools = Yu Ke ke...@intel.com DISTRO_PN_ALIAS_pn-console-tools = Debian=console-tools Ubuntu=console-tools +RECIPE_MANUAL_CHECK_DATE_pn-console-tools= Jul 01, 2011 RECIPE_STATUS_pn-fuse = red RECIPE_LATEST_VERSION_pn-fuse = 2.8.4 @@ -1463,6 +1465,7 @@ RECIPE_INTEL_SECTION_pn-gconf-dbus = base utils RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gconf-dbus = n/a RECIPE_LATEST_RELEASE_DATE_pn-gconf-dbus = n/a RECIPE_COMMENTS_pn-gconf-dbus = difficult to identify official site and current status +RECIPE_MANUAL_CHECK_DATE_pn-gconf-dbus = Jul 01, 2011 RECIPE_STATUS_pn-elfutils =green # no update needed RECIPE_LAST_UPDATE_pn-elfutils = Jul 16, 2010 @@ -3359,6 +3362,7 @@ RECIPE_INTEL_SECTION_pn-qemugl=graphic app RECIPE_LAST_UPDATE_pn-qemugl = Nov 28, 2010 RECIPE_NO_UPDATE_REASON_pn-qemugl = Do not upgrade to version: 33466cd8 because the upstream is broken in x86_64 build RECIPE_MAINTAINER_pn-qemugl=Yu Ke ke...@intel.com +RECIPE_MANUAL_CHECK_DATE_pn-qemugl= Jul 01, 2011 RECIPE_STATUS_pn-fotowall=green # no update needed RECIPE_LATEST_VERSION_pn-fotowall=0.9 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] libdrm: upgrade to 2.4.26
Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-graphics/drm/libdrm.inc |3 +++ .../{libdrm-2.4.25 = libdrm}/installtests.patch |0 .../drm/{libdrm_2.4.25.bb = libdrm_2.4.26.bb} |4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-graphics/drm/{libdrm-2.4.25 = libdrm}/installtests.patch (100%) rename meta/recipes-graphics/drm/{libdrm_2.4.25.bb = libdrm_2.4.26.bb} (54%) diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index a66afad..1ad9dc3 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc @@ -10,6 +10,9 @@ SRC_URI = http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2; PROVIDES = drm DEPENDS = libpthread-stubs udev cairo virtual/libx11 +#libpciaccess is required starting from libdrm 2.4.26 +DEPENDS += libpciaccess + inherit autotools pkgconfig PACKAGES =+ libdrm-tests diff --git a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch similarity index 100% rename from meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch rename to meta/recipes-graphics/drm/libdrm/installtests.patch diff --git a/meta/recipes-graphics/drm/libdrm_2.4.25.bb b/meta/recipes-graphics/drm/libdrm_2.4.26.bb similarity index 54% rename from meta/recipes-graphics/drm/libdrm_2.4.25.bb rename to meta/recipes-graphics/drm/libdrm_2.4.26.bb index 177e444..e5aa6a4 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.25.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.26.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 SRC_URI += file://installtests.patch -SRC_URI[md5sum] = f53dc4c72109b17908e4113c3b8addfe -SRC_URI[sha256sum] = 51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f +SRC_URI[md5sum] = 062569426773f69b11a47a7712bba770 +SRC_URI[sha256sum] = b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc PR = r0 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] RFC: combo layer tool v2
This is the V2 RFC patch of combo layer tool. Thanks for Paul and Chris's valuable review, the version includes all their comments: - fix several grammar issue - fix the incorrect patch range - print the component repo name when updating - delete the temporary directory when it is done - use the python ConfigParser class to simplify the parsing The following changes since commit b30cb584a738915113e88b7db1028d53b2bae5f9: Richard Purdie (1): Revert gcc: rebase the patch to avoid patch rejection are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/combo-layer-v3 http://git.pokylinux.org/cgit.cgi//log/?h=kyu3/combo-layer-v3 Yu Ke (1): combo-layer-tool: add tool to manipulate combo layer scripts/combo-layer | 360 +++ scripts/combo-layer-hook-default.sh | 13 ++ scripts/combo-layer.conf.example| 37 3 files changed, 410 insertions(+), 0 deletions(-) create mode 100755 scripts/combo-layer create mode 100755 scripts/combo-layer-hook-default.sh create mode 100644 scripts/combo-layer.conf.example ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] combo-layer-tool: add tool to manipulate combo layer
This patch adds the script combo-layer.py to manipulate the combo layer repo. A combo layer repo is a repo containing multiple component repo, e.g. oe-core, bitbake, BSP repos. The combo layer repo need to be updated by syncing with the component repo upstream. This script is written to assist the combo layer handling. Combo layer tool provides three functionalities: - init: when the combo layer repo and component repo is not existed, init will git init the combo layer repo, and also git clone the component repo - update: combo layer tool will pull the latest commit from component repo upstream, and apply the commit since last update commit to the combo repo. If user specify interactive mode(--interactive), user can edit the patch list to select which commit to apply. - splitpatch: split the combo repo commit into separate patches per component repo. So that user can submit the patch to component repo upstream. Combo layer tool uses config file to define the component repo info. please check the combo-layer.conf.example for the detail explanation of the config file field. CC: Richard Purdie richard.pur...@linuxfoundation.org CC: Paul Eggleton paul.eggle...@intel.com CC: Chris Larson clar...@kergoth.com Signed-off-by: Yu Ke ke...@intel.com --- scripts/combo-layer | 360 +++ scripts/combo-layer-hook-default.sh | 13 ++ scripts/combo-layer.conf.example| 37 3 files changed, 410 insertions(+), 0 deletions(-) create mode 100755 scripts/combo-layer create mode 100755 scripts/combo-layer-hook-default.sh create mode 100644 scripts/combo-layer.conf.example diff --git a/scripts/combo-layer b/scripts/combo-layer new file mode 100755 index 000..ef798ab --- /dev/null +++ b/scripts/combo-layer @@ -0,0 +1,360 @@ +#!/usr/bin/env python +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# Copyright 2011 Intel Corporation +# Authored-by: Richard Purdie richard.pur...@intel.com +# Paul Eggleton paul.eggle...@intel.com +# Yu Ke ke...@intel.com +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# 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., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os, sys +import optparse +import logging +import subprocess +import ConfigParser + +__version__ = 0.1.0 + +def logger_create(): +logger = logging.getLogger() +loggerhandler = logging.StreamHandler() +loggerhandler.setFormatter(logging.Formatter([%(asctime)s] %(message)s,%H:%M:%S)) +logger.addHandler(loggerhandler) +logger.setLevel(logging.INFO) +return logger + +logger = logger_create() + +class Configuration(object): + +Manages the configuration + +A valid conf looks like: + +# repo name +[bitbake] + +# mandatory options + +# git upstream uri +src_uri = git://git.openembedded.org/bitbake + +# the directory to clone the component repo +local_repo_dir = ~/src/bitbake + +# the relative dir to commit the repo patch +# use . if it is root dir +dest_dir = bitbake + +# the updated revision last time. +# leave it empty if no commit updated yet, and then the tool +# will start from the first commit +last_revision = + +# optional options + +# file_filter: only include the interested file +# file_filter = [path] [path] ... +# example: +# file_filter = src/ : only include the subdir src +# file_filter = src/*.c : only include the src *.c file +# file_filter = src/main.c src/Makefile.am : only include these two files + +[oe-core] +src_uri = git://git.openembedded.org/openembedded-core +local_repo_dir = ~/src/oecore +dest_dir = . +last_revision = + +# more repos ... + + +def __init__(self, options): +for key, val in options.__dict__.items(): +setattr(self, key, val) +self.parser = ConfigParser.ConfigParser() +self.parser.readfp(open(self.conffile)) +self.repos = {} +for repo in self.parser.sections(): +self.repos[repo] = {} +for (name, value) in self.parser.items(repo): +self.repos[repo][name] = value + +def update(self, repo, option, value): +self.parser.set(repo, option, value) +self.parser.write(open(self.conffile, w)) + +def sanity_check(self): +required_options=[src_uri, local_repo_dir, dest_dir, last_revision] +msg = +for name in self.repos: +for option in required_options
Re: [OE-core] [PATCH] RFC - combo layer repo tool
on 2011-6-19 6:47, Chris Larson wrote: On Fri, Jun 17, 2011 at 10:42 AM, Paul Eggletonpaul.eggle...@intel.com wrote: Hi Ke, Great work. Here's my review so far: On Monday 13 June 2011 14:15:04 Yu, Ke wrote: --- /dev/null +++ b/scripts/combo-layer-hook-default.sh @@ -0,0 +1,14 @@ +#!/bin/sh First thought on starting to read the patch: why are we home rolling a parser when the format is clearly ini style, which the ConfigParser module parses just fine? Paul, Chris, Thanks a lot for your valuable comment. I've sent out the V2 RFC patch, and has all your comments included. Please review. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] distro_tracking_field: update recipe maintainer
reassign Qing's recipe to other team member Signed-off-by: Yu Ke ke...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 111 ++-- 1 files changed, 55 insertions(+), 56 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index f4aa1ea..8318e5f 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -1,7 +1,7 @@ RECIPE_STATUS_pn-diffutils = green RECIPE_LATEST_VERSION_pn-diffutils = 3.0 RECIPE_LAST_UPDATE_pn-diffutils = Dec 10, 2010 -RECIPE_MAINTAINER_pn-diffutils = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-diffutils = Mei Lei lei@intel.com RECIPE_STATUS_pn-epdfview = red RECIPE_LATEST_VERSION_pn-epdfview = check @@ -223,7 +223,7 @@ RECIPE_LATEST_VERSION_pn-dbus = 1.4.1 RECIPE_INTEL_SECTION_pn-dbus = base libs RECIPE_LATEST_RELEASE_DATE_pn-dbus = 12/2010 RECIPE_LAST_UPDATE_pn-dbus = Jan 20, 2011 -RECIPE_MAINTAINER_pn-dbus = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-dbus = Dongxiao Xu dongxiao...@intel.com RECIPE_STATUS_pn-dbus-glib = green RECIPE_DEPENDENCY_CHECK_pn-dbus-glib = not done @@ -325,7 +325,7 @@ RECIPE_MAINTAINER_pn-libtirpc = Dongxiao Xu dongxiao...@intel.com RECIPE_STATUS_pn-gdbm = green RECIPE_LAST_UPDATE_pn-gdbm = Jul 21, 2006 -RECIPE_MAINTAINER_pn-gdbm = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-gdbm = Yu Ke ke...@intel.com RECIPE_LATEST_VERSION_pn-gdbm = 1.8.3 RECIPE_INTEL_SECTION_pn-gdbm = base libs RECIPE_LATEST_RELEASE_DATE_pn-gdbm = 10/2002 @@ -339,7 +339,6 @@ RECIPE_LATEST_RELEASE_DATE_pn-pth = 06/2006 RECIPE_STATUS_pn-python-pycurl = yellow # several exports to work with python RECIPE_LAST_UPDATE_pn-python-pycurl = Mar 25, 2010 -RECIPE_MAINTAINER_pn-python-pycurl = Qing He qing...@intel.com RECIPE_DEPENDENCY_CHECK_pn-python-pycurl = not done RECIPE_LATEST_VERSION_pn-python-pycurl = 7.19.0 RECIPE_PATCH_pn-python-pycurl+no-static-link = no static libraries @@ -426,7 +425,7 @@ RECIPE_COMMENTS_pn-libgcrypt = RECIPE_STATUS_pn-gnutls = yellow # need explict pre configure RECIPE_LAST_UPDATE_pn-gnutls = May 25, 2011 -RECIPE_MAINTAINER_pn-gnutls = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-gnutls = Yu Ke ke...@intel.com RECIPE_DEPENDENCY_CHECK_pn-gnutls = done RECIPE_LATEST_VERSION_pn-gnutls = 2.12.5 RECIPE_PATCH_pn-gnutls+gnutls-openssl = unkown @@ -439,7 +438,7 @@ RECIPE_COMMENTS_pn-gnutls = requires libtasn1, but has an internal copy RECIPE_STATUS_pn-lzo = green RECIPE_LAST_UPDATE_pn-lzo = Dec 31, 2010 -RECIPE_MAINTAINER_pn-lzo = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-lzo = Dexuan Cui dexuan@intel.com RECIPE_LATEST_VERSION_pn-lzo = 2.04 RECIPE_INTEL_SECTION_pn-lzo = base libs RECIPE_LATEST_RELEASE_DATE_pn-lzo = 10/2010 @@ -473,7 +472,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-libnss-mdns = 05/2007 RECIPE_STATUS_pn-ncurses = green RECIPE_LAST_UPDATE_pn-ncurses = Dec 30, 2010 -RECIPE_MAINTAINER_pn-ncurses = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-ncurses = Saul Wold s...@linux.intel.com RECIPE_LATEST_VERSION_pn-ncurses = 5.7 RECIPE_INTEL_SECTION_pn-ncurses = base libs RECIPE_LATEST_RELEASE_DATE_pn-ncurses = 11/2008 @@ -524,7 +523,7 @@ RECIPE_COMMENTS_pn-libcap = RECIPE_STATUS_pn-libevent = green RECIPE_LAST_UPDATE_pn-libevent = Jul 7, 2010 -RECIPE_MAINTAINER_pn-libevent = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libevent = Scott Garman scott.a.gar...@intel.com RECIPE_NO_UPDATE_REASON_pn-libevent=libevent 2 is incompatible RECIPE_LATEST_VERSION_pn-libevent = 2.0.11 RECIPE_INTEL_SECTION_pn-libevent = base libs @@ -533,7 +532,7 @@ RECIPE_MANUAL_CHECK_DATE_pn-libevent = May 24, 2011 RECIPE_STATUS_pn-libnfsidmap = green RECIPE_LAST_UPDATE_pn-libnfsidmap = Jan 20, 2011 -RECIPE_MAINTAINER_pn-libnfsidmap = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libnfsidmap = Scott Garman scott.a.gar...@intel.com RECIPE_LATEST_VERSION_pn-libnfsidmap = 0.24 RECIPE_INTEL_SECTION_pn-libnfsidmap = base libs RECIPE_LATEST_RELEASE_DATE_pn-libnfsidmap = 12/2010 @@ -579,7 +578,7 @@ DISTRO_PN_ALIAS_pn-libcheck = Ubuntu=check Fedora=check OpenSuSE=check RECIPE_STATUS_pn-augeas = green RECIPE_DEPENDENCY_CHECK_pn-augeas = done RECIPE_LAST_UPDATE_pn-augeas = Aug 20, 2010 -RECIPE_MAINTAINER_pn-augeas = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-augeas = Saul Wold s...@linux.intel.com RECIPE_LATEST_VERSION_pn-augeas = 0.7.3 RECIPE_INTEL_SECTION_pn-augeas = base libs RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-augeas = 1 month @@ -594,12 +593,12 @@ RECIPE_INTEL_SECTION_pn-sat-solver = base libs DISTRO_PN_ALIAS_pn-sat-solver = OSPDT OpenSuSE=satsolver-tools RECIPE_COMMENTS_pn-sat-solver = RECIPE_LAST_UPDATE_pn-sat-solver = Aug 20, 2010 -RECIPE_MAINTAINER_pn-sat-solver = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-sat-solver = Mark Hatle mark.ha...@windriver.com RECIPE_STATUS_pn-libzypp = green
[OE-core] [PATCH] RFC - combo layer repo tool
combo-layer-tool: add tool to manipulate combo layer This patch adds the script combo-layer.py to manipulate the combo layer repo. A combo layer repo is a repo containing multiple component repo, e.g. oe-core, bitbake, BSP repos. The combo layer repo need to be updated by syncing with the component repo upstream. This script is written to assist the combo layer handling. See https://wiki.yoctoproject.org/wiki/Layer_Tooling#Combination_repo_tool for detail task description Combo layer tool provides three functionalities: - init: when the combo layer repo and component repo is not existed, init will git init the combo layer repo, and also git clone the component repo - update: combo layer tool will pull the latest commit from component repo upstream, and apply the commit since last update commit to the combo repo. If user specify interactive mode(--interactive), user can edit the patch list to select which commit to apply. - splitpatch: split the combo repo commit into separate patches per component repo. So that user can submit the patch to component repo upstream. Combo layer tool uses config file to define the component repo info. please check the combo-layer.conf.example for the detail explanation  of the config file field.    CC: Richard Purdie richard.pur...@linuxfoundation.org  CC: Paul , Eggleton paul.eggle...@intel.com   Signed-off-by: Yu Ke ke...@intel.com Note: I meeting some difficulty in push it to contrib tree. So just send it out as plain patch for review first. diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh new file mode 100755 index 000..7dec9b8 --- /dev/null +++ b/scripts/combo-layer-hook-default.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# Take a patch from bitbake and apply to poky +# Call as $0 revision to apply +# Parameter: +# $1 patch-file +# $2 revision +# $3 reponame + +patchfile=$1 +rev=$2 +reponame=$3 + +sed -i -e s#Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1# $patchfile +sed -i -e 0,/Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1# $patchfile diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example new file mode 100644 index 000..13a370f --- /dev/null +++ b/scripts/combo-layer.conf.example @@ -0,0 +1,38 @@ +# repo name +[bitbake] +# mandatory options +# git upstream uri +src_uri = git://git.openembedded.org/bitbake + +# the directory to clone the component repo +local_repo_dir = /home/kyu3/src/test/bitbake + +# the relative dir to commit the repo patch +# use . if it is root dir +dest_dir = bitbake + +# the updated revision last time. +# leave it empty if no commit updated yet, and then the tool +# will start from the first commit +last_revision = + +# optional options + +# file_filter: only include the interested file +# file_filter = [path] [path] ... +# example: +# file_filter = src/ : only include the subdir src +# file_filter = src/*.c : only include the src *.c file +# file_filter = src/main.c src/Makefile.am : only include these two files + +# hook: if provided, the tool will call the hook to proceed the generated patch from upstream, +# and then apply the modified patch to combo repo +# the hook's parameter is: ./hook patchpath revision reponame +# example: +# hook = combo-layer-hook-default.sh + +[oe-core] +src_uri = git://git.openembedded.org/openembedded-core +local_repo_dir = /home/kyu3/src/test/oecore +dest_dir = . +last_revision = diff --git a/scripts/combo-layer.py b/scripts/combo-layer.py new file mode 100755 index 000..1ebd81b --- /dev/null +++ b/scripts/combo-layer.py @@ -0,0 +1,405 @@ +#!/usr/bin/env python +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# Copyright 2011 Intel Corporation +# Authored-by: Richard Purdie richard.pur...@intel.com +# Paul Eggleton paul.eggle...@intel.com +# Yu Ke ke...@intel.com +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# 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., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os, sys, re +import optparse +import logging +import subprocess,shlex + +__version__ = 0.1.0 + +def logger_create(): +logger = logging.getLogger() +loggerhandler = logging.StreamHandler() +loggerhandler.setFormatter(logging.Formatter([%(asctime)s] %(message)s,%H:%M:%S
[OE-core] [PATCH 0/1] add mesa-demos to sato-sdk to fix bug 1112
The following changes since commit c412674cf818e77e35857fb93353e392e7ac9e53: Khem Raj (1): package.bbclass,prserv.bbclass: Compare USE_PR_SERV with 1 or 0 are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/bug1112 http://git.pokylinux.org/cgit.cgi//log/?h=kyu3/bug1112 Yu Ke (1): sato-sdk: add mesa-demos application meta/classes/core-image.bbclass |1 + meta/recipes-sato/images/core-image-sato-sdk.bb |2 +- meta/recipes-sato/tasks/task-core.bb|6 +- 3 files changed, 7 insertions(+), 2 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] xserver: force to use libdl
on 2011-5-28 16:07, Richard Purdie wrote: On Sat, 2011-05-28 at 12:45 +0800, Yu Ke wrote: The marco in question is in xorg-server-1.10.1/configure.ac AC_CHECK_FUNC([dlopen], [], AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS=-ldl)) AC_SUBST(DLOPEN_LIBS) Ideally, the dlopen test should fail since dlopen is not available in libc, and then DLOPEN_LIBS=-ldl is executed. In this case, the later build will correctly link libdl. qemux86 fall into this case. But in ppc case, the dlopen test unfortunately pass, and DLOPEN_LIBS become , which caused later linker error of unresolved dlopen reference. but I did not yet understand why ppc is so special. For detail, I've attached two config.log, one for ppc, one for qemux86. in ppc, configure:15235: checking for dlopen configure:15235: result: yes Thanks. If you look at config.log you'll see this near the top: | #modphp | ac_cv_c_bigendian_php=${ac_cv_c_bigendian_php=yes} | ac_cv_sizeof_ptrdiff_t=${ac_cv_sizeof_ptrdiff_t=4} | ac_cv_func_dlopen=${ac_cv_func_dlopen=yes} | lt_cv_dlopen_self=${lt_cv_dlopen_self=yes} and then if you look at the configure script for the xserver you'll see ${ac_cv_func_dlopen} being set to yes is likely triggering the bad result. These are coming from the powerpc site files: richard@rex:poky/meta/site$ grep dlopen * -r powerpc-common:ac_cv_func_dlopen=${ac_cv_func_dlopen=yes} powerpc-common:lt_cv_dlopen_self=${lt_cv_dlopen_self=yes} and I suspect if you remove those two lines, things will work a lot better! Only powerpc has the broken site file which is why only powerpc is affected. Thanks Richard. This make sense and explain why only powerpc has this issue. I've remove these two line, and build the core-image-sato-sdk qemuppc, it passed. I will send out the patch. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix powerpc xserver dlopen issue
Fix Yocto bug 736, 737 The following changes since commit c412674cf818e77e35857fb93353e392e7ac9e53: Khem Raj (1): package.bbclass,prserv.bbclass: Compare USE_PR_SERV with 1 or 0 are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/dl-issue http://git.pokylinux.org/cgit.cgi//log/?h=kyu3/dl-issue Yu Ke (1): site/powerpc-common: remove the incorrect dlopen default setting meta/site/powerpc-common |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] site/powerpc-common: remove the incorrect dlopen default setting
These two setting for dlopen is not correct. dlopen is not available in libc, instead it is provided by libdl. so the setting should not be yes by default. This fixes [YOCTO #736] [YOCTO #737] Thanks Richard for pointing out the root cause. CC: Richard Purdie richard.pur...@linuxfoundation.org CC: Philip Balister phi...@balister.org CC: Koen Kooi k...@dominion.thruhere.net Signed-off-by: Yu Ke ke...@intel.com --- meta/site/powerpc-common |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/meta/site/powerpc-common b/meta/site/powerpc-common index 8c0da23..4d0378b 100644 --- a/meta/site/powerpc-common +++ b/meta/site/powerpc-common @@ -239,8 +239,6 @@ ac_cv_sizeof_int=${ac_cv_sizeof_int='4'} #modphp ac_cv_c_bigendian_php=${ac_cv_c_bigendian_php=yes} ac_cv_sizeof_ptrdiff_t=${ac_cv_sizeof_ptrdiff_t=4} -ac_cv_func_dlopen=${ac_cv_func_dlopen=yes} -lt_cv_dlopen_self=${lt_cv_dlopen_self=yes} # apache2 (note other apache stanza in this file) ap_void_ptr_lt_long=${ap_void_ptr_lt_long=no} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Qt4 mips-relocate.patch
Hi Paul, This patch is to fix the issue which is specifically found in Qt4.6.x with binutils 2.20. and the upgrade of either Qt or binutils may fix this issue. Since you have go through the binutils change, and did not find relevant commit, probably the relevant change lies in Qt upgrade, or more specifically, the change with libQtWebKit. Regardless of where the root cause may be, since the combination of QT4.7 and bintuils 2.21 can pass the build now, I think it is safe to remove this patch and reenable the -Bsymbolic-functions flag. It is will also benefit the runtime performance. Regards Ke -Original Message- From: Paul Eggleton [mailto:paul.eggle...@linux.intel.com] Sent: Wednesday, May 18, 2011 12:13 AM To: Yu, Ke Cc: openembedded-core@lists.openembedded.org Subject: Qt4 mips-relocate.patch Hi there, I was going through patches for Qt4 and found that (among others) mips- relocate.patch was not being applied for Qt 4.7.x. From the comment it seems it was intended to fix a link-time error when building qt4-x11-free for mips - some kind of issue with binutils 2.20 [1]. However I just built qt4-x11-free 4.7.3 with MACHINE=qemumips without the patch and it built just fine. We're using binutils 2.21 now, I checked and there is nothing relevant that I can see in the binutils changelog to suggest that a mips/symbolic-functions issue was fixed, and we are apparently still enabling the option that originally triggered the problem when building Qt 4.7.x. Ke / anyone else, any ideas? If the problem can no longer reproduced can we simply remove this patch? Cheers, Paul [1] http://bugzilla.pokylinux.org/show_bug.cgi?id=271 -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] sqlite: upgrade from 3.7.5 to 3.7.6.2
From: Yu Ke ke...@intel.com - also remove the libtool.patch since it is already in the release version - update the LIC_FILES_CHKSUM, the license is not changed, just use sqlite3.h as more appropriate license file. the original sqlite3.c is actually not point to license content. Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-support/sqlite/sqlite3.inc |5 meta/recipes-support/sqlite/sqlite3/libtool.patch | 25 - meta/recipes-support/sqlite/sqlite3_3.7.5.bb | 10 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb| 10 4 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-support/sqlite/sqlite3/libtool.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index 92c4930..d8ef8dc 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -6,11 +6,6 @@ DEPENDS = readline ncurses tcl-native DEPENDS_virtclass-native = tcl-native LICENSE = PD -SRC_URI = http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://libtool.patch - -S = ${WORKDIR}/sqlite-${PV} - inherit autotools pkgconfig EXTRA_OECONF = --disable-tcl --enable-shared --enable-threadsafe diff --git a/meta/recipes-support/sqlite/sqlite3/libtool.patch b/meta/recipes-support/sqlite/sqlite3/libtool.patch deleted file mode 100644 index ccf9993..000 --- a/meta/recipes-support/sqlite/sqlite3/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=== sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.0 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.0 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this Makefile.in and the configure.in script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb deleted file mode 100644 index 212d9e2..000 --- a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require sqlite3.inc - -LIC_FILES_CHKSUM = file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6 - -SRC_URI = http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz; -S = ${WORKDIR}/sqlite-autoconf-3070500 -PR = r0 - -SRC_URI[md5sum] = a9604a82613ade2e7f4c303f233e477f -SRC_URI[sha256sum] = cb5b86926ec9f65882b2244f2d620337d911ec73411863f77e48cf6a2f94 diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb new file mode 100644 index 000..34d1653 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb @@ -0,0 +1,10 @@ +require sqlite3.inc + +LIC_FILES_CHKSUM = file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0 + +SRC_URI = http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz; +S = ${WORKDIR}/sqlite-autoconf-3070602 +PR = r0 + +SRC_URI[md5sum] = f16c08617968b4087b3d591fd575f59f +SRC_URI[sha256sum] = 53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1
From: Yu Ke ke...@intel.com - update the license checksum due to SUN/Oracle name changing - remove the nodolt.patch because it is already in upstream and release http://cgit.freedesktop.org/xorg/xserver/commit/?id=a769f4c22a9cfb5ba248c924a66c31ec966bd8a0 - update the patch upstream status Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- .../xserver-xf86-dri-lite/macro_tweak.patch|2 + .../xserver-xf86-dri-lite/nodolt.patch | 12 -- .../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 ++ .../xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb| 22 5 files changed, 23 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 7afa8c9..add4d29 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -128,7 +128,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= 1.0.3 PREFERRED_VERSION_xrandr ?= 1.3.4 PREFERRED_VERSION_xrdb ?= 1.0.5 PREFERRED_VERSION_xserver-kdrive ?= 1.7.99.2 -PREFERRED_VERSION_xserver-xf86-dri-lite ?= 1.9.3 +PREFERRED_VERSION_xserver-xf86-dri-lite ?= 1.10.1 PREFERRED_VERSION_xset ?= 1.2.1 PREFERRED_VERSION_xtrans ?= 1.2.6 PREFERRED_VERSION_xtrans-native ?= 1.2.6 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch index cd408c7..2b75427 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch @@ -6,6 +6,8 @@ xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they are all upgraded to 1.8.99.904, the the files/macro_tweak.patch can be safely replace by this patch. +Upstream-Status: Pending + Signed-off-by: Yu Ke ke...@intel.com diff --git a/xorg-server.m4 b/xorg-server.m4 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch deleted file mode 100644 index 6b34032..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: git/configure.ac -=== git.orig/configure.ac 2009-01-15 20:35:31.0 + -+++ git/configure.ac 2009-01-15 20:35:38.0 + -@@ -62,7 +62,6 @@ - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --DOLT - AC_PROG_MAKE_SET - PKG_PROG_PKG_CONFIG - AC_PROG_LEX diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb new file mode 100644 index 000..ea57140 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb @@ -0,0 +1,20 @@ +require xserver-xf86-dri-lite.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 + +PROTO_DEPS += xf86driproto dri2proto + +DEPENDS += font-util + +PE = 1 +PR = r0 + +SRC_URI += file://crosscompile.patch + +# Misc build failure for master HEAD +SRC_URI += file://fix_open_max_preprocessor_error.patch + +SRC_URI[md5sum] = 75f117c74f2ecaf9dd167f6a66ac98de +SRC_URI[sha256sum] = 143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d + +EXTRA_OECONF += --enable-dri --enable-dri2 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb deleted file mode 100644 index faa4f64..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -require xserver-xf86-dri-lite.inc - - -PROTO_DEPS += xf86driproto dri2proto - -DEPENDS += font-util - -PE = 1 -PR = r0 - -SRC_URI += file://nodolt.patch \ -file://crosscompile.patch -# file://libdri-xinerama-symbol.patch;patch=1 -# file://xserver-boottime.patch;patch=1 - -# Misc build failure for master HEAD -SRC_URI += file://fix_open_max_preprocessor_error.patch - -SRC_URI[md5sum] = 5bef6839a76d029204ab31aa2fcb5201 -SRC_URI[sha256sum] = 864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d - -EXTRA_OECONF += --enable-dri --enable-dri2 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] xf86-video-intel: upgrade from 2.14.0 to 2.15.0
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- ...-intel_2.14.0.bb = xf86-video-intel_2.15.0.bb} |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.14.0.bb = xf86-video-intel_2.15.0.bb} (83%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index da730e6..7afa8c9 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -145,6 +145,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= 2.6.0 PREFERRED_VERSION_xf86-input-mouse ?= 1.7.0 PREFERRED_VERSION_xf86-input-keyboard ?= 1.6.0 PREFERRED_VERSION_xf86-input-synaptics ?= 1.4.0 -PREFERRED_VERSION_xf86-video-intel ?= 2.14.0 +PREFERRED_VERSION_xf86-video-intel ?= 2.15.0 diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb similarity index 83% rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb index 099cf9d..6c9db59 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb @@ -9,7 +9,7 @@ Infrastructure (DRI). LIC_FILES_CHKSUM = file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e -PR = r1 +PR = r0 EXTRA_OECONF += --disable-xvmc @@ -21,5 +21,5 @@ DEPENDS += virtual/libx11 libxvmc drm xf86driproto glproto \ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -SRC_URI[md5sum] = 05f187582aeabda57fcd6f2782cfbf8e -SRC_URI[sha256sum] = e18c37a579a960516e69de5c6f74750ca02208c0e41cf763ae5630c84db507df +SRC_URI[md5sum] = ba56ae395a9769ada1fef2014468bee9 +SRC_URI[sha256sum] = c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddf01c8474259c1720 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
From: Yu Ke ke...@intel.com - remove the following patches, since they are already in upstream xserver-xf86-lite/libdri-xinerama-symbol.patch, xserver-xf86-lite/drmfix.patch xserver-xf86-lite/nodolt.patch xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch - rebase the patch for 1.10.1 xserver-xf86-lite/crosscompile.patch Signed-off-by: Yu Ke ke...@intel.com --- .../xserver-xf86-lite/crosscompile.patch | 35 ++-- .../xorg-xserver/xserver-xf86-lite/drmfix.patch| 13 - .../xserver-xf86-lite/libdri-xinerama-symbol.patch | 50 .../xserver-xf86-lite/macro_tweak.patch| 30 +++ .../xorg-xserver/xserver-xf86-lite/nodolt.patch| 12 - ...make_sys_c_use_unaligned_access_functions.patch | 256 .../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 + .../xorg-xserver/xserver-xf86-lite_1.7.99.2.bb | 12 - 8 files changed, 61 insertions(+), 359 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch index 2341e40..2f98bb8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch @@ -1,19 +1,22 @@ -Index: xorg-server-1.7.99.2/configure.ac -=== xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.0 + -+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.0 + -@@ -503,14 +503,10 @@ - - dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR --AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [ - DEFAULT_FONT_PATH=${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/ - case $host_os in - darwin*) DEFAULT_FONT_PATH=${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts ;; - esac -- ]) +Upstream-Status: Inappropriate [configuration] + +diff --git a/configure.ac b/configure.ac +index b3b752c..600500b 100644 +--- a/configure.ac b/configure.ac +@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. + DEFAULT_FONT_PATH=${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/ +-if test $cross_compiling != yes; then +- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], +- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], +- [case $host_os in ++ case $host_os in + darwin*) DEFAULT_FONT_PATH=${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts ;; +- esac]) +-fi ++ esac AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), [ FONTPATH=$withval ], [ FONTPATH=${DEFAULT_FONT_PATH} ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch deleted file mode 100644 index a62a767..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am -=== xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.0 +0200 -+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am2008-03-13 18:27:23.0 +0100 -@@ -41,7 +41,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME
Re: [OE-core] [yocto] OpenEmbedded eV membership drive
Sorry, I meant to send to Philips only, not want to CC list to bother wider people. Regards Ke -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Yu Ke Sent: Monday, May 09, 2011 2:17 PM To: Philip Balister Cc: openembedded-core Subject: Re: [OE-core] [yocto] OpenEmbedded eV membership drive on 2011-5-4 3:44, Philip Balister wrote: e of the things we would like to do is vote in new members to the eV (for the .us guys, think 501c3). If you are interested in becoming a member, read the Organization web page and send me an email indicating your desire to become a member. Please include a short paragraph explaining who you are and how you are involved with OpenEmbedded. Hi Philip, I have the interests to become the member of eV. Below is my short bio. Biography: Yu Ke is a senior software engineer in Intel Open Source Technology Center. Currently he is working in Yocto Project as tech leader of Yocto PRC team. Ke begin to play with OpenEmbedded when join Yocto project since its creation. He is involved in various areas in the project, including core package maintenance and build system development. Regards Yu Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] poky-default-revisions: move SRCREV to every recipe
From: Yu Ke ke...@intel.com move the SRCREV from poky-default-revisions.inc to its corresponding recipe, in this case, those non poky distro can also use its SRCREV. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/srcrev-recipe Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/srcrev-recipe Thanks, Yu Ke ke...@intel.com --- Yu Ke (1): poky-default-revisions: move the SRCREV to recipe file meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb |1 + .../recipes-graphics/clutter/table_git.bb |1 + meta-demoapps/recipes-graphics/clutter/tidy_git.bb |1 + .../matchbox-themes-extra_git.bb |1 + .../conf/distro/include/poky-default-revisions.inc | 203 meta/conf/layer.conf |2 - .../eee-acpi-scripts/eee-acpi-scripts_git.bb |1 + meta/recipes-bsp/uboot/u-boot_git.bb |1 + meta/recipes-bsp/x-load/x-load_git.bb |1 + meta/recipes-bsp/zaurusd/zaurusd_svn.bb|1 + meta/recipes-connectivity/connman/connman_git.bb |1 + meta/recipes-connectivity/gsm/libgsmd_svn.bb |1 + meta/recipes-connectivity/gypsy/gypsy_git.bb |1 + meta/recipes-connectivity/ofono/ofono_git.bb |1 + meta/recipes-core/dbus-wait/dbus-wait_svn.bb |2 + meta/recipes-core/eglibc/eglibc_2.12.bb|2 + meta/recipes-core/psplash/psplash_svn.bb |1 + .../installer/adt-installer_1.0.bb |1 + meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |1 + meta/recipes-devtools/opkg/opkg-nogpg_svn.bb |2 + meta/recipes-devtools/opkg/opkg_svn.bb |1 + meta/recipes-devtools/pkgconfig/pkgconfig_git.bb |1 + meta/recipes-devtools/prelink/prelink_git.bb |1 + meta/recipes-devtools/pseudo/pseudo_git.bb |1 + meta/recipes-devtools/qemu/qemu_git.bb |2 + .../recipes-devtools/swabber/swabber-native_git.bb |1 + meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb |1 + meta/recipes-devtools/ubootchart/ubootchart_svn.bb |1 + meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb |1 + meta/recipes-extended/libzypp/libzypp_git.bb |1 + meta/recipes-extended/sat-solver/sat-solver_git.bb |1 + meta/recipes-extended/zypper/zypper_git.bb |1 + meta/recipes-gnome/gnome/gconf-dbus_svn.bb |1 + .../gnome/gobject-introspection_git.bb |2 + .../gtk-theme-torturer/gtk-theme-torturer_git.bb |3 +- meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb|2 + meta/recipes-graphics/clutter/clutter-box2d_git.bb |1 + .../clutter/clutter-gst-1.4_git.bb |1 + .../clutter/clutter-gtk-1.4_git.bb |1 + meta/recipes-graphics/clutter/clutter_git.bb |1 + meta/recipes-graphics/drm/libdrm_git.bb|1 + meta/recipes-graphics/fstests/fstests_svn.bb |2 + meta/recipes-graphics/libfakekey/libfakekey_git.bb |2 + .../libmatchbox/libmatchbox_git.bb |1 + .../matchbox-wm-2/matchbox-wm-2_svn.bb |1 + .../matchbox-wm/matchbox-wm_git.bb |1 + meta/recipes-graphics/mesa/mesa-dri_git.bb |1 + meta/recipes-graphics/mesa/qemugl_git.bb |2 + meta/recipes-graphics/mutter/mutter_git.bb |1 + meta/recipes-graphics/xcb/libxcb_git.bb|2 + meta/recipes-graphics/xcb/xcb-proto_git.bb |1 + .../xorg-driver/xf86-input-keyboard_git.bb |1 + .../xorg-driver/xf86-input-mouse_git.bb|1 + .../xorg-driver/xf86-input-synaptics_git.bb|1 + .../xorg-driver/xf86-video-intel_git.bb|1 + .../xorg-driver/xf86-video-omapfb_git.bb |1 + meta/recipes-graphics/xorg-lib/libx11-diet_git.bb |2 + meta/recipes-graphics/xorg-lib/libx11-trim_git.bb |1 + meta/recipes-graphics/xorg-lib/libx11_git.bb |1 + .../recipes-graphics/xorg-lib/libxcalibrate_git.bb |1 + meta/recipes-graphics/xorg-lib/libxext_git.bb |1 + meta/recipes-graphics/xorg-lib/libxi_git.bb|1 + .../xorg-proto/calibrateproto_git.bb |2 + meta/recipes-graphics/xorg-proto/dri2proto_git.bb |3 + meta/recipes-graphics/xorg-proto/inputproto_git.bb |1 + .../xorg-xserver/xserver-xf86-dri-lite_git.bb |1 + .../xvideo-tests/xvideo-tests_svn.bb |2 + meta/recipes-kernel/blktrace/blktrace_git.bb |2 + meta/recipes-kernel/dtc/dtc_git.inc|2 + .../kern-tools/kern-tools-native_git.bb|1 + .../linux-firmware/linux-firmware_git.bb |1 + .../linux-libc-headers-yocto_git.bb|1 + .../recipes-kernel/linux/linux-yocto-stable_git.bb | 12 ++ meta/recipes-kernel/linux/linux-yocto_git.bb | 14 ++ meta/recipes-kernel
Re: [OE-core] [PATCH 0/1] poky-default-revisions: move SRCREV to every recipe
on 2011-5-4 22:24, Frans Meulenbroeks wrote: 2011/5/4 Richard Purdierichard.pur...@linuxfoundation.org On Wed, 2011-05-04 at 22:05 +0800, Yu Ke wrote: From: Yu Keke...@intel.com move the SRCREV from poky-default-revisions.inc to its corresponding recipe, in this case, those non poky distro can also use its SRCREV. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/srcrev-recipe Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/srcrev-recipe Thanks, Yu Keke...@intel.com --- Yu Ke (1): poky-default-revisions: move the SRCREV to recipe file Merged to master, thanks for resolving this issue! :) Cheers, Richard I would have preferred a more standardised placement of SRCREV. Most of the time the SRCREV is before the PV, but not always (and sometimes separated with an empty line and sometimes not). Also there is at least one error introduced: diff --git a/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bbb/meta/recipes-devtools/yaffs2/ yaffs2-utils_cvs.bb index 6171fe5..c729c7c 100644 --- a/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bbhttp://git.pokylinux.org/cgit.cgi/poky-contrib/tree/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb?h=kyu3/srcrev-recipeid=d2e078aa046ae6c4f169695f546cf229db5be1f7 +++ b/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bbhttp://git.pokylinux.org/cgit.cgi/poky-contrib/tree/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb?h=kyu3/srcrev-recipeid=c75b49ff5cfd10f5187af2b66a0a8d5513460374 @@ -1,3 +1,4 @@ require yaffs2-utils.inc PR = r1 +SRCDAT = 20071107 That should be SRCDATE. There might be more of these, my eye just fell on this one. Thanks for pointing it out. For unknown reason, my proxy does not work in cvs fetcher , so this recipe is untested. I should take more care on this. A patch is just sent out to fix it. Regards Ke Frans PS: speaking of yaffs2 utils: it could be considered to move to a somewhat newer version (not that I care as I do not use yaffs2) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] poky-default-revisions: move SRCREV to every recipe
on 2011-5-4 23:39, Bruce Ashfield wrote: On Wed, May 4, 2011 at 10:05 AM, Yu Keke...@intel.com wrote: From: Yu Keke...@intel.com move the SRCREV from poky-default-revisions.inc to its corresponding recipe, in this case, those non poky distro can also use its SRCREV. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/srcrev-recipe Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/srcrev-recipe Thanks, Yu Keke...@intel.com --- Yu Ke (1): poky-default-revisions: move the SRCREV to recipe file meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb |1 + .../recipes-graphics/clutter/table_git.bb |1 + meta-demoapps/recipes-graphics/clutter/tidy_git.bb |1 + snip meta/recipes-kernel/blktrace/blktrace_git.bb |2 + meta/recipes-kernel/dtc/dtc_git.inc|2 + .../kern-tools/kern-tools-native_git.bb|1 + .../linux-firmware/linux-firmware_git.bb |1 + .../linux-libc-headers-yocto_git.bb|1 + .../recipes-kernel/linux/linux-yocto-stable_git.bb | 12 ++ meta/recipes-kernel/linux/linux-yocto_git.bb | 14 ++\ Would it be possible to get direct cc on changes to the linux-yocto recipes ? I didn't expect this and it is causing me a bit of pain at the moment. A direct cc' would have helped, since I would have preferred to stage the change in with my other items. Bruce Get it, will CC you next time for linux-yocto changes. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] git fetcher fix for Yocto bug 972
From: Yu Ke ke...@intel.com Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/bug972 Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug972 Thanks, Yu Ke ke...@intel.com --- Yu Ke (1): git fetcher: make tag back to work, fix Yocto bug 972 bitbake/lib/bb/fetch2/git.py |1 + 1 files changed, 1 insertions(+), 0 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] git fetcher: make tag back to work, fix Yocto bug 972
From: Yu Ke ke...@intel.com In current git fetcher, tag does not work due to commit http://git.pokylinux.org/cgit/cgit.cgi/poky/commit/?id=5920e85c561624e657c126df58f5c378a8950bbc. Tag is not in sha256 form, so it will be treated invalid, and silently replaced by latest revision. To fix it, this patch treat tag name as branches name, thus it will be handled correctly later. Thanks Richard for reviewing and proposing the better approach. Fix [YOCTO #972] CC: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Yu Ke ke...@intel.com --- bitbake/lib/bb/fetch2/git.py |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index d462acf..811acbf 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -81,6 +81,7 @@ class Git(FetchMethod): for name in ud.names: # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one if not ud.revisions[name] or len(ud.revisions[name]) != 40 or (False in [c in abcdef0123456789 for c in ud.revisions[name]]): +ud.branches[name] = ud.revisions[name] ud.revisions[name] = self.latest_revision(ud.url, ud, d, name) def localpath(self, url, ud, d): -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] mesa 7.10.2: add python-native dependency
From: Yu Ke ke...@intel.com As Tom point out, mesa 7.10 has introduce some python script (e.g. src/mesa/main/es_generator.py), so should add python-native dependency Signed-off-by: Yu Ke ke...@intel.com CC: Tom Rini tom_r...@mentor.com --- meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb index 99d6066..28f9f27 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb @@ -6,7 +6,7 @@ PROTO_DEPS = xf86driproto glproto dri2proto LIB_DEPS = libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \ libxml2-native -DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native +DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native PR = r0 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] misc recipe upgrade
From: Yu Ke ke...@intel.com these are some remaining patches on my hand: - remove old mesa recipe to cleanup mesa - add python dependcy for mesa - reassign Kevin's recipe Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/upgrade-04-18 Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-04-18 Thanks, Yu Ke ke...@intel.com --- Yu Ke (3): mesa 7.10.2: add python-native dependency mesa: cleanup and remove the old version 7.5, 7.7 and 7.8.2 distro tracking: reassign Kevin's recipe .../conf/distro/include/distro_tracking_fields.inc | 66 ++-- meta/recipes-graphics/mesa/mesa-dri/cross2.patch |2 + meta/recipes-graphics/mesa/mesa-dri/crossfix.patch |2 + meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb |2 +- meta/recipes-graphics/mesa/mesa-dri_7.5.bb | 48 -- meta/recipes-graphics/mesa/mesa-dri_7.7.bb | 49 --- meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb | 56 - 7 files changed, 38 insertions(+), 187 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.5.bb delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.7.bb delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] xf86-input-vmmouse: upgrade from 12.6.10 to 12.7.0
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- ...use_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-vmmouse_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} (64%) diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.10.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb similarity index 64% rename from meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.10.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb index 6288507..9535a8f 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.10.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} += xf86-input-mouse LIC_FILES_CHKSUM = file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc -SRC_URI[md5sum] = 49c6e77851e9f7bc5cb7d85f061992f8 -SRC_URI[sha256sum] = a6369d5a860627f2a38842d5563045b263a459e534f6ae08df48f330f9a40910 +SRC_URI[md5sum] = dc77181330f983c7d0ec1ea1592c2ca7 +SRC_URI[sha256sum] = 00e5d527a0d97e6b2a6e8c519e1339427e66fa0a43af026858655c7c62bd9e35 COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] libdrm: upgrade from 2.4.23 to 2.4.25
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- .../drm/libdrm-2.4.23/installtests.patch | 43 - .../drm/libdrm-2.4.25/installtests.patch | 49 .../drm/{libdrm_2.4.23.bb = libdrm_2.4.25.bb} |5 +- 4 files changed, 53 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch create mode 100644 meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch rename meta/recipes-graphics/drm/{libdrm_2.4.23.bb = libdrm_2.4.25.bb} (54%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index b164b77..3e9c9da 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -136,7 +136,7 @@ PREFERRED_VERSION_xtrans-nativesdk ?= 1.2.6 PREFERRED_VERSION_xvinfo ?= 1.1.1 PREFERRED_VERSION_xwininfo ?= 1.1.1 PREFERRED_VERSION_mesa-dri ?= 7.10 -PREFERRED_VERSION_libdrm ?= 2.4.23 +PREFERRED_VERSION_libdrm ?= 2.4.25 PREFERRED_VERSION_xcb-proto ?= 1.6 PREFERRED_VERSION_libxcb ?= 1.7 PREFERRED_VERSION_libxcb-nativesdk ?= 1.7 diff --git a/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch deleted file mode 100644 index 9d6a168..000 --- a/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: libdrm-2.4.7/tests/Makefile.am -=== libdrm-2.4.7.orig/tests/Makefile.am2009-04-09 20:16:35.0 +0100 -+++ libdrm-2.4.7/tests/Makefile.am 2009-04-17 12:35:14.0 +0100 -@@ -6,10 +6,11 @@ - - LDADD = $(top_builddir)/libdrm.la - --check_PROGRAMS = \ -+bin_PROGRAMS = \ - dristat \ - drmstat - -+check_PROGRAMS = - SUBDIRS = - - if HAVE_LIBKMS -Index: libdrm-2.4.7/tests/modeprint/Makefile.am -=== libdrm-2.4.7.orig/tests/modeprint/Makefile.am 2009-02-17 19:52:37.0 + -+++ libdrm-2.4.7/tests/modeprint/Makefile.am 2009-04-17 12:35:32.0 +0100 -@@ -3,7 +3,7 @@ - -I$(top_srcdir)/libdrm/intel/ \ - -I$(top_srcdir)/libdrm - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - modeprint - - modeprint_SOURCES = \ -Index: libdrm-2.4.7/tests/modetest/Makefile.am -=== libdrm-2.4.7.orig/tests/modetest/Makefile.am 2009-02-17 19:52:37.0 + -+++ libdrm-2.4.7/tests/modetest/Makefile.am2009-04-17 12:35:42.0 +0100 -@@ -4,7 +4,7 @@ - -I$(top_srcdir)/libdrm \ - $(CAIRO_CFLAGS) - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - modetest - - modetest_SOURCES = \ diff --git a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch new file mode 100644 index 000..2704ee6 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch @@ -0,0 +1,49 @@ +tests: also install tests app + +Upstream-Status: Pending + +Signed-off-by: Yu Ke ke...@intel.com + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index bf1987f..d909e19 100644 +--- a/tests/Makefile.am b/tests/Makefile.am +@@ -6,10 +6,11 @@ AM_CPPFLAGS = \ + + LDADD = $(top_builddir)/libdrm.la + +-check_PROGRAMS = \ ++bin_PROGRAMS = \ + dristat \ + drmstat + ++check_PROGRAMS = + SUBDIRS = modeprint + + if HAVE_LIBKMS +diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am +index c4862ac..7db76ea 100644 +--- a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am +@@ -2,7 +2,7 @@ AM_CFLAGS = \ + -I$(top_srcdir)/include/drm \ + -I$(top_srcdir) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modeprint + + modeprint_SOURCES = \ +diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am +index 2191242..1d2c1b0 100644 +--- a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am +@@ -4,7 +4,7 @@ AM_CFLAGS = \ + -I$(top_srcdir) \ + $(CAIRO_CFLAGS) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modetest + + modetest_SOURCES = \ diff --git a/meta/recipes-graphics/drm/libdrm_2.4.23.bb b/meta/recipes-graphics/drm/libdrm_2.4.25.bb similarity index 54% rename from meta/recipes-graphics/drm/libdrm_2.4.23.bb rename to meta/recipes-graphics/drm/libdrm_2.4.25.bb index 1546cea..177e444 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.23.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.25.bb @@ -3,7 +3,8 @@ require libdrm.inc LIC_FILES_CHKSUM = file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71 SRC_URI += file://installtests.patch -SRC_URI[md5sum] = 7577ff36ec364d88fae466d4f7fc5fc6 -SRC_URI[sha256sum
[OE-core] [PATCH 0/9] recipes upgrade V2
From: Yu Ke ke...@intel.com This patch set upgrade the following recipes: libdrm xf86-input-synaptics xf86-input-vmmouse mesa evieext xf86-input-mouse pango xf86-input-keyboard xkbcomp changes since V1: add the upstream status tag. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/upgrade-04-15 Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-04-15 Thanks, Yu Ke ke...@intel.com --- Yu Ke (9): libdrm: upgrade from 2.4.23 to 2.4.25 xf86-input-synaptics: upgrade from 1.3.0 to 1.4.0 xf86-input-vmmouse: upgrade from 12.6.10 to 12.7.0 mesa: upgrade to 7.10.2 evieext: upgrade from 1.1.0 to 1.1.1 xf86-input-mouse: upgrade from 1.6 to 1.7 pango: upgrade from 1.28.3 to 1.28.4 xf86-input-keyboard: upgrade from 1.5.0 to 1.6.0 xkbcomp: upgrade from 1.2.0 to 1.2.1 .../distro/include/preferred-xorg-versions.inc | 12 +- .../drm/libdrm-2.4.23/installtests.patch | 43 - .../drm/libdrm-2.4.25/installtests.patch | 49 + .../drm/{libdrm_2.4.23.bb = libdrm_2.4.25.bb} |5 +- .../mesa/files/talloc-removal.patch|15571 .../mesa/{mesa-dri_7.10.bb = mesa-dri_7.10.2.bb} |7 +- .../{mesa-xlib_7.10.bb = mesa-xlib_7.10.2.bb} |7 +- .../{pango-1.28.3 = pango-1.28.4}/no-tests.patch |4 + .../pango/{pango_1.28.3.bb = pango_1.28.4.bb} |4 +- .../xorg-app/xkbcomp/cross-compile-fix.patch | 35 - .../{xkbcomp_1.2.0.bb = xkbcomp_1.2.1.bb} |5 +- ...board_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} |4 +- .../xorg-driver/xf86-input-mouse/unbreak.patch |2 + ...ut-mouse_1.6.0.bb = xf86-input-mouse_1.7.0.bb} |4 +- ...tics_1.3.0.bb = xf86-input-synaptics_1.4.0.bb} |4 +- ...use_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} |4 +- .../{evieext_1.1.0.bb = evieext_1.1.1.bb} |8 +- 17 files changed, 86 insertions(+), 15682 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch create mode 100644 meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch rename meta/recipes-graphics/drm/{libdrm_2.4.23.bb = libdrm_2.4.25.bb} (54%) delete mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch rename meta/recipes-graphics/mesa/{mesa-dri_7.10.bb = mesa-dri_7.10.2.bb} (85%) rename meta/recipes-graphics/mesa/{mesa-xlib_7.10.bb = mesa-xlib_7.10.2.bb} (68%) rename meta/recipes-graphics/pango/{pango-1.28.3 = pango-1.28.4}/no-tests.patch (72%) rename meta/recipes-graphics/pango/{pango_1.28.3.bb = pango_1.28.4.bb} (50%) delete mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch rename meta/recipes-graphics/xorg-app/{xkbcomp_1.2.0.bb = xkbcomp_1.2.1.bb} (72%) rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} (74%) rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.6.0.bb = xf86-input-mouse_1.7.0.bb} (76%) rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.3.0.bb = xf86-input-synaptics_1.4.0.bb} (83%) rename meta/recipes-graphics/xorg-driver/{xf86-input-vmmouse_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} (64%) rename meta/recipes-graphics/xorg-proto/{evieext_1.1.0.bb = evieext_1.1.1.bb} (54%) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] xf86-input-keyboard: upgrade from 1.5.0 to 1.6.0
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- ...board_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} (74%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 658b2e3..705e6c0 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -143,7 +143,7 @@ PREFERRED_VERSION_libxcb-nativesdk ?= 1.7 PREFERRED_VERSION_libpciaccess ?= 0.12.0 PREFERRED_VERSION_xf86-input-evdev ?= 2.6.0 PREFERRED_VERSION_xf86-input-mouse ?= 1.7.0 -PREFERRED_VERSION_xf86-input-keyboard ?= 1.5.0 +PREFERRED_VERSION_xf86-input-keyboard ?= 1.6.0 PREFERRED_VERSION_xf86-input-synaptics ?= 1.4.0 PREFERRED_VERSION_xf86-video-intel ?= 2.14.0 diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb similarity index 74% rename from meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb index aa8be67..9b1441d 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb @@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10 PR = r0 -SRC_URI[md5sum] = b74d7162db5ce7899c17927c6cfa9522 -SRC_URI[sha256sum] = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0 +SRC_URI[md5sum] = e2abe9f13e526a73cb68a7d257546eba +SRC_URI[sha256sum] = c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [poky] [PATCH 5/9] evieext: upgrade from 1.1.0 to 1.1.1
on 2011-4-12 2:13, Saul Wold wrote: On 04/10/2011 06:28 PM, Yu Ke wrote: From: Yu Keke...@intel.com - also change license checksum, the license is still MIT-X, but corp name is changed from SUN to Oracle Signed-off-by: Yu Keke...@intel.com --- .../distro/include/preferred-xorg-versions.inc | 2 +- .../{evieext_1.1.0.bb = evieext_1.1.1.bb} | 8 2 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-graphics/xorg-proto/{evieext_1.1.0.bb = evieext_1.1.1.bb} (54%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 5fd2040..fabc0da 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -9,7 +9,7 @@ PREFERRED_VERSION_bigreqsproto-nativesdk ?= 1.1.1 PREFERRED_VERSION_compositeproto ?= 0.4.2 PREFERRED_VERSION_damageproto ?= 1.2.1 PREFERRED_VERSION_dmxproto ?= 2.3.1 -PREFERRED_VERSION_evieext ?= 1.1.0 +PREFERRED_VERSION_evieext ?= 1.1.1 PREFERRED_VERSION_fixesproto ?= 4.1.2 PREFERRED_VERSION_fontcacheproto ?= 0.1.3 PREFERRED_VERSION_fontcacheproto-native ?= 0.1.3 diff --git a/meta/recipes-graphics/xorg-proto/evieext_1.1.0.bb b/meta/recipes-graphics/xorg-proto/evieext_1.1.1.bb similarity index 54% rename from meta/recipes-graphics/xorg-proto/evieext_1.1.0.bb rename to meta/recipes-graphics/xorg-proto/evieext_1.1.1.bb index 5800af1..271398d 100644 --- a/meta/recipes-graphics/xorg-proto/evieext_1.1.0.bb +++ b/meta/recipes-graphics/xorg-proto/evieext_1.1.1.bb @@ -6,10 +6,10 @@ DESCRIPTION = This package provides the wire protocol for the X Event \ Interception Extension. This extension allows the interception of \ keyboard and mouse events. -PR = r1 +PR = r0 PE = 1 -LIC_FILES_CHKSUM = file://COPYING;md5=6cf85dc8217152304ac976db1e240ebe +LIC_FILES_CHKSUM = file://COPYING;md5=4db9fc6a58e873c6392eec53082d89b5 Was there a change in the type of license? Why did COPYING change? Sau! the license type is unchanged (MIT-X), and the COPYING changes because the corp name changes from Sun to Oracle. The commit description has all the info. Regards Ke -SRC_URI[md5sum] = 5c74f61d6f77b2e6a083b2b31000be42 -SRC_URI[sha256sum] = 47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885 +SRC_URI[md5sum] = 98bd86a13686f65f0873070fdee6efc7 +SRC_URI[sha256sum] = 1cf74114436d99f56577a90b6438a32ba31b8128c9e63842bb179aba592733fe ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] xf86-input-vmmouse: upgrade from 12.6.10 to 12.7.0
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- ...use_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-vmmouse_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} (64%) diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.10.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb similarity index 64% rename from meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.10.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb index 6288507..9535a8f 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.10.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} += xf86-input-mouse LIC_FILES_CHKSUM = file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc -SRC_URI[md5sum] = 49c6e77851e9f7bc5cb7d85f061992f8 -SRC_URI[sha256sum] = a6369d5a860627f2a38842d5563045b263a459e534f6ae08df48f330f9a40910 +SRC_URI[md5sum] = dc77181330f983c7d0ec1ea1592c2ca7 +SRC_URI[sha256sum] = 00e5d527a0d97e6b2a6e8c519e1339427e66fa0a43af026858655c7c62bd9e35 COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] xf86-input-synaptics: upgrade from 1.3.0 to 1.4.0
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- ...tics_1.3.0.bb = xf86-input-synaptics_1.4.0.bb} |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.3.0.bb = xf86-input-synaptics_1.4.0.bb} (83%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 092ba35..3d6d934 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -144,7 +144,7 @@ PREFERRED_VERSION_libpciaccess ?= 0.12.0 PREFERRED_VERSION_xf86-input-evdev ?= 2.6.0 PREFERRED_VERSION_xf86-input-mouse ?= 1.6.0 PREFERRED_VERSION_xf86-input-keyboard ?= 1.5.0 -PREFERRED_VERSION_xf86-input-synaptics ?= 1.3.0 +PREFERRED_VERSION_xf86-input-synaptics ?= 1.4.0 PREFERRED_VERSION_xf86-video-intel ?= 2.14.0 diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb similarity index 83% rename from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb index b0953bb..39cd35f 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb @@ -18,5 +18,5 @@ DEPENDS += libxi # EXTRA_OEMAKE += sdkdir=${STAGING_INCDIR}/xorg -SRC_URI[md5sum] = b4e58eba1bdca13f0929a4b03b262135 -SRC_URI[sha256sum] = 30a33250c4f3d2daa8a61cab847dc7befd3248db0fca139d17fd7b890b5a8fd7 +SRC_URI[md5sum] = cbe487f9d22237d1e39c7d0b5812ab7e +SRC_URI[sha256sum] = 5874d979f028636dbddf14fffb84b496b006e63d5ea8dfa120820e58642812c2 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/9] xf86-input-mouse: upgrade from 1.6 to 1.7
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- ...ut-mouse_1.6.0.bb = xf86-input-mouse_1.7.0.bb} |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.6.0.bb = xf86-input-mouse_1.7.0.bb} (76%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index fabc0da..b2d7731 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -142,7 +142,7 @@ PREFERRED_VERSION_libxcb ?= 1.7 PREFERRED_VERSION_libxcb-nativesdk ?= 1.7 PREFERRED_VERSION_libpciaccess ?= 0.12.0 PREFERRED_VERSION_xf86-input-evdev ?= 2.6.0 -PREFERRED_VERSION_xf86-input-mouse ?= 1.6.0 +PREFERRED_VERSION_xf86-input-mouse ?= 1.7.0 PREFERRED_VERSION_xf86-input-keyboard ?= 1.5.0 PREFERRED_VERSION_xf86-input-synaptics ?= 1.4.0 PREFERRED_VERSION_xf86-video-intel ?= 2.14.0 diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb similarity index 76% rename from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb index 61d73e1..fbc2c66 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb @@ -10,5 +10,5 @@ driver. LIC_FILES_CHKSUM = file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19 -SRC_URI[md5sum] = cef849b1a2743d2e84de98422f372974 -SRC_URI[sha256sum] = c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb +SRC_URI[md5sum] = 7f31472689c15b6de62eff04d0fb57d7 +SRC_URI[sha256sum] = 4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] xf86-input-keyboard: upgrade from 1.5.0 to 1.6.0
From: Yu Ke ke...@intel.com Signed-off-by: Yu Ke ke...@intel.com --- .../distro/include/preferred-xorg-versions.inc |2 +- ...board_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} (74%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index b2d7731..4e67f1c 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -143,7 +143,7 @@ PREFERRED_VERSION_libxcb-nativesdk ?= 1.7 PREFERRED_VERSION_libpciaccess ?= 0.12.0 PREFERRED_VERSION_xf86-input-evdev ?= 2.6.0 PREFERRED_VERSION_xf86-input-mouse ?= 1.7.0 -PREFERRED_VERSION_xf86-input-keyboard ?= 1.5.0 +PREFERRED_VERSION_xf86-input-keyboard ?= 1.6.0 PREFERRED_VERSION_xf86-input-synaptics ?= 1.4.0 PREFERRED_VERSION_xf86-video-intel ?= 2.14.0 diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb similarity index 74% rename from meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb index aa8be67..9b1441d 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb @@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10 PR = r0 -SRC_URI[md5sum] = b74d7162db5ce7899c17927c6cfa9522 -SRC_URI[sha256sum] = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0 +SRC_URI[md5sum] = e2abe9f13e526a73cb68a7d257546eba +SRC_URI[sha256sum] = c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 9/9] xkbcomp: upgrade from 1.2.0 to 1.2.1
From: Yu Ke ke...@intel.com - Also remove the cross compiling patch, since it is already included in 1.2.1 release Signed-off-by: Yu Ke ke...@intel.com --- .../xorg-app/xkbcomp/cross-compile-fix.patch | 35 .../{xkbcomp_1.2.0.bb = xkbcomp_1.2.1.bb} |5 +-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch rename meta/recipes-graphics/xorg-app/{xkbcomp_1.2.0.bb = xkbcomp_1.2.1.bb} (72%) diff --git a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch deleted file mode 100644 index ca65345..000 --- a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit cc55d8f5ab021861308b071aab9c03016be15187 -Author: Gaetan Nadon mems...@videotron.ca -Date: Sun Oct 31 20:35:24 2010 -0400 - -config: replace AC_CHECK_FILE with test -f as it fails to cross-compile - -Testing for the presence of xkbparse.c is legitimate as this is a build -file, but the Autoconf macro assumes it is testing on the host system -and fails. - -Tested-by: Abdoulaye Walsimou Gaye a...@embtoolkit.org -Signed-off-by: Gaetan Nadon mems...@videotron.ca - -diff --git a/configure.ac b/configure.ac -index c69230b..8e6bd6e 100644 a/configure.ac -+++ b/configure.ac -@@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS - - AM_CONFIG_HEADER(config.h) - -+# If both the C file and YACC are missing, the package cannot be build. - AC_PROG_YACC - AC_PATH_PROG([YACC_INST], $YACC) --AC_CHECK_FILE([$srcdir/xkbparse.c], [], -- [test -z $YACC_INST AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])]) -- -+if test ! -f $srcdir/xkbparse.c; then -+ if test -z $YACC_INST; then -+ AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y]) -+ fi -+fi - - AC_CHECK_FUNCS([strdup strcasecmp]) - diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb similarity index 72% rename from meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb rename to meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb index f574690..0cf334a 100644 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb @@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a DEPENDS += libxkbfile -SRC_URI += file://cross-compile-fix.patch +SRC_URI[md5sum] = 885b4d8a7c8c7afb3312d31934cb3549 +SRC_URI[sha256sum] = b7612527914402d091424a93bc16f0d4d8778b4a874171f3f3dc681c690e65eb BBCLASSEXTEND = native -SRC_URI[md5sum] = 0f55995cd8da9b2d88553e1a2e17cd0a -SRC_URI[sha256sum] = 2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/9] upgrade recipes
From: Yu Ke ke...@intel.com upgrade the following recipes to latest version: libdrm xf86-input-synaptics xf86-input-vmmouse mesa evieext xf86-input-mouse pango xf86-input-keyboard xkbcomp Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/upgrade-04-11 Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-04-11 Thanks, Yu Ke ke...@intel.com --- Yu Ke (9): libdrm: upgrade from 2.4.23 to 2.4.24 xf86-input-synaptics: upgrade from 1.3.0 to 1.4.0 xf86-input-vmmouse: upgrade from 12.6.10 to 12.7.0 mesa: upgrade to 7.10.2 evieext: upgrade from 1.1.0 to 1.1.1 xf86-input-mouse: upgrade from 1.6 to 1.7 pango: upgrade from 1.28.3 to 1.28.4 xf86-input-keyboard: upgrade from 1.5.0 to 1.6.0 xkbcomp: upgrade from 1.2.0 to 1.2.1 .../distro/include/preferred-xorg-versions.inc | 12 +- .../installtests.patch |0 .../drm/{libdrm_2.4.23.bb = libdrm_2.4.24.bb} |4 +- .../mesa/files/talloc-removal.patch|15571 .../mesa/{mesa-dri_7.10.bb = mesa-dri_7.10.2.bb} |7 +- .../{mesa-xlib_7.10.bb = mesa-xlib_7.10.2.bb} |7 +- .../{pango-1.28.3 = pango-1.28.4}/no-tests.patch |0 .../pango/{pango_1.28.3.bb = pango_1.28.4.bb} |4 +- .../xorg-app/xkbcomp/cross-compile-fix.patch | 35 - .../{xkbcomp_1.2.0.bb = xkbcomp_1.2.1.bb} |5 +- ...board_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} |4 +- ...ut-mouse_1.6.0.bb = xf86-input-mouse_1.7.0.bb} |4 +- ...tics_1.3.0.bb = xf86-input-synaptics_1.4.0.bb} |4 +- ...use_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} |4 +- .../{evieext_1.1.0.bb = evieext_1.1.1.bb} |8 +- 15 files changed, 30 insertions(+), 15639 deletions(-) rename meta/recipes-graphics/drm/{libdrm-2.4.23 = libdrm-2.4.24}/installtests.patch (100%) rename meta/recipes-graphics/drm/{libdrm_2.4.23.bb = libdrm_2.4.24.bb} (54%) delete mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch rename meta/recipes-graphics/mesa/{mesa-dri_7.10.bb = mesa-dri_7.10.2.bb} (85%) rename meta/recipes-graphics/mesa/{mesa-xlib_7.10.bb = mesa-xlib_7.10.2.bb} (68%) rename meta/recipes-graphics/pango/{pango-1.28.3 = pango-1.28.4}/no-tests.patch (100%) rename meta/recipes-graphics/pango/{pango_1.28.3.bb = pango_1.28.4.bb} (50%) delete mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch rename meta/recipes-graphics/xorg-app/{xkbcomp_1.2.0.bb = xkbcomp_1.2.1.bb} (72%) rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.5.0.bb = xf86-input-keyboard_1.6.0.bb} (74%) rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.6.0.bb = xf86-input-mouse_1.7.0.bb} (76%) rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.3.0.bb = xf86-input-synaptics_1.4.0.bb} (83%) rename meta/recipes-graphics/xorg-driver/{xf86-input-vmmouse_12.6.10.bb = xf86-input-vmmouse_12.7.0.bb} (64%) rename meta/recipes-graphics/xorg-proto/{evieext_1.1.0.bb = evieext_1.1.1.bb} (54%) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core