Re: [OE-core] [oe] Fwd: open source conference in Honduras needs Yocto Project/Openembedded/OpenHardware speaker
I can't (formally) speak for Diego, but that sounds awesome (I think he will be happy). The LinuxCon abstract looks promising, but I better shutup and let DIego respond when's able to. Thanks, and you're entirely welcome (and hopefully I can see it in person...) Steve On Thu, Jun 4, 2015 at 8:50 PM, Eduardo Silva edua...@monkey.io wrote: Hi Stephen and Diego, Our work is basically data collection from a end-to-end point of view with Open Source tools that we develop and distribute. It covers embedded (openembedded/yocto) and common system applications, the project involved are: 1. Fluentd / http://fluentd.org : open source data collector 2. Fluent Bit / http://fluentbit.io : open source data collector with a strong focus in Embedded Linux 3. Monkey Server / http://monkey-project.com : a scalable web server for embedded linux and others. 4. Duda I/O / http://duda.io: a web services framework for Linux and embedded Linux. note: all projects are licensed under the Apache v2 License we have international experience, at the moment (in 1 hour) I will be presenting at LinuxCon Japan: http://sched.co/2mgz We can cover the travel costs, If you like the proposal I will only need to re-check my schedule to validate availability. Please let me know if this works. thanks for your time, On Thu, Jun 4, 2015 at 10:27 AM, Stephen Arnold stephen.arnol...@gmail.com wrote: That works if you have some travel coverage, unfortunately I just heard Diego is in the hospital (no details yet) so there may be a short delay in reply... They are very interested in open source (both hardware and software) so feel free to propose suitable topics (depends on what you've been working on recently I guess). I was going to do Gentoo embedded but I'm not sure if I can even go yet... Steve On Tue, Jun 2, 2015 at 6:36 PM, Eduardo Silva edua...@monkey.io wrote: HI Stephen, I just read on the OpenEmbedded List that you are looking for candidates to talk about Yocto or related technology. I work for the Open Source team at Treasure Data and we are a Linux Foundation member. As I am based in Costa Rica I see a good chance to participate. If you are interested let me know so we can discuss more in detail, thanks in advance, On Tue, Jun 2, 2015 at 4:59 PM, Philip Balister phi...@balister.org wrote: Speaking opportunity in Honduras. Contact Steve, not me. Philip Forwarded Message Subject: [OE-core] open source conference in Honduras needs Yocto Project/Openembedded/OpenHardware speaker Date: Tue, 2 Jun 2015 14:45:22 -0700 From: Stephen Arnold stephen.arnol...@gmail.com To: Patches and discussions about the oe-core layer openembedded-core@lists.openembedded.org There seems to be plenty of room (only 2 or 3 speakers signed up so far) and they'd love to have an official LF (or just embedded linux) speaker. I've been invited to speak, and they can cover the normal fees/lodging/food for speakers (just not the travel costs, so I'm still working things out with my wife...) http://ecsl2015.softwarelibre.ca/ I guess I was hoping Linux Foundation (or member companies) had enough support to maybe send an openembedded developer to speak as an outreach sort of thing. Steve Arnold aka nerdboy/mr_science -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-devel mailing list openembedded-de...@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Eduardo Silva -- Eduardo Silva Monkey Software -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] meta-gir issues and maintenance
I start maintaining this layer some days ago.
So I only fix tested with g-ir gir-test-image build.
I'll update gir version from 1.34.2 to latest stable version (more than 1.39.0
:)
Thanks for your reporting
-Original Message-
From: João Henrique Ferreira de Freitas [mailto:joa...@gmail.com]
Sent: Thursday, June 04, 2015 10:53 AM
To: Changhyeok Bae
Cc: openembedded-core@lists.openembedded.org; 이명구
Subject: Re: [OE-core] meta-gir issues and maintenance
Hi,
Using https://github.com/meta-gir/meta-gir and dizzy I got:
| checking for i586-poky-linux-pkg-config... (cached)
/srv/yocto/build/dizzy/tmp/sysroots/x86_64-linux/usr/bin/pkg-config
| checking pkg-config is at least version 0.16... yes checking for
| glib-compile-schemas...
/srv/yocto/build/dizzy/tmp/sysroots/x86_64-linux/usr/bin/glib-compile-schemas
| checking for gobject-introspection... configure: error: You need to
have gobject-introspection = 1.39.0 installed to build gtk+
| Configure failed. The contents of all config.log files follows to aid
debugging
| ERROR: oe_runconf failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at
/srv/yocto/build/dizzy/tmp/work/i586-poky-linux/gtk+3/3.12.2-r0/temp/log.do_configure.24043)
ERROR: Task 129
(/home/joaohf/opensource/poky/meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb,
do_configure) failed with exit code '1'
NOTE: Tasks Summary: Attempted 2542 tasks of which 2464 didn't need to be rerun
and 1 failed.
Waiting for 0 running tasks to finish:
Summary: 1 task failed:
/home/joaohf/opensource/poky/meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb,
do_configure
Summary: There was 1 WARNING message shown.
Summary: There was 1 ERROR message shown, returning a non-zero exit code.
joaohf@couve:/srv/yocto/build/dizzy$
My bblayers.conf was:
BBLAYERS ?= \
/home/joaohf/opensource/poky/meta \
/home/joaohf/opensource/poky/meta-yocto \
/home/joaohf/opensource/poky/meta-yocto-bsp \
/home/joaohf/opensource/meta/meta-gir/meta-gir-core \
/home/joaohf/opensource/meta/meta-gir/meta-gir \
/home/joaohf/opensource/meta/meta-openembedded/meta-oe \
Thanks.
On 02/06/2015 02:59, Changhyeok Bae wrote:
Hi, I changed forked repo to https://github.com/meta-gir/meta-gir and changed
some components matched with dizzy.
Please test again with latest version.
Thanks
Changhyeok
-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: Friday, May 29, 2015 11:17 PM
To: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] meta-gir issues and maintenance
Hi Changhyeok,
Did you get this error when using meta-gir? In my case I am setting my recipe
to inherit the g-ir class.
| checking for python script directory... (cached)
${prefix}/lib/python2.7/site-packages
| checking for python extension module directory... (cached)
${exec_prefix}/lib/python2.7/site-packages
| checking for python module thread... yes checking whether to enable
| threading in pygobject... yes
|
/srv/yocto/build/fido/tmp/work/i586-poky-linux/python-pygobject/3.0.4-r0/pygobject-3.0.4/configure:
line 15892: ./libtool: No such file or directory
| checking for i586-poky-linux-pkg-config...
/srv/yocto/build/fido/tmp/sysroots/x86_64-linux/usr/bin/pkg-config
| checking pkg-config is at least version 0.16... yes checking for
| GLIB
| - version = 2.24.0... cross compiling; assumed OK...
| yes (version 2.42.1)
| checking for ffi... checking for FFI... yes checking for GIO... yes
| checking for GI... no
| configure: error: Package requirements (glib-2.0 = 2.24.0
| gobject-introspection-1.0 = 1.29.0
| ) were not met:
|
| No package 'gobject-introspection-1.0' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables GI_CFLAGS and
| GI_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
| Configure failed. The contents of all config.log files follows to
| aid
debugging
| ERROR: oe_runconf failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at
/srv/yocto/build/fido/tmp/work/i586-poky-linux/python-pygobject/3.0.4-
r0/temp/log.do_configure.13915)
ERROR: Task 233
(/home/joaohf/opensource/meta/meta-gir/meta-gir/recipes-gir/python-pyg
object/python-pygobject_3.0.4.bb,
do_configure) failed with exit code '1'
WARNING: QA Issue: libgirepository: configure was passed unrecognised
options: --disable-schemas-install [unknown-configure-option]
WARNING: QA Issue: g-ir-tools-native: configure was passed
unrecognised
options: --disable-schemas-install [unknown-configure-option]
NOTE: Tasks Summary: Attempted 2578 tasks of which 2524 didn't need to be
rerun and 1 failed.
Waiting
[OE-core] [PATCH 0/1] linux-yocto/3.19: update reference BSPs to 3.19
Here's the first patch to update the h/w refernece BSPs to the 3.19 kernel. I'll send a follow up patch to the yocto-bsp layer to bump the preferred kernel there as well. Cheers, Bruce The following changes since commit fcc67ae90feeceee204bdb36e45eacf8d056779a: xserver-xorg: Upgrade 1.16.3 - 1.17.1 (OELAYOUT_ABI change) (2015-06-03 16:38:49 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (1): linux-yocto: update beaglebone, mpc8315e and edgerouter to 3.19 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.19.bb | 18 +- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] linux-yocto: update beaglebone, mpc8315e and edgerouter to 3.19
Bumping the linux-yocto SRCREVs to integrate fixes for the h/w reference
BSPs to the 3.19 kernel.
Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto_3.19.bb | 18 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index 777aa60b14c4..6907060d3314 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= 3.19.5
KMETA = meta
KCONF_BSP_AUDIT_LEVEL = 2
-SRCREV_machine ?= d3c0b958e68824c7037005e2a84e5661ba98d5b0
-SRCREV_meta ?= 727cfce45077a1f73f1dbc42e8093fde0c5e36a7
+SRCREV_machine ?= 6c21811060c03100a32d0acc493df5fb3743b7c8
+SRCREV_meta ?= 118f27167f4626fc7c71cefbec7c55a41d3a6d62
PV = ${LINUX_VERSION}+git${SRCPV}
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 975b3afbf1d1..6218c02eca8b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= standard/common-pc
KBRANCH_qemux86-64 ?= standard/common-pc-64/base
KBRANCH_qemumips64 ?= standard/mti-malta64
-SRCREV_machine_qemuarm ?= e5aa4ad4249e079b8459a90b4ffa50d04b474458
-SRCREV_machine_qemuarm64 ?= d3c0b958e68824c7037005e2a84e5661ba98d5b0
-SRCREV_machine_qemumips ?= 3b8cc925c5312b37cb824dfe58c2a4dcbb2b9732
-SRCREV_machine_qemuppc ?= 4ac61cf97719f01c5cb226881956e77624fb534c
-SRCREV_machine_qemux86 ?= d3c0b958e68824c7037005e2a84e5661ba98d5b0
-SRCREV_machine_qemux86-64 ?= d3c0b958e68824c7037005e2a84e5661ba98d5b0
-SRCREV_machine_qemumips64 ?= f5bf944a0edde0e379af4296917d33a562e6586b
-SRCREV_machine ?= d3c0b958e68824c7037005e2a84e5661ba98d5b0
-SRCREV_meta ?= 727cfce45077a1f73f1dbc42e8093fde0c5e36a7
+SRCREV_machine_qemuarm ?= c75bfc837fa8079278e77e8c122fe506c4ba7438
+SRCREV_machine_qemuarm64 ?= 6c21811060c03100a32d0acc493df5fb3743b7c8
+SRCREV_machine_qemumips ?= b6aae264b3d4e74cc29a5db8c376840579d1f433
+SRCREV_machine_qemuppc ?= f6c2fa7ca86bd548cc96bd0ddf8aa89229e4c2c2
+SRCREV_machine_qemux86 ?= 6c21811060c03100a32d0acc493df5fb3743b7c8
+SRCREV_machine_qemux86-64 ?= 6c21811060c03100a32d0acc493df5fb3743b7c8
+SRCREV_machine_qemumips64 ?= d3a1f6f5501167c76fb662d518140133f5ce78c5
+SRCREV_machine ?= 6c21811060c03100a32d0acc493df5fb3743b7c8
+SRCREV_meta ?= 118f27167f4626fc7c71cefbec7c55a41d3a6d62
SRC_URI =
git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-tools: add dependency glib-2.0
On 2015年06月04日 17:23, Jack Mitchell wrote: On 04/06/15 06:57, Kai Kang wrote: Add dependency glib-2.0 for alsa-tools. It is required by new added sub-component hdajacksensetest. Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb index 9133012..b5b9cc4 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb @@ -3,7 +3,7 @@ HOMEPAGE = http://www.alsa-project.org; BUGTRACKER = https://bugtrack.alsa-project.org/alsa-bug/login_page.php; SECTION = console/utils LICENSE = GPLv2 LGPLv2+ -DEPENDS = alsa-lib ncurses +DEPENDS = alsa-lib ncurses glib-2.0 LIC_FILES_CHKSUM = file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34 It would be nice to put this behind a hdajacksensetest packageconfig if possible. The hdajacksensetest is just a sub-directory/component not a feature, and it can't be built without library glib. If make it as a package config, we have to find a way to remove hdajacksensetes. I suppose it is not proper to add it as a packageconfig. BTW, the dependency on glib-2.0 for alsa-tools is passed by depending on gtk+3 if 'x11' in distro feauture. If without 'x11', not such dependency, then build hdajacksensetest fails. So add 'glib-2.0' to DEPENDS. Thanks, -- Regards, Neil | Kai Kang -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] autogen: redirect the log file to build dir
From: Roy Li rongqing...@windriver.com
Signed-off-by: Roy Li rongqing...@windriver.com
---
.../autogen/autogen-native_5.18.4.bb | 4 +++-
.../autogen/autogen/redirect-output-dir.patch | 28 ++
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
b/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
index 302ba79..5fd6b7e 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=d32239bcb673463ab874e80d47fae504
SRC_URI = ${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
file://guile.patch \
file://increase-timeout-limit.patch \
- file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch
+ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \
+ file://redirect-output-dir.patch \
+
SRC_URI[md5sum] = 6f48029cc839303d28496e1609868938
SRC_URI[sha256sum] =
3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d
diff --git a/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
b/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
new file mode 100644
index 000..de126ed
--- /dev/null
+++ b/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
@@ -0,0 +1,28 @@
+[PATCH] redirect the dir of mklibsrc-log.tx
+
+Upstream-Statue: Pending
+
+redirect mklibsrc-log.tx to builddir, not /tmp; otherwise mklibsrc-log.tx
+maybe unable to be written if other users is building autogen at the same time.
+
+Signed-off-by: Roy Li rongqing...@windriver.com
+---
+ pkg/libopts/mklibsrc.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/libopts/mklibsrc.sh b/pkg/libopts/mklibsrc.sh
+index 416b402..d612fbc 100644
+--- a/pkg/libopts/mklibsrc.sh
b/pkg/libopts/mklibsrc.sh
+@@ -19,7 +19,7 @@
+ ## with this program. If not, see http://www.gnu.org/licenses/.
+
+ set -ex
+-exec 2 /tmp/mklibsrc-log.tx
++exec 2 $top_builddir/mklibsrc-log.tx
+
+ top_builddir=`cd $top_builddir ; pwd`
+ top_srcdir=`cd $top_srcdir ; pwd`
+--
+1.9.1
+
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3] distrodata: Use Python CSV instead of did by hand
Fix CSV generation in distrodata class using Python CSV
module before it some errors happen when read due to
incorrect quoting/delimiters.
[YOCTO #]
Signed-off-by: Aníbal Limón anibal.li...@linux.intel.com
---
meta/classes/distrodata.bbclass | 126 +---
1 file changed, 65 insertions(+), 61 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 092c372..1886805 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -2,11 +2,16 @@ addhandler distro_eventhandler
distro_eventhandler[eventmask] = bb.event.BuildStarted
python distro_eventhandler() {
import oe.distro_check as dc
+import csv
logfile = dc.create_log_file(e.data, distrodata.csv)
+
lf = bb.utils.lockfile(%s.lock % logfile)
-f = open(logfile, a)
-
f.write(Package,Description,Owner,License,VerMatch,Version,Upsteam,Reason,Recipe
Status,Distro 1,Distro 2,Distro 3\n)
-f.close()
+with open(logfile, a) as f:
+writer = csv.writer(f)
+writer.writerow(['Package', 'Description', 'Owner', 'License',
+'VerMatch', 'Version', 'Upsteam', 'Reason', 'Recipe Status',
+'Distro 1', 'Distro 2', 'Distro 3'])
+f.close()
bb.utils.unlockfile(lf)
return
@@ -98,6 +103,7 @@ python do_distrodata_np() {
addtask distrodata
do_distrodata[nostamp] = 1
python do_distrodata() {
+import csv
logpath = d.getVar('LOG_DIR', True)
bb.utils.mkdirhier(logpath)
logfile = os.path.join(logpath, distrodata.csv)
@@ -176,14 +182,13 @@ python do_distrodata() {
result = dist_check.compare_in_distro_packages_list(distro_check_dir,
localdata)
lf = bb.utils.lockfile(%s.lock % logfile)
-f = open(logfile, a)
-f.write(%s,%s,%s,%s,%s,%s,%s,%s,%s % \
- (pname, pdesc, maintainer, plicense, vermatch, pcurver,
pupver, noupdate_reason, rstatus))
-line =
-for i in result:
-line = line + , + i
-f.write(line + \n)
-f.close()
+with open(logfile, a) as f:
+row = [pname, pdesc, maintainer, plicense, vermatch, pcurver,
pupver, noupdate_reason, rstatus]
+row.extend(result)
+
+writer = csv.writer(f)
+writer.writerow(row)
+f.close()
bb.utils.unlockfile(lf)
}
@@ -198,45 +203,33 @@ do_distrodataall() {
addhandler checkpkg_eventhandler
checkpkg_eventhandler[eventmask] = bb.event.BuildStarted
bb.event.BuildCompleted
python checkpkg_eventhandler() {
+import csv
+
def parse_csv_file(filename):
package_dict = {}
-fd = open(filename, r)
-lines = fd.read().rsplit(\n)
-fd.close()
-
-first_line = ''
-index = 0
-for line in lines:
-#Skip the first line
-if index == 0:
-first_line = line
-index += 1
-continue
-elif line == '':
-continue
-index += 1
-package_name = line.rsplit(\t)[0]
-if '-native' in package_name or 'nativesdk-' in package_name:
-original_name = package_name.rsplit('-native')[0]
-if original_name == '':
-original_name = package_name.rsplit('nativesdk-')[0]
-if original_name in package_dict:
+
+with open(filename, r) as f:
+reader = csv.reader(f, delimiter='\t')
+for row in reader:
+pn = row[0]
+
+if reader.line_num == 1:
+header = row
continue
-else:
-package_dict[package_name] = line
-else:
-new_name = package_name + -native
-if not(new_name in package_dict):
-new_name = 'nativesdk-' + package_name
-if new_name in package_dict:
-del package_dict[new_name]
-package_dict[package_name] = line
-
-fd = open(filename, w)
-fd.write(%s\n%first_line)
-for el in package_dict:
-fd.write(package_dict[el] + \n)
-fd.close()
+
+if '-native' in pn or 'nativesdk-' in pn:
+continue
+
+if not pn in package_dict.keys():
+package_dict[pn] = row
+f.close()
+
+with open(filename, w) as f:
+writer = csv.writer(f, delimiter='\t')
+writer.writerow(header)
+for pn in package_dict.keys():
+writer.writerow(package_dict[pn])
+f.close()
del package_dict
@@ -245,9 +238,13 @@ python checkpkg_eventhandler() {
logfile = dc.create_log_file(e.data, checkpkg.csv)
lf = bb.utils.lockfile(%s.lock % logfile)
-f = open(logfile, a)
-
Re: [OE-core] [PATCHv2 4/4] distrodata: Use Python CSV instead of did by hand
Hi Ross, Comments below, alimon On 04/06/15 15:08, Burton, Ross wrote: On 4 June 2015 at 21:06, Burton, Ross ross.bur...@intel.com wrote: So whereas before the SRC_URI field in checkpkg.cvs generally just listed the first entry (the main source) it now lists the entire of SRC_URI. Presumably this bug fix is desired behaviour? No i made a mistake here thanks for notice, sending v3... Also fields that used to say None are now empty. Again, this seems like a fix to me, although it changes behaviour. Yes it changes the behavior but it is right to me also. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dizzy][PATCH] license.bbclass: set dirs for do_populate_lic_setscene
merged to staging.
- armin
On 06/04/2015 04:37 AM, Martin Jansa wrote:
From: Robert Yang liezhi.y...@windriver.com
Fixed:
ERROR: Build of do_populate_lic failed
ERROR: Traceback (most recent call last):
File bitbake/lib/bb/build.py, line 497, in exec_task
return _exec_task(fn, task, d, quieterr)
File bitbake/lib/bb/build.py, line 437, in _exec_task
exec_func(func, localdata)
File bitbake/lib/bb/build.py, line 212, in exec_func
exec_func_python(func, d, runfile, cwd=adir)
File
/home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/bitbake/lib/bb/build.py,
line 237, in exec_func_python
os.chdir(cwd)
OSError: [Errno 2] No such file or directory:
'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build'
When running setscene, the cwd is $B which maybe removed by
autotools.bbclass or cmake.bbclass when rebuild.
Signed-off-by: Robert Yang liezhi.y...@windriver.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/classes/license.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 14d3107..d03b9eb 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -389,6 +389,8 @@ do_populate_lic[sstate-outputdirs] = ${LICENSE_DIRECTORY}/
ROOTFS_POSTPROCESS_COMMAND_prepend = write_package_manifest;
license_create_manifest;
+do_populate_lic_setscene[dirs] = ${LICSSTATEDIR}/${PN}
+do_populate_lic_setscene[cleandirs] = ${LICSSTATEDIR}
python do_populate_lic_setscene () {
sstate_setscene(d)
}
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [fido][PATCH] e2fsprogs: install populate-extfs.sh
On 04/06/15 09:47, Martin Jansa wrote:
On Sat, May 16, 2015 at 06:58:43AM +0200, Martin Jansa wrote:
From: Martin Jansa martin.ja...@gmail.com
ping
This has been queued in my fido-next branch[1] for a while, I'm hoping
to do an autobuilder run and propose it for merge to fido over the next
few days.
Regards,
Joshua
* install populate-extfs.sh from contrib, be aware that in order
to use it you need to set DEBUGFS shell variable, otherwise it will
try to use debugfs from relative path which is almost always
incorrect:
CONTRIB_DIR=$(dirname $(readlink -f $0))
DEBUGFS=$CONTRIB_DIR/../debugfs/debugfs
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index 66065bc..abc959f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -54,6 +54,8 @@ do_install () {
oe_multilib_header ext2fs/ext2_types.h
install -d ${D}${base_bindir}
mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
+
+ install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
}
do_install_append_class-target() {
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [fido][PATCH] squashfs-tools: build and install unsquashfs as well
On 04/06/15 09:48, Martin Jansa wrote:
On Thu, May 21, 2015 at 01:24:36PM +0200, Martin Jansa wrote:
* it's useful for debugging corrupt squashfs images from mksquashfs
ping
Thanks, this is queued in my fido-next branch[1] pending an autobuilder run.
Regards,
Joshua
1.
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=joshuagl/fido-next
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
index d36f0fe..19d555e1 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
@@ -27,11 +27,12 @@ SPDX_S = ${WORKDIR}/squashfs${PV}
EXTRA_OEMAKE = MAKEFLAGS= LZMA_SUPPORT=1 LZMA_DIR=../.. XZ_SUPPORT=1
LZO_SUPPORT=1 LZ4_SUPPORT=1
do_compile() {
-oe_runmake mksquashfs
+ oe_runmake mksquashfs unsquashfs
}
do_install () {
install -d ${D}${sbindir}
install -m 0755 mksquashfs ${D}${sbindir}/
+ install -m 0755 unsquashfs ${D}${sbindir}/
}
ARM_INSTRUCTION_SET = arm
--
2.4.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 1/4] recipeutils: Improve get_recipe_pv_without_srcpv function
Use pv instead of rd this make the function more generic and
avoid copy recipe data.
Signed-off-by: Aníbal Limón anibal.li...@linux.intel.com
---
meta/lib/oe/recipeutils.py | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 37efefb..26bbf3e 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -626,23 +626,17 @@ def replace_dir_vars(path, d):
path = path.replace(dirpath, '${%s}' % dirvars[dirpath])
return path
-def get_recipe_pv_without_srcpv(rd, uri_type):
+def get_recipe_pv_without_srcpv(pv, uri_type):
Get PV without SRCPV common in SCM's for now only
support git.
Returns tuple with pv, prefix and suffix.
-pv = ''
pfx = ''
sfx = ''
if uri_type == 'git':
-rd_tmp = rd.createCopy()
-
-rd_tmp.setVar('SRCPV', '')
-pv = rd_tmp.getVar('PV', True)
-
git_regex =
re.compile((?Ppfx(v|))(?Pver((\d+[\.\-_]*)+))(?Psfx(\+|)(git|)(r|)(AUTOINC|)(\+|))(?Prev.*))
m = git_regex.match(pv)
@@ -650,8 +644,6 @@ def get_recipe_pv_without_srcpv(rd, uri_type):
pv = m.group('ver')
pfx = m.group('pfx')
sfx = m.group('sfx')
-else:
-pv = rd.getVar('PV', True)
return (pv, pfx, sfx)
@@ -704,7 +696,7 @@ def get_recipe_upstream_version(rd):
pupver = ud.method.latest_versionstring(ud, rd)
if uri_type == 'git':
-(pv, pfx, sfx) = get_recipe_pv_without_srcpv(rd, uri_type)
+(pv, pfx, sfx) = get_recipe_pv_without_srcpv(pv, uri_type)
latest_revision = ud.method.latest_revision(ud, rd, ud.names[0])
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 3/4] distrodata: checkpkg make usage of oe.recipeutils.get_recipe_upstream_version
Now get_recipe_upstream_version function exists in oe.recipeutils module
to avoid duplicate code make usage of it.
Signed-off-by: Aníbal Limón anibal.li...@linux.intel.com
---
meta/classes/distrodata.bbclass | 84 ++---
1 file changed, 37 insertions(+), 47 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index e1fc6dd..092c372 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -266,11 +266,15 @@ python do_checkpkg() {
import re
import tempfile
import subprocess
+import oe.recipeutils
+from bb.utils import vercmp_string
+from bb.fetch2 import FetchError, NoMethodError, decodeurl
first check whether a uri is provided
src_uri = d.getVar('SRC_URI', True)
if not src_uri:
return
+uri_type, _, _, _, _, _ = decodeurl(src_uri)
initialize log files.
logpath = d.getVar('LOG_DIR', True)
@@ -310,10 +314,7 @@ python do_checkpkg() {
pdesc = localdata.getVar('DESCRIPTION', True)
pgrp = localdata.getVar('SECTION', True)
-if localdata.getVar('PRSPV', True):
-pversion = localdata.getVar('PRSPV', True)
-else:
-pversion = localdata.getVar('PV', True)
+pversion = localdata.getVar('PV', True)
plicense = localdata.getVar('LICENSE', True)
psection = localdata.getVar('SECTION', True)
phome = localdata.getVar('HOMEPAGE', True)
@@ -325,61 +326,50 @@ python do_checkpkg() {
maintainer = localdata.getVar('RECIPE_MAINTAINER', True)
Get upstream version version
-pupver = None
-pstatus = ErrUnknown
-found = 0
-
-for uri in src_uri.split():
-m = re.compile('(?Ptype[^:]*)').match(uri)
-if not m:
-raise MalformedUrl(uri)
-elif m.group('type') in ('http', 'https', 'ftp', 'cvs', 'svn',
'git'):
-found = 1
-psrcuri = uri
-pproto = m.group('type')
-break
-if not found:
-pproto = file
-
-if pproto in ['http', 'https', 'ftp', 'git']:
-try:
-ud = bb.fetch2.FetchData(psrcuri, d)
-pupver = ud.method.latest_versionstring(ud, d)
-if pproto == 'git':
-if pupver == :
-pupver = pversion.rsplit(+)[0]
-if re.search(pversion, gitrAUTOINC):
-pupver += +gitrAUTOINC+
-else:
-pupver += +gitAUTOINC+
-latest_revision = ud.method.latest_revision(ud, d,
ud.names[0])
-pupver += latest_revision[:10]
-except Exception as inst:
-bb.warn(%s: unexpected error: %s % (pname, repr(inst)))
+pupver =
+pstatus =
+
+try:
+uv = oe.recipeutils.get_recipe_upstream_version(localdata)
+
+pupver = uv['version']
+except Exception as e:
+if e is FetchError:
pstatus = ErrAccess
-elif pproto == file:
-Local files are always updated
-pupver = pversion
-else:
-pstatus = ErrUnsupportedProto
-bb.note(do_checkpkg, protocol %s isn't implemented % pproto)
+elif e is NoMethodError:
+pstatus = ErrUnsupportedProto
+else:
+pstatus = ErrUnknown
+Set upstream version status
if not pupver:
pupver = N/A
-elif pupver == pversion:
-pstatus = MATCH
else:
-pstatus = UPDATE
+pv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pversion,
uri_type)
+upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver,
uri_type)
+
+cmp = vercmp_string(pv, upv)
+if cmp == -1:
+pstatus = UPDATE
+elif cmp == 0:
+pstatus = MATCH
Read from manual distro tracking fields as alternative
pmver = d.getVar(RECIPE_UPSTREAM_VERSION, True)
if not pmver:
pmver = N/A
pmstatus = ErrNoRecipeData
-elif pmver == pupver:
-pmstatus = MATCH
else:
-pmstatus = UPDATE
+mpv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pmver,
uri_type)
+upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver,
uri_type)
+
+cmp = vercmp_string(mpv, upv)
+if cmp == -1:
+pmstatus = UPDATE
+elif cmp == 0:
+pmstatus = MATCH
+else:
+pmstatus =
pdepends = .join(pdepends.split(\t))
pdesc = .join(pdesc.split(\t))
--
1.9.1
--
[OE-core] [PATCHv2 2/4] distrodata: Remove unnecessary include of package_regex.inc
This causes a warning when follow documentation to use distrodata
class that points to include,
include conf/distro/include/distro_alias.inc
include conf/distro/include/recipe_color.inc
include conf/distro/include/maintainers.inc
include conf/distro/include/upstream_tracking.inc
include conf/distro/include/package_regex.inc
INHERIT+= distrodata
Signed-off-by: Aníbal Limón anibal.li...@linux.intel.com
---
meta/classes/distrodata.bbclass | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 83aa381..e1fc6dd 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -1,4 +1,3 @@
-include conf/distro/include/package_regex.inc
addhandler distro_eventhandler
distro_eventhandler[eventmask] = bb.event.BuildStarted
python distro_eventhandler() {
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 0/4] recipeutils and distrodata fixes
xserver-xorg: Upgrade 1.16.3 - 1.17.1 (OELAYOUT_ABI change) (2015-06-03 16:38:49 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib alimon/distrodata http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=alimon/distrodata Aníbal Limón (4): recipeutils: Improve get_recipe_pv_without_srcpv function distrodata: Remove unnecessary include of package_regex.inc distrodata: checkpkg make usage of oe.recipeutils.get_recipe_upstream_version distrodata: Use Python CSV instead of did by hand meta/classes/distrodata.bbclass | 210 +++- meta/lib/oe/recipeutils.py | 12 +-- 2 files changed, 103 insertions(+), 119 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 4/4] distrodata: Use Python CSV instead of did by hand
Fix CSV generation in distrodata class using Python CSV
module before it some errors happen when read due to
incorrect quoting/delimiters.
[YOCTO #]
Signed-off-by: Aníbal Limón anibal.li...@linux.intel.com
---
meta/classes/distrodata.bbclass | 125
1 file changed, 64 insertions(+), 61 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 092c372..0cefa7a 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -2,11 +2,16 @@ addhandler distro_eventhandler
distro_eventhandler[eventmask] = bb.event.BuildStarted
python distro_eventhandler() {
import oe.distro_check as dc
+import csv
logfile = dc.create_log_file(e.data, distrodata.csv)
+
lf = bb.utils.lockfile(%s.lock % logfile)
-f = open(logfile, a)
-
f.write(Package,Description,Owner,License,VerMatch,Version,Upsteam,Reason,Recipe
Status,Distro 1,Distro 2,Distro 3\n)
-f.close()
+with open(logfile, a) as f:
+writer = csv.writer(f)
+writer.writerow(['Package', 'Description', 'Owner', 'License',
+'VerMatch', 'Version', 'Upsteam', 'Reason', 'Recipe Status',
+'Distro 1', 'Distro 2', 'Distro 3'])
+f.close()
bb.utils.unlockfile(lf)
return
@@ -98,6 +103,7 @@ python do_distrodata_np() {
addtask distrodata
do_distrodata[nostamp] = 1
python do_distrodata() {
+import csv
logpath = d.getVar('LOG_DIR', True)
bb.utils.mkdirhier(logpath)
logfile = os.path.join(logpath, distrodata.csv)
@@ -176,14 +182,13 @@ python do_distrodata() {
result = dist_check.compare_in_distro_packages_list(distro_check_dir,
localdata)
lf = bb.utils.lockfile(%s.lock % logfile)
-f = open(logfile, a)
-f.write(%s,%s,%s,%s,%s,%s,%s,%s,%s % \
- (pname, pdesc, maintainer, plicense, vermatch, pcurver,
pupver, noupdate_reason, rstatus))
-line =
-for i in result:
-line = line + , + i
-f.write(line + \n)
-f.close()
+with open(logfile, a) as f:
+row = [pname, pdesc, maintainer, plicense, vermatch, pcurver,
pupver, noupdate_reason, rstatus]
+row.extend(result)
+
+writer = csv.writer(f)
+writer.writerow(row)
+f.close()
bb.utils.unlockfile(lf)
}
@@ -198,45 +203,33 @@ do_distrodataall() {
addhandler checkpkg_eventhandler
checkpkg_eventhandler[eventmask] = bb.event.BuildStarted
bb.event.BuildCompleted
python checkpkg_eventhandler() {
+import csv
+
def parse_csv_file(filename):
package_dict = {}
-fd = open(filename, r)
-lines = fd.read().rsplit(\n)
-fd.close()
-
-first_line = ''
-index = 0
-for line in lines:
-#Skip the first line
-if index == 0:
-first_line = line
-index += 1
-continue
-elif line == '':
-continue
-index += 1
-package_name = line.rsplit(\t)[0]
-if '-native' in package_name or 'nativesdk-' in package_name:
-original_name = package_name.rsplit('-native')[0]
-if original_name == '':
-original_name = package_name.rsplit('nativesdk-')[0]
-if original_name in package_dict:
+
+with open(filename, r) as f:
+reader = csv.reader(f, delimiter='\t')
+for row in reader:
+pn = row[0]
+
+if reader.line_num == 1:
+header = row
continue
-else:
-package_dict[package_name] = line
-else:
-new_name = package_name + -native
-if not(new_name in package_dict):
-new_name = 'nativesdk-' + package_name
-if new_name in package_dict:
-del package_dict[new_name]
-package_dict[package_name] = line
-
-fd = open(filename, w)
-fd.write(%s\n%first_line)
-for el in package_dict:
-fd.write(package_dict[el] + \n)
-fd.close()
+
+if '-native' in pn or 'nativesdk-' in pn:
+continue
+
+if not pn in package_dict.keys():
+package_dict[pn] = row
+f.close()
+
+with open(filename, w) as f:
+writer = csv.writer(f, delimiter='\t')
+writer.writerow(header)
+for pn in package_dict.keys():
+writer.writerow(package_dict[pn])
+f.close()
del package_dict
@@ -245,9 +238,13 @@ python checkpkg_eventhandler() {
logfile = dc.create_log_file(e.data, checkpkg.csv)
lf = bb.utils.lockfile(%s.lock % logfile)
-f = open(logfile, a)
-
Re: [OE-core] [dizzy][PATCH] mesa: update --with-llvm-shared-libs configure option
done
On 06/04/2015 01:36 AM, Martin Jansa wrote:
On Mon, May 04, 2015 at 04:07:07PM -0700, akuster808 wrote:
merged to staging.
- armin
Ping for merging staging to dizzy branch
On 05/01/2015 10:47 AM, Martin Jansa wrote:
From: Andre McCurdy armccu...@gmail.com
As per the Mesa 10.2 release notes, --with-llvm-shared-libs
has been renamed to --enable-llvm-shared-libs.
http://www.mesa3d.org/relnotes/10.2.html
Signed-off-by: Andre McCurdy armccu...@gmail.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/mesa/mesa.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 1857f3c..658bd3a 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -62,7 +62,7 @@ PACKAGECONFIG[gallium] =
--with-gallium-drivers=${GALLIUMDRIVERS}, --witho
PACKAGECONFIG[gallium-egl] = --enable-gallium-egl, --disable-gallium-egl
PACKAGECONFIG[gallium-gbm] = --enable-gallium-gbm, --disable-gallium-gbm
MESA_LLVM_RELEASE ?= 3.3
-PACKAGECONFIG[gallium-llvm] = --enable-gallium-llvm --with-llvm-shared-libs,
--disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \
+PACKAGECONFIG[gallium-llvm] = --enable-gallium-llvm
--enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \
${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED}
else ''}
export WANT_LLVM_RELEASE = ${MESA_LLVM_RELEASE}
--
___
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] [dizzy][PATCH] e2fsprogs: install populate-extfs.sh
done
On 06/04/2015 01:36 AM, Martin Jansa wrote:
On Sat, May 16, 2015 at 06:59:15AM +0200, Martin Jansa wrote:
From: Martin Jansa martin.ja...@gmail.com
ping
* install populate-extfs.sh from contrib, be aware that in order
to use it you need to set DEBUGFS shell variable, otherwise it will
try to use debugfs from relative path which is almost always
incorrect:
CONTRIB_DIR=$(dirname $(readlink -f $0))
DEBUGFS=$CONTRIB_DIR/../debugfs/debugfs
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index 70ccdfd..95c612c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -54,6 +54,8 @@ do_install () {
oe_multilib_header ext2fs/ext2_types.h
install -d ${D}${base_bindir}
mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
+
+ install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
}
do_install_append_class-target() {
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 4/4] distrodata: Use Python CSV instead of did by hand
On 4 June 2015 at 21:06, Burton, Ross ross.bur...@intel.com wrote: So whereas before the SRC_URI field in checkpkg.cvs generally just listed the first entry (the main source) it now lists the entire of SRC_URI. Presumably this bug fix is desired behaviour? Also fields that used to say None are now empty. Again, this seems like a fix to me, although it changes behaviour. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/10] devtool: update-recipe: do rev parsing in a separate function
Split out the logic of determining initial rev and update rev into a
separate function.
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/lib/devtool/standard.py | 55 +++--
1 file changed, 31 insertions(+), 24 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index aed76ea..c8ba247 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -514,6 +514,36 @@ def modify(args, config, basepath, workspace):
return 0
+def _get_patchset_revs(args, srctree, recipe_path):
+Get initial and update rev of a recipe. These are the start point of the
+whole patchset and start point for the patches to be re-generated/updated.
+
+import bb
+
+if args.initial_rev:
+return args.initial_rev, args.initial_rev
+
+# Parse initial rev from recipe
+commits = []
+initial_rev = None
+with open(recipe_path, 'r') as f:
+for line in f:
+if line.startswith('# initial_rev:'):
+initial_rev = line.split(':')[-1].strip()
+elif line.startswith('# commit:'):
+commits.append(line.split(':')[-1].strip())
+
+update_rev = initial_rev
+if initial_rev:
+# Find first actually changed revision
+stdout, _ = bb.process.run('git rev-list --reverse %s..HEAD' %
+ initial_rev, cwd=srctree)
+newcommits = stdout.split()
+for i in xrange(min(len(commits), len(newcommits))):
+if newcommits[i] == commits[i]:
+update_rev = commits[i]
+
+return initial_rev, update_rev
def update_recipe(args, config, basepath, workspace):
Entry point for the devtool 'update-recipe' subcommand
@@ -618,34 +648,11 @@ def update_recipe(args, config, basepath, workspace):
logger.info('You will need to update SRC_URI within the recipe to
point to a git repository where you have pushed your changes')
elif mode == 'patch':
-commits = []
-update_rev = None
-if args.initial_rev:
-initial_rev = args.initial_rev
-else:
-initial_rev = None
-with open(append, 'r') as f:
-for line in f:
-if line.startswith('# initial_rev:'):
-initial_rev = line.split(':')[-1].strip()
-elif line.startswith('# commit:'):
-commits.append(line.split(':')[-1].strip())
-
-if initial_rev:
-# Find first actually changed revision
-(stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD'
% initial_rev, cwd=srctree)
-newcommits = stdout.split()
-for i in xrange(min(len(commits), len(newcommits))):
-if newcommits[i] == commits[i]:
-update_rev = commits[i]
-
+initial_rev, update_rev = _get_patchset_revs(args, srctree, append)
if not initial_rev:
logger.error('Unable to find initial revision - please specify it
with --initial-rev')
return -1
-if not update_rev:
-update_rev = initial_rev
-
# Find list of existing patches in recipe file
existing_patches = oe.recipeutils.get_recipe_patches(rd)
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] devtool: simplify the logic of determining patches to be removed
A slight simplification of the code.
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/lib/devtool/standard.py | 25 +++--
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index c8ba247..aa95e6e 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -657,26 +657,23 @@ def update_recipe(args, config, basepath, workspace):
existing_patches = oe.recipeutils.get_recipe_patches(rd)
removepatches = []
-seqpatch_re = re.compile('^[0-9]{4}-')
+seqpatch_re = re.compile('^([0-9]{4}-)?(.+)')
if not args.no_remove:
# Get all patches from source tree and check if any should be
removed
tempdir = tempfile.mkdtemp(prefix='devtool')
try:
GitApplyTree.extractPatches(srctree, initial_rev, tempdir)
-newpatches = os.listdir(tempdir)
+# Strip numbering from patch names. If it's a git sequence
+# named patch, the numbers might not match up since we are
+# starting from a different revision This does assume that
+# people are using unique shortlog values, but they ought to be
+# anyway...
+newpatches = [seqpatch_re.match(fname).group(2) for fname in
+ os.listdir(tempdir)]
for patch in existing_patches:
-# If it's a git sequence named patch, the numbers might
not match up
-# since we are starting from a different revision
-# This does assume that people are using unique shortlog
values, but
-# they ought to be anyway...
-patchfile = os.path.basename(patch)
-if seqpatch_re.search(patchfile):
-for newpatch in newpatches:
-if seqpatch_re.search(newpatch) and patchfile[5:]
== newpatch[5:]:
-break
-else:
-removepatches.append(patch)
-elif patchfile not in newpatches:
+basename = seqpatch_re.match(
+os.path.basename(patch)).group(2)
+if basename not in newpatches:
removepatches.append(patch)
finally:
shutil.rmtree(tempdir)
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] devtool: slight simplification of path splitting logic
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com --- scripts/lib/devtool/standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index dfa45e8..c860094 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -468,7 +468,7 @@ def modify(args, config, basepath, workspace): if s.startswith(workdir): # Handle if S is set to a subdirectory of the source if s != workdir and os.path.dirname(s) != workdir: -srcsubdir = os.sep.join(os.path.relpath(s, workdir).split(os.sep)[1:]) +srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] srctree = os.path.join(srctree, srcsubdir) appendpath = os.path.join(config.workspace_path, 'appends') -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] devtool: fix wrong indentation
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com --- scripts/lib/devtool/standard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index c5b32d8..1e99413 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -657,8 +657,8 @@ def update_recipe(args, config, basepath, workspace): for newpatch in newpatches: if seqpatch_re.search(newpatch) and patchfile[5:] == newpatch[5:]: break -else: -removepatches.append(patch) +else: +removepatches.append(patch) elif patchfile not in newpatches: removepatches.append(patch) finally: -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] devtool: use DevtoolError for error handling
Use DevtoolError exception more widely for handling error cases. This
exception is now caught in the main script and raising it can be used to
exit with an error. This hopefully simplifies error handling. The
change also makes exit codes more consistent, always returning '1' when
an error occurs.
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/devtool | 8 ++-
scripts/lib/devtool/__init__.py | 6 ++
scripts/lib/devtool/deploy.py | 31
scripts/lib/devtool/standard.py | 152 ++--
4 files changed, 97 insertions(+), 100 deletions(-)
diff --git a/scripts/devtool b/scripts/devtool
index 307846a..7fd4da3 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -35,6 +35,7 @@ context = None
scripts_path = os.path.dirname(os.path.realpath(__file__))
lib_path = scripts_path + '/lib'
sys.path = sys.path + [lib_path]
+from devtool import DevtoolError
import scriptutils
logger = scriptutils.logger_create('devtool')
@@ -249,7 +250,12 @@ def main():
if args.subparser_name != 'create-workspace':
read_workspace()
-ret = args.func(args, config, basepath, workspace)
+try:
+ret = args.func(args, config, basepath, workspace)
+except DevtoolError as err:
+if str(err):
+logger.error(str(err))
+ret = 1
return ret
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index 9ec1ef6..ea0b63e 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -25,6 +25,12 @@ import logging
logger = logging.getLogger('devtool')
+
+class DevtoolError(Exception):
+Exception for handling devtool errors
+pass
+
+
def exec_build_env_command(init_path, builddir, cmd, watch=False, **options):
Run a program in bitbake build context
import bb
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index 92a3cb4..ca74a8e 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -19,7 +19,7 @@
import os
import subprocess
import logging
-from devtool import exec_build_env_command, setup_tinfoil
+from devtool import exec_build_env_command, setup_tinfoil, DevtoolError
logger = logging.getLogger('devtool')
@@ -34,8 +34,8 @@ def deploy(args, config, basepath, workspace):
import oe.recipeutils
if not args.recipename in workspace:
-logger.error(no recipe named %s in your workspace % args.recipename)
-return -1
+raise DevtoolError(no recipe named %s in your workspace %
+ args.recipename)
try:
host, destdir = args.target.split(':')
except ValueError:
@@ -50,12 +50,13 @@ def deploy(args, config, basepath, workspace):
try:
rd = oe.recipeutils.parse_recipe_simple(tinfoil.cooker,
args.recipename, tinfoil.config_data)
except Exception as e:
-logger.error('Exception parsing recipe %s: %s' % (args.recipename, e))
-return 2
+raise DevtoolError('Exception parsing recipe %s: %s' %
+ (args.recipename, e))
recipe_outdir = rd.getVar('D', True)
if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir):
-logger.error('No files to deploy - have you built the %s recipe? If
so, the install step has not installed any files.' % args.recipename)
-return -1
+raise DevtoolError('No files to deploy - have you built the %s '
+ 'recipe? If so, the install step has not installed '
+ 'any files.' % args.recipename)
if args.dry_run:
print('Files to be deployed for %s on target %s:' % (args.recipename,
args.target))
@@ -67,7 +68,7 @@ def deploy(args, config, basepath, workspace):
if os.path.exists(deploy_file):
if undeploy(args, config, basepath, workspace):
# Error already shown
-return -1
+return 1
extraoptions = ''
if args.no_host_check:
@@ -76,8 +77,8 @@ def deploy(args, config, basepath, workspace):
extraoptions += ' -q'
ret = subprocess.call('scp -r %s %s/* %s:%s' % (extraoptions,
recipe_outdir, args.target, destdir), shell=True)
if ret != 0:
-logger.error('Deploy failed - rerun with -s to get a complete error
message')
-return ret
+raise DevtoolError('Deploy failed - rerun with -s to get a complete '
+ 'error message')
logger.info('Successfully deployed %s' % recipe_outdir)
@@ -99,8 +100,7 @@ def undeploy(args, config, basepath, workspace):
Entry point for the devtool 'undeploy' subcommand
deploy_file = os.path.join(basepath, 'target_deploy', args.target,
args.recipename + '.list')
if not os.path.exists(deploy_file):
-logger.error('%s has not been deployed' % args.recipename)
-return -1
+raise DevtoolError('%s has not been deployed' %
[OE-core] [PATCH 02/10] devtool: refactor bb task execution into a separate class
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/lib/devtool/standard.py | 50 -
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 1e99413..aed76ea 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -213,6 +213,32 @@ def extract(args, config, basepath, workspace):
else:
return -1
+class BbTaskExecutor(object):
+Class for executing bitbake tasks for a recipe
+
+FIXME: This is very awkward. Unfortunately it's not currently easy to
+properly execute tasks outside of bitbake itself, until then this has to
+suffice if we are to handle e.g. linux-yocto's extra tasks
+
+
+def __init__(self, rdata):
+self.rdata = rdata
+self.executed = []
+
+def exec_func(self, func, report):
+Run bitbake task function
+if not func in self.executed:
+deps = self.rdata.getVarFlag(func, 'deps')
+if deps:
+for taskdepfunc in deps:
+self.exec_func(taskdepfunc, True)
+if report:
+logger.info('Executing %s...' % func)
+fn = self.rdata.getVar('FILE', True)
+localdata = bb.build._task_data(fn, func, self.rdata)
+bb.build.exec_func(func, localdata)
+self.executed.append(func)
+
def _extract_source(srctree, keep_temp, devbranch, d):
Extract sources of a recipe
@@ -270,28 +296,12 @@ def _extract_source(srctree, keep_temp, devbranch, d):
# We don't want to move the source to STAGING_KERNEL_DIR here
crd.setVar('STAGING_KERNEL_DIR', '${S}')
-# FIXME: This is very awkward. Unfortunately it's not currently easy
to properly
-# execute tasks outside of bitbake itself, until then this has to
suffice if we
-# are to handle e.g. linux-yocto's extra tasks
-executed = []
-def exec_task_func(func, report):
-Run specific bitbake task for a recipe
-if not func in executed:
-deps = crd.getVarFlag(func, 'deps')
-if deps:
-for taskdepfunc in deps:
-exec_task_func(taskdepfunc, True)
-if report:
-logger.info('Executing %s...' % func)
-fn = d.getVar('FILE', True)
-localdata = bb.build._task_data(fn, func, crd)
-bb.build.exec_func(func, localdata)
-executed.append(func)
+task_executor = BbTaskExecutor(crd)
logger.info('Fetching %s...' % pn)
-exec_task_func('do_fetch', False)
+task_executor.exec_func('do_fetch', False)
logger.info('Unpacking...')
-exec_task_func('do_unpack', False)
+task_executor.exec_func('do_unpack', False)
srcsubdir = crd.getVar('S', True)
if srcsubdir == workdir:
# Find non-patch sources that were unpacked to srctree directory
@@ -343,7 +353,7 @@ def _extract_source(srctree, keep_temp, devbranch, d):
crd.setVar('PATCHTOOL', 'git')
logger.info('Patching...')
-exec_task_func('do_patch', False)
+task_executor.exec_func('do_patch', False)
bb.process.run('git tag -f devtool-patched', cwd=srcsubdir)
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] devtool: split out 'srcrev' update mode into a separate function
Refactor update_recipe() (i.e. the implementation of the update-recipe
command) by splitting out the 'srcrev' into a distinct function.
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/lib/devtool/standard.py | 188
1 file changed, 111 insertions(+), 77 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index c860094..9b5795d 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -29,6 +29,12 @@ from devtool import exec_build_env_command, setup_tinfoil
logger = logging.getLogger('devtool')
+
+class DevtoolError(Exception):
+Exception for handling devtool errors
+pass
+
+
def plugin_init(pluginlist):
Plugin initialization
pass
@@ -542,6 +548,103 @@ def _get_patchset_revs(args, srctree, recipe_path):
return initial_rev, update_rev
+def _remove_patch_entries(srcuri, patchlist):
+Remove patch entries from SRC_URI
+remaining = patchlist[:]
+entries = []
+for patch in patchlist:
+patchfile = os.path.basename(patch)
+for i in xrange(len(srcuri)):
+if srcuri[i].startswith('file://') and
os.path.basename(srcuri[i].split(';')[0]) == patchfile:
+entries.append(srcuri[i])
+remaining.remove(patch)
+srcuri.pop(i)
+break
+return entries, remaining
+
+def _remove_patch_files(args, patches, destpath):
+Unlink existing patch files
+for patchfile in patches:
+if args.append:
+if not destpath:
+raise Exception('destpath should be set here')
+patchfile = os.path.join(destpath, os.path.basename(patchfile))
+
+if os.path.exists(patchfile):
+logger.info('Removing patch %s' % patchfile)
+# FIXME git rm here would be nice if the file in question is
+# tracked
+# FIXME there's a chance that this file is referred to by
+# another recipe, in which case deleting wouldn't be the
+# right thing to do
+os.remove(patchfile)
+# Remove directory if empty
+try:
+os.rmdir(os.path.dirname(patchfile))
+except OSError as ose:
+if ose.errno != errno.ENOTEMPTY:
+raise
+
+def _update_recipe_srcrev(args, srctree, rd, config_data):
+Implement the 'srcrev' mode of update-recipe
+import bb
+import oe.recipeutils
+from oe.patch import GitApplyTree
+
+recipefile = rd.getVar('FILE', True)
+logger.info('Updating SRCREV in recipe %s' % os.path.basename(recipefile))
+
+# Get HEAD revision
+try:
+stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree)
+except bb.process.ExecutionError as err:
+raise DevtoolError('Failed to get HEAD revision in %s: %s' %
+ (srctree, err))
+srcrev = stdout.strip()
+if len(srcrev) != 40:
+raise DevtoolError('Invalid hash returned by git: %s' % stdout)
+
+destpath = None
+removepatches = []
+patchfields = {}
+patchfields['SRCREV'] = srcrev
+orig_src_uri = rd.getVar('SRC_URI', False) or ''
+if not args.no_remove:
+# Find list of existing patches in recipe file
+existing_patches = oe.recipeutils.get_recipe_patches(rd)
+
+old_srcrev = (rd.getVar('SRCREV', False) or '')
+tempdir = tempfile.mkdtemp(prefix='devtool')
+try:
+GitApplyTree.extractPatches(srctree, old_srcrev, tempdir)
+newpatches = os.listdir(tempdir)
+for patch in existing_patches:
+patchfile = os.path.basename(patch)
+if patchfile in newpatches:
+removepatches.append(patch)
+finally:
+shutil.rmtree(tempdir)
+
+if removepatches:
+srcuri = orig_src_uri.split()
+removedentries, _ = _remove_patch_entries(srcuri, removepatches)
+if removedentries:
+patchfields['SRC_URI'] = ' '.join(srcuri)
+
+if args.append:
+_, destpath = oe.recipeutils.bbappend_recipe(
+rd, args.append, None, wildcardver=args.wildcard_version,
+extralines=patchfields)
+else:
+oe.recipeutils.patch_recipe(config_data, recipefile, patchfields)
+
+if not 'git://' in orig_src_uri:
+logger.info('You will need to update SRC_URI within the recipe to '
+'point to a git repository where you have pushed your '
+'changes')
+
+_remove_patch_files(args, removepatches, destpath)
+
def update_recipe(args, config, basepath, workspace):
Entry point for the devtool 'update-recipe' subcommand
if not args.recipename in workspace:
@@ -581,69 +684,16 @@ def update_recipe(args, config, basepath, workspace):
else:
mode = args.mode
-
[OE-core] [PATCH 00/10] devtool refactoring
This patchset contains contains some refactoring of the devtool code, hopefully making the code more maintainable and somewhat easier to read. The following changes since commit c91ffdb8fff4a62ccb80196a3d735e4b9a3056a3: dosfstools: Add recipe for v3.0.28 (2015-06-03 16:38:14 +0100) are available in the git repository at: ssh://oegit/openembedded-core-contrib marquiz/devtool/refactor http://git.openembedded.org/openembedded-core-contrib/commit/?h=marquiz/devtool/refactor Markus Lehtonen (10): devtool: fix wrong indentation devtool: refactor bb task execution into a separate class devtool: update-recipe: do rev parsing in a separate function devtool: simplify the logic of determining patches to be removed devtool: simplify few conditionals a bit devtool: slight simplification of path splitting logic devtool: split out 'srcrev' update mode into a separate function devtool: split out 'patch' update mode into a separate function devtool: remove some unused return values devtool: use DevtoolError for error handling scripts/devtool | 9 +- scripts/lib/devtool/__init__.py | 6 + scripts/lib/devtool/deploy.py | 31 +- scripts/lib/devtool/standard.py | 646 +--- 4 files changed, 369 insertions(+), 323 deletions(-) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/10] devtool: split out 'patch' update mode into a separate function
Continue refactoring of update_recipe() by splitting out the 'patch'
mode into a separate function.
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/lib/devtool/standard.py | 236 +---
1 file changed, 122 insertions(+), 114 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 9b5795d..1665ca8 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -645,6 +645,119 @@ def _update_recipe_srcrev(args, srctree, rd, config_data):
_remove_patch_files(args, removepatches, destpath)
+def _update_recipe_patch(args, config, srctree, rd, config_data):
+Implement the 'patch' mode of update-recipe
+import bb
+import oe.recipeutils
+from oe.patch import GitApplyTree
+
+recipefile = rd.getVar('FILE', True)
+append = os.path.join(config.workspace_path, 'appends', '%s.bbappend' %
+ os.path.splitext(os.path.basename(recipefile))[0])
+if not os.path.exists(append):
+raise DevtoolError('unable to find workspace bbappend for recipe %s' %
+ args.recipename)
+
+initial_rev, update_rev = _get_patchset_revs(args, srctree, append)
+if not initial_rev:
+raise DevtoolError('Unable to find initial revision - please specify '
+ 'it with --initial-rev')
+
+# Find list of existing patches in recipe file
+existing_patches = oe.recipeutils.get_recipe_patches(rd)
+
+removepatches = []
+seqpatch_re = re.compile('^([0-9]{4}-)?(.+)')
+if not args.no_remove:
+# Get all patches from source tree and check if any should be removed
+tempdir = tempfile.mkdtemp(prefix='devtool')
+try:
+GitApplyTree.extractPatches(srctree, initial_rev, tempdir)
+# Strip numbering from patch names. If it's a git sequence named
+# patch, the numbers might not match up since we are starting from
+# a different revision This does assume that people are using
+# unique shortlog values, but they ought to be anyway...
+newpatches = [seqpatch_re.match(fname).group(2) for fname in
+ os.listdir(tempdir)]
+for patch in existing_patches:
+basename = seqpatch_re.match(
+os.path.basename(patch)).group(2)
+if basename not in newpatches:
+removepatches.append(patch)
+finally:
+shutil.rmtree(tempdir)
+
+# Get updated patches from source tree
+tempdir = tempfile.mkdtemp(prefix='devtool')
+try:
+GitApplyTree.extractPatches(srctree, update_rev, tempdir)
+
+# Match up and replace existing patches with corresponding new patches
+updatepatches = False
+updaterecipe = False
+destpath = None
+newpatches = os.listdir(tempdir)
+if args.append:
+patchfiles = {}
+for patch in existing_patches:
+patchfile = os.path.basename(patch)
+if patchfile in newpatches:
+patchfiles[os.path.join(tempdir, patchfile)] = patchfile
+newpatches.remove(patchfile)
+for patchfile in newpatches:
+patchfiles[os.path.join(tempdir, patchfile)] = None
+
+if patchfiles or removepatches:
+removevalues = None
+if removepatches:
+srcuri = (rd.getVar('SRC_URI', False) or '').split()
+removedentries, remaining = _remove_patch_entries(
+srcuri, removepatches)
+if removedentries or remaining:
+remaining = ['file://' + os.path.basename(item) for
+ item in remaining]
+removevalues = {'SRC_URI': removedentries + remaining}
+_, destpath = oe.recipeutils.bbappend_recipe(
+rd, args.append, patchfiles,
+removevalues=removevalues)
+else:
+logger.info('No patches needed updating')
+else:
+for patch in existing_patches:
+patchfile = os.path.basename(patch)
+if patchfile in newpatches:
+logger.info('Updating patch %s' % patchfile)
+shutil.move(os.path.join(tempdir, patchfile), patch)
+newpatches.remove(patchfile)
+updatepatches = True
+srcuri = (rd.getVar('SRC_URI', False) or '').split()
+if newpatches:
+# Add any patches left over
+patchdir = os.path.join(os.path.dirname(recipefile),
+rd.getVar('BPN', True))
+bb.utils.mkdirhier(patchdir)
+
[OE-core] [PATCH 09/10] devtool: remove some unused return values
Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com
---
scripts/devtool | 1 -
scripts/lib/devtool/standard.py | 3 ---
2 files changed, 4 deletions(-)
diff --git a/scripts/devtool b/scripts/devtool
index 0100eb8..307846a 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -157,7 +157,6 @@ def _enable_workspace_layer(workspacedir, config, basepath):
bblayers_conf = os.path.join(basepath, 'conf', 'bblayers.conf')
if not os.path.exists(bblayers_conf):
logger.error('Unable to find bblayers.conf')
-return -1
_, added = bb.utils.edit_bblayers_conf(bblayers_conf, workspacedir,
config.workspace_path)
if added:
logger.info('Enabling workspace layer in bblayers.conf')
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 1665ca8..2c48d69 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -416,9 +416,6 @@ def _check_preserve(config, recipename):
tf.write(line)
os.rename(newfile, origfile)
-return False
-
-
def modify(args, config, basepath, workspace):
Entry point for the devtool 'modify' subcommand
import bb
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] recipeutils adds get_recipe_upstream_version and distrodata fixes
On 4 June 2015 at 17:54, Aníbal Limón anibal.li...@linux.intel.com wrote: The problem is i forget to add v2 to the patch [1] that is a new version of the patch [2], sorry about that. The problem is we merged v1 of that patch into master. Can you rebase and fix what's in master? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] recipeutils adds get_recipe_upstream_version and distrodata fixes
On 2 June 2015 at 20:49, Aníbal Limón anibal.li...@linux.intel.com wrote:
Aníbal Limón (4):
recipeutils: Add get_recipe_upstream_version and
get_recipe_pv_without_srcpv functions
distrodata: Remove unnecessary include of package_regex.inc
distrodata: checkpkg make usage of
oe.recipeutils.get_recipe_upstream_version
distrodata: Use Python CSV instead of did by hand
This series is causing this error if I run core-image-sato -c checkpkgall:
ERROR: Error executing a python function in
/home/ross/Yocto/poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:
The stack trace of python calls that resulted in this exception/failure was:
File: 'do_checkpkg', lineno: 126, function: module
0122:f.close()
0123:bb.utils.unlockfile(lf)
0124:
0125:
*** 0126:do_checkpkg(d)
0127:
File: 'do_checkpkg', lineno: 87, function: do_checkpkg
0083:Set upstream version status
0084:if not pupver:
0085:pupver = N/A
0086:else:
*** 0087:pv, _, _ =
oe.recipeutils.get_recipe_pv_without_srcpv(pversion, uri_type)
0088:upv, _, _ =
oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type)
0089:
0090:cmp = vercmp_string(pv, upv)
0091:if cmp == -1:
File: '/home/ross/Yocto/poky/meta/lib/oe/recipeutils.py', lineno: 641,
function: get_recipe_pv_without_srcpv
0637:pfx = ''
0638:sfx = ''
0639:
0640:if uri_type == 'git':
*** 0641:rd_tmp = rd.createCopy()
0642:
0643:rd_tmp.setVar('SRCPV', '')
0644:pv = rd_tmp.getVar('PV', True)
0645:
Exception: AttributeError: 'str' object has no attribute 'createCopy'
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] recipeutils adds get_recipe_upstream_version and distrodata fixes
On 04/06/15 11:54, Burton, Ross wrote: On 4 June 2015 at 17:54, Aníbal Limón anibal.li...@linux.intel.com wrote: The problem is i forget to add v2 to the patch [1] that is a new version of the patch [2], sorry about that. The problem is we merged v1 of that patch into master. Can you rebase and fix what's in master? Sure, alimon Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] Fwd: open source conference in Honduras needs Yocto Project/Openembedded/OpenHardware speaker
That works if you have some travel coverage, unfortunately I just heard Diego is in the hospital (no details yet) so there may be a short delay in reply... They are very interested in open source (both hardware and software) so feel free to propose suitable topics (depends on what you've been working on recently I guess). I was going to do Gentoo embedded but I'm not sure if I can even go yet... Steve On Tue, Jun 2, 2015 at 6:36 PM, Eduardo Silva edua...@monkey.io wrote: HI Stephen, I just read on the OpenEmbedded List that you are looking for candidates to talk about Yocto or related technology. I work for the Open Source team at Treasure Data and we are a Linux Foundation member. As I am based in Costa Rica I see a good chance to participate. If you are interested let me know so we can discuss more in detail, thanks in advance, On Tue, Jun 2, 2015 at 4:59 PM, Philip Balister phi...@balister.org wrote: Speaking opportunity in Honduras. Contact Steve, not me. Philip Forwarded Message Subject: [OE-core] open source conference in Honduras needs Yocto Project/Openembedded/OpenHardware speaker Date: Tue, 2 Jun 2015 14:45:22 -0700 From: Stephen Arnold stephen.arnol...@gmail.com To: Patches and discussions about the oe-core layer openembedded-core@lists.openembedded.org There seems to be plenty of room (only 2 or 3 speakers signed up so far) and they'd love to have an official LF (or just embedded linux) speaker. I've been invited to speak, and they can cover the normal fees/lodging/food for speakers (just not the travel costs, so I'm still working things out with my wife...) http://ecsl2015.softwarelibre.ca/ I guess I was hoping Linux Foundation (or member companies) had enough support to maybe send an openembedded developer to speak as an outreach sort of thing. Steve Arnold aka nerdboy/mr_science -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-devel mailing list openembedded-de...@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Eduardo Silva -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] recipeutils adds get_recipe_upstream_version and distrodata fixes
Hi Ross,
The problem is i forget to add v2 to the patch [1] that is a new version
of the patch [2], sorry
about that.
Kind regards,
alimon
[1]
http://lists.openembedded.org/pipermail/openembedded-core/2015-June/105576.html
[2]
http://lists.openembedded.org/pipermail/openembedded-core/2015-June/105534.html
On 04/06/15 11:09, Burton, Ross wrote:
On 2 June 2015 at 20:49, Aníbal Limón anibal.li...@linux.intel.com wrote:
Aníbal Limón (4):
recipeutils: Add get_recipe_upstream_version and
get_recipe_pv_without_srcpv functions
distrodata: Remove unnecessary include of package_regex.inc
distrodata: checkpkg make usage of
oe.recipeutils.get_recipe_upstream_version
distrodata: Use Python CSV instead of did by hand
This series is causing this error if I run core-image-sato -c checkpkgall:
ERROR: Error executing a python function in
/home/ross/Yocto/poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:
The stack trace of python calls that resulted in this exception/failure was:
File: 'do_checkpkg', lineno: 126, function: module
0122:f.close()
0123:bb.utils.unlockfile(lf)
0124:
0125:
*** 0126:do_checkpkg(d)
0127:
File: 'do_checkpkg', lineno: 87, function: do_checkpkg
0083:Set upstream version status
0084:if not pupver:
0085:pupver = N/A
0086:else:
*** 0087:pv, _, _ =
oe.recipeutils.get_recipe_pv_without_srcpv(pversion, uri_type)
0088:upv, _, _ =
oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type)
0089:
0090:cmp = vercmp_string(pv, upv)
0091:if cmp == -1:
File: '/home/ross/Yocto/poky/meta/lib/oe/recipeutils.py', lineno: 641,
function: get_recipe_pv_without_srcpv
0637:pfx = ''
0638:sfx = ''
0639:
0640:if uri_type == 'git':
*** 0641:rd_tmp = rd.createCopy()
0642:
0643:rd_tmp.setVar('SRCPV', '')
0644:pv = rd_tmp.getVar('PV', True)
0645:
Exception: AttributeError: 'str' object has no attribute 'createCopy'
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] populate_sdk_ext: consider custom configuration in local.conf
Hi Qi,
On Wednesday 27 May 2015 14:09:39 Chen Qi wrote:
Copy the contents of local.conf under TOPDIR into the final generated
local.conf. In this way, custom settings are also made into the final
local.conf like IMAGE_INSTALL, DISTRO_FEATURES, VIRTUAL-RUNTIME_xxx, etc.
Before this change, installing extensible SDK would usually report failure
when preparing the build system if the user has custom configuration for
DISTRO_FEATURES in local.conf. Also, items in IMAGE_INSTALL_append in
local.conf also don't get built correctly.
This patch solves the above problem.
A blacklist mechanism is also introduced so that we can blacklist variables
that should not be copied into the final local.conf file. Currently, the
blacklist contains 'TMPDIR', 'SSTATE_DIR', 'DL_DIR', 'STAMPS_DIR',
'BASE_WORKDIR' and 'DEPLOY_DIR'. What these variables have in common is
that they are set in bitbake.conf using '?=' or '??='.
In addition, we check to avoid any setting that might lead to host path
bleeding into SDK's configuration.
[YOCTO #7616]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
meta/classes/populate_sdk_ext.bbclass | 23 +++
1 file changed, 23 insertions(+)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass index 2fc4c11..49ba26b 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -16,6 +16,7 @@ SDK_RDEPENDS_append_task-populate-sdk-ext =
${SDK_TARGETS} SDK_RELOCATE_AFTER_INSTALL_task-populate-sdk-ext = 0
SDK_META_CONF_WHITELIST ?= MACHINE DISTRO PACKAGE_CLASSES
+SDK_META_CONF_BLACKLIST ?= TMPDIR DL_DIR SSTATE_DIR STAMPS_DIR
BASE_WORKDIR DEPLOY_DIR
SDK_TARGETS ?= ${PN}
OE_INIT_ENV_SCRIPT ?= oe-init-build-env
@@ -114,6 +115,28 @@ python copy_buildsystem () {
f.write('# this configuration provides, it is strongly suggested
that you set\n') f.write('# up a proper instance of the full build system
and use that instead.\n\n')
+# Copy configurations from the current local.conf
+builddir = d.getVar('TOPDIR', True)
+with open(builddir + '/conf/local.conf', 'r') as lf:
+varblacklist = d.getVar('SDK_META_CONF_BLACKLIST',
True).split() +skip = False
+for line in lf:
+line = line.lstrip()
+if line.startswith('#'):
+continue
+# avoid host path bleeding into SDK configuration
+if line.find('/') != -1:
+continue
+for varname in varblacklist:
+if line.startswith(varname):
+skip = True
+break
+if not skip:
+f.write(line)
+skip = False
+f.write('\n')
+
+# Configurations in local.conf which are specific for extensible
SDK f.write('INHERIT += %s\n\n' % 'uninative')
f.write('CONF_VERSION = %s\n\n' % d.getVar('CONF_VERSION'))
I've been thinking about this; since I've recently added edit_metadata() in
bitbake's lib/bb/utils.py, it would make sense to use that rather than adding
another piece of code that effectively parses bitbake configuration files
(though
I know this isn't adding much). I know this series has been going back and
forth for a while now and the delays have largely been my fault, so I'd be
happy to make this change and resend the series - it's up to you.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] python-numpy: duplicate i586 over-ride for i686
On Jun 3, 2015, at 8:31 PM, Andre McCurdy armccu...@gmail.com wrote: Signed-off-by: Andre McCurdy armccu...@gmail.com --- meta/recipes-devtools/python/python-numpy_1.7.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/python/python-numpy_1.7.0.bb b/meta/recipes-devtools/python/python-numpy_1.7.0.bb index d4fd279..28ad97f 100644 --- a/meta/recipes-devtools/python/python-numpy_1.7.0.bb +++ b/meta/recipes-devtools/python/python-numpy_1.7.0.bb @@ -30,6 +30,10 @@ CONFIGFILESURI_i586 = \ file://config.h \ file://numpyconfig.h \ +CONFIGFILESURI_i686 = \ +file://config.h \ +file://numpyconfig.h \ +” can we use x86 override instead ? CONFIGFILESURI_x86-64 = \ file://config.h \ file://_numpyconfig.h \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core signature.asc Description: Message signed with OpenPGP using GPGMail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] xf86-input-evdev: Upgrade 2.9.1 - 2.9.2
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../{xf86-input-evdev_2.9.1.bb = xf86-input-evdev_2.9.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.9.1.bb =
xf86-input-evdev_2.9.2.bb} (83%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
index 6d71ba8..66428df 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
@@ -16,5 +16,5 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16
DEPENDS += mtdev libevdev
-SRC_URI[md5sum] = 8f73a98e32dccc9d054b54727cc4093f
-SRC_URI[sha256sum] =
0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9
+SRC_URI[md5sum] = 99eebf171e6c7bffc42d4fc430d47454
+SRC_URI[sha256sum] =
792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] xkeyboard-config: Upgrade 2.14 - 2.15
Drop what remains of the patch the removed some GPLv3 content: both
eu and ph layout licenses have been corrected.
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../0001-Remove-GPLv3-content.patch| 51 --
...ard-config_2.14.bb = xkeyboard-config_2.15.bb} | 8 ++--
2 files changed, 3 insertions(+), 56 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.14.bb =
xkeyboard-config_2.15.bb} (82%)
diff --git
a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
deleted file mode 100644
index 596dc7b..000
---
a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Remove GPLv3 content so the package remains MIT licensed.
-
-symbols/eu has been relicensed upstream.
-Remove symbols/ph until that is relicensed upstream.
-
-Upstream-Status; Backport
-Signed-off-by: Ross Burton ross.bur...@intel.com
-
-From b3a21c1137c011d9220775fd8b2e704ff75c088c Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov sergey.udalt...@gmail.com
-Date: Tue, 26 May 2015 20:57:46 +0100
-Subject: Removed GPLv3 line
-
-https://bugs.freedesktop.org/show_bug.cgi?id=31073
-
-diff --git a/symbols/ph b/symbols/ph
-index 6b3defa..a5fe5dc 100644
a/symbols/ph
-+++ b/symbols/ph
-@@ -2,8 +2,6 @@
- // Philippines National Keyboard Layout v1.0.0 (2010-10-23)
//
- // http://laibcoms.com/sandbox/the-philippines-national-keyboard-layout
//
- //
//
--// License: GNU/GPLv3
//
--//
//
- // Loosely based on ISO/IEC 9995-3:2009
//
- //* glyphs that are not used in Philippine Languages and//
- //Philippine English were not included //
---
-cgit v0.10.2
-
-From 5da6d510b460cad1b31288618cc364e586576826 Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov sergey.udalt...@gmail.com
-Date: Sat, 9 May 2015 00:35:25 +0100
-Subject: fixed the license (removed GPL)
-
-https://bugs.freedesktop.org/show_bug.cgi?id=31658
-
-diff --git a/symbols/eu b/symbols/eu
-index 0a4d31a..5b767f1 100644
a/symbols/eu
-+++ b/symbols/eu
-@@ -1,6 +1,5 @@
- // Based on http://eurkey.steffen.bruentjen.eu/
- // Copyright: Copyright 2012 Steffen Bruentjen (eurkey (at) steffen dot
bruentjen dot de)
--// License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- // modified by Christoph Roeper spam (at) roeper dot biz (use firstName to
mail)
-
- default partial alphanumeric_keys modifier_keys
---
-cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb
b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
index a960744..f416990 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
@@ -12,11 +12,9 @@ BUGTRACKER =
https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi
LICENSE = MIT MIT-style
LIC_FILES_CHKSUM = file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9
-SRC_URI =
${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \
- file://0001-Remove-GPLv3-content.patch \
-
-SRC_URI[md5sum] = 2869c03d85b606f929aab054ef6e1b60
-SRC_URI[sha256sum] =
dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae
+SRC_URI =
${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2
+SRC_URI[md5sum] = 4af1deeb7c5f4cad62e65957d98d6758
+SRC_URI[sha256sum] =
0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf
SECTION = x11/libs
DEPENDS = intltool-native virtual/gettext util-macros libxslt-native
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] xf86-input-synaptics: Upgrade 1.8.1 - 1.8.2
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../{xf86-input-synaptics_1.8.1.bb = xf86-input-synaptics_1.8.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.8.1.bb =
xf86-input-synaptics_1.8.2.bb} (80%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
index 19be77a..19c122f 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
@@ -10,8 +10,8 @@ advanced features of the touchpad to become available.
LIC_FILES_CHKSUM = file://COPYING;md5=55aacd3535a741824955c5eb8f061398
-SRC_URI[md5sum] = ed70d0cba94262a4008dcef654ab34a9
-SRC_URI[sha256sum] =
d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a
+SRC_URI[md5sum] = 8ed68e8cc674dd61adb280704764aafb
+SRC_URI[sha256sum] =
7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80
DEPENDS += libxi mtdev libxtst libevdev
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Upgrade X drivers and xkeyboard-config
Some of the drivers I am not able to test: all upgrades are fairly
small point upgrades though.
The following changes since commit fcc67ae90feeceee204bdb36e45eacf8d056779a:
xserver-xorg: Upgrade 1.16.3 - 1.17.1 (OELAYOUT_ABI change) (2015-06-03
16:38:49 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/xorg-drivers
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/xorg-drivers
Jussi Kukkonen (6):
xf86-input-evdev: Upgrade 2.9.1 - 2.9.2
xf86-input-keyboard: Upgrade 1.8.0 - 1.8.1
xf86-input-synaptics: Upgrade 1.8.1 - 1.8.2
xf86-video-omap: Upgrade to 0.4.3
xf86-video-vmware: Upgrade 13.0.2 - 13.1.0
xkeyboard-config: Upgrade 2.14 - 2.15
...ut-evdev_2.9.1.bb = xf86-input-evdev_2.9.2.bb} | 4 +-
...board_1.8.0.bb = xf86-input-keyboard_1.8.1.bb} | 4 +-
...tics_1.8.1.bb = xf86-input-synaptics_1.8.2.bb} | 4 +-
.../xorg-driver/xf86-video-omap/configure.patch| 74 --
...-video-omap_git.bb = xf86-video-omap_0.4.3.bb} | 11 +---
...001-configure-fix-build-without-xatracker.patch | 37 ---
...mware_13.0.2.bb = xf86-video-vmware_13.1.0.bb} | 7 +-
.../0001-Remove-GPLv3-content.patch| 51 ---
...ard-config_2.14.bb = xkeyboard-config_2.15.bb} | 8 +--
9 files changed, 15 insertions(+), 185 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.9.1.bb =
xf86-input-evdev_2.9.2.bb} (83%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.8.0.bb =
xf86-input-keyboard_1.8.1.bb} (73%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.8.1.bb =
xf86-input-synaptics_1.8.2.bb} (80%)
delete mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb =
xf86-video-omap_0.4.3.bb} (85%)
delete mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_13.0.2.bb =
xf86-video-vmware_13.1.0.bb} (59%)
delete mode 100644
meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.14.bb =
xkeyboard-config_2.15.bb} (82%)
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] xf86-video-vmware: Upgrade 13.0.2 - 13.1.0
Remove one upstreamed patch.
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
...001-configure-fix-build-without-xatracker.patch | 37 --
...mware_13.0.2.bb = xf86-video-vmware_13.1.0.bb} | 7 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_13.0.2.bb =
xf86-video-vmware_13.1.0.bb} (59%)
diff --git
a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
deleted file mode 100644
index cf66403..000
---
a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton ross.bur...@intel.com
-
-From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001
-From: Julien Cristau jcris...@debian.org
-Date: Tue, 1 Apr 2014 10:11:13 +0200
-Subject: [PATCH 1/2] configure: fix build without xatracker
-
-ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the
-fifth.
-
-Debian bug#743239 https://bugs.debian.org/743239
-
-Reviewed-by: Thomas Klausner w...@netbsd.org
-Reviewed-by: Jakob Bornecrantz ja...@vmware.com
-Signed-off-by: Julien Cristau jcris...@debian.org
-Signed-off-by: Jakob Bornecrantz ja...@vmware.com
- configure.ac |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd3ad4e..be40ed7 100644
a/configure.ac
-+++ b/configure.ac
-@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then
- [PKG_CHECK_EXISTS([xatracker = 2.0.0],
- [AC_DEFINE([HAVE_XA_2], 1,
- [Has version 2 of XA])])],
--[],[BUILD_VMWGFX=no])
-+[BUILD_VMWGFX=no])
- #
- # Check for prime.
- #
---
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
similarity index 59%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
index 24041b5..89b98ee 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53
DEPENDS += virtual/libx11 xineramaproto videoproto libpciaccess
-SRC_URI += file://0001-configure-fix-build-without-xatracker.patch \
-file://0002-add-option-for-vmwgfx.patch
+SRC_URI += file://0002-add-option-for-vmwgfx.patch
-SRC_URI[md5sum] = 91d1d7d33181766714405ab013d31244
-SRC_URI[sha256sum] =
c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54
+SRC_URI[md5sum] = 0cba22fed4cb639d5c4276f7892c543d
+SRC_URI[sha256sum] =
3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] xf86-video-omap: Upgrade to 0.4.3
Use last release instead of slightly older git revision, drop the
upstreamed patch.
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../xorg-driver/xf86-video-omap/configure.patch| 74 --
...-video-omap_git.bb = xf86-video-omap_0.4.3.bb} | 11 +---
2 files changed, 3 insertions(+), 82 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb =
xf86-video-omap_0.4.3.bb} (85%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
deleted file mode 100644
index d298d5d..000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386]
-Signed-off-by: Ross Burton ross.bur...@intel.com
-
-From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
-From: Ross Burton ross.bur...@intel.com
-Date: Wed, 21 Nov 2012 23:39:18 +
-Subject: [PATCH] build: rationalise DRI checks
-
-The existing logic around DRI was complicated and defined a number of variables
-that were not used, when in reality DRI is required.
-
-Move the glproto check to the main pkg-config check, and remove everything
else.
-
-Signed-off-by: Ross Burton ross.bur...@intel.com
- configure.ac | 33 +
- 1 file changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11238b1..c321b98 100644
a/configure.ac
-+++ b/configure.ac
-@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server = 1.3] xproto fontsproto [libdrm =
2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+PKG_CHECK_MODULES(XORG, [xorg-server = 1.3] xproto fontsproto [libdrm =
2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
-
- # Checks for header files.
- AC_HEADER_STDC
-
--save_CFLAGS=$CFLAGS
--CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
--AC_CHECK_FILE([${sdkdir}/dri.h],
-- [have_dri_h=yes], [have_dri_h=no])
--AC_CHECK_FILE([${sdkdir}/dristruct.h],
-- [have_dristruct_h=yes], [have_dristruct_h=no])
--fi
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI = xauto; then
--if test $have_dri_h = yes -a \
--$have_dristruct_h = yes; then
--DRI=yes
--else
--DRI=no
--fi
--fi
--AC_MSG_RESULT([$DRI])
--CFLAGS=$save_CFLAGS $DEBUGFLAGS
--
--AM_CONDITIONAL(DRI, test x$DRI = xyes)
--if test $DRI = yes; then
--PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
--AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
--fi
--
- AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
- if test $VIDEO_DEBUG = yes; then
- AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
- fi
-
--AC_SUBST([DRI_CFLAGS])
-
- DRIVER_NAME=omap
- AC_SUBST([DRIVER_NAME])
---
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
index 454d0a1..95de4ba 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
@@ -24,15 +24,10 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602
DEPENDS += virtual/libx11 libdrm xf86driproto
-SRCREV = ae0394e687f1a77e966cf72f895da91840dffb8f
-PR = ${INC_PR}.3
-PV = 0.4.2+gitr${SRCPV}
-
-SRC_URI = git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
- file://configure.patch \
-
+SRC_URI[md5sum] = be35daf6fa4b75092cc4a8978c437bc5
+SRC_URI[sha256sum] =
db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d
-S = ${WORKDIR}/git
+PR = ${INC_PR}.3
CFLAGS += -I${STAGING_INCDIR}/xorg
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] xf86-input-keyboard: Upgrade 1.8.0 - 1.8.1
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../{xf86-input-keyboard_1.8.0.bb = xf86-input-keyboard_1.8.1.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.8.0.bb =
xf86-input-keyboard_1.8.1.bb} (73%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
index f138918..6fe51ac 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
@@ -9,5 +9,5 @@ core keyboard.
LIC_FILES_CHKSUM = file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10
-SRC_URI[md5sum] = ce936e219682bacf5a4a9c4ab940edb8
-SRC_URI[sha256sum] =
41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b
+SRC_URI[md5sum] = 96ccc43d389b970afbd3893875dfd678
+SRC_URI[sha256sum] =
1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 0/7] devtool: improve handling of local source files
Hi Markus, On Wednesday 03 June 2015 17:50:25 Markus Lehtonen wrote: Second version of my patchset aiming to improve handling of local source files. The only significant change since the first version is the addition of unit tests. Did you see the comments I made on v1 patchset? https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg64396.html Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [daisy][PATCH 0/1] Backport of gcc header fix from master/dizzy
On Friday 22 May 2015 17:02:03 Paul Eggleton wrote: I made this backport earlier but missed actually sending it. The following change since commit 5a577ec878a15f3caaf4893b819825ffb8c81266: build-appliance-image: Update to daisy head revision (2015-05-13 13:27:45 +0100) is available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/gcc-omp-fix-daisy http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paul e/gcc-omp-fix-daisy Paul Eggleton (1): gcc: ensure target gcc headers can be included meta/recipes-devtools/gcc/gcc-4.8.inc | 1 + .../gcc/gcc-4.8/target-gcc-includedir.patch| 81 ++ 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch Now that 1.6.3 is out can we look at merging this? Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] gstreamer1.0-plugins-base.inc: use x86 over-ride instead of i586
Support i686 without needing to duplicate the i586 over-ride.
Signed-off-by: Andre McCurdy armccu...@gmail.com
---
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 06eac67..97e2949 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -37,4 +37,4 @@ EXTRA_OECONF += \
FILES_${MLPREFIX}libgsttag-1.0 +=
${datadir}/gst-plugins-base/1.0/license-translations.dict
-CACHED_CONFIGUREVARS_append_i586 = ac_cv_header_emmintrin_h=no
ac_cv_header_xmmintrin_h=no
+CACHED_CONFIGUREVARS_append_x86 = ac_cv_header_emmintrin_h=no
ac_cv_header_xmmintrin_h=no
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] lame: use x86 over-ride instead of i586
Support i686 without needing to duplicate the i586 over-ride.
Signed-off-by: Andre McCurdy armccu...@gmail.com
---
meta/recipes-multimedia/lame/lame_3.99.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb
b/meta/recipes-multimedia/lame/lame_3.99.5.bb
index d0e8872..0477611 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -27,4 +27,4 @@ FILES_libmp3lame = ${libdir}/libmp3lame.so.*
FILES_libmp3lame-dev = ${includedir} ${libdir}/*
FILES_${PN}-dev =
-CACHED_CONFIGUREVARS_append_i586 = ac_cv_header_emmintrin_h=no
ac_cv_header_xmmintrin_h=no
+CACHED_CONFIGUREVARS_append_x86 = ac_cv_header_emmintrin_h=no
ac_cv_header_xmmintrin_h=no
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] nettle: update package to 3.1.1 version.
this requires the gnutls 3.4.1 update or the current gnutils build will break.
Signed-off-by: Armin Kuster akuster...@gmail.com
---
.../nettle/{nettle_2.7.1.bb = nettle_3.1.1.bb} | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-support/nettle/{nettle_2.7.1.bb = nettle_3.1.1.bb} (48%)
diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb
b/meta/recipes-support/nettle/nettle_3.1.1.bb
similarity index 48%
rename from meta/recipes-support/nettle/nettle_2.7.1.bb
rename to meta/recipes-support/nettle/nettle_3.1.1.bb
index f53afcc..ce5e756 100644
--- a/meta/recipes-support/nettle/nettle_2.7.1.bb
+++ b/meta/recipes-support/nettle/nettle_3.1.1.bb
@@ -1,17 +1,17 @@
SUMMARY = A low level cryptographic library
HOMEPAGE = http://www.lysator.liu.se/~nisse/nettle/;
SECTION = libs
-LICENSE = LGPLv2.1 GPLv2
-LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-
file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d
\
-
file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d
+LICENSE = GPLv2+ GPLv3 LGPLv3+
+LIC_FILES_CHKSUM =
file://COPYINGv2;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548 \
+
file://COPYINGv3;beginline=1;endline=2;md5=d1c727712ceba52db52e0ee449cadf43 \
+
file://COPYING.LESSERv3;beginline=1;endline=2;md5=ff44a06d461487fb65f84ad672a1d1c8
DEPENDS += gmp
SRC_URI = http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz;
-SRC_URI[md5sum] = 003d5147911317931dd453520eb234a5
-SRC_URI[sha256sum] =
bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40
+SRC_URI[md5sum] = b40fa88dc32f37a182b6b42092ebb144
+SRC_URI[sha256sum] =
5fd4d25d64d8ddcb85d0d897572af73b05b4d163c6cc49438a5bfbb8ff293d4c
EXTRA_OECONF = --disable-openssl
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] neon: build fix
fixup to allow building with api changes in gnutls.
Signed-off-by: Armin Kuster akuster...@gmail.com
---
.../neon/neon/gnutls_4.3_fixup.patch | 53 ++
meta/recipes-support/neon/neon_0.30.1.bb | 3 +-
2 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
diff --git a/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
b/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
new file mode 100644
index 000..0020330
--- /dev/null
+++ b/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
@@ -0,0 +1,53 @@
+replace deprecated GnuTLS functions with newer ones if available
+
+Upstream Status: Pending
+
+Signed-off-by: Armin Kuster akuster...@gmail.com
+
+Index: neon-0.30.1/macros/neon.m4
+===
+--- neon-0.30.1.orig/macros/neon.m4
neon-0.30.1/macros/neon.m4
+@@ -987,6 +987,10 @@ gnutls)
+ gnutls_certificate_get_x509_cas \
+ gnutls_x509_crt_sign2])
+
++ # gnutls 4.3 check
++ AC_CHECK_LIB(gnutls, gnutls_global_init)
++ AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,)
++
+# fail if gnutls_x509_crt_sign2 is not found (it was introduced in 1.2.0,
which is required)
+if test x${ac_cv_func_gnutls_x509_crt_sign2} != xyes; then
+AC_MSG_ERROR([GnuTLS version predates gnutls_x509_crt_sign2, newer
version required (at least 1.2.0)])
+Index: neon-0.30.1/src/ne_gnutls.c
+===
+--- neon-0.30.1.orig/src/ne_gnutls.c
neon-0.30.1/src/ne_gnutls.c
+@@ -553,7 +553,13 @@ dup_error:
+ static int provide_client_cert(gnutls_session_t session,
+const gnutls_datum_t *req_ca_rdn, int nreqs,
+const gnutls_pk_algorithm_t *sign_algos,
+- int sign_algos_length, gnutls_retr_st *st)
++ int sign_algos_length,
++#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION
++gnutls_retr2_st* st
++#else
++gnutls_retr_st *st
++#endif
++)
+ {
+ ne_session *sess = gnutls_session_get_ptr(session);
+
+@@ -617,8 +623,11 @@ static int provide_client_cert(gnutls_se
+ #endif
+ ) {
+ NE_DEBUG(NE_DBG_SSL, Supplying client certificate.\n);
+-
++#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION
++st-cert_type = type;
++#else
+ st-type = type;
++#endif
+ st-ncerts = 1;
+ st-cert.x509 = sess-client_cert-cert.subject;
+ st-key.x509 = sess-client_cert-pkey;
diff --git a/meta/recipes-support/neon/neon_0.30.1.bb
b/meta/recipes-support/neon/neon_0.30.1.bb
index 9245244..bac5bac 100644
--- a/meta/recipes-support/neon/neon_0.30.1.bb
+++ b/meta/recipes-support/neon/neon_0.30.1.bb
@@ -10,7 +10,8 @@ DEPENDS_class-native = zlib-native libxml2-native
expat-native gnutls-native
BBCLASSEXTEND = native
SRC_URI = http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
- file://pkgconfig.patch
+ file://pkgconfig.patch \
+ file://gnutls_4.3_fixup.patch
SRC_URI[md5sum] = 231adebe5c2f78fded3e3df6e958878e
SRC_URI[sha256sum] =
00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Gntls update to 4.3.1
THe nettle and gnutls updates must be done as a pair.
The following changes since commit 6dc53d3694d555147b272d18678fcf908ddced32:
bitbake: fixup 6 (2015-06-03 17:37:08 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akuster/gnutls-update
http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/gntls-update
Armin Kuster (3):
nettle: update package to 3.1.1 version.
gnutls: update to 3.4.1
neon: build fix
meta/recipes-support/gnutls/gnutls.inc | 3 +-
.../gnutls/configure.ac-fix-sed-command.patch | 29 ++--
meta/recipes-support/gnutls/gnutls_3.3.14.bb | 8
meta/recipes-support/gnutls/gnutls_3.4.1.bb| 8
.../neon/neon/gnutls_4.3_fixup.patch | 53 ++
meta/recipes-support/neon/neon_0.30.1.bb | 3 +-
.../nettle/{nettle_2.7.1.bb = nettle_3.1.1.bb}| 12 ++---
7 files changed, 84 insertions(+), 32 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/gnutls_3.3.14.bb
create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb
create mode 100644 meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
rename meta/recipes-support/nettle/{nettle_2.7.1.bb = nettle_3.1.1.bb} (48%)
--
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] gnutls: update to 3.4.1
This version supports the nettle 3.x and higher and requires that version.
this include a security fix:
GNUTLS-SA-2015-2
no CVE assigned to date.
enable openssl compat via PACKAGECONFIG as iputils needs gnutls/openssl.h
for migration info:
http://www.gnutls.org/manual/gnutls.html#Upgrading-from-previous-versions
Signed-off-by: Armin Kuster akuster...@gmail.com
---
meta/recipes-support/gnutls/gnutls.inc | 3 ++-
.../gnutls/configure.ac-fix-sed-command.patch | 29 ++
meta/recipes-support/gnutls/gnutls_3.3.14.bb | 8 --
meta/recipes-support/gnutls/gnutls_3.4.1.bb| 8 ++
4 files changed, 23 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/gnutls_3.3.14.bb
create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index e9b138a..6928cb9 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -34,9 +34,10 @@ do_configure_prepend() {
done
}
-PACKAGECONFIG ??= zlib
+PACKAGECONFIG ??= zlib openssl_compat
PACKAGECONFIG[tpm] = --with-tpm, --without-tpm, trousers
PACKAGECONFIG[zlib] = --with-zlib, --without-zlib, zlib
+PACKAGECONFIG[openssl_compat] = --enable-openssl-compatibility,,
PACKAGES =+ ${PN}-openssl ${PN}-xx
diff --git
a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
index 44a9934..342143f 100644
--- a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
+++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
@@ -13,19 +13,16 @@ Signed-off-by: Robert Yang liezhi.y...@windriver.com
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index c6818a0..1c4582d 100644
a/configure.ac
-+++ b/configure.ac
-@@ -466,7 +466,7 @@ if test $NEED_LIBOPTS_DIR = true;then
- dnl replace libopts-generated files with distributed backups, if present
- missing_baks=
- for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
-- nam=`echo $i|sed 's/.bak//g'`
-+ nam=`echo $i|sed 's/\.bak$//'`
- if test -f $i;then
- cp -f $i $nam
- else
---
-2.0.1
-
+Index: gnutls-3.4.1/configure.ac
+===
+--- gnutls-3.4.1.orig/configure.ac
gnutls-3.4.1/configure.ac
+@@ -530,7 +530,7 @@ if test $enable_tools != no || test
+ dnl replace libopts-generated files with distributed backups,
if present
+ missing_baks=
+ for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak;
do
+- nam=`echo $i|sed 's/.bak//g'`
++ nam=`echo $i|sed 's/\.bak$//'`
+ if test -f $i;then
+ cp -f $i $nam
+ else
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.14.bb
b/meta/recipes-support/gnutls/gnutls_3.3.14.bb
deleted file mode 100644
index f41d183..000
--- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require gnutls.inc
-
-SRC_URI += file://correct_rpl_gettimeofday_signature.patch \
-file://configure.ac-fix-sed-command.patch \
-file://use-pkg-config-to-locate-zlib.patch \
-
-SRC_URI[md5sum] = 7f4465f8c564cf9cb8f5cb38b909f7ca
-SRC_URI[sha256sum] =
0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52
diff --git a/meta/recipes-support/gnutls/gnutls_3.4.1.bb
b/meta/recipes-support/gnutls/gnutls_3.4.1.bb
new file mode 100644
index 000..1b64813
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_3.4.1.bb
@@ -0,0 +1,8 @@
+require gnutls.inc
+
+SRC_URI += file://correct_rpl_gettimeofday_signature.patch \
+file://configure.ac-fix-sed-command.patch \
+file://use-pkg-config-to-locate-zlib.patch \
+
+SRC_URI[md5sum] = 2d04f34fa25b45f9dcb9104c0394e12e
+SRC_URI[sha256sum] =
e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] x264: use x86 over-ride instead of i586
Support i686 without needing to duplicate the i586 over-ride.
Signed-off-by: Andre McCurdy armccu...@gmail.com
---
meta/recipes-multimedia/x264/x264_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/x264/x264_git.bb
b/meta/recipes-multimedia/x264/x264_git.bb
index 0e856b3..105ccae 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -51,5 +51,5 @@ do_install() {
}
# PIC can't be enabled for 32-bit x86
-INSANE_SKIP_${PN}_append_i586 = textrel
+INSANE_SKIP_${PN}_append_x86 = textrel
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] python-numpy: use x86 over-ride instead of i586
Support i686 without needing to duplicate the i586 over-ride.
Signed-off-by: Andre McCurdy armccu...@gmail.com
---
meta/recipes-devtools/python/python-numpy/{i586 = x86}/config.h | 0
meta/recipes-devtools/python/python-numpy/{i586 = x86}/numpyconfig.h | 0
meta/recipes-devtools/python/python-numpy_1.7.0.bb| 2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/python-numpy/{i586 = x86}/config.h (100%)
rename meta/recipes-devtools/python/python-numpy/{i586 = x86}/numpyconfig.h
(100%)
diff --git a/meta/recipes-devtools/python/python-numpy/i586/config.h
b/meta/recipes-devtools/python/python-numpy/x86/config.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/i586/config.h
rename to meta/recipes-devtools/python/python-numpy/x86/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
b/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
rename to meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy_1.7.0.bb
b/meta/recipes-devtools/python/python-numpy_1.7.0.bb
index d4fd279..81cdfde 100644
--- a/meta/recipes-devtools/python/python-numpy_1.7.0.bb
+++ b/meta/recipes-devtools/python/python-numpy_1.7.0.bb
@@ -26,7 +26,7 @@ CONFIGFILESURI_mipsel = \
file://config.h \
file://numpyconfig.h \
-CONFIGFILESURI_i586 = \
+CONFIGFILESURI_x86 = \
file://config.h \
file://numpyconfig.h \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] base-files: Fix LSB NG Cases.
-/tset/LSB.fhs/var/tmp/tmp-tc. The LSB Core test requires the /var/tmp directory supports creation of files. And the mount tmpfs on /var/volatile cause the /var/tmp directory can't be writable for non-root users. Signed-off-by: Li Xin lixin.f...@cn.fujitsu.com --- meta/recipes-core/base-files/base-files/fstab | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index d79a016..458ec70 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -4,7 +4,6 @@ proc /procproc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 tmpfs/run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs/var/volatiletmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dizzy][PATCH] mesa: update --with-llvm-shared-libs configure option
On Mon, May 04, 2015 at 04:07:07PM -0700, akuster808 wrote:
merged to staging.
- armin
Ping for merging staging to dizzy branch
On 05/01/2015 10:47 AM, Martin Jansa wrote:
From: Andre McCurdy armccu...@gmail.com
As per the Mesa 10.2 release notes, --with-llvm-shared-libs
has been renamed to --enable-llvm-shared-libs.
http://www.mesa3d.org/relnotes/10.2.html
Signed-off-by: Andre McCurdy armccu...@gmail.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/mesa/mesa.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 1857f3c..658bd3a 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -62,7 +62,7 @@ PACKAGECONFIG[gallium] =
--with-gallium-drivers=${GALLIUMDRIVERS}, --witho
PACKAGECONFIG[gallium-egl] = --enable-gallium-egl,
--disable-gallium-egl
PACKAGECONFIG[gallium-gbm] = --enable-gallium-gbm,
--disable-gallium-gbm
MESA_LLVM_RELEASE ?= 3.3
-PACKAGECONFIG[gallium-llvm] = --enable-gallium-llvm
--with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \
+PACKAGECONFIG[gallium-llvm] = --enable-gallium-llvm
--enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE}
\
${@'elfutils' if
${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}
export WANT_LLVM_RELEASE = ${MESA_LLVM_RELEASE}
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dizzy][PATCH] e2fsprogs: install populate-extfs.sh
On Sat, May 16, 2015 at 06:59:15AM +0200, Martin Jansa wrote:
From: Martin Jansa martin.ja...@gmail.com
ping
* install populate-extfs.sh from contrib, be aware that in order
to use it you need to set DEBUGFS shell variable, otherwise it will
try to use debugfs from relative path which is almost always
incorrect:
CONTRIB_DIR=$(dirname $(readlink -f $0))
DEBUGFS=$CONTRIB_DIR/../debugfs/debugfs
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index 70ccdfd..95c612c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -54,6 +54,8 @@ do_install () {
oe_multilib_header ext2fs/ext2_types.h
install -d ${D}${base_bindir}
mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
+
+ install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
}
do_install_append_class-target() {
--
2.4.0
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dizzy][PATCH] squashfs-tools: build and install unsquashfs as well
On Thu, May 21, 2015 at 01:24:11PM +0200, Martin Jansa wrote:
* it's useful for debugging corrupt squashfs images from mksquashfs
ping
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
index d36f0fe..19d555e1 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
@@ -27,11 +27,12 @@ SPDX_S = ${WORKDIR}/squashfs${PV}
EXTRA_OEMAKE = MAKEFLAGS= LZMA_SUPPORT=1 LZMA_DIR=../.. XZ_SUPPORT=1
LZO_SUPPORT=1 LZ4_SUPPORT=1
do_compile() {
-oe_runmake mksquashfs
+ oe_runmake mksquashfs unsquashfs
}
do_install () {
install -d ${D}${sbindir}
install -m 0755 mksquashfs ${D}${sbindir}/
+ install -m 0755 unsquashfs ${D}${sbindir}/
}
ARM_INSTRUCTION_SET = arm
--
2.4.1
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [fido][PATCH] squashfs-tools: build and install unsquashfs as well
On Thu, May 21, 2015 at 01:24:36PM +0200, Martin Jansa wrote:
* it's useful for debugging corrupt squashfs images from mksquashfs
ping
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
index d36f0fe..19d555e1 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.3.bb
@@ -27,11 +27,12 @@ SPDX_S = ${WORKDIR}/squashfs${PV}
EXTRA_OEMAKE = MAKEFLAGS= LZMA_SUPPORT=1 LZMA_DIR=../.. XZ_SUPPORT=1
LZO_SUPPORT=1 LZ4_SUPPORT=1
do_compile() {
-oe_runmake mksquashfs
+ oe_runmake mksquashfs unsquashfs
}
do_install () {
install -d ${D}${sbindir}
install -m 0755 mksquashfs ${D}${sbindir}/
+ install -m 0755 unsquashfs ${D}${sbindir}/
}
ARM_INSTRUCTION_SET = arm
--
2.4.1
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] python-numpy: duplicate i586 over-ride for i686
On Wed, Jun 3, 2015 at 11:30 PM, Khem Raj raj.k...@gmail.com wrote: On Jun 3, 2015, at 8:31 PM, Andre McCurdy armccu...@gmail.com wrote: Signed-off-by: Andre McCurdy armccu...@gmail.com --- meta/recipes-devtools/python/python-numpy_1.7.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/python/python-numpy_1.7.0.bb b/meta/recipes-devtools/python/python-numpy_1.7.0.bb index d4fd279..28ad97f 100644 --- a/meta/recipes-devtools/python/python-numpy_1.7.0.bb +++ b/meta/recipes-devtools/python/python-numpy_1.7.0.bb @@ -30,6 +30,10 @@ CONFIGFILESURI_i586 = \ file://config.h \ file://numpyconfig.h \ +CONFIGFILESURI_i686 = \ +file://config.h \ +file://numpyconfig.h \ +” can we use x86 override instead ? Yes, I'll send a v2. I'm hopeful that this set of fixes will be acceptable for fido, which is why I initially went for adding i686 over-rides instead of a more widespread clean-up to replace i586 with x86. CONFIGFILESURI_x86-64 = \ file://config.h \ file://_numpyconfig.h \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dizzy][PATCH] perf: add LIBNUMA_DEFINES
On Wed, May 27, 2015 at 06:33:47PM +0200, Martin Jansa wrote:
From: Robert Yang liezhi.y...@windriver.com
ping
Fixed:
WARNING: QA Issue: perf rdepends on numactl, but it isn't a build dependency?
[build-deps]
The numactl is in meta-oe.
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
meta/recipes-kernel/perf/perf.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb
b/meta/recipes-kernel/perf/perf.bb
index 19772d8..1f1f552 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -65,6 +65,7 @@ B = ${WORKDIR}/${BPN}-${PV}
SCRIPTING_DEFINES = ${@perf_feature_enabled('perf-scripting', '',
'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}
TUI_DEFINES = ${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}
LIBUNWIND_DEFINES = ${@perf_feature_enabled('perf-libunwind', '',
'NO_LIBUNWIND=1 NO_LIBDW_DWARF_UNWIND=1',d)}
+LIBNUMA_DEFINES = ${@perf_feature_enabled('perf-libnuma', '',
'NO_LIBNUMA=1',d)}
# The LDFLAGS is required or some old kernels fails due missing
# symbols and this is preferred than requiring patches to every old
@@ -80,7 +81,8 @@ EXTRA_OEMAKE = '\
AR=${AR} \
EXTRA_CFLAGS=-ldw \
perfexecdir=${libexecdir} \
-NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES}
${SCRIPTING_DEFINES} \
+NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \
+${SCRIPTING_DEFINES} ${LIBNUMA_DEFINES} \
'
EXTRA_OEMAKE += \
--
2.4.1
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [fido][PATCH] e2fsprogs: install populate-extfs.sh
On Sat, May 16, 2015 at 06:58:43AM +0200, Martin Jansa wrote:
From: Martin Jansa martin.ja...@gmail.com
ping
* install populate-extfs.sh from contrib, be aware that in order
to use it you need to set DEBUGFS shell variable, otherwise it will
try to use debugfs from relative path which is almost always
incorrect:
CONTRIB_DIR=$(dirname $(readlink -f $0))
DEBUGFS=$CONTRIB_DIR/../debugfs/debugfs
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index 66065bc..abc959f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -54,6 +54,8 @@ do_install () {
oe_multilib_header ext2fs/ext2_types.h
install -d ${D}${base_bindir}
mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
+
+ install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
}
do_install_append_class-target() {
--
2.4.0
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] rpm: remove extra dev and dbg packages
There should be only one dev and dbg package.
[YOCTO #7481]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
meta/recipes-devtools/rpm/rpm_5.4.14.bb | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 03a24f0..75b1ae2 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -34,10 +34,6 @@ DESCRIPTION_perl-modules-rpm = The perl-modules-rpm package
contains a module t
written in the Perl programming language to use the interface \
supplied by the RPM Package Manager libraries.
-SUMMARY_perl-module-rpm-dev = Development components for perl bindings
-DESCRIPTION_perl-modules-rpm-dev = Development items such as man pages for
use with the Perl \
-language bindings.
-
HOMEPAGE = http://rpm5.org/;
LICENSE = LGPLv2.1
LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
@@ -211,7 +207,7 @@ CFLAGS_append = -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY
-DRPM_VENDOR_OE
LDFLAGS_append_libc-uclibc = -lrt -lpthread
-PACKAGES = ${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev
${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev
python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale
+PACKAGES = ${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev
${PN}-common ${PN}-build python-rpm perl-module-rpm ${PN}-locale
SOLIBS = 5.4.so
@@ -248,6 +244,7 @@ FILES_${PN} = ${bindir}/rpm \
FILES_${PN}-dbg += ${libdir}/rpm/.debug \
${libdir}/rpm/bin/.debug \
+ ${libdir}/python*/site-packages/rpm/.debug/_* \
FILES_${PN}-common = ${bindir}/rpm2cpio \
@@ -341,18 +338,12 @@ RDEPENDS_${PN}-build = file bash perl
RDEPENDS_python-rpm = ${PN}
-FILES_python-rpm-dbg = ${libdir}/python*/site-packages/rpm/.debug/_*
-FILES_python-rpm-dev = ${libdir}/python*/site-packages/rpm/*.la
-FILES_python-rpm-staticdev = ${libdir}/python*/site-packages/rpm/*.a
FILES_python-rpm = ${libdir}/python*/site-packages/rpm
PROVIDES += python-rpm
FILES_perl-module-rpm = ${libdir}/perl/*/* \
-FILES_perl-module-rpm-dev = ${prefix}/share/man/man3/RPM* \
-
-
RDEPENDS_${PN}-dev += bash
FILES_${PN}-dev = ${includedir}/rpm \
@@ -381,6 +372,7 @@ FILES_${PN}-staticdev = \
${libdir}/librpmmisc.a \
${libdir}/librpmbuild.a \
${libdir}/rpm/lib/liblua.a \
+ ${libdir}/python*/site-packages/rpm/*.a \
do_configure() {
--
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/1] rpm: remove extra dev and dbg packages
The following changes since commit c91ffdb8fff4a62ccb80196a3d735e4b9a3056a3: dosfstools: Add recipe for v3.0.28 (2015-06-03 16:38:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/dev http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/dev Robert Yang (1): rpm: remove extra dev and dbg packages meta/recipes-devtools/rpm/rpm_5.4.14.bb | 14 +++--- 1 file changed, 3 insertions(+), 11 deletions(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] alsa-tools: add dependency glib-2.0
Add dependency glib-2.0 for alsa-tools. It is required by new added sub-component hdajacksensetest. Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb index 9133012..b5b9cc4 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb @@ -3,7 +3,7 @@ HOMEPAGE = http://www.alsa-project.org; BUGTRACKER = https://bugtrack.alsa-project.org/alsa-bug/login_page.php; SECTION = console/utils LICENSE = GPLv2 LGPLv2+ -DEPENDS = alsa-lib ncurses +DEPENDS = alsa-lib ncurses glib-2.0 LIC_FILES_CHKSUM = file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34 -- 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] python-numpy: duplicate i586 over-ride for i686
On 4 June 2015 at 09:39, Andre McCurdy armccu...@gmail.com wrote: Yes, I'll send a v2. I'm hopeful that this set of fixes will be acceptable for fido, which is why I initially went for adding i686 over-rides instead of a more widespread clean-up to replace i586 with x86. Changing i586 to x86 is a sensible fix, I can't see why that wouldn't be suitable for fido. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Robert Yang : bison: 2.7.1 - 3.0.4
On Tue, Apr 21, 2015 at 06:20:58AM +, g...@git.openembedded.org wrote:
Module: openembedded-core.git
Branch: master
Commit: fbb26d8db8e71fd979edd2bafa7e0bab7632950c
URL:
http://git.openembedded.org/?p=openembedded-core.gita=commit;h=fbb26d8db8e71fd979edd2bafa7e0bab7632950c
Author: Robert Yang liezhi.y...@windriver.com
Date: Tue Apr 14 02:07:12 2015 -0700
bison: 2.7.1 - 3.0.4
* Based on Chong Lu's previous upgrade to 3.0.2
* Remove unneeded patches:
dont-depend-on-help2man.patch and
fix_cross_manpage_building.patch
It seems to cause occasional hang in configure script when calling
javac, this is example from one world build:
|-python /home/jenkins/oe/world/shr-core/bitbake/bin/bitbake-worker decafbad
`-python /home/jenkins/oe/world/shr-core/bitbake/bin/bitbake-worker decafbad
`-run.do_configur
/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/bison/3.0.4-r0/temp/run.do_configure.14060
`-bash
/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/bison/3.0.4-r0/bison-3.0.4/configure
--build=x86_64-linux --host=i586-oe-linux --target=i586-oe-linux --prefix=/usr
--exec_prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin
--libexecdir=/usr/lib/bison --datadir=/usr/share --sysconfdir=/etc
--sharedstatedir=/com --localstatedir=/var --libdir=/usr/lib
--includedir=/usr/include --oldincludedir=/usr/include
--infodir=/usr/share/info --mandir=/usr/share/man --disable-silent-rules
--disable-dependency-tracking
--with-libtool-sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86
M4=m4 --enable-nls
`-javac -version
`-9*[{javac}]
`-3*[{python}]
jenkins@aruba:~$ javac -version
javac 1.6.0_24
Killing that javac process unblocked it.
Signed-off-by: Chong Lu chong...@windriver.com
Signed-off-by: Robert Yang liezhi.y...@windriver.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
.../bison/bison/dont-depend-on-help2man.patch | 32
--
.../bison/bison/fix_cross_manpage_building.patch | 19 -
.../bison/{bison_2.7.1.bb = bison_3.0.4.bb} | 22 +++
3 files changed, 10 insertions(+), 63 deletions(-)
diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
deleted file mode 100644
index 21b44bf..000
--- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate
-
-Signed-off-by: Marko Lindqvist cazf...@gmail.com
-diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am
bison-2.7/doc/Makefile.am2012-12-09 17:51:03.0 +0200
-+++ bison-2.7/doc/Makefile.am2013-01-02 06:49:50.804894071 +0200
-@@ -52,15 +52,11 @@
- ## Man Pages. ##
- ## --- ##
-
--dist_man_MANS = $(srcdir)/bison.1
--
--EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
--MAINTAINERCLEANFILES += $(dist_man_MANS)
-+EXTRA_DIST += bison.x common.x
-
- # Depend on configure to get version number changes.
- common_dep = $(top_srcdir)/configure $(srcdir)/common.x
- srcsrcdir = $(top_srcdir)/bin
--$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c
-
- # Differences to ignore when comparing the man page (the date).
- remove_time_stamp = \
-@@ -94,8 +90,6 @@
- fi
- $(AM_V_at)rm -f $@*.t
-
--nodist_man_MANS = yacc.1
--
- ## -- ##
- ## Graphviz examples generation. ##
- ## -- ##
diff --git
a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
deleted file mode 100644
index 8b68379..000
--- a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-help2man is looking at the generated binary for help output. This does not
work for cross compilations. So taking out the local PREPATH (../src)
directory from path so that help2 man can find the native version of the
bison in the native sysroot directory.
-
-Date: 2010/06/28
-Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c7f2755..af9453a 100644
a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -80,7 +80,6 @@ PREPATH = $(top_builddir)/src
- echo cd $$dir '' $(MAKE) $(AM_MAKEFLAGS) $$program\
- (cd $$dir $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \
- done
--$(AM_V_at)PATH=$(PREPATH)$(PATH_SEPARATOR)$$PATH; \
- export PATH; \
- $(HELP2MAN) \
- --include=$*.x \
diff --git
Re: [OE-core] [PATCH] alsa-tools: add dependency glib-2.0
On 04/06/15 06:57, Kai Kang wrote: Add dependency glib-2.0 for alsa-tools. It is required by new added sub-component hdajacksensetest. Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb index 9133012..b5b9cc4 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb @@ -3,7 +3,7 @@ HOMEPAGE = http://www.alsa-project.org; BUGTRACKER = https://bugtrack.alsa-project.org/alsa-bug/login_page.php; SECTION = console/utils LICENSE = GPLv2 LGPLv2+ -DEPENDS = alsa-lib ncurses +DEPENDS = alsa-lib ncurses glib-2.0 LIC_FILES_CHKSUM = file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34 It would be nice to put this behind a hdajacksensetest packageconfig if possible. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dizzy][PATCH] license.bbclass: set dirs for do_populate_lic_setscene
From: Robert Yang liezhi.y...@windriver.com
Fixed:
ERROR: Build of do_populate_lic failed
ERROR: Traceback (most recent call last):
File bitbake/lib/bb/build.py, line 497, in exec_task
return _exec_task(fn, task, d, quieterr)
File bitbake/lib/bb/build.py, line 437, in _exec_task
exec_func(func, localdata)
File bitbake/lib/bb/build.py, line 212, in exec_func
exec_func_python(func, d, runfile, cwd=adir)
File
/home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/bitbake/lib/bb/build.py,
line 237, in exec_func_python
os.chdir(cwd)
OSError: [Errno 2] No such file or directory:
'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build'
When running setscene, the cwd is $B which maybe removed by
autotools.bbclass or cmake.bbclass when rebuild.
Signed-off-by: Robert Yang liezhi.y...@windriver.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/classes/license.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 14d3107..d03b9eb 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -389,6 +389,8 @@ do_populate_lic[sstate-outputdirs] = ${LICENSE_DIRECTORY}/
ROOTFS_POSTPROCESS_COMMAND_prepend = write_package_manifest;
license_create_manifest;
+do_populate_lic_setscene[dirs] = ${LICSSTATEDIR}/${PN}
+do_populate_lic_setscene[cleandirs] = ${LICSSTATEDIR}
python do_populate_lic_setscene () {
sstate_setscene(d)
}
--
2.4.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] xf86-video-omap: Upgrade to 0.4.3
On Thu, Jun 04, 2015 at 01:44:20PM +0300, Jussi Kukkonen wrote:
Use last release instead of slightly older git revision, drop the
upstreamed patch.
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../xorg-driver/xf86-video-omap/configure.patch| 74
--
...-video-omap_git.bb = xf86-video-omap_0.4.3.bb} | 11 +---
2 files changed, 3 insertions(+), 82 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb =
xf86-video-omap_0.4.3.bb} (85%)
diff --git
a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
deleted file mode 100644
index d298d5d..000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Upstream-Status: Submitted
[https://bugs.freedesktop.org/show_bug.cgi?id=57386]
-Signed-off-by: Ross Burton ross.bur...@intel.com
-
-From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
-From: Ross Burton ross.bur...@intel.com
-Date: Wed, 21 Nov 2012 23:39:18 +
-Subject: [PATCH] build: rationalise DRI checks
-
-The existing logic around DRI was complicated and defined a number of
variables
-that were not used, when in reality DRI is required.
-
-Move the glproto check to the main pkg-config check, and remove everything
else.
-
-Signed-off-by: Ross Burton ross.bur...@intel.com
- configure.ac | 33 +
- 1 file changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11238b1..c321b98 100644
a/configure.ac
-+++ b/configure.ac
-@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server = 1.3] xproto fontsproto [libdrm =
2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+PKG_CHECK_MODULES(XORG, [xorg-server = 1.3] xproto fontsproto [libdrm =
2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
-
- # Checks for header files.
- AC_HEADER_STDC
-
--save_CFLAGS=$CFLAGS
--CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
--AC_CHECK_FILE([${sdkdir}/dri.h],
-- [have_dri_h=yes], [have_dri_h=no])
--AC_CHECK_FILE([${sdkdir}/dristruct.h],
-- [have_dristruct_h=yes], [have_dristruct_h=no])
--fi
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI = xauto; then
--if test $have_dri_h = yes -a \
--$have_dristruct_h = yes; then
--DRI=yes
--else
--DRI=no
--fi
--fi
--AC_MSG_RESULT([$DRI])
--CFLAGS=$save_CFLAGS $DEBUGFLAGS
--
--AM_CONDITIONAL(DRI, test x$DRI = xyes)
--if test $DRI = yes; then
--PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
--AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
--fi
--
- AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
- if test $VIDEO_DEBUG = yes; then
- AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
- fi
-
--AC_SUBST([DRI_CFLAGS])
-
- DRIVER_NAME=omap
- AC_SUBST([DRIVER_NAME])
---
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
index 454d0a1..95de4ba 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
@@ -24,15 +24,10 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602
DEPENDS += virtual/libx11 libdrm xf86driproto
-SRCREV = ae0394e687f1a77e966cf72f895da91840dffb8f
-PR = ${INC_PR}.3
-PV = 0.4.2+gitr${SRCPV}
-
-SRC_URI = git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
- file://configure.patch \
-
+SRC_URI[md5sum] = be35daf6fa4b75092cc4a8978c437bc5
+SRC_URI[sha256sum] =
db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d
-S = ${WORKDIR}/git
+PR = ${INC_PR}.3
Drop PR when PV is incremented.
CFLAGS += -I${STAGING_INCDIR}/xorg
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
Re: [OE-core] [oe-commits] Robert Yang : perf: fix for rebuilding
I think this commit:
commit 9dafa571ed0a40d21a886dec7704c31150b21942
Author: Robert Yang liezhi.y...@windriver.com
Date: Sun Jan 18 22:46:29 2015 -0800
perf: fix for rebuilding
Fix for rebuilding error:
make[3]: *** No rule to make target
`/path/to/sysroots/qemuarm64/usr/src/kernel/tools/lib/traceevent//trace-seq.c',
needed by `.trace-seq.d'. Stop.
make[2]: *** [sub-make] Error 2
Signed-off-by: Robert Yang liezhi.y...@windriver.com
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index bd57c6c..6925eb2 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -115,6 +115,10 @@ do_install() {
}
do_configure_prepend () {
+# Fix for rebuilding
+rm -rf ${B}/
+mkdir ${B}/
+
#kernels before 3.1 do not support WERROR env variable
sed -i 's,-Werror ,,' ${S}/tools/perf/Makefile
if [ -e ${S}/tools/perf/config/Makefile ]; then
is causing occasional do_populate_lic failure with:
ERROR: Build of do_populate_lic failed
ERROR: Traceback (most recent call last):
File bitbake/lib/bb/build.py, line 497, in exec_task
return _exec_task(fn, task, d, quieterr)
File bitbake/lib/bb/build.py, line 440, in _exec_task
exec_func(func, localdata)
File bitbake/lib/bb/build.py, line 212, in exec_func
exec_func_python(func, d, runfile, cwd=adir)
File bitbake/lib/bb/build.py, line 237, in exec_func_python
os.chdir(cwd)
OSError: [Errno 2] No such file or directory:
'BUILD/work/qemux86-webos-linux/perf/1.0-r9/perf-1.0'
ERROR: Task 3216 (oe-core/meta/recipes-kernel/perf/perf.bb, do_populate_lic)
failed with exit code '1'
perf.bb sets:
B = ${WORKDIR}/${BPN}-${PV}
and order of do_configure,do_populate_lic isn't given
meta/classes/license.bbclass:addtask populate_lic after do_patch before do_build
So I think we should backport this change to dizzy as well:
oe-core$ git show -1 jansa/dizzy-backports
commit 40aeb23c427e0c56f7073fc54ea63bf0eabbe092
Author: Robert Yang liezhi.y...@windriver.com
Date: Wed Mar 11 01:35:38 2015 -0700
license.bbclass: set dirs for do_populate_lic_setscene
Fixed:
ERROR: Build of do_populate_lic failed
ERROR: Traceback (most recent call last):
File bitbake/lib/bb/build.py, line 497, in exec_task
return _exec_task(fn, task, d, quieterr)
File bitbake/lib/bb/build.py, line 437, in _exec_task
exec_func(func, localdata)
File bitbake/lib/bb/build.py, line 212, in exec_func
exec_func_python(func, d, runfile, cwd=adir)
File
/home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/bitbake/lib/bb/build.py,
line 237, in exec_func_python
os.chdir(cwd)
OSError: [Errno 2] No such file or directory:
'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build'
When running setscene, the cwd is $B which maybe removed by
autotools.bbclass or cmake.bbclass when rebuild.
Signed-off-by: Robert Yang liezhi.y...@windriver.com
Signed-off-by: Ross Burton ross.bur...@intel.com
Regards,
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 4/4] distrodata: Use Python CSV instead of did by hand
On 4 June 2015 at 19:42, Aníbal Limón anibal.li...@linux.intel.com wrote: Fix CSV generation in distrodata class using Python CSV module before it some errors happen when read due to incorrect quoting/delimiters. So whereas before the SRC_URI field in checkpkg.cvs generally just listed the first entry (the main source) it now lists the entire of SRC_URI. Presumably this bug fix is desired behaviour? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] devtool: improve handling of local source files
Hi, On Tue, 2015-05-12 at 19:01 +0100, Paul Eggleton wrote: Hi Markus, On Thursday 30 April 2015 12:16:06 Markus Lehtonen wrote: This patchset tries to improve handling of local source files (i.e. file:// in SRC_URI). First, it improves packages for which S=WORKDIR (that possibly only have local sources. Second, it makes local sources available in the srctree for all packages. See yocto bug #7602 I've finally looked at these, apologies for the delay. Some comments: * I don't think we really want the local files to become part of the git repository by default - they shouldn't be committed. Once users have finished with devtool, we want them to be able to push the source tree to their own repo and point to that within the recipe, whilst keeping the local files next to the recipe. So you suggest to add a new command line option to devtool extract and modify (--local-files or smth)? What to do when there are only local files (no source tarball / repo) - automatically enable --local-files in this case? * This implies that new files added to the local files dir when we do devtool update-recipe should not be added as a patch, they should be copied next to the recipe and added to SRC_URI. I'm more than happy for us to implement this separately as a follow-up (i.e. we could start by not handling adding files to the local files directory at all.) Yeah, I actually have this WIP. Currently (i.e. with the current patchset), new files added to 'local-files' are just ignored. They are not copied and no patches is generated out of these. * The local-files directory needs to be named specific to OE - oe-local-files would be ideal. If we could have one place in the code where this was defined that would be ideal as well (maybe at some point we'd allow it to be configured). This is not a big deal. Should it perhaps be bb-local-files instead? Thanks, Markus -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 0/7] devtool: improve handling of local source files
Hi, On Thu, 2015-06-04 at 11:49 +0100, Paul Eggleton wrote: Hi Markus, On Wednesday 03 June 2015 17:50:25 Markus Lehtonen wrote: Second version of my patchset aiming to improve handling of local source files. The only significant change since the first version is the addition of unit tests. Did you see the comments I made on v1 patchset? https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg64396.html Hmm, I had somehow managed to miss that one. I now responded to that. Cheers, Markus -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] xf86-video-omap: Upgrade to 0.4.3
On 4 June 2015 at 14:13, Martin Jansa martin.ja...@gmail.com wrote:
On Thu, Jun 04, 2015 at 01:44:20PM +0300, Jussi Kukkonen wrote:
Use last release instead of slightly older git revision, drop the
upstreamed patch.
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com
---
.../xorg-driver/xf86-video-omap/configure.patch| 74
--
...-video-omap_git.bb = xf86-video-omap_0.4.3.bb} | 11 +---
2 files changed, 3 insertions(+), 82 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb =
xf86-video-omap_0.4.3.bb} (85%)
diff --git
a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
deleted file mode 100644
index d298d5d..000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Upstream-Status: Submitted
[https://bugs.freedesktop.org/show_bug.cgi?id=57386]
-Signed-off-by: Ross Burton ross.bur...@intel.com
-
-From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
-From: Ross Burton ross.bur...@intel.com
-Date: Wed, 21 Nov 2012 23:39:18 +
-Subject: [PATCH] build: rationalise DRI checks
-
-The existing logic around DRI was complicated and defined a number of
variables
-that were not used, when in reality DRI is required.
-
-Move the glproto check to the main pkg-config check, and remove everything
else.
-
-Signed-off-by: Ross Burton ross.bur...@intel.com
- configure.ac | 33 +
- 1 file changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11238b1..c321b98 100644
a/configure.ac
-+++ b/configure.ac
-@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server = 1.3] xproto fontsproto [libdrm =
2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+PKG_CHECK_MODULES(XORG, [xorg-server = 1.3] xproto fontsproto [libdrm =
2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
-
- # Checks for header files.
- AC_HEADER_STDC
-
--save_CFLAGS=$CFLAGS
--CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
--AC_CHECK_FILE([${sdkdir}/dri.h],
-- [have_dri_h=yes], [have_dri_h=no])
--AC_CHECK_FILE([${sdkdir}/dristruct.h],
-- [have_dristruct_h=yes], [have_dristruct_h=no])
--fi
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI = xauto; then
--if test $have_dri_h = yes -a \
--$have_dristruct_h = yes; then
--DRI=yes
--else
--DRI=no
--fi
--fi
--AC_MSG_RESULT([$DRI])
--CFLAGS=$save_CFLAGS $DEBUGFLAGS
--
--AM_CONDITIONAL(DRI, test x$DRI = xyes)
--if test $DRI = yes; then
--PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
--AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver
support])
--fi
--
- AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
- if test $VIDEO_DEBUG = yes; then
- AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
- fi
-
--AC_SUBST([DRI_CFLAGS])
-
- DRIVER_NAME=omap
- AC_SUBST([DRIVER_NAME])
---
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
index 454d0a1..95de4ba 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
@@ -24,15 +24,10 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602
DEPENDS += virtual/libx11 libdrm xf86driproto
-SRCREV = ae0394e687f1a77e966cf72f895da91840dffb8f
-PR = ${INC_PR}.3
-PV = 0.4.2+gitr${SRCPV}
-
-SRC_URI = git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
- file://configure.patch \
-
+SRC_URI[md5sum] = be35daf6fa4b75092cc4a8978c437bc5
+SRC_URI[sha256sum] =
db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d
-S = ${WORKDIR}/git
+PR = ${INC_PR}.3
Drop PR when PV is incremented.
Thanks. I've dropped the PR and pushed to same branch.
Jussi
CFLAGS += -I${STAGING_INCDIR}/xorg
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
Re: [OE-core] [PATCH] copyleft_filter.bbclass: Allow to filter on name
Hi Mariano,
On Friday 22 May 2015 06:29:25 mariano.lo...@linux.intel.com wrote:
From: Mariano Lopez mariano.lo...@linux.intel.com
The archiver uses a license based filter to provide the source code.
This patch allows to search on name based on two new variables
(SRC_INCLUDE_NAME, SRC_EXCLUDE_NAME). Both variables are empty by default.
The filter by name has higher priority than the license filter.
Signed-off-by: Mariano Lopez mariano.lo...@linux.intel.com
---
meta/classes/archiver.bbclass| 14 ++
meta/classes/copyleft_filter.bbclass | 28
2 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index b598aa3..138c407 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -52,14 +52,12 @@ do_ar_original[dirs] = ${ARCHIVER_OUTDIR}
${ARCHIVER_WORKDIR} python () {
pn = d.getVar('PN', True)
-if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \
-d.getVar('COPYLEFT_LICENSE_EXCLUDE', True):
-included, reason = copyleft_should_include(d)
-if not included:
-bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
-return
-else:
-bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
+included, reason = should_include_src(d)
+if not included:
+bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
+return
+else:
+bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True)
diff --git a/meta/classes/copyleft_filter.bbclass
b/meta/classes/copyleft_filter.bbclass index 2c1d8f1..d5c3b59 100644
--- a/meta/classes/copyleft_filter.bbclass
+++ b/meta/classes/copyleft_filter.bbclass
@@ -25,6 +25,14 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native
nativesdk cross crosssdk cross- COPYLEFT_AVAILABLE_RECIPE_TYPES[type] =
'list'
COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available
recipe types'
+SRC_INCLUDE_NAME ?= ''
+SRC_INCLUDE_NAME[type] = 'list'
+SRC_INCLUDE_NAME[doc] = 'Space separated list of recipe names to include'
+
+SRC_EXCLUDE_NAME ?= ''
+SRC_EXCLUDE_NAME[type] = 'list'
+SRC_EXCLUDE_NAME[doc] = 'Space separated list of recipe names to exclude'
+
def copyleft_recipe_type(d):
for recipe_type in
oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d): if
oe.utils.inherits(d, recipe_type):
@@ -59,4 +67,24 @@ def copyleft_should_include(d):
else:
return False, 'recipe has excluded licenses: %s' % ',
'.join(reason)
+def should_include_src(d):
+
+Determine if this recipe's source should be deployed
+
+from fnmatch import fnmatchcase as fnmatch
+
+if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \
+d.getVar('COPYLEFT_LICENSE_EXCLUDE', True):
+is_included, reason = copyleft_should_include(d)
+
+if any(fnmatch(d.getVar('PN', True), name) \
+for name in oe.data.typed_value('SRC_INCLUDE_NAME', d)):
+is_included, reason = True, 'recipe included by name'
+if any(fnmatch(d.getVar('PN', True), name) \
+for name in oe.data.typed_value('SRC_EXCLUDE_NAME', d)):
+is_included, reason = False, 'recipe excluded by name'
+
+if 'reason' not in locals():
+is_included, reason = False, 'recipe did not match any condition'
+return is_included, reason
I really need to be more active in reviewing things, sorry about the lack of
reply. A couple of comments:
1) It looks like we already have a function in copyleft_filter.bbclass that we
should simply be extending i.e. copyleft_should_include() - you would then
need to change archiver.bbclass so that it always calls that function instead
of being conditional on whether COPYLEFT_LICENSE_INCLUDE or
COPYLEFT_LICENSE_EXCLUDE are set.
2) Following on from the above, the new variable ought to be named
consistently with the other variables used by the class, e.g.
COPYLEFT_PN_INCLUDE and COPYLEFT_PN_EXCLUDE.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] devtool: improve handling of local source files
On Thursday 04 June 2015 16:12:07 Markus Lehtonen wrote: On Tue, 2015-05-12 at 19:01 +0100, Paul Eggleton wrote: On Thursday 30 April 2015 12:16:06 Markus Lehtonen wrote: This patchset tries to improve handling of local source files (i.e. file:// in SRC_URI). First, it improves packages for which S=WORKDIR (that possibly only have local sources. Second, it makes local sources available in the srctree for all packages. See yocto bug #7602 I've finally looked at these, apologies for the delay. Some comments: * I don't think we really want the local files to become part of the git repository by default - they shouldn't be committed. Once users have finished with devtool, we want them to be able to push the source tree to their own repo and point to that within the recipe, whilst keeping the local files next to the recipe. So you suggest to add a new command line option to devtool extract and modify (--local-files or smth)? What to do when there are only local files (no source tarball / repo) - automatically enable --local-files in this case? Is another option really required? Unless I'm missing something, I would have thought the behaviour for local files ought to be the same regardless of whether they are in addition to the upstream source, or the only files in SRC_URI. * This implies that new files added to the local files dir when we do devtool update-recipe should not be added as a patch, they should be copied next to the recipe and added to SRC_URI. I'm more than happy for us to implement this separately as a follow-up (i.e. we could start by not handling adding files to the local files directory at all.) Yeah, I actually have this WIP. Currently (i.e. with the current patchset), new files added to 'local-files' are just ignored. They are not copied and no patches is generated out of these. OK, then it sounds like the behaviour for added files is reasonable for the moment and we can extend it as a follow-up. * The local-files directory needs to be named specific to OE - oe-local-files would be ideal. If we could have one place in the code where this was defined that would be ideal as well (maybe at some point we'd allow it to be configured). This is not a big deal. Should it perhaps be bb-local-files instead? Well strictly speaking all of this is being defined in OE, not bitbake, hence my suggestion of oe-local-files. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
