Re: [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Hi, Should I rebase/repost this? Aside libav versions/pinning preferences, this single patch deserves to be commited. Regards, Matthieu -Message d'origine- De : openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Matthieu Crapet Envoyé : mercredi 21 mai 2014 13:38 À : openembedded-core@lists.openembedded.org Objet : [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl Dropped libvorvis dependency because there is already a (better) builtin vorbis codec. Don't confuse codec names: "vorbis" (builtin) and "libvorbis" (using external library). Changes: - add --enable-nonfree when faac or openssl are used - add DESCRIPTION - sort PACKAGECONFIG entries Tested with libav-0.8.11 & libav-9.13. Signed-off-by: Matthieu Crapet --- meta/recipes-multimedia/libav/libav.inc | 39 ++--- 1 file changed, 31 insertions(+), 8 deletions(-) [...] -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] State of bitbake world, Failed tasks 2014-06-02
This build still contains huge patch setting B = S or inherit for autotools-brokensep for all recipes which were failing in earlier master builds. abiword and few other recipes issues are now hidden by libgsf failure most efl recipes are hidden by efl failure (testing 1.10.0 version which I haven't sent to ML yet) qt5 is broken because it's testing new 5.3.0 firefox broken probably by freetype upgrade grub.do_package failing again for some reason http://www.openembedded.org/wiki/Bitbake_World_Status == Failed tasks 2014-06-02 == === common (9) === * meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb, do_compile * meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb, do_compile * meta-openembedded/meta-oe/recipes-navigation/omgps/omgps_svn.bb, do_compile * meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb, do_compile * meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.2.bb, do_compile * meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb, do_compile * meta-qt5/recipes-qt/qt5/qtbase_5.3.0.bb, do_compile * meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb, do_fetch * meta-qt5/recipes-qt/qt5/qtwayland_git.bb, do_fetch === common-x86 (3) === * meta-browser/recipes-browser/chromium/chromium_35.0.1883.0.bb, do_compile * meta-browser/recipes-mozilla/firefox/firefox_10.0.11esr.bb, do_compile * openembedded-core/meta/recipes-bsp/grub/grub_2.00.bb, do_package === qemuarm (1) === * meta-openembedded/meta-efl/recipes-efl/efl/efl_1.10.0.bb, do_compile === qemux86 (1) === * meta-openembedded/meta-efl/recipes-efl/efl/efl_1.10.0.bb, do_install === qemux86_64 (1) === * meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb, do_compile === Number of failed tasks === {| class=wikitable |- ||qemuarm ||10 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140530_174007.log/ |- ||qemux86 ||13 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140531_061843.log/ |- ||qemux86_64||14 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140531_204145.log/ |} -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] wic: add support to look in all layers and get plugins
Hi, A late review but I hope to be a pertinent one. > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf > Of Joao Henrique Ferreira de Freitas > Sent: Thursday, May 15, 2014 4:37 AM > To: openembedded-core@lists.openembedded.org > Cc: tom.zanu...@linux.intel.com > Subject: [OE-core] [PATCH 2/2] wic: add support to look in all layers and get > plugins > > Plugins are looked in 'scripts/lib/mic/plugins/[type]/' directory on all > BBLAYERS variable returned by bitbake environment. If found, it will be load > at runtime. > > The user could create your own plugin and keep it inside its layers. For now > the path must be /scripts/lib/mic/plugins/[type]/. Where 'type' > could be 'imager' or 'source'. > > Signed-off-by: João Henrique Ferreira de Freitas > --- > scripts/lib/mic/plugin.py | 28 +++- > 1 file changed, 23 insertions(+), 5 deletions(-) > > diff --git a/scripts/lib/mic/plugin.py b/scripts/lib/mic/plugin.py index > df03c15..bec33d6 100644 > --- a/scripts/lib/mic/plugin.py > +++ b/scripts/lib/mic/plugin.py > @@ -20,12 +20,14 @@ import os, sys > from mic import msger > from mic import pluginbase > from mic.utils import errors > - > +from mic.utils.oe.misc import * > > __ALL__ = ['PluginMgr', 'pluginmgr'] > > PLUGIN_TYPES = ["imager", "source"] # TODO "hook" > > +PLUGIN_DIR = "/lib/mic/plugins" # relative to scripts > +SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR > > class PluginMgr(object): > plugin_dirs = {} > @@ -42,8 +44,23 @@ class PluginMgr(object): > mic_path = os.path.dirname(__file__) > eos = mic_path.find('scripts') + len('scripts') > scripts_path = mic_path[:eos] > +self.scripts_path = scripts_path > +self.plugin_dir = scripts_path + PLUGIN_DIR > +self.layers_path = None > + > +def _build_plugin_dir_list(self, dl, ptype): > +if self.layers_path is None: > +self.layers_path = get_bitbake_var("BBLAYERS") > +layer_dirs = [] > + > +for layer_path in self.layers_path.split(): > +path = os.path.join(layer_path, SCRIPTS_PLUGIN_DIR, ptype) > +layer_dirs.append(path) > > -self.plugin_dir = scripts_path + "/lib/mic/plugins" > +path = os.path.join(dl, ptype) > +layer_dirs.append(path) [Adrian Calianu] 1) It looks like a bad indentation, here, adding 'dl' path for each found BBLAYER. Probably those two lines from above should not be part of 'for' statement. 2) If BBLAYERS variable is empty/None then the "self.layers_path.split()" will generate an error: AttributeError: 'NoneType' object has no attribute 'split' I don't think is good idea to force users to have BBLAYER variable set since will broke the raw mode of the wic. > + > +return layer_dirs > > def append_dirs(self, dirs): > for path in dirs: > @@ -56,7 +73,7 @@ class PluginMgr(object): > path = os.path.abspath(os.path.expanduser(path)) > > if not os.path.isdir(path): > -msger.warning("Plugin dir is not a directory or does not exist: > %s"\ > +msger.debug("Plugin dir is not a directory or does not > + exist: %s"\ >% path) > return > > @@ -93,8 +110,9 @@ class PluginMgr(object): > if ptype not in PLUGIN_TYPES: > raise errors.CreatorError('%s is not valid plugin type' % ptype) > > -self._add_plugindir(os.path.join(self.plugin_dir, ptype)) > -self._load_all() > +plugins_dir = self._build_plugin_dir_list(self.plugin_dir, > + ptype) > + > +self.append_dirs(plugins_dir) > > return pluginbase.get_plugins(ptype) > > -- > 1.8.3.2 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] diffstat: fix autoheader warning due to missing AC_DEFINE template
Signed-off-by: Ross Burton --- .../diffstat/diffstat/aclocal-popen.patch | 20 meta/recipes-devtools/diffstat/diffstat_1.58.bb|1 + 2 files changed, 21 insertions(+) create mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch new file mode 100644 index 000..d95561b --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch @@ -0,0 +1,20 @@ +Add a description to the HAVE_POPEN_PROTOTYPE AC_DEFINE so that this define is +included in config.h. + +Upstream-Status: Submitted (via email) +Signed-off-by: Ross Burton + + +diff --git a/aclocal.m4 b/aclocal.m4 +index 3f20573..ec5ca51 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -931,7 +931,7 @@ ac_cv_td_popen=no, + ac_cv_td_popen=yes)) + AC_MSG_RESULT($ac_cv_td_popen) + if test $ac_cv_td_popen = yes; then +- AC_DEFINE(HAVE_POPEN_PROTOTYPE) ++ AC_DEFINE(HAVE_POPEN_PROTOTYPE,[1],[Conflicting popen prototype]) + fi + ])dnl + dnl --- diff --git a/meta/recipes-devtools/diffstat/diffstat_1.58.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb index 204473a..15fb423 100644 --- a/meta/recipes-devtools/diffstat/diffstat_1.58.bb +++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0 SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ file://dirfix.patch \ file://aclocal.patch \ + file://aclocal-popen.patch \ file://run-ptest \ " -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] diffstat: patches have now been submitted upstream
Signed-off-by: Ross Burton --- meta/recipes-devtools/diffstat/diffstat/aclocal.patch |2 +- meta/recipes-devtools/diffstat/diffstat/dirfix.patch |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch index ff18f1b..cde4a40 100644 --- a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch +++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch @@ -8,7 +8,7 @@ The original macro name (AC_ACVERSION) leads to this error: | configure.in:9: the top level | autom4te: m4 failed with exit status: 1 -Upstream-Status: Inappropriate [embedded specific] +Upstream-Status: Submitted (via email) Signed-off-by: Bogdan Marinescu Index: diffstat-1.58/aclocal.m4 diff --git a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch index 6685056..15dbf2b 100644 --- a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch +++ b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch @@ -8,7 +8,7 @@ Results in "mkdir: cannot create directory `/usr/lib64': Permission denied" Since the directory is never used, we can just remove the mkdir. -Upstream-Status: Pending +Upstream-Status: Submitted (via email) RP 23/9/2011 -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH v2] gzip: Avoid host contamination during build
On Fri, May 30, 2014 at 6:39 PM, Dan McGregor wrote: > From: Dan McGregor > > On systems with /bin and /usr/bin merged the gzip recipe may find grep > in /usr/bin, while OE puts it in /bin. Force the recipe to find grep in > the correct place. > > Signed-off-by: Dan McGregor Great fix. It seems like a good patch to backport to Daisy (adding Saul in Cc). -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] qemu: upgrade to 2.0.0
QEmu upgrade to 2.0.0 Tested with all qemu machines. Due to updated SeaBIOS, for x86* architectures, a fix for v86d is also needed. The following changes since commit ae642d3fadb83f641034148d833a5c1deb3a1f10: socat: upgrade to 1.7.2.4 (2014-06-01 14:30:40 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/qemu_upg_20 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/qemu_upg_20 Cristian Iorga (2): v86d: fix for SeaBIOS VGA BIOS compatibility qemu: upgrade to 2.0.0 .../v86d/v86d/Update-x86emu-from-X.org.patch | 21766 +++ meta/recipes-bsp/v86d/v86d_0.1.10.bb | 3 +- .../recipes-devtools/qemu/qemu/fxrstorssefix.patch |31 - .../qemu/{qemu_1.7.0.bb => qemu_2.0.0.bb} | 9 +- 4 files changed, 21772 insertions(+), 37 deletions(-) create mode 100644 meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch rename meta/recipes-devtools/qemu/{qemu_1.7.0.bb => qemu_2.0.0.bb} (70%) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qemu: upgrade to 2.0.0
- switched to ${BP} variable. - updated download link; - fxrstorssefix.patch no longer needed, superseded; Signed-off-by: Cristian Iorga --- .../recipes-devtools/qemu/qemu/fxrstorssefix.patch | 31 -- .../qemu/{qemu_1.7.0.bb => qemu_2.0.0.bb} | 9 +++ 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch rename meta/recipes-devtools/qemu/{qemu_1.7.0.bb => qemu_2.0.0.bb} (70%) diff --git a/meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch b/meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch deleted file mode 100644 index 59ab0f5..000 --- a/meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch +++ /dev/null @@ -1,31 +0,0 @@ -When we restore the mxcsr resgister with FXRSTOR, we need to update the various SSE -flag files by calling update_sse_status() else we're using the flags from some other -process with interesting results. - -The code isn't ordered to make this easy hence the function declaration. - -Upstream-Status: Pending - -RP 2013/9/30 - -Index: qemu-1.5.0/target-i386/fpu_helper.c -=== qemu-1.5.0.orig/target-i386/fpu_helper.c 2013-09-30 18:46:39.283377648 + -+++ qemu-1.5.0/target-i386/fpu_helper.c2013-09-30 18:46:56.895377232 + -@@ -1149,6 +1149,8 @@ - } - } - -+static void update_sse_status(CPUX86State *env); -+ - void helper_fxrstor(CPUX86State *env, target_ulong ptr, int data64) - { - int i, fpus, fptag, nb_xmm_regs; -@@ -1180,6 +1182,7 @@ - if (env->cr[4] & CR4_OSFXSR_MASK) { - /* XXX: finish it */ - env->mxcsr = cpu_ldl_data(env, ptr + 0x18); -+update_sse_status(env); - /* cpu_ldl_data(env, ptr + 0x1c); */ - if (env->hflags & HF_CS64_MASK) { - nb_xmm_regs = 16; diff --git a/meta/recipes-devtools/qemu/qemu_1.7.0.bb b/meta/recipes-devtools/qemu/qemu_2.0.0.bb similarity index 70% rename from meta/recipes-devtools/qemu/qemu_1.7.0.bb rename to meta/recipes-devtools/qemu/qemu_2.0.0.bb index b776ccc..b8ce624 100644 --- a/meta/recipes-devtools/qemu/qemu_1.7.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.0.0.bb @@ -3,13 +3,12 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -SRC_URI += "file://fxrstorssefix.patch \ -file://qemu-enlarge-env-entry-size.patch \ +SRC_URI += "file://qemu-enlarge-env-entry-size.patch \ file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch" -SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"; -SRC_URI[md5sum] = "32893941d40d052a5e649efcf06aca06" -SRC_URI[sha256sum] = "31f333a85f2d14c605a77679904a9668eaeb1b6dc7da53a1665230f46bc21314" +SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"; +SRC_URI[md5sum] = "2790f44fd76da5de5024b4aafeb594c2" +SRC_URI[sha256sum] = "60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b" COMPATIBLE_HOST_class-target_mips64 = "null" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
On 06/02/2014 12:03 AM, Matthieu CRAPET wrote: Hi, Should I rebase/repost this? Aside libav versions/pinning preferences, this single patch deserves to be commited. Yes please, but I think you want to consider using bb.utils.contains_any() instead of your contains_one implementation. Sau! Regards, Matthieu -Message d'origine- De : openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Matthieu Crapet Envoyé : mercredi 21 mai 2014 13:38 À : openembedded-core@lists.openembedded.org Objet : [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl Dropped libvorvis dependency because there is already a (better) builtin vorbis codec. Don't confuse codec names: "vorbis" (builtin) and "libvorbis" (using external library). Changes: - add --enable-nonfree when faac or openssl are used - add DESCRIPTION - sort PACKAGECONFIG entries Tested with libav-0.8.11 & libav-9.13. Signed-off-by: Matthieu Crapet --- meta/recipes-multimedia/libav/libav.inc | 39 ++--- 1 file changed, 31 insertions(+), 8 deletions(-) [...] -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] recipes: Add missing pkgconfig class inherits
These recipes all use pkg-config in some way but were missing dependencies on the tool, this patch adds them. Signed-off-by: Richard Purdie diff --git a/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/meta/recipes-bsp/gummiboot/gummiboot_git.bb index 80df2b6..7fc908e 100644 --- a/meta/recipes-bsp/gummiboot/gummiboot_git.bb +++ b/meta/recipes-bsp/gummiboot/gummiboot_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "gnu-efi util-linux" -inherit autotools +inherit autotools pkgconfig inherit deploy PV = "43+git${SRCPV}" diff --git a/meta/recipes-bsp/usbutils/usbutils_007.bb b/meta/recipes-bsp/usbutils/usbutils_007.bb index a65672e..b93b2bd 100644 --- a/meta/recipes-bsp/usbutils/usbutils_007.bb +++ b/meta/recipes-bsp/usbutils/usbutils_007.bb @@ -17,7 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ SRC_URI[md5sum] = "be6c42294be5c940f208190d3479d50c" SRC_URI[sha256sum] = "e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3" -inherit autotools gettext +inherit autotools gettext pkgconfig do_install_append() { # We only need the compressed copy, remove the uncompressed version diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index 321fddb..11c9616 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -24,7 +24,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools-brokensep +inherit autotools-brokensep pkgconfig EXTRA_OECONF = "\ --disable-gstreamer \ diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index f121ea3..6688739 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git \ S = "${WORKDIR}/git" -inherit autotools-brokensep gtk-icon-cache +inherit autotools-brokensep gtk-icon-cache pkgconfig RDEPENDS_${PN} = "connman" diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb index 73cfa6b..048b0e5 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb @@ -44,7 +44,7 @@ INITSCRIPT_PARAMS = "defaults" INITSCRIPT_NAME_${PN}-client = "nfscommon" INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21" -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd pkgconfig SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service" SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service" diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb index fdb19ba..691dc86 100644 --- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb +++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb @@ -14,4 +14,4 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}" S = "${WORKDIR}/git" -inherit autotools +inherit autotools pkgconfig diff --git a/meta/recipes-core/kbd/kbd_2.0.1.bb b/meta/recipes-core/kbd/kbd_2.0.1.bb index 265b906..9c6eabb 100644 --- a/meta/recipes-core/kbd/kbd_2.0.1.bb +++ b/meta/recipes-core/kbd/kbd_2.0.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" DEPENDS = "libcheck" -inherit autotools gettext ptest +inherit autotools gettext ptest pkgconfig RREPLACES_${PN} = "console-tools" RPROVIDES_${PN} = "console-tools" diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb index c597111..d19460a 100644 --- a/meta/recipes-devtools/guile/guile_2.0.11.bb +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb @@ -28,7 +28,7 @@ SRC_URI[md5sum] = "03f1bce1a4983076d955003472306a13" SRC_URI[sha256sum] = "aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2" -inherit autotools gettext texinfo +inherit autotools gettext pkgconfig texinfo BBCLASSEXTEND = "native" DEPENDS = "libunistring bdwgc gmp libtool libffi" diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc index 61f81b0..ac25326 100644 --- a/meta/recipes-extended/augeas/augeas.inc +++ b/meta/recipes-extended/augeas/augeas.inc @@ -12,7 +12,7 @@ SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ DEPENDS = "readline libxml2" -inherit autotools +inherit autotools pkgconfig PACKAGES =+ "${PN}-lenses lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-dbg" diff --git a/meta/recipes-extended/blktool/blktool_4-6.1.bb b/meta/recipes-extended/blktool/blktool_4-6.1.bb index 8bd1bae..69f2261 100644 --- a/meta/recipes-extended/blktool/blktool_4-6.1.bb +++ b/meta/recipes-extended/blktool/blktool_4-6.1.bb @@ -21,4 +21,4 @@ SRC_URI[patch.sha256sum] = "d7923527e1a00984620ab307c9047
[OE-core] gsettings-desktop-schemas: Add missing DEPENDS on gobject-introspection-stub-native
It uses gobject-introspection macros but was missing a dependency upon something which provides them. Signed-off-by: Richard Purdie diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb index eb09d2f..a0123d9 100644 --- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb +++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PR = "r1" -DEPENDS = "glib-2.0 intltool-native" +DEPENDS = "glib-2.0 intltool-native gobject-introspection-stub-native" inherit gnomebase gsettings gettext -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lame: Add missing DEPENDS on gettext-native
Without this, configure will fail due to a missing AM_ICONV macro. Signed-off-by: Richard Purdie diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb index 695b7ca..2192f3f 100644 --- a/meta/recipes-multimedia/lame/lame_3.99.5.bb +++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb @@ -5,7 +5,7 @@ SECTION = "console/utils" LICENSE = "LGPLv2+" LICENSE_FLAGS = "commercial" -DEPENDS = "ncurses" +DEPENDS = "ncurses gettext-native" LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \ -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] oprofileui-server/oprofileui/pcmanfm: Add missing intltool-native DEPENDS
These recipes all require intltool-native to build but were missing a dependency on it. Signed-off-by: Richard Purdie diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb index d80a0e8..eb3b78b 100644 --- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb @@ -9,6 +9,8 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \ file://init \ file://oprofileui-server.service " +DEPENDS += "intltool-native" + EXTRA_OECONF += "--disable-client --enable-server" RDEPENDS_${PN} = "oprofile avahi-daemon" diff --git a/meta/recipes-kernel/oprofile/oprofileui.inc b/meta/recipes-kernel/oprofile/oprofileui.inc index 6d59e47..1dfd0c6 100644 --- a/meta/recipes-kernel/oprofile/oprofileui.inc +++ b/meta/recipes-kernel/oprofile/oprofileui.inc @@ -8,7 +8,7 @@ SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "glib-2.0 avahi" +DEPENDS = "glib-2.0 avahi intltool-native" inherit autotools pkgconfig diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb index fe25682..14c5cd5 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" SECTION = "x11" -DEPENDS = "gtk+ startup-notification libfm" +DEPENDS = "gtk+ startup-notification libfm intltool-native" DEPENDS_append_poky = " libowl" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libcroco/libfm/menu-cache: Add missing gtk-doc class dependencies
These recipes all use gtk-doc m4 macros but were missing dependencies on the class. Signed-off-by: Richard Purdie diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb index 73a9c52..98bbe76 100644 --- a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb +++ b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb @@ -18,4 +18,4 @@ SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb index 385665f..7d04265 100644 --- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb +++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb @@ -13,7 +13,7 @@ BBCLASSEXTEND = "native" EXTRA_OECONF += "--enable-Bsymbolic=auto" PR = "r1" -inherit autotools-brokensep pkgconfig gnomebase +inherit autotools-brokensep pkgconfig gnomebase gtk-doc GNOME_COMPRESS_TYPE = "xz" diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.1.2.2.bb index ea6323a..11ca9c1 100644 --- a/meta/recipes-support/libfm/libfm_1.1.2.2.bb +++ b/meta/recipes-support/libfm/libfm_1.1.2.2.bb @@ -17,7 +17,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08" SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682" -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig gtk-doc PACKAGES += "${PN}-mime" FILES_${PN}-mime = "${datadir}/mime/" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sanity.bbclass: Add libsdl-native check
If libsdl-native is in ASSUME_PROVIDED, check for it in the sanity tests. This warns the user if they've said its being provided but it isn't and prevents silent build issues. Signed-off-by: Richard Purdie diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 989bdcd..4b42b17 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -550,6 +550,10 @@ def check_sanity_version_change(status, d): if not check_app_exists("qemu-arm", d): status.addresult("qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH") +if "libsdl-native" in assume_provided: +if not check_app_exists("sdl-config", d): +status.addresult("libsdl-native is set to be ASSUME_PROVIDED but sdl-config can't be found in PATH. Please either install it, or configure qemu not to require sdl.") + (result, message) = check_gcc_march(d) if result and message: status.addresult("Your gcc version is older than 4.5, please add the following param to local.conf\n \ -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH RFC] autotools: Improve configure dependency code for finding m4 files
We have an open bug about the warnings issues in builds from an sstate cache when something like glib-2.0 gets rebuilt. The issue is that sstate is "clever" and prunes unneeded dependencies out the tree. For example is X depends on pkgconfig-native but we've already build X and installed it from sstate, it will not get installed when you build Y which depends on X. This patch changes the logic to match the sstate behaviour and prune out unnecessary dependencies from the scope of aclocal. This in turn removes the warning about missing manifest files. The issue is that this patch exposes holes in our DEPENDS in recipes, specifically that some native tools are not listed, specifically, and problematically, pkgconfig, gtk-doc and intltool-native in particular. I've sent out patches against OE-Core that address the bulk of the issues there however I'm conscious this is probably going to a bug issue in other layers and may be too annoying to consider at this point. The other alternative is simply to turn the warning into a debug statement. I appreciate the code below has commented blocks, this is simply debug I've left around for now. It will be cleaned from any final version. Signed-off-by: Richard Purdie diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 0dc1e6b..34d432e 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -142,15 +142,51 @@ python autotools_copy_aclocals () { return taskdepdata = d.getVar("BB_TASKDEPDATA", False) +#bb.warn(str(taskdepdata)) pn = d.getVar("PN", True) aclocaldir = d.getVar("ACLOCALDIR", True) oe.path.remove(aclocaldir) bb.utils.mkdirhier(aclocaldir) +start = None configuredeps = [] + for dep in taskdepdata: data = taskdepdata[dep] -if data[1] == "do_configure" and data[0] != pn: -configuredeps.append(data[0]) +if data[1] == "do_configure" and data[0] == pn: +start = dep +break +if not start: +bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?") + +# We need to find configure tasks which are either from -> +# or -> but not -> unless they're direct +# dependencies. This mirrors what would get restored from sstate. +done = [dep] +next = [dep] +while next: +new = [] +for dep in next: +data = taskdepdata[dep] +for datadep in data[3]: +if datadep in done: +continue +done.append(datadep) +if (not data[0].endswith("-native")) and taskdepdata[datadep][0].endswith("-native") and dep != start: +continue +new.append(datadep) +if taskdepdata[datadep][1] == "do_configure": +configuredeps.append(taskdepdata[datadep][0]) +next = new + +#configuredeps2 = [] +#for dep in taskdepdata: +#data = taskdepdata[dep] +#if data[1] == "do_configure" and data[0] != pn: +#configuredeps2.append(data[0]) +#configuredeps.sort() +#configuredeps2.sort() +#bb.warn(str(configuredeps)) +#bb.warn(str(configuredeps2)) cp = [] for c in configuredeps: -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH RFC] autotools: Improve configure dependency code for finding m4 files
On Mon, Jun 02, 2014 at 09:15:01PM +0100, Richard Purdie wrote: > We have an open bug about the warnings issues in builds from an sstate > cache when something like glib-2.0 gets rebuilt. The issue is that > sstate is "clever" and prunes unneeded dependencies out the tree. > > For example is X depends on pkgconfig-native but we've already build X > and installed it from sstate, it will not get installed when you build Y > which depends on X. > > This patch changes the logic to match the sstate behaviour and prune out > unnecessary dependencies from the scope of aclocal. This in turn removes > the warning about missing manifest files. > > The issue is that this patch exposes holes in our DEPENDS in recipes, > specifically that some native tools are not listed, specifically, and > problematically, pkgconfig, gtk-doc and intltool-native in particular. > > I've sent out patches against OE-Core that address the bulk of the > issues there however I'm conscious this is probably going to a bug issue > in other layers and may be too annoying to consider at this point. The > other alternative is simply to turn the warning into a debug statement. I'm fine with new warning like this, because I would say that fixing this has higher priority than e.g. QA warnings we have, so it's annoying, but easy to fix. If you wait +- a week I can do test run on my world builds and report how many warnings it shows. > I appreciate the code below has commented blocks, this is simply debug > I've left around for now. It will be cleaned from any final version. > > Signed-off-by: Richard Purdie > > diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass > index 0dc1e6b..34d432e 100644 > --- a/meta/classes/autotools.bbclass > +++ b/meta/classes/autotools.bbclass > @@ -142,15 +142,51 @@ python autotools_copy_aclocals () { > return > > taskdepdata = d.getVar("BB_TASKDEPDATA", False) > +#bb.warn(str(taskdepdata)) > pn = d.getVar("PN", True) > aclocaldir = d.getVar("ACLOCALDIR", True) > oe.path.remove(aclocaldir) > bb.utils.mkdirhier(aclocaldir) > +start = None > configuredeps = [] > + > for dep in taskdepdata: > data = taskdepdata[dep] > -if data[1] == "do_configure" and data[0] != pn: > -configuredeps.append(data[0]) > +if data[1] == "do_configure" and data[0] == pn: > +start = dep > +break > +if not start: > +bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?") > + > +# We need to find configure tasks which are either from -> > > +# or -> but not -> unless they're > direct > +# dependencies. This mirrors what would get restored from sstate. > +done = [dep] > +next = [dep] > +while next: > +new = [] > +for dep in next: > +data = taskdepdata[dep] > +for datadep in data[3]: > +if datadep in done: > +continue > +done.append(datadep) > +if (not data[0].endswith("-native")) and > taskdepdata[datadep][0].endswith("-native") and dep != start: > +continue > +new.append(datadep) > +if taskdepdata[datadep][1] == "do_configure": > +configuredeps.append(taskdepdata[datadep][0]) > +next = new > + > +#configuredeps2 = [] > +#for dep in taskdepdata: > +#data = taskdepdata[dep] > +#if data[1] == "do_configure" and data[0] != pn: > +#configuredeps2.append(data[0]) > +#configuredeps.sort() > +#configuredeps2.sort() > +#bb.warn(str(configuredeps)) > +#bb.warn(str(configuredeps2)) > > cp = [] > for c in configuredeps: > > -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH RFC] autotools: Improve configure dependency code for finding m4 files
On Mon, 2014-06-02 at 23:47 +0200, Martin Jansa wrote: > On Mon, Jun 02, 2014 at 09:15:01PM +0100, Richard Purdie wrote: > > We have an open bug about the warnings issues in builds from an sstate > > cache when something like glib-2.0 gets rebuilt. The issue is that > > sstate is "clever" and prunes unneeded dependencies out the tree. > > > > For example is X depends on pkgconfig-native but we've already build X > > and installed it from sstate, it will not get installed when you build Y > > which depends on X. > > > > This patch changes the logic to match the sstate behaviour and prune out > > unnecessary dependencies from the scope of aclocal. This in turn removes > > the warning about missing manifest files. > > > > The issue is that this patch exposes holes in our DEPENDS in recipes, > > specifically that some native tools are not listed, specifically, and > > problematically, pkgconfig, gtk-doc and intltool-native in particular. > > > > I've sent out patches against OE-Core that address the bulk of the > > issues there however I'm conscious this is probably going to a bug issue > > in other layers and may be too annoying to consider at this point. The > > other alternative is simply to turn the warning into a debug statement. > > I'm fine with new warning like this, because I would say that fixing > this has higher priority than e.g. QA warnings we have, so it's > annoying, but easy to fix. > > If you wait +- a week I can do test run on my world builds and report > how many warnings it shows. I think the trouble is going to be that the warning only indicates a potential problem, some of them will be valid issues and some won't be. If you include this patch, it will remove those warnings but the cases of missing dependencies will become hard do_configure fails when it can't match macros like those from pkg-config. I can't think of a manageable way of just giving warnings about true missing dependencies :/. There isn't any rush with this change, its just something to further think about I guess. We could do with getting a feel for the scale of the problem though. On IRC you asked why your minimal from sstate builds don't show this issue. That is a good question and one I'll look into as I'd have expected them to. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] mesa-demos: Use DEMOS_DATA_DIR.
Modify mesa demo apps to respect the DEMOS_DATA_DIR configuration parameter for locating data files. Signed-off-by: Drew Moseley --- ...s-Use-DEMOS_DATA_DIR-to-locate-data-files.patch | 234 + meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 3 +- 2 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch new file mode 100644 index 000..c89f878 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch @@ -0,0 +1,234 @@ +From bc7fa67d13e8032601df5cf04e15c53a7204dcd7 Mon Sep 17 00:00:00 2001 +From: Drew Moseley +Date: Fri, 9 May 2014 11:50:24 -0400 +Subject: [PATCH] mesa-demos: Use DEMOS_DATA_DIR to locate data files + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] +Signed-off-by: Drew Moseley +--- + src/glsl/bezier.c |2 +- + src/glsl/blinking-teapot.c |4 ++-- + src/glsl/brick.c|4 ++-- + src/glsl/bump.c |6 +++--- + src/glsl/convolutions.c |2 +- + src/glsl/mandelbrot.c |4 ++-- + src/glsl/multitex.c |4 ++-- + src/glsl/simplex-noise.c|2 +- + src/glsl/skinning.c |4 ++-- + src/glsl/texdemo1.c |8 + src/glsl/toyball.c |4 ++-- + src/objviewer/objview.c | 12 ++-- + src/perf/glslstateschange.c |8 + 13 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c +index 0b56bc1..e01603d 100644 +--- a/src/glsl/bezier.c b/src/glsl/bezier.c +@@ -13,7 +13,7 @@ + #include "glut_wrap.h" + #include "shaderutil.h" + +-static const char *filename = "bezier.geom"; ++static const char *filename = DEMOS_DATA_DIR "bezier.geom"; + + static GLuint fragShader; + static GLuint vertShader; +diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c +index e3bf24d..7662b1f 100644 +--- a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c +@@ -63,8 +63,8 @@ init_opengl (void) + exit(1); + } + +- vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); +- fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); ++ vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); ++ fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); + prog_id = LinkShaders (vshad_id, fshad_id); + + UseProgram (prog_id); +diff --git a/src/glsl/brick.c b/src/glsl/brick.c +index 3021856..fe5f190 100644 +--- a/src/glsl/brick.c b/src/glsl/brick.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH06-brick.frag"; +-static char *VertProgFile = "CH06-brick.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/bump.c b/src/glsl/bump.c +index 59f62cd..3a1b20a 100644 +--- a/src/glsl/bump.c b/src/glsl/bump.c +@@ -15,9 +15,9 @@ + #include "readtex.h" + + +-static char *FragProgFile = "CH11-bumpmap.frag"; +-static char *FragTexProgFile = "CH11-bumpmaptex.frag"; +-static char *VertProgFile = "CH11-bumpmap.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; ++static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; + static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; + + /* program/shader objects */ +diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c +index a120cfe..9312f00 100644 +--- a/src/glsl/convolutions.c b/src/glsl/convolutions.c +@@ -340,7 +340,7 @@ static void init(void) + +menuInit(); +readTexture(textureLocation); +- createProgram("convolution.vert", "convolution.frag"); ++ createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); + +glEnable(GL_TEXTURE_2D); +glClearColor(1.0, 1.0, 1.0, 1.0); +diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c +index 31ede1d..ab34a0f 100644 +--- a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH18-mandel.frag"; +-static char *VertProgFile = "CH18-mandel.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c +index 262ea50..546bd27 100644 +--- a/src/glsl/multitex.c
[OE-core] [PATCH 1/3] mesa-demos: Build with system data files
Use the "--with-system-data-files" when configuring mesa-demos so that the data files in /usr/share/mesa-demos/ will be properly located at run time. Copy some additional data files into the target filesystem. Signed-off-by: Drew Moseley --- meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 11 +++ 1 file changed, 11 insertions(+) diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb index 7cda19e..972ead3 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb @@ -27,6 +27,8 @@ PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ # The Wayland code doesn't work with Wayland 1.0, so disable it for now #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +EXTRA_OECONF = "--with-system-data-files" + PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype" @@ -38,3 +40,12 @@ PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa," PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" + +do_install_append () { +install -m 0644 ${S}/src/perf/*.frag \ +${S}/src/perf/*.vert \ +${S}/src/glsl/*.frag \ +${S}/src/glsl/*.vert \ +${S}/src/glsl/*.geom \ +${S}/src/glsl/*.glsl ${D}${datadir}/${BPN} +} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] mesa-demos: Add missing data files.
Add some data files that are present in the git repository: http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 but not in the release tarball ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 Signed-off-by: Drew Moseley --- .../0001-mesa-demos-Add-missing-data-files.patch | 623 + meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 3 +- 2 files changed, 625 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch new file mode 100644 index 000..c785103 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch @@ -0,0 +1,623 @@ +From 87f9a62329d7c5f4d351fbb63a41f2a1935fb2f1 Mon Sep 17 00:00:00 2001 +From: Drew Moseley +Date: Mon, 12 May 2014 15:22:32 -0400 +Subject: [PATCH] mesa-demos: Add missing data files. + +Add some data files that are present in the git repository: + http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 +but not in the release tarball + ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 + +Upstream-Status: Backport +Signed-off-by: Drew Moseley +--- + src/fpglsl/depth-read.glsl |4 + + src/fpglsl/infinite-loop.glsl |7 + + src/glsl/CH11-bumpmaptex.frag | 47 +++ + src/glsl/blinking-teapot.frag | 31 + + src/glsl/blinking-teapot.vert | 16 +++ + src/glsl/convolution.frag | 21 +++ + src/glsl/simplex-noise.glsl | 279 +++ + src/glsl/skinning.vert | 24 + src/perf/glslstateschange1.frag | 19 +++ + src/perf/glslstateschange1.vert | 14 ++ + src/perf/glslstateschange2.frag | 17 +++ + src/perf/glslstateschange2.vert | 14 ++ + src/vpglsl/infinite-loop.glsl |8 ++ + 13 files changed, 501 insertions(+) + create mode 100644 src/fpglsl/depth-read.glsl + create mode 100644 src/fpglsl/infinite-loop.glsl + create mode 100644 src/glsl/CH11-bumpmaptex.frag + create mode 100644 src/glsl/blinking-teapot.frag + create mode 100644 src/glsl/blinking-teapot.vert + create mode 100644 src/glsl/convolution.frag + create mode 100644 src/glsl/simplex-noise.glsl + create mode 100644 src/glsl/skinning.vert + create mode 100644 src/perf/glslstateschange1.frag + create mode 100644 src/perf/glslstateschange1.vert + create mode 100644 src/perf/glslstateschange2.frag + create mode 100644 src/perf/glslstateschange2.vert + create mode 100644 src/vpglsl/infinite-loop.glsl + +diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl +new file mode 100644 +index 000..86d298e +--- /dev/null b/src/fpglsl/depth-read.glsl +@@ -0,0 +1,4 @@ ++void main() ++{ ++ gl_FragColor = gl_FragCoord.; ++} +diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl +new file mode 100644 +index 000..c6dc6ee +--- /dev/null b/src/fpglsl/infinite-loop.glsl +@@ -0,0 +1,7 @@ ++void main() { ++ vec4 sum = vec4(0); ++ for (int i = 1; i != 2; i += 2) { ++ sum += vec4(0.1, 0.1, 0.1, 0.1); ++ } ++ gl_FragColor = sum; ++} +diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag +new file mode 100644 +index 000..b5dabb4 +--- /dev/null b/src/glsl/CH11-bumpmaptex.frag +@@ -0,0 +1,47 @@ ++// ++// Fragment shader for procedural bumps ++// ++// Authors: John Kessenich, Randi Rost ++// ++// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. ++// ++// See 3Dlabs-License.txt for license information ++// ++// Texture mapping/modulation added by Brian Paul ++// ++ ++varying vec3 LightDir; ++varying vec3 EyeDir; ++ ++uniform float BumpDensity; // = 16.0 ++uniform float BumpSize;// = 0.15 ++uniform float SpecularFactor; // = 0.5 ++ ++uniform sampler2D Tex; ++ ++void main() ++{ ++vec3 ambient = vec3(0.25); ++vec3 litColor; ++vec2 c = BumpDensity * gl_TexCoord[0].st; ++vec2 p = fract(c) - vec2(0.5); ++ ++float d, f; ++d = p.x * p.x + p.y * p.y; ++f = inversesqrt(d + 1.0); ++ ++if (d >= BumpSize) ++{ p = vec2(0.0); f = 1.0; } ++ ++vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz; ++ ++vec3 normDelta = vec3(p.x, p.y, 1.0) * f; ++litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0)); ++vec3 reflectDir = reflect(LightDir, normDelta); ++ ++float spec = max(dot(EyeDir, reflectDir), 0.0); ++spec *= SpecularFactor; ++litColor = min(litColor + spec, vec3(1.0)); ++ ++gl_FragColor = vec4(litColor, 1.0); ++} +diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag +new file mode 100644 +index 000..0db060b +--- /dev/null b/src/glsl/blinking-teapot.frag +@@ -0,0 +1,31 @@ ++#extension GL_ARB_uniform_buffer_object : enable ++ ++layout(std140) uni
[OE-core] [PATCH 1/3] gawk: upgrade from 4.0.2 to 4.1.1
Upgrade gawk from 4.0.2 to 4.1.1. Signed-off-by: Chen Qi --- .../gawk/{gawk-4.0.2 => gawk-4.1.1}/run-ptest |0 .../gawk/{gawk_4.0.2.bb => gawk_4.1.1.bb} |6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/gawk/{gawk-4.0.2 => gawk-4.1.1}/run-ptest (100%) rename meta/recipes-extended/gawk/{gawk_4.0.2.bb => gawk_4.1.1.bb} (84%) diff --git a/meta/recipes-extended/gawk/gawk-4.0.2/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest similarity index 100% rename from meta/recipes-extended/gawk/gawk-4.0.2/run-ptest rename to meta/recipes-extended/gawk/gawk-4.1.1/run-ptest diff --git a/meta/recipes-extended/gawk/gawk_4.0.2.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb similarity index 84% rename from meta/recipes-extended/gawk/gawk_4.0.2.bb rename to meta/recipes-extended/gawk/gawk_4.1.1.bb index cb2f9c0..a6872d8 100644 --- a/meta/recipes-extended/gawk/gawk_4.0.2.bb +++ b/meta/recipes-extended/gawk/gawk_4.1.1.bb @@ -20,15 +20,15 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "4d505dc2c9f1eb3e9f8d6cac87d4bd1a" -SRC_URI[sha256sum] = "6e0de117c3713aa8d7fa347fc9fd645b10038ae49d8cf947d8c1d51cbb76141a" +SRC_URI[md5sum] = "45f5b09aa87b4744c4c53bf274e96ed0" +SRC_URI[sha256sum] = "556464bd2e4bc5a0fad4526b59623e4be40b4c2f4c663dfaaf246af6e2ec1d62" inherit autotools gettext texinfo update-alternatives PACKAGES += "gawk-common pgawk dgawk" FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk" -FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*" +FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/* ${libexecdir}/*.so ${libexecdir}/*.la" FILES_pgawk = "${bindir}/pgawk*" FILES_${PN}-dbg += "${libexecdir}/awk/.debug" FILES_dgawk = "${bindir}/dgawk*" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] grep: upgrade 2.18 to 2.19
Upgrade grep from 2.18 to 2.19. Signed-off-by: Chen Qi --- .../grep/{grep_2.18.bb => grep_2.19.bb}|4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/grep/{grep_2.18.bb => grep_2.19.bb} (86%) diff --git a/meta/recipes-extended/grep/grep_2.18.bb b/meta/recipes-extended/grep/grep_2.19.bb similarity index 86% rename from meta/recipes-extended/grep/grep_2.18.bb rename to meta/recipes-extended/grep/grep_2.19.bb index 99337f7..f38a9a6 100644 --- a/meta/recipes-extended/grep/grep_2.18.bb +++ b/meta/recipes-extended/grep/grep_2.19.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee" SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[md5sum] = "7439f8266f50844b56cc3e2721606541" -SRC_URI[sha256sum] = "e6436e5077fa1497feccc8feaabd3f507b172369bf120fbc9e4874bba81be720" +SRC_URI[md5sum] = "ac732142227d9fe9567d71301e127979" +SRC_URI[sha256sum] = "6388295be48cfcaf7665d9cd3914e6625ea000e9414132bfefd45cf1d8eec34d" inherit autotools gettext texinfo -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Package Upgrades
This patchset upgrades three packages, gawk, grep and shadow. There's a remaining problem here. After upgrading the shadow package, the 'pwconv' and 'grpconv' commands cannot run successfully in pkg_postinst. I tried to run them in the devshell environment, they succeeded. I digged into the codes but still had no idea. Hope somebody could help me out here. Best Regards, Chen Qi The following changes since commit 3fa9508521d27e17bfe1a0aeb15d7fc2377218cd: Update tzcode to 2014c (2014-05-29 10:32:29 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/package-upgrades http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/package-upgrades Chen Qi (3): gawk: upgrade from 4.0.2 to 4.1.1 grep: upgrade 2.18 to 2.19 shadow: upgrade from 4.1.4.3 to 4.2.1 .../gawk/{gawk-4.0.2 => gawk-4.1.1}/run-ptest |0 .../gawk/{gawk_4.0.2.bb => gawk_4.1.1.bb} |6 +- .../grep/{grep_2.18.bb => grep_2.19.bb}|4 +- .../shadow/files/add_root_cmd_groupmems.patch | 75 -- .../shadow/files/add_root_cmd_options.patch| 1384 .../allow-for-setting-password-in-clear-text.patch | 215 ++- ...fix-unexpected-open-failure-in-chroot-env.patch | 46 + .../shadow/files/fix-etc-gshadow-reading.patch | 36 - ...installation-failure-with-subids-disabled.patch | 28 + .../shadow-4.1.4.2-env-reset-keep-locale.patch | 31 - .../files/shadow-4.1.4.2-groupmod-pam-check.patch | 36 - .../files/shadow-4.1.4.2-su_no_sanitize_env.patch | 31 - .../shadow/files/shadow.automake-1.11.patch| 106 -- .../files/shadow_fix_for_automake-1.12.patch | 23 - .../files/slackware_fix_for_glib-2.17_crypt.patch | 63 - meta/recipes-extended/shadow/files/useradd.patch | 17 - ...-compilation-failure-with-subids-disabled.patch | 33 + ...uretty_4.1.4.3.bb => shadow-securetty_4.2.1.bb} |0 ...-sysroot_4.1.4.3.bb => shadow-sysroot_4.2.1.bb} |0 meta/recipes-extended/shadow/shadow.inc| 33 +- .../shadow/{shadow_4.1.4.3.bb => shadow_4.2.1.bb} |0 21 files changed, 227 insertions(+), 1940 deletions(-) rename meta/recipes-extended/gawk/{gawk-4.0.2 => gawk-4.1.1}/run-ptest (100%) rename meta/recipes-extended/gawk/{gawk_4.0.2.bb => gawk_4.1.1.bb} (84%) rename meta/recipes-extended/grep/{grep_2.18.bb => grep_2.19.bb} (86%) delete mode 100644 meta/recipes-extended/shadow/files/add_root_cmd_groupmems.patch delete mode 100644 meta/recipes-extended/shadow/files/add_root_cmd_options.patch create mode 100644 meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch delete mode 100644 meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch create mode 100644 meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch delete mode 100644 meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch delete mode 100644 meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch delete mode 100644 meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch delete mode 100644 meta/recipes-extended/shadow/files/shadow.automake-1.11.patch delete mode 100644 meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-extended/shadow/files/slackware_fix_for_glib-2.17_crypt.patch delete mode 100644 meta/recipes-extended/shadow/files/useradd.patch create mode 100644 meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch rename meta/recipes-extended/shadow/{shadow-securetty_4.1.4.3.bb => shadow-securetty_4.2.1.bb} (100%) rename meta/recipes-extended/shadow/{shadow-sysroot_4.1.4.3.bb => shadow-sysroot_4.2.1.bb} (100%) rename meta/recipes-extended/shadow/{shadow_4.1.4.3.bb => shadow_4.2.1.bb} (100%) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] fetch2/svn.py: fix Unable to fetch URL bug
For svn source, when download a revsion on branches, if the download revsion < the branch created time revsion, then it will fail. The detail description reference the Yocto Project bugzilla, please see: https://bugzilla.yoctoproject.org/show_bug.cgi?id=6258 Signed-off-by: Wenlin Kang --- lib/bb/fetch2/svn.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 8847461..75e21df 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -98,7 +98,8 @@ class Svn(FetchMethod): suffix = "" if ud.revision: options.append("-r %s" % ud.revision) -suffix = "@%s" % (ud.revision) +#follow this line can make the fetch fail when download a revsion on branches if the download revsion < the branch created time revsion. +#suffix = "@%s" % (ud.revision) if command == "fetch": svncmd = "%s co %s %s://%s/%s%s %s" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] man-pages: Update to 3.68
README updated with general text regarding installation location Signed-off-by: Saul Wold --- .../man-pages/{man-pages_3.65.bb => man-pages_3.68.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/man-pages/{man-pages_3.65.bb => man-pages_3.68.bb} (72%) diff --git a/meta/recipes-extended/man-pages/man-pages_3.65.bb b/meta/recipes-extended/man-pages/man-pages_3.68.bb similarity index 72% rename from meta/recipes-extended/man-pages/man-pages_3.65.bb rename to meta/recipes-extended/man-pages/man-pages_3.68.bb index 435b557..fb66984 100644 --- a/meta/recipes-extended/man-pages/man-pages_3.65.bb +++ b/meta/recipes-extended/man-pages/man-pages_3.68.bb @@ -4,11 +4,11 @@ SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"; LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://README;md5=0422377a748010b2b738342e24f141c1" +LIC_FILES_CHKSUM = "file://README;md5=8f2a3d43057d458e5066714980567a60" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz" -SRC_URI[md5sum] = "8d273473a803cbe9f41b29b2294e5fda" -SRC_URI[sha256sum] = "3e936fb931239882ab2816a1497218b48ddc4834793a9779dfe91328c7587eb0" +SRC_URI[md5sum] = "b23aa8262f9c999e66a413fb44a0a055" +SRC_URI[sha256sum] = "ad26df6a8878cb87309e8cb1e5867def3e3bfa731e3cf02af076db7d94f58f1f" RDEPENDS_${PN} = "man" -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] libxkbcommon: Update to 0.4.2
Signed-off-by: Saul Wold --- .../xorg-lib/{libxkbcommon_0.4.1.bb => libxkbcommon_0.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.4.1.bb => libxkbcommon_0.4.2.bb} (82%) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.2.bb similarity index 82% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.2.bb index cf5dfeb..2b18061 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.2.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"; -SRC_URI[md5sum] = "b70f4ed97b6c9432dc956e4177f3336a" -SRC_URI[sha256sum] = "90ee502ec919814533c65e74c208212854f5bae9b9b87932eeb96fb3876b8ff6" +SRC_URI[md5sum] = "4b717adce41c8305258e99a9b396330a" +SRC_URI[sha256sum] = "a0fc71b07eeddba4af62bd709e24cec219778bb6871384aa850b2f5798a48957" inherit autotools pkgconfig -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] Updates and a dependency Patch
Set up package updates and a patch for some dependency issues with adduser and update-rc.d. Sau! The following changes since commit 6433f5d68eba1ce7306fbfb19265ea6786715d7c: diffstat: patches have now been submitted upstream (2014-06-02 21:35:52 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/updates http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates Saul Wold (7): libxkbcommon: Update to 0.4.2 libcheck: Update to 0.9.13 libffi: Update to 3.1 man-pages: Update to 3.68 cups: Update to 1.7.3 resolvconf: Update to 1.75 update-rc.d/useradd: Add additional dependecies meta/classes/update-rc.d.bbclass | 2 ++ meta/classes/useradd.bbclass | 2 +- .../resolvconf/{resolvconf_1.74.bb => resolvconf_1.75.bb} | 6 +++--- meta/recipes-extended/cups/{cups_1.7.2.bb => cups_1.7.3.bb} | 4 ++-- .../man-pages/{man-pages_3.65.bb => man-pages_3.68.bb}| 6 +++--- meta/recipes-gnome/libffi/{libffi_3.0.13.bb => libffi_3.1.bb} | 8 .../xorg-lib/{libxkbcommon_0.4.1.bb => libxkbcommon_0.4.2.bb} | 4 ++-- .../libcheck/{libcheck_0.9.12.bb => libcheck_0.9.13.bb} | 4 ++-- 8 files changed, 19 insertions(+), 17 deletions(-) rename meta/recipes-connectivity/resolvconf/{resolvconf_1.74.bb => resolvconf_1.75.bb} (92%) rename meta/recipes-extended/cups/{cups_1.7.2.bb => cups_1.7.3.bb} (40%) rename meta/recipes-extended/man-pages/{man-pages_3.65.bb => man-pages_3.68.bb} (72%) rename meta/recipes-gnome/libffi/{libffi_3.0.13.bb => libffi_3.1.bb} (77%) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.4.1.bb => libxkbcommon_0.4.2.bb} (82%) rename meta/recipes-support/libcheck/{libcheck_0.9.12.bb => libcheck_0.9.13.bb} (79%) -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] update-rc.d/useradd: Add additional dependecies
These dependcies are needed to ensure that thier packages are created correctly since these classes have runtime dependiences in their packages but they are not actually created yet at rootfs time. [YOCTO #6072] Signed-off-by: Saul Wold --- meta/classes/update-rc.d.bbclass | 2 ++ meta/classes/useradd.bbclass | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 56eef4e..ca9486b 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -1,6 +1,7 @@ UPDATERCPN ?= "${PN}" DEPENDS_append = " update-rc.d-native" +DEPENDS_append_class-target = " initscripts" UPDATERCD = "update-rc.d" UPDATERCD_class-cross = "" UPDATERCD_class-native = "" @@ -67,6 +68,7 @@ python __anonymous() { } PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd " +PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd " populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst" diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 3dd7a61..ea15dab 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -4,7 +4,7 @@ inherit useradd_base # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts DEPENDS_append = "${USERADDDEPENDS}" -USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" +USERADDDEPENDS = " base-files base-passwd shadow-native shadow-sysroot shadow" USERADDDEPENDS_class-cross = "" USERADDDEPENDS_class-native = "" USERADDDEPENDS_class-nativesdk = "" -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] resolvconf: Update to 1.75
Archive compression changed to xz Signed-off-by: Saul Wold --- .../resolvconf/{resolvconf_1.74.bb => resolvconf_1.75.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-connectivity/resolvconf/{resolvconf_1.74.bb => resolvconf_1.75.bb} (92%) diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb similarity index 92% rename from meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb rename to meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb index 68bd515..7310c83 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb @@ -11,10 +11,10 @@ AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf"; RDEPENDS_${PN} = "bash" -SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz" -SRC_URI[md5sum] = "2f190d3bb8960b69157f63590c262e93" -SRC_URI[sha256sum] = "2e72e6884e9105cbf57101ab0f11e768717b6f76b7f5100c6a2a0cc69bb3d4a0" +SRC_URI[md5sum] = "4b8bc86a3cf070e3fd0e9aff7eaaba56" +SRC_URI[sha256sum] = "16167f37a77ef4bc4596dcbefece269b6a10d10fa448594ec55ed3303193086e" inherit allarch -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] libffi: Update to 3.1
LICENSE file has updated year Signed-off-by: Saul Wold --- meta/recipes-gnome/libffi/{libffi_3.0.13.bb => libffi_3.1.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-gnome/libffi/{libffi_3.0.13.bb => libffi_3.1.bb} (77%) diff --git a/meta/recipes-gnome/libffi/libffi_3.0.13.bb b/meta/recipes-gnome/libffi/libffi_3.1.bb similarity index 77% rename from meta/recipes-gnome/libffi/libffi_3.0.13.bb rename to meta/recipes-gnome/libffi/libffi_3.1.bb index 9897ca8..bc97aba 100644 --- a/meta/recipes-gnome/libffi/libffi_3.0.13.bb +++ b/meta/recipes-gnome/libffi/libffi_3.1.bb @@ -7,13 +7,13 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e54c573c49435ccbbd3f6dc9e49a065e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" -SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz \ +SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \ file://fix-libffi.la-location.patch" -SRC_URI[md5sum] = "45f3b6dbc9ee7c7dfbbbc5feba571529" -SRC_URI[sha256sum] = "1e1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" +SRC_URI[md5sum] = "f5898b29bbfd70502831a212d9249d10" +SRC_URI[sha256sum] = "97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb" EXTRA_OECONF += "--disable-builddir" -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] cups: Update to 1.7.3
Signed-off-by: Saul Wold --- meta/recipes-extended/cups/{cups_1.7.2.bb => cups_1.7.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/cups/{cups_1.7.2.bb => cups_1.7.3.bb} (40%) diff --git a/meta/recipes-extended/cups/cups_1.7.2.bb b/meta/recipes-extended/cups/cups_1.7.3.bb similarity index 40% rename from meta/recipes-extended/cups/cups_1.7.2.bb rename to meta/recipes-extended/cups/cups_1.7.3.bb index 5d19fff..2175ba7 100644 --- a/meta/recipes-extended/cups/cups_1.7.2.bb +++ b/meta/recipes-extended/cups/cups_1.7.3.bb @@ -2,5 +2,5 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d" -SRC_URI[md5sum] = "f06a997d4b71b81b23324e27174f93e7" -SRC_URI[sha256sum] = "315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676" +SRC_URI[md5sum] = "d498c3020acda0904ab0c13b6389a1ec" +SRC_URI[sha256sum] = "fa989f856d1499169dc442fb2311053ea42fe455ca2721693ba5a9fe4b333e31" -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] libcheck: Update to 0.9.13
Signed-off-by: Saul Wold --- .../libcheck/{libcheck_0.9.12.bb => libcheck_0.9.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libcheck/{libcheck_0.9.12.bb => libcheck_0.9.13.bb} (79%) diff --git a/meta/recipes-support/libcheck/libcheck_0.9.12.bb b/meta/recipes-support/libcheck/libcheck_0.9.13.bb similarity index 79% rename from meta/recipes-support/libcheck/libcheck_0.9.12.bb rename to meta/recipes-support/libcheck/libcheck_0.9.13.bb index 2a83031..8c063d4 100644 --- a/meta/recipes-support/libcheck/libcheck_0.9.12.bb +++ b/meta/recipes-support/libcheck/libcheck_0.9.13.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \ " -SRC_URI[md5sum] = "46fe540d1a03714c7a1967dbc6d484e7" -SRC_URI[sha256sum] = "c7d47e55e133a0ca19a52e08a99333ac55cb22618b53719b7f4117a1875b1ea3" +SRC_URI[md5sum] = "95530868f81a9496b2518fd2b713008a" +SRC_URI[sha256sum] = "ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7" S = "${WORKDIR}/check-${PV}" -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] cogl: update to 1.18.0
From: Tim Orling Announcement: http://lists.freedesktop.org/archives/cogl/2014-March/001636.html * License changed from LGPL to MIT * kms-include-stddef.h-before-drm.h.patch fixed upstream Signed-off-by: Tim Orling --- meta/recipes-graphics/cogl/cogl-1.0.inc| 2 +- .../kms-include-stddef.h-before-drm.h.patch| 33 -- meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb | 8 -- meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb | 6 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index a4a8550..e25968e 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -1,6 +1,6 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs" HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"; -LICENSE = "LGPLv2.1+" +LICENSE = "MIT" inherit clutter diff --git a/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch b/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch deleted file mode 100644 index 7cce279..000 --- a/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Submitted [c...@lists.freedesktop.org] - -From 5e4f4689308732a0570a1631169247157c59f064 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -Date: Tue, 28 Jan 2014 18:36:04 +0100 -Subject: [PATCH] kms: include stddef.h before drm.h - -Not doing so leads to the following error, if stddef.h is not included -indirectly through EGL headers: - -| libdrm/drm.h:132:2: error: unknown type name 'size_t' -| size_t name_len; /**< Length of name buffer */ - -Signed-off-by: Andreas Oberritter - cogl/winsys/cogl-winsys-egl-kms.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c -index f7c9cfb..144ad9b 100644 a/cogl/winsys/cogl-winsys-egl-kms.c -+++ b/cogl/winsys/cogl-winsys-egl-kms.c -@@ -40,6 +40,7 @@ - - #include - #include -+#include - #include - #include - #include --- -1.8.3.2 - diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb deleted file mode 100644 index 521158e..000 --- a/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require cogl-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch" - -SRC_URI[archive.md5sum] = "aaf32bde135cf3815aa3221726bad71e" -SRC_URI[archive.sha256sum] = "65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7" diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb new file mode 100644 index 000..375b079 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb @@ -0,0 +1,6 @@ +require cogl-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" + +SRC_URI[archive.md5sum] = "994a29f5c02768367b6f035bfe456ba6" +SRC_URI[archive.sha256sum] = "a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e" -- 1.8.3.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] cogl/clutter update to 1.18
From: Tim Orling The following changes since commit 6433f5d68eba1ce7306fbfb19265ea6786715d7c: diffstat: patches have now been submitted upstream are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib timo/cogl-clutter-1.18 http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-1.18 Tim Orling (2): cogl: update to 1.18.0 clutter: update to 1.18.2 .../clutter/clutter-1.0/install-examples.patch | 14 ++--- .../recipes-graphics/clutter/clutter-1.0_1.16.2.bb | 8 -- .../recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 ++ meta/recipes-graphics/cogl/cogl-1.0.inc| 2 +- .../kms-include-stddef.h-before-drm.h.patch| 33 -- meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb | 8 -- meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb | 6 7 files changed, 17 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb -- 1.8.3.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] clutter: update to 1.18.2
From: Tim Orling * Updated Ross's install-examples.patch to current ** AM_CPPFLAGS changes no longer needed ** example_DATA = ... redhand.png no longer needed ** minor line # changes Signed-off-by: Tim Orling --- .../clutter/clutter-1.0/install-examples.patch | 14 ++ meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb| 8 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb| 8 3 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch index d96b038..3b6a70e 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch +++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -7,22 +7,12 @@ diff --git a/examples/Makefile.am b/examples/Makefile.am index 4b9b449..232cd19 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am -@@ -31,7 +31,7 @@ LDADD = \ - AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS) - - AM_CPPFLAGS = \ -- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ -+ -DTESTS_DATADIR=\""$(exampledir)"\" \ - -DG_DISABLE_SINGLE_INCLUDES \ - -DGLIB_DISABLE_DEPRECATION_WARNINGS \ - -I$(top_srcdir) \ -@@ -39,6 +39,8 @@ AM_CPPFLAGS = \ +@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/clutter \ -I$(top_builddir)/clutter -noinst_PROGRAMS = $(all_examples) +exampledir = $(pkglibdir)/examples +example_PROGRAMS = $(all_examples) -+example_DATA = $(top_srcdir)/tests/data/redhand.png - -include $(top_srcdir)/build/autotools/Makefile.am.gitignore + EXTRA_DIST = redhand.png diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb deleted file mode 100644 index 584f9d0..000 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "976614a2f7e60af088a0a460fe9d267e" -SRC_URI[archive.sha256sum] = "0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42" - -SRC_URI += "file://install-examples.patch" diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb new file mode 100644 index 000..452e7ee --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb @@ -0,0 +1,8 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29" +SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63" + +SRC_URI += "file://install-examples.patch" -- 1.8.3.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] fetch2/svn.py: fix Unable to fetch URL bug
On 06/02/2014 06:55 PM, Wenlin Kang wrote: For svn source, when download a revsion on branches, if the download revsion < the branch created time revsion, then it will fail. The detail description reference the Yocto Project bugzilla, please see: https://bugzilla.yoctoproject.org/show_bug.cgi?id=6258 Signed-off-by: Wenlin Kang --- lib/bb/fetch2/svn.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 8847461..75e21df 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -98,7 +98,8 @@ class Svn(FetchMethod): suffix = "" if ud.revision: options.append("-r %s" % ud.revision) -suffix = "@%s" % (ud.revision) +#follow this line can make the fetch fail when download a revsion on branches if the download revsion < the branch created time revsion. +#suffix = "@%s" % (ud.revision) Will this cause other failures if there versions requests at a specific revision? can you detail how you tested this? if command == "fetch": svncmd = "%s co %s %s://%s/%s%s %s" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC/RFT 1/2] wayland: upgrade to 1.5.0
On 05/23/2014 12:02 AM, Tim Orling wrote: From: Tim Orling * update disable-macro-checks-not-used-for-scanner.patch = trivial change to non-patched text (+ posix_fallocate) * drop just-scanner.patch, no longer needed I'm afraid that we can't drop this patch, I met the same error on CentOS 5.10 again, as described in the original patch: From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Fri, 7 Feb 2014 16:36:47 +0200 Subject: [PATCH] just scanner We only build wayland-native for the scanner, so disable the bits we don't actually need. This gives us a small speed up but importantly should allow wayland-native to compile on older hosts such as CentOS 5 which currently fails: | wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory | wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) Upstream-Status: Inappropriate Signed-off-by: Ross Burton Signed-off-by: Valentin Popa // Robert Signed-off-by: Tim Orling --- ...disable-macro-checks-not-used-for-scanner.patch | 2 +- .../wayland/wayland/just-scanner.patch | 49 -- .../wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} | 7 ++-- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch rename meta/recipes-graphics/wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} (89%) diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch index bf499bb..cd8bc55 100644 --- a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch +++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac +++ b/configure.ac @@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) - AC_CHECK_FUNCS([accept4 mkostemp]) + AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) -AC_CHECK_DECL(SFD_CLOEXEC,[], - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch deleted file mode 100644 index ae9935e..000 --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 -From: Valentin Popa -Date: Fri, 7 Feb 2014 16:36:47 +0200 -Subject: [PATCH] just scanner - -We only build wayland-native for the scanner, so disable the bits we don't -actually need. This gives us a small speed up but importantly should allow -wayland-native to compile on older hosts such as CentOS 5 which currently fails: - -| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory -| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton -Signed-off-by: Valentin Popa - Makefile.am | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 99607b0..ecce1f1 100644 a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,7 @@ if BUILD_DOCS - doc_subdir = doc - endif - --SUBDIRS = protocol src $(doc_subdir) tests cursor -+SUBDIRS = protocol src $(doc_subdir) - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -diff --git a/src/Makefile.am b/src/Makefile.am -index 15f44a5..b938d17 100644 a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,4 @@ --lib_LTLIBRARIES = libwayland-server.la libwayland-client.la -+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la - noinst_LTLIBRARIES = libwayland-util.la - - include_HEADERS = \ --- -1.8.3.2 - diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.5.0.bb similarity index 89% rename from meta/recipes-graphics/wayland/wayland_1.4.0.bb rename to meta/recipes-graphics/wayland/wayland_1.5.0.bb index 9f6419d..b1ae59e 100644 --- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb @@ -11,10 +11,9 @@ LIC_FILES_CH
Re: [OE-core] How to find out why shared sstate is not being used for a recipe
On 05/29/2014 01:12 AM, Richard Purdie wrote: On Wed, 2014-05-28 at 13:46 -0700, Christopher Larson wrote: On Wed, May 28, 2014 at 1:42 PM, Khem Raj wrote: On Mon, May 26, 2014 at 11:58 PM, Mike Looijmans wrote: > I have a deja-vu feeling about this question. > > I have this recipe: > > https://github.com/topic-embedded-products/meta-topic/blob/master/recipes-bsp/fpga/fpga-image-miami.bb > > Which includes this one: > https://github.com/topic-embedded-products/meta-topic/blob/master/recipes-bsp/fpga/fpga-image.inc > > I have a build server that exports its sstate-cache directory through HTTP, > and a local host that attempts to use that sstate-cache. This works fine, > except for the recipe above. Building this recipe takes about 1 hour, so i > really really really want to share that state at any cost. As you can see, > I've done a big shotgun blast of "vardepdsexclude" to get the recipe to be > as common as possible. Still any host wants to build its own version. > > How can I diagnose the REASON that my machine thinks it isn't building the > exact same thing as the build server? see https://wiki.yoctoproject.org/wiki/Enable_sstate_cache towards the end it talks about verifying sstate sigs If the sstate is local at least, you can use bitbake -S printdiff . There's also bitbake-whatchanged, but the bitbake one is superior. It's on two different machines, so I think that does not qualify as "local". Worst case, you can pull the siginfo files from one build and the siginfo files from the sstate mirror and then see which ones are different, then run bitbake-diffsigs X Y to compare the two files. How do I find what to pull? I have (ssh) access to both machines. The sstate-cache dir contains a bunch of two-digit directories and a gazillion files. I could just copy the whole thing to one machine, there's gigabit between them, but then what do I do with these files? bitbake -S just tries to automate that process if it can. bitbake -S usually crashes here. Met vriendelijke groet / kind regards, Mike Looijmans TOPIC Embedded Systems Eindhovenseweg 32-C, NL-5683 KH Best Postbus 440, NL-5680 AK Best Telefoon: (+31) (0) 499 33 69 79 Telefax: (+31) (0) 499 33 69 70 E-mail: mike.looijm...@topic.nl Website: www.topic.nl Please consider the environment before printing this e-mail Visit us at MEDTEC Europe 3-5 June, Messe Stuttgart, stand number 5D20 http://medteceurope.com/index.php?page=home-en -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] How to find out why shared sstate is not being used for a recipe
On 06/03/2014 07:25 AM, Mike Looijmans wrote: Worst case, you can pull the siginfo files from one build and the siginfo files from the sstate mirror and then see which ones are different, then run bitbake-diffsigs X Y to compare the two files. How do I find what to pull? I have (ssh) access to both machines. The sstate-cache dir contains a bunch of two-digit directories and a gazillion files. I could just copy the whole thing to one machine, there's gigabit between them, but then what do I do with these files? mike:~/zynq_platform/build$ find sstate-cache -name '*fpga-image-miami*.siginfo' | wc -l 480 Suppose I copy them. Where do I copy them to, and what do I do with these 480 files to tell me why the system insists on rebuilding this package? Mike. PS: I really really want to find out. Several of these FPGA recipes take 3.5 hours to build on the fastest i5 we could buy. So you can imagine we really want to prevent having to build it more than once. Met vriendelijke groet / kind regards, Mike Looijmans TOPIC Embedded Systems Eindhovenseweg 32-C, NL-5683 KH Best Postbus 440, NL-5680 AK Best Telefoon: (+31) (0) 499 33 69 79 Telefax: (+31) (0) 499 33 69 70 E-mail: mike.looijm...@topic.nl Website: www.topic.nl Please consider the environment before printing this e-mail Visit us at MEDTEC Europe 3-5 June, Messe Stuttgart, stand number 5D20 http://medteceurope.com/index.php?page=home-en -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bash: fixed bash build error
When build bash, a error occurs, the log follow: make[1]: *** No rule to make target `/config.status', needed by `Makefile'. Stop. make: [installdirs] Error 2 (ignored) The cause is that some variable,PACKAGE and VERSION don't be defined, and others don't get correct value, eg, top_builddir in po/Makevar, GETTEXT_MACRO_VERSION and MKDIR_P in po/Makefile.in.in and so on. The patch fixed above problem. Signed-off-by: Wenlin Kang --- .../bash/bash/fix-build-error.patch| 83 meta/recipes-extended/bash/bash_4.3.bb |1 + 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-extended/bash/bash/fix-build-error.patch diff --git a/meta/recipes-extended/bash/bash/fix-build-error.patch b/meta/recipes-extended/bash/bash/fix-build-error.patch new file mode 100644 index 000..9db6fe2 --- /dev/null +++ b/meta/recipes-extended/bash/bash/fix-build-error.patch @@ -0,0 +1,83 @@ + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Wenlin Kang + +diff -aurN bash-4.3-org/aclocal.m4 bash-4.3/aclocal.m4 +--- bash-4.3-org/aclocal.m42014-05-23 15:28:54.252565146 +0800 bash-4.3/aclocal.m42014-05-23 15:33:19.924570133 +0800 +@@ -3710,6 +3710,14 @@ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AM_NLS])dnl ++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++ AC_REQUIRE([AC_PROG_SED])dnl ++ ++ AC_SUBST([mkdir_p], ['$(MKDIR_P)']) ++ ++ dnl Release version of the gettext macros. This is used to ensure that ++ dnl the gettext macros and po/Makefile.in.in are in sync. ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. +@@ -3723,6 +3731,22 @@ + :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + ++ dnl Test whether it is GNU msgfmt >= 0.15. ++changequote(,)dnl ++ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in ++'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; ++*) MSGFMT_015=$MSGFMT ;; ++ esac ++changequote([,])dnl ++ AC_SUBST([MSGFMT_015]) ++changequote(,)dnl ++ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in ++'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; ++*) GMSGFMT_015=$GMSGFMT ;; ++ esac ++changequote([,])dnl ++ AC_SUBST([GMSGFMT_015]) ++ + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. +@@ -3733,6 +3757,15 @@ + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + ++ dnl Test whether it is GNU xgettext >= 0.15. ++changequote(,)dnl ++ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in ++'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; ++*) XGETTEXT_015=$XGETTEXT ;; ++ esac ++changequote([,])dnl ++ AC_SUBST([XGETTEXT_015]) ++ + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) +diff -aurN bash-4.3-org/configure.ac bash-4.3/configure.ac +--- bash-4.3-org/configure.ac 2014-05-23 15:28:54.208565145 +0800 bash-4.3/configure.ac 2014-05-23 15:29:35.640565923 +0800 +@@ -1201,6 +1201,10 @@ + #AC_SUBST(ALLOCA_SOURCE) + #AC_SUBST(ALLOCA_OBJECT) + ++# Define the identity of the package. ++AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])dnl ++ + AC_OUTPUT([Makefile builtins/Makefile lib/readline/Makefile lib/glob/Makefile \ + lib/intl/Makefile \ + lib/malloc/Makefile lib/sh/Makefile lib/termcap/Makefile \ +diff -aurN bash-4.3-org/po/Makevars bash-4.3/po/Makevars +--- bash-4.3-org/po/Makevars 2014-05-23 15:28:54.204565145 +0800 bash-4.3/po/Makevars 2014-05-23 15:30:04.772566469 +0800 +@@ -5,7 +5,7 @@ + + # These two variables depend on the location of this directory. + subdir = po +-top_builddir = $(BUILD_DIR) ++top_builddir = .. + + # These options get passed to xgettext. + XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ -C diff --git a/meta/recipes-extended/bash/bash_4.3.bb b/meta/recipes-extended/bash/bash_4.3.bb index 25b7410..3ddf145 100644 --- a/meta/recipes-extended/bash/bash_4.3.bb +++ b/meta/recipes-extended/bash/bash_4.3.bb @@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ file://build-tests.patch \ file://test-output.patch \ file://run-ptest \ + file://fix-build-error.patch \ " SRC_URI[tarball.md5sum] = "81348932d5da294953e15d4814c74dd1" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] apr: upgrade to 1.5.1
On 05/29/2014 08:27 PM, Hongxu Jia wrote: The LICENSE has no change, except a newline added. Signed-off-by: Hongxu Jia --- meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} (91%) diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.5.1.bb similarity index 91% rename from meta/recipes-support/apr/apr_1.4.8.bb rename to meta/recipes-support/apr/apr_1.5.1.bb index 0a77ad7..7f2d2ca 100644 --- a/meta/recipes-support/apr/apr_1.4.8.bb +++ b/meta/recipes-support/apr/apr_1.5.1.bb @@ -4,7 +4,7 @@ SECTION = "libs" DEPENDS = "util-linux" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" BBCLASSEXTEND = "native" @@ -16,8 +16,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ " -SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41" -SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421" +SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab" +SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac" inherit autotools-brokensep lib_package binconfig multilib_header ptest There may be an issue with your apr udpate: https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/122/steps/BuildImages/logs/stdio Sau! -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] udev: add udev-utils to RDEPENDS
On 02/03/2014 10:01 PM, David Nyström wrote: On mån 3 feb 2014 14:43:53, Phil Blundell wrote: On Mon, 2014-02-03 at 13:58 +0100, David Nyström wrote: An intended fix for below error message with core-image-lsb, Sending this as an RFC since I dont really know what constitutes a RRECOMMENDS vs. RDEPENDS. Is this clearly defined somewhere ? Below should be an RDEPENDS, no ? INIT: version 2.88 booting Starting udev udevd[59]: starting version 182 /etc/rcS.d/S04udev: line 108: udevadm: command not found /etc/rcS.d/S04udev: line 113: udevadm: command not found /etc/rcS.d/S04udev: line 114: udevadm: command not found That depends (ha ha) on what the udevadm call in question is actually doing. If udev is so badly broken without it as to be unusable then yes, it should be an RDEPENDS. If udev will still work without then RRECOMMENDS is appropriate and the initscript should be tweaked to deal with it. p. SNIP -- udevadm control --env=STARTUP=1 if [ "$not_first_boot" != "" ];then udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics--subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform (udevadm settle --timeout=10; udevadm control --env=STARTUP=)& else udevadm trigger --action=add udevadm settle fi -- SNIP Does this classify as essential ? If essential, we either need to move udev-utils to RDEPENDS. If not essential, fix the script to detect if udevadm is available. Br, David Hi All, I think it's essential. Without 'udevadm trigger --action=add', the system start-up process may have some problem. I can recall that once I removed this line from the init scripts in my live image, the image could not boot up correctly. I think this patch is reasonable and I'd like to acknowledge it. Best Regards, Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bash: fixed bash build error
On Tue, 2014-06-03 at 13:59 +0800, Wenlin Kang wrote: > When build bash, a error occurs, the log follow: > make[1]: *** No rule to make target `/config.status', > needed by `Makefile'. Stop. > make: [installdirs] Error 2 (ignored) > > The cause is that some variable,PACKAGE and VERSION don't be defined, > and others don't get correct value, eg, top_builddir in po/Makevar, > GETTEXT_MACRO_VERSION and MKDIR_P in po/Makefile.in.in and so on. > > The patch fixed above problem. Why are you seeing this issue yet for most of us, bash builds fine? Cheers, Richard > Signed-off-by: Wenlin Kang > --- > .../bash/bash/fix-build-error.patch| 83 > > meta/recipes-extended/bash/bash_4.3.bb |1 + > 2 files changed, 84 insertions(+) > create mode 100644 meta/recipes-extended/bash/bash/fix-build-error.patch > > diff --git a/meta/recipes-extended/bash/bash/fix-build-error.patch > b/meta/recipes-extended/bash/bash/fix-build-error.patch > new file mode 100644 > index 000..9db6fe2 > --- /dev/null > +++ b/meta/recipes-extended/bash/bash/fix-build-error.patch > @@ -0,0 +1,83 @@ > + > +Upstream-Status: Inappropriate [OE specific] > +Signed-off-by: Wenlin Kang > + > +diff -aurN bash-4.3-org/aclocal.m4 bash-4.3/aclocal.m4 > +--- bash-4.3-org/aclocal.m4 2014-05-23 15:28:54.252565146 +0800 > bash-4.3/aclocal.m4 2014-05-23 15:33:19.924570133 +0800 > +@@ -3710,6 +3710,14 @@ > + AC_REQUIRE([AC_PROG_INSTALL])dnl > + AC_REQUIRE([AM_MKINSTALLDIRS])dnl > + AC_REQUIRE([AM_NLS])dnl > ++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl > ++ AC_REQUIRE([AC_PROG_SED])dnl > ++ > ++ AC_SUBST([mkdir_p], ['$(MKDIR_P)']) > ++ > ++ dnl Release version of the gettext macros. This is used to ensure that > ++ dnl the gettext macros and po/Makefile.in.in are in sync. > ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) > + > + dnl Perform the following tests also if --disable-nls has been given, > + dnl because they are needed for "make dist" to work. > +@@ -3723,6 +3731,22 @@ > + :) > + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) > + > ++ dnl Test whether it is GNU msgfmt >= 0.15. > ++changequote(,)dnl > ++ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in > ++'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; > ++*) MSGFMT_015=$MSGFMT ;; > ++ esac > ++changequote([,])dnl > ++ AC_SUBST([MSGFMT_015]) > ++changequote(,)dnl > ++ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in > ++'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; > ++*) GMSGFMT_015=$GMSGFMT ;; > ++ esac > ++changequote([,])dnl > ++ AC_SUBST([GMSGFMT_015]) > ++ > + dnl Search for GNU xgettext 0.12 or newer in the PATH. > + dnl The first test excludes Solaris xgettext and early GNU xgettext > versions. > + dnl The second test excludes FreeBSD xgettext. > +@@ -3733,6 +3757,15 @@ > + dnl Remove leftover from FreeBSD xgettext call. > + rm -f messages.po > + > ++ dnl Test whether it is GNU xgettext >= 0.15. > ++changequote(,)dnl > ++ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in > ++'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; > ++*) XGETTEXT_015=$XGETTEXT ;; > ++ esac > ++changequote([,])dnl > ++ AC_SUBST([XGETTEXT_015]) > ++ > + dnl Search for GNU msgmerge 0.11 or newer in the PATH. > + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, > + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) > +diff -aurN bash-4.3-org/configure.ac bash-4.3/configure.ac > +--- bash-4.3-org/configure.ac2014-05-23 15:28:54.208565145 +0800 > bash-4.3/configure.ac2014-05-23 15:29:35.640565923 +0800 > +@@ -1201,6 +1201,10 @@ > + #AC_SUBST(ALLOCA_SOURCE) > + #AC_SUBST(ALLOCA_OBJECT) > + > ++# Define the identity of the package. > ++AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl > ++AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])dnl > ++ > + AC_OUTPUT([Makefile builtins/Makefile lib/readline/Makefile > lib/glob/Makefile \ > + lib/intl/Makefile \ > + lib/malloc/Makefile lib/sh/Makefile lib/termcap/Makefile \ > +diff -aurN bash-4.3-org/po/Makevars bash-4.3/po/Makevars > +--- bash-4.3-org/po/Makevars 2014-05-23 15:28:54.204565145 +0800 > bash-4.3/po/Makevars 2014-05-23 15:30:04.772566469 +0800 > +@@ -5,7 +5,7 @@ > + > + # These two variables depend on the location of this directory. > + subdir = po > +-top_builddir = $(BUILD_DIR) > ++top_builddir = .. > + > + # These options get passed to xgettext. > + XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ -C > diff --git a/meta/recipes-extended/bash/bash_4.3.bb > b/meta/recipes-extended/bash/bash_4.3.bb > index 25b7410..3ddf145 100644 > --- a/meta/recipes-extended/bash/bash_4.3.bb > +++ b/meta/recipes-extended/bash/bash_4.3.bb > @@ -10,6 +10,7 @@ SRC_URI = > "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ > file://build-tests.patch \ > file://test-output.patch \ >