[OE-core] [PATCH 4/4] qemu: update run-ptest script
From: Kai Kang The Makefile in directory tests has been renamed, then update script run-ptest to follow the change. Signed-off-by: Kai Kang --- meta/recipes-devtools/qemu/qemu/run-ptest | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu/run-ptest b/meta/recipes-devtools/qemu/qemu/run-ptest index f4b8e97..2206b31 100644 --- a/meta/recipes-devtools/qemu/qemu/run-ptest +++ b/meta/recipes-devtools/qemu/qemu/run-ptest @@ -1,8 +1,10 @@ #!/bin/sh # #This script is used to run qemu test suites -ptestdir=$(pwd) -cd tests +# +ptestdir=$(dirname "$(readlink -f "$0")") export SRC_PATH=$ptestdir -make -k runtest-TESTS | sed '/: OK/ s/^/PASS: /g' + +cd $ptestdir/tests +make -f Makefile.include -k runtest-TESTS | sed '/: OK/ s/^/PASS: /g' -- 2.10.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] glibc: fix CVE-2016-6323
From: Kai Kang
Backport patch to fix CVE-2016-6323 of glibc. And remove the section of
file ChangeLog which can't be applied.
Ref:
https://sourceware.org/bugzilla/show_bug.cgi?id=20435
Signed-off-by: Kai Kang
---
...k-__startcontext-as-.cantunwind-bug-20435.patch | 46 ++
meta/recipes-core/glibc/glibc_2.24.bb | 1 +
2 files changed, 47 insertions(+)
create mode 100644
meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch
diff --git
a/meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch
b/meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch
new file mode 100644
index 000..95067d3
--- /dev/null
+++
b/meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch
@@ -0,0 +1,46 @@
+Backport patch to fix CVE-2016-6323 for glibc. And remove the section of
+ChangeLog which can't be applied.
+
+Upstream-Status: Backport
[https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e2ff6c]
+CVE: CVE-2016-6323
+Signed-off-by: Kai Kang
+---
+From 9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab
+Date: Mon, 8 Aug 2016 09:29:18 +0200
+Subject: [PATCH] arm: mark __startcontext as .cantunwind (bug 20435)
+
+__startcontext marks the bottom of the call stack of the contexts created
+by makecontext.
+---
+ ChangeLog| 6 ++
+ sysdeps/unix/sysv/linux/arm/setcontext.S | 7 +++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S
b/sysdeps/unix/sysv/linux/arm/setcontext.S
+index 603e508..d1f168f 100644
+--- a/sysdeps/unix/sysv/linux/arm/setcontext.S
b/sysdeps/unix/sysv/linux/arm/setcontext.S
+@@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext)
+
+ /* Called when a makecontext() context returns. Start the
+ context in R4 or fall through to exit(). */
++ /* Unwind descriptors are looked up based on PC - 2, so we have to
++ make sure to mark the instruction preceding the __startcontext
++ label as .cantunwind. */
++ .fnstart
++ .cantunwind
++ nop
+ ENTRY(__startcontext)
+ movsr0, r4
+ bne PLTJMP(__setcontext)
+
+ @ New context was 0 - exit
+ b PLTJMP(HIDDEN_JUMPTARGET(exit))
++ .fnend
+ END(__startcontext)
+
+ #ifdef PIC
+--
+2.10.1
+
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb
b/meta/recipes-core/glibc/glibc_2.24.bb
index f5a21b2..475c133 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -37,6 +37,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
file://0026-build_local_scope.patch \
+ file://0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch \
"
SRC_URI += "\
--
2.10.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] qemu: fix CVE-2016-7909
From: Kai Kang
Backport patch to fix CVE-2016-7909 of qemu.
Ref:
https://security-tracker.debian.org/tracker/CVE-2016-7909
Signed-off-by: Kai Kang
---
.../qemu/qemu/0004-fix-CVE-2016-7909.patch | 42 ++
meta/recipes-devtools/qemu/qemu_2.7.0.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/0004-fix-CVE-2016-7909.patch
diff --git a/meta/recipes-devtools/qemu/qemu/0004-fix-CVE-2016-7909.patch
b/meta/recipes-devtools/qemu/qemu/0004-fix-CVE-2016-7909.patch
new file mode 100644
index 000..e71bbf6
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0004-fix-CVE-2016-7909.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Backport [http://git.qemu.org/?p=qemu.git;a=commit;h=34e29ce]
+CVE: CVE-2016-7909
+
+Signed-off-by: Kai Kang
+---
+From 34e29ce754c02bb6b3bdd244fbb85033460feaff Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit
+Date: Fri, 30 Sep 2016 00:27:33 +0530
+Subject: [PATCH] net: pcnet: check rx/tx descriptor ring length
+
+The AMD PC-Net II emulator has set of control and status(CSR)
+registers. Of these, CSR76 and CSR78 hold receive and transmit
+descriptor ring length respectively. This ring length could range
+from 1 to 65535. Setting ring length to zero leads to an infinite
+loop in pcnet_rdra_addr() or pcnet_transmit(). Add check to avoid it.
+
+Reported-by: Li Qiang
+Signed-off-by: Prasad J Pandit
+Signed-off-by: Jason Wang
+---
+ hw/net/pcnet.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
+index 198a01f..3078de8 100644
+--- a/hw/net/pcnet.c
b/hw/net/pcnet.c
+@@ -1429,8 +1429,11 @@ static void pcnet_csr_writew(PCNetState *s, uint32_t
rap, uint32_t new_value)
+ case 47: /* POLLINT */
+ case 72:
+ case 74:
++break;
+ case 76: /* RCVRL */
+ case 78: /* XMTRL */
++val = (val > 0) ? val : 512;
++break;
+ case 112:
+if (CSR_STOP(s) || CSR_SPND(s))
+break;
+--
+2.10.1
+
diff --git a/meta/recipes-devtools/qemu/qemu_2.7.0.bb
b/meta/recipes-devtools/qemu/qemu_2.7.0.bb
index a75bcdf..cef181d 100644
--- a/meta/recipes-devtools/qemu/qemu_2.7.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.7.0.bb
@@ -12,6 +12,7 @@ SRC_URI +=
"file://configure-fix-Darwin-target-detection.patch \
file://0001-virtio-zero-vq-inuse-in-virtio_reset.patch \
file://0002-fix-CVE-2016-7423.patch \
file://0003-fix-CVE-2016-7908.patch \
+file://0004-fix-CVE-2016-7909.patch \
"
SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2";
--
2.10.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Fix CVEs and qemu run-ptest script
From: Kai Kang The following changes since commit 09278be8c209976da03f63b5a956d212ac171317: conf/distro/include/maintainers: move toolchain to Khem Raj (2016-11-09 12:20:48 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/fixes-20161110 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/fixes-20161110 Kai Kang (4): openssh: fix CVE-2016-8858 glibc: fix CVE-2016-6323 qemu: fix CVE-2016-7909 qemu: update run-ptest script .../openssh/openssh/fix-CVE-2016-8858.patch| 39 ++ meta/recipes-connectivity/openssh/openssh_7.3p1.bb | 1 + ...k-__startcontext-as-.cantunwind-bug-20435.patch | 46 ++ meta/recipes-core/glibc/glibc_2.24.bb | 1 + .../qemu/qemu/0004-fix-CVE-2016-7909.patch | 42 meta/recipes-devtools/qemu/qemu/run-ptest | 8 ++-- meta/recipes-devtools/qemu/qemu_2.7.0.bb | 1 + 7 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch create mode 100644 meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0004-fix-CVE-2016-7909.patch -- 2.10.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] openssh: fix CVE-2016-8858
From: Kai Kang
Backport patch to fix CVE-2016-8858 of openssh.
Ref:
https://bugzilla.redhat.com/show_bug.cgi?id=1384860
Signed-off-by: Kai Kang
---
.../openssh/openssh/fix-CVE-2016-8858.patch| 39 ++
meta/recipes-connectivity/openssh/openssh_7.3p1.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644
meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
b/meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
new file mode 100644
index 000..b26ee81
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
@@ -0,0 +1,39 @@
+Fix CVE-2016-8858 of openssh
+
+Backport patch from upstream and drop the change of comment which can NOT be
applied.
+
+Upstream-Status: Backport [
https://anongit.mindrot.org/openssh.git/commit/?id=ec165c3 ]
+CVE: CVE-2016-8858
+
+Signed-off-by: Kai Kang
+---
+From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001
+From: "mar...@openbsd.org"
+Date: Mon, 10 Oct 2016 19:28:48 +
+Subject: [PATCH] upstream commit
+
+Unregister the KEXINIT handler after message has been
+received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
+allocation of up to 128MB -- until the connection is closed. Reported by
+shilei-c at 360.cn
+
+Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05
+---
+ kex.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kex.c b/kex.c
+index 3f97f8c..6a94bc5 100644
+--- a/kex.c
b/kex.c
+@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
+ if (kex == NULL)
+ return SSH_ERR_INVALID_ARGUMENT;
+
++ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
+ ptr = sshpkt_ptr(ssh, &dlen);
+ if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
+ return r;
+--
+2.10.1
+
diff --git a/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
index 039b0ff..94eb0ed 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
@@ -25,6 +25,7 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \
file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \
file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
+ file://fix-CVE-2016-8858.patch \
"
PAM_SRC_URI = "file://sshd"
--
2.10.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFT][PATCH] systemd: Upgrade to 232
* Drop support for rcS.d SysV init scripts.
These are prone to cause dependency loops, and almost all packages with
rcS scripts now ship a native systemd service.
* Drop mount propagation patch, it only happens with libseccomp, OE doesnt
enable it
* kdbus option has disappeared from configure
* Ignore dev-so for PN now since systemd introduced private .so see
https://github.com/systemd/systemd/issues/3810
Signed-off-by: Khem Raj
---
meta/recipes-core/systemd/systemd.inc | 4 +-
c-Change-the-default-device-timeout-to-2.patch | 8 +-
...r-getty-to-agetty-in-console-setup-system.patch | 10 +-
.../systemd/0003-define-exp10-if-missing.patch | 12 +-
...nv-when-secure-versions-are-not-available.patch | 21 ++--
...t-install-dependency-links-at-install-tim.patch | 10 +-
...heck-for-additional-features-that-uclibc-.patch | 10 +-
...pper-instead-of-looking-for-relative-opti.patch | 38 ++
...wn-Use-execvpe-only-when-libc-supports-it.patch | 16 +--
...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 27 +++--
...0010-implment-systemd-sysv-install-for-OE.patch | 6 +-
...nes-Build-conditionally-when-HAVE_MYHOSTN.patch | 12 +-
.../systemd/0012-rules-whitelist-hd-devices.patch | 21 ++--
...-Make-root-s-home-directory-configurable.patch} | 90 +-
...tor-add-support-for-executing-scripts-und.patch | 133 -
...vert-rules-remove-firmware-loading-rules.patch} | 6 +-
...remove-userspace-firmware-loading-suppor.patch} | 58 +
...0015-systemd-user-avoid-using-system-auth.patch | 35 --
...patch => 0016-make-test-dir-configurable.patch} | 21 ++--
...=> 0017-remove-duplicate-include-uchar.h.patch} | 10 +-
...h => 0018-check-for-uchar.h-in-configure.patch} | 16 ++-
...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} | 20 ++--
...sing.h-for-getting-secure_getenv-definiti.patch | 27 -
.../systemd/systemd/CVE-2016-7795.patch| 69 ---
...dev-re-enable-mount-propagation-for-udevd.patch | 31 -
.../systemd/{systemd_230.bb => systemd_232.bb} | 22 ++--
26 files changed, 195 insertions(+), 538 deletions(-)
rename
meta/recipes-core/systemd/systemd/{0014-Make-root-s-home-directory-configurable.patch
=> 0013-Make-root-s-home-directory-configurable.patch} (66%)
delete mode 100644
meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
rename
meta/recipes-core/systemd/systemd/{0016-Revert-rules-remove-firmware-loading-rules.patch
=> 0014-Revert-rules-remove-firmware-loading-rules.patch} (84%)
rename
meta/recipes-core/systemd/systemd/{0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
=> 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (89%)
delete mode 100644
meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
rename
meta/recipes-core/systemd/systemd/{0018-make-test-dir-configurable.patch =>
0016-make-test-dir-configurable.patch} (77%)
rename
meta/recipes-core/systemd/systemd/{0019-remove-duplicate-include-uchar.h.patch
=> 0017-remove-duplicate-include-uchar.h.patch} (81%)
rename
meta/recipes-core/systemd/systemd/{0020-check-for-uchar.h-in-configure.patch =>
0018-check-for-uchar.h-in-configure.patch} (76%)
rename
meta/recipes-core/systemd/systemd/{0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
=> 0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (69%)
delete mode 100644
meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
delete mode 100644 meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
delete mode 100644
meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
rename meta/recipes-core/systemd/{systemd_230.bb => systemd_232.bb} (97%)
diff --git a/meta/recipes-core/systemd/systemd.inc
b/meta/recipes-core/systemd/systemd.inc
index f800f42..29e0be6 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,12 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-SRCREV = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba"
+SRCREV = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c"
SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
-PV = "230+git${SRCPV}"
-
S = "${WORKDIR}/git"
LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
diff --git
a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
index f7ef7a3..ee2cd6c 100644
---
a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
+++
b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device
[OE-core] [PATCH 7/7] oe-selftest: devtool: test that updating a file with subdir= works
If you have a file:// entry in SRC_URI with a subdir= parameter that
makes it extract into the source tree, then when you update that file in
oe-local-files and run devtool update-recipe then you want the original
file to be updated. This was made to work by OE-Core commit
9069fef5dad5a873c8a8f720f7bcbc7625556309 together with
31f1bbad248c36a8c86dde4ff57ce42efc664082, however until now there was no
oe-selftest test to verify it.
Note that in order to succeed this test also requires the fix
"lib/oe/recipeutils: ignore archives by default in
get_recipe_local_files()" since the test recipe uses a local tarball.
Signed-off-by: Paul Eggleton
---
.../recipes-test/devtool/devtool-test-subdir.bb| 7 ++
.../devtool-test-subdir/devtool-test-subdir.tar.gz | Bin 0 -> 181 bytes
.../devtool/devtool-test-subdir/testfile | 1 +
meta/lib/oeqa/selftest/devtool.py | 25 +
4 files changed, 33 insertions(+)
create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
b/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
new file mode 100644
index 000..1a163f8
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
@@ -0,0 +1,7 @@
+LICENSE = "CLOSED"
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "file://devtool-test-subdir.tar.gz \
+ file://testfile;subdir=${BPN}"
+
+S = "${WORKDIR}/${BPN}"
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz
b/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz
new file mode 100644
index
..3d44f803cb996f47ddb9566a6a2c278bd2fd38a7
GIT binary patch
literal 181
zcmb2|=3q$6J|51%{Pv!)O`V=r&CCF&amo1dGRnw5U#@gCt_C1KIoKB3%8wHJFS`o2@h
zUS??8Jmt|PpTgJocYl|^y6(&VH_HWT*GYRHymoEq|Cg=lnV=Qkpj&_MeLi@+zuhOx!GHt~9AEb)s!EYTgMk46=?79i
literal 0
HcmV?d1
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
b/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
new file mode 100644
index 000..12b519c
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
@@ -0,0 +1 @@
+Modified version
diff --git a/meta/lib/oeqa/selftest/devtool.py
b/meta/lib/oeqa/selftest/devtool.py
index 92dc5e5..2a08721 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -972,6 +972,31 @@ class DevtoolTests(DevtoolBase):
if 'gzip compressed data' not in result.output:
self.fail('New patch file is not gzipped - file reports:\n%s' %
result.output)
+def test_devtool_update_recipe_local_files_subdir(self):
+# Try devtool extract on a recipe that has a file with subdir= set in
+# SRC_URI such that it overwrites a file that was in an archive that
+# was also in SRC_URI
+# First, modify the recipe
+testrecipe = 'devtool-test-subdir'
+recipefile = get_bb_var('FILE', testrecipe)
+src_uri = get_bb_var('SRC_URI', testrecipe)
+tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+self.track_for_cleanup(tempdir)
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+# (don't bother with cleaning the recipe on teardown, we won't be
building it)
+result = runCmd('devtool modify %s' % testrecipe)
+testfile = os.path.join(self.workspacedir, 'sources', testrecipe,
'testfile')
+self.assertTrue(os.path.exists(testfile), 'Extracted source could not
be found')
+with open(testfile, 'r') as f:
+contents = f.read().rstrip()
+self.assertEqual(contents, 'Modified version', 'File has apparently
not been overwritten as it should have been')
+# Test devtool update-recipe without modifying any files
+self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
os.path.basename(recipefile)))
+result = runCmd('devtool update-recipe %s' % testrecipe)
+expected_status = []
+self._check_repo_status(os.path.dirname(recipefile), expected_status)
+
@testcase(1163)
def test_devtool_extract(self):
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] devtool: update-recipe: support replacing remote patches
If you have a patch remotely fetched in a recipe (e.g. from an http
server) that needs updating then add a local version and substitute the
entry in SRC_URI to point to it.
One can argue about how desirable it is to be modifying patches fetched
in this way, but then one can argue about how desirable it is to have
such patches in the recipe in the first place - and in any case if
devtool update-recipe is to correctly transfer changes to such patches
made in the git repository within the source tree to the recipe then
there isn't much choice but to do it this way.
Signed-off-by: Paul Eggleton
---
scripts/lib/devtool/standard.py | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index af0d467..34de7bd 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1104,6 +1104,15 @@ def _remove_file_entries(srcuri, filelist):
break
return entries, remaining
+def _replace_srcuri_entry(srcuri, filename, newentry):
+"""Replace entry corresponding to specified file with a new entry"""
+basename = os.path.basename(filename)
+for i in range(len(srcuri)):
+if os.path.basename(srcuri[i].split(';')[0]) == basename:
+srcuri.pop(i)
+srcuri.insert(i, newentry)
+break
+
def _remove_source_files(append, files, destpath):
"""Unlink existing patch files"""
for path in files:
@@ -1424,6 +1433,10 @@ def _update_recipe_patch(recipename, workspace, srctree,
rd, appendlayerdir, wil
raise DevtoolError('Unable to find initial revision - please specify '
'it with --initial-rev')
+dl_dir = rd.getVar('DL_DIR', True)
+if not dl_dir.endswith('/'):
+dl_dir += '/'
+
tempdir = tempfile.mkdtemp(prefix='devtool')
try:
local_files_dir = tempfile.mkdtemp(dir=tempdir)
@@ -1468,6 +1481,7 @@ def _update_recipe_patch(recipename, workspace, srctree,
rd, appendlayerdir, wil
logger.info('No patches or local source files needed updating')
else:
# Update existing files
+files_dir = _determine_files_dir(rd)
for basepath, path in upd_f.items():
logger.info('Updating file %s' % basepath)
if os.path.isabs(basepath):
@@ -1479,11 +1493,19 @@ def _update_recipe_patch(recipename, workspace,
srctree, rd, appendlayerdir, wil
updatefiles = True
for basepath, path in upd_p.items():
patchfn = os.path.join(patches_dir, basepath)
-logger.info('Updating patch %s' % basepath)
+if os.path.dirname(path) + '/' == dl_dir:
+# This is a a downloaded patch file - we now need to
+# replace the entry in SRC_URI with our local version
+logger.info('Replacing remote patch %s with updated local
version' % basepath)
+path = os.path.join(files_dir, basepath)
+_replace_srcuri_entry(srcuri, basepath, 'file://%s' %
basepath)
+updaterecipe = True
+else:
+logger.info('Updating patch %s' % basepath)
+logger.debug('Moving new patch %s to %s' % (patchfn, path))
_move_file(patchfn, path)
updatefiles = True
# Add any new files
-files_dir = _determine_files_dir(rd)
for basepath, path in new_f.items():
logger.info('Adding new file %s' % basepath)
_move_file(os.path.join(local_files_dir, basepath),
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] lib/oe/recipeutils: ignore archives by default in get_recipe_local_files()
By default, have get_recipe_local_files() not return any archive
files. This prevents a local tarball from being erroneously removed
from SRC_URI if you run "devtool modify" on a recipe followed by
"devtool update-recipe". It doesn't actually help you to directly
update the contents of such tarballs, but at least now it won't break
the recipe.
Signed-off-by: Paul Eggleton
---
meta/lib/oe/recipeutils.py | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index ab4177a..1589feb 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -389,10 +389,15 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False,
download=True):
return copied, remotes
-def get_recipe_local_files(d, patches=False):
+def get_recipe_local_files(d, patches=False, archives=False):
"""Get a list of local files in SRC_URI within a recipe."""
uris = (d.getVar('SRC_URI', True) or "").split()
fetch = bb.fetch2.Fetch(uris, d)
+# FIXME this list should be factored out somewhere else (such as the
+# fetcher) though note that this only encompasses actual container formats
+# i.e. that can contain multiple files as opposed to those that only
+# contain a compressed stream (i.e. .tar.gz as opposed to just .gz)
+archive_exts = ['.tar', '.tgz', '.tar.gz', '.tar.Z', '.tbz', '.tbz2',
'.tar.bz2', '.tar.xz', '.tar.lz', '.zip', '.jar', '.rpm', '.srpm', '.deb',
'.ipk', '.tar.7z', '.7z']
ret = {}
for uri in uris:
if fetch.ud[uri].type == 'file':
@@ -409,7 +414,14 @@ def get_recipe_local_files(d, patches=False):
if os.path.isabs(subdir):
continue
fname = os.path.join(subdir, fname)
-ret[fname] = fetch.localpath(uri)
+localpath = fetch.localpath(uri)
+if not archives:
+# Ignore archives that will be unpacked
+if localpath.endswith(tuple(archive_exts)):
+unpack = fetch.ud[uri].parm.get('unpack', True)
+if unpack:
+continue
+ret[fname] = localpath
return ret
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] lib/oe/patch: fix handling of patches with no header
If a patch applied by a recipe has no header and we turn the recipe's
source into a git tree (when PATCHTOOL = "git" or when using devtool
extract / modify / upgrade), the commit message ends up consisting only
of the original filename marker ("%% original patch: filename.patch").
When we come to do turn the commits back into a set of patches in
extractPatches(), this first line ends up in the "Subject: " part of
the file, but we were ignoring it because the line didn't start with the
marker text. The end result was we weren't able to get the original
patch name. Strip off any "Subject [PATCH x/y]" part before looking for
the marker text to fix.
This caused "devtool modify openssl" followed by "devtool update-recipe
openssl" (without any changes in-between) to remove version-script.patch
because that patch has no header and we weren't able to determine the
original filename.
Signed-off-by: Paul Eggleton
---
meta/lib/oe/patch.py | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 0332f10..dbefd28 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -428,6 +428,7 @@ class GitApplyTree(PatchTree):
def extractPatches(tree, startcommit, outdir, paths=None):
import tempfile
import shutil
+import re
tempdir = tempfile.mkdtemp(prefix='oepatch')
try:
shellcmd = ["git", "format-patch", startcommit, "-o", tempdir]
@@ -443,10 +444,13 @@ class GitApplyTree(PatchTree):
try:
with open(srcfile, 'r', encoding=encoding) as f:
for line in f:
-if
line.startswith(GitApplyTree.patch_line_prefix):
+checkline = line
+if checkline.startswith('Subject: '):
+checkline = re.sub(r'\[.+?\]\s*', '',
checkline[9:])
+if
checkline.startswith(GitApplyTree.patch_line_prefix):
outfile = line.split()[-1].strip()
continue
-if
line.startswith(GitApplyTree.ignore_commit_prefix):
+if
checkline.startswith(GitApplyTree.ignore_commit_prefix):
continue
patchlines.append(line)
except UnicodeDecodeError:
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] devtool: update-recipe: check output before treating it as a string
As of the move to Python 3 and the fixes we applied at that time,
bb.process.run() will return a byte array of length 0 rather than an
empty string if the output is empty. That may be a bug that we should
fix, but for now it's easiest to just check the result here before
treating it as a string. This fixes running "devtool update-recipe" or
"devtool finish" on a recipe which has no source tree, for example
initramfs-framework.
Fixes [YOCTO #10563].
Signed-off-by: Paul Eggleton
---
scripts/lib/devtool/standard.py | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4523048..1511641 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -332,10 +332,11 @@ def _git_ls_tree(repodir, treeish='HEAD',
recursive=False):
cmd.append('-r')
out, _ = bb.process.run(cmd, cwd=repodir)
ret = {}
-for line in out.split('\0'):
-if line:
-split = line.split(None, 4)
-ret[split[3]] = split[0:3]
+if out:
+for line in out.split('\0'):
+if line:
+split = line.split(None, 4)
+ret[split[3]] = split[0:3]
return ret
def _git_exclude_path(srctree, path):
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] oe-selftest: devtool: test update-recipe with only local files
Add a test to ensure devtool update-recipe works properly on recipes
that contain only local files (since the other tests we have didn't test
that).
Relates to [YOCTO #10563].
Signed-off-by: Paul Eggleton
---
.../recipes-test/devtool/devtool-test-localonly.bb | 6 ++
.../recipes-test/devtool/devtool-test-localonly/file1 | 1 +
.../recipes-test/devtool/devtool-test-localonly/file2 | 1 +
meta/lib/oeqa/selftest/devtool.py | 18 ++
4 files changed, 26 insertions(+)
create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
new file mode 100644
index 000..28ff49e
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
@@ -0,0 +1,6 @@
+LICENSE = "CLOSED"
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "file://file1 \
+ file://file2"
+
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
new file mode 100644
index 000..f4bdcfc
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
@@ -0,0 +1 @@
+The first file
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
new file mode 100644
index 000..a7e2414
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
@@ -0,0 +1 @@
+The second file
diff --git a/meta/lib/oeqa/selftest/devtool.py
b/meta/lib/oeqa/selftest/devtool.py
index 46f5a0b..f6226c1 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -930,6 +930,24 @@ class DevtoolTests(DevtoolBase):
('??', '.*/0001-Add-new-file.patch$')]
self._check_repo_status(os.path.dirname(recipefile), expected_status)
+def test_devtool_update_recipe_local_files_3(self):
+# First, modify the recipe
+testrecipe = 'devtool-test-localonly'
+recipefile = get_bb_var('FILE', testrecipe)
+src_uri = get_bb_var('SRC_URI', testrecipe)
+tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+self.track_for_cleanup(tempdir)
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+# (don't bother with cleaning the recipe on teardown, we won't be
building it)
+result = runCmd('devtool modify %s' % testrecipe)
+# Modify one file
+runCmd('echo "Another line" >> file2',
cwd=os.path.join(self.workspacedir, 'sources', testrecipe, 'oe-local-files'))
+self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
os.path.basename(recipefile)))
+result = runCmd('devtool update-recipe %s' % testrecipe)
+expected_status = [(' M', '.*/%s/file2$' % testrecipe)]
+self._check_repo_status(os.path.dirname(recipefile), expected_status)
+
@testcase(1163)
def test_devtool_extract(self):
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] devtool: update-recipe: fix handling of compressed local patches
It is possible to use gzip or bzip2 to compress patches and still refer
to them in compressed form in the SRC_URI value within a recipe. If you
run "devtool modify" on such a recipe, make changes to the commit for
the patch and then run devtool update-recipe, we need to correctly
associate the commit back to the compressed patch file and re-compress
the patch, neither of which we were doing previously.
Additionally, add an oe-selftest test to ensure this doesn't regress in
future.
Fixes [YOCTO #8278].
Signed-off-by: Paul Eggleton
---
.../recipes-test/devtool/devtool-test-patch-gz.bb | 16 ++
.../devtool/devtool-test-patch-gz/readme.patch.gz | Bin 0 -> 449 bytes
meta/classes/patch.bbclass | 9 ++--
meta/lib/oe/recipeutils.py | 6 +--
meta/lib/oeqa/selftest/devtool.py | 24 +
scripts/lib/devtool/standard.py| 55 ++---
6 files changed, 85 insertions(+), 25 deletions(-)
create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
new file mode 100644
index 000..719a5f1
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "libxres libxext virtual/libx11 ncurses"
+
+SRC_URI =
"http://downloads.yoctoproject.org/releases/xrestop/xrestop-0.4.tar.gz \
+ file://readme.patch.gz \
+ "
+
+S = "${WORKDIR}/xrestop-0.4"
+
+SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b"
+SRC_URI[sha256sum] =
"67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257"
+
+inherit autotools pkgconfig
+
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz
b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz
new file mode 100644
index
..4752492ccd661e2c360d8fe2ca4dcef61dea89ce
GIT binary patch
literal 449
zcmV;y0Y3g8iwFpRQ6X3W19D|yWNl?GaA9;~XaJQ_O>5jR5WVYHyjxnlc4f!1V^fNk
zWJ7aE3E3?KLJs~Id)3;KYs+B+{qddME-gJ44dTsc=FQC0?PLdJlx8wZ;!344qp+#@
zPUA$yDr(w9R#{f3l}d1L4Yo8QOd(}{GDK2_;+AQ0Jd{h1P1p70IPv4iZa`> README', cwd=srctree)
+runCmd('git commit -a --amend --no-edit', cwd=srctree)
+self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
os.path.basename(recipefile)))
+result = runCmd('devtool update-recipe %s' % testrecipe)
+expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)]
+self._check_repo_status(os.path.dirname(recipefile), expected_status)
+patch_gz = os.path.join(os.path.dirname(recipefile), testrecipe,
'readme.patch.gz')
+result = runCmd('file %s' % patch_gz)
+if 'gzip compressed data' not in result.output:
+self.fail('New patch file is not gzipped - file reports:\n%s' %
result.output)
+
@testcase(1163)
def test_devtool_extract(self):
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 1511641..af0d467 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1128,7 +1128,7 @@ def _remove_source_files(append, files, destpath):
raise
-def _export_patches(srctree, rd, start_rev, destdir):
+def _export_patches(srctree, rd, start_rev, destdir, changed_revs=None):
"""Export patches from srctree to given location.
Returns three-tuple of dicts:
1. updated - patches that already exist in SRCURI
@@ -1157,18 +1157,44 @@ def _export_patches(srctree, rd, start_rev, destdir):
# revision This does assume that people are using unique shortlog
# values, but they ought to be anyway...
new_basename = seqpatch_re.match(new_patch).group(2)
-found = False
+match_name = None
for old_patch in existing_patches:
old_basename = seqpatch_re.match(old_patch).group(2)
-if new_basename == old_basename:
-updated[new_patch] = existing_patches.pop(old_patch)
-found = True
-# Rename patch files
-if new_patch != old_patch:
-os.rename(os.path.join(destdir, new_patch),
- os.path.join(destdir, old_patch))
+old_basename_splitext = os.path.splitext(old_basename)
+if old_basename.endswith(('.gz', '.bz2', '.Z')) and
old_basename_splitext[0] == new_basename:
+old_patch_noext = os.path.splitext(old_patch)[0]
+match_name = old_patch_noext
break
-
[OE-core] [PATCH 0/7] A bunch of fixes for devtool update-recipe
A bunch of fixes for devtool update-recipe and associated oe-selftest tests. The following changes since commit 9303d8055c45a0f6af295d70a6f6a8b9d8d8a7c9: devtool: add "rename" subcommand (2016-11-07 11:04:17 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/devtool23-oe http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/devtool23-oe Paul Eggleton (7): devtool: update-recipe: check output before treating it as a string oe-selftest: devtool: test update-recipe with only local files lib/oe/patch: fix handling of patches with no header devtool: update-recipe: fix handling of compressed local patches devtool: update-recipe: support replacing remote patches lib/oe/recipeutils: ignore archives by default in get_recipe_local_files() oe-selftest: devtool: test that updating a file with subdir= works .../recipes-test/devtool/devtool-test-localonly.bb | 6 ++ .../devtool/devtool-test-localonly/file1 | 1 + .../devtool/devtool-test-localonly/file2 | 1 + .../recipes-test/devtool/devtool-test-patch-gz.bb | 16 .../devtool/devtool-test-patch-gz/readme.patch.gz | Bin 0 -> 449 bytes .../recipes-test/devtool/devtool-test-subdir.bb| 7 ++ .../devtool-test-subdir/devtool-test-subdir.tar.gz | Bin 0 -> 181 bytes .../devtool/devtool-test-subdir/testfile | 1 + meta/classes/patch.bbclass | 9 ++- meta/lib/oe/patch.py | 8 +- meta/lib/oe/recipeutils.py | 22 +++-- meta/lib/oeqa/selftest/devtool.py | 67 +++ scripts/lib/devtool/standard.py| 90 +++-- 13 files changed, 193 insertions(+), 35 deletions(-) create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-localonly.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-localonly/file1 create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-localonly/file2 create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] go: Add recipes for golang compilers and tools
This is converging the recipes for go from
meta-virtualization and oe-meta-go
Add recipes for go 1.7
go.bbclass is added to ease out writing
recipes for go packages
Signed-off-by: Khem Raj
---
meta/classes/go.bbclass| 74 +++
meta/classes/goarch.bbclass| 40
meta/recipes-devtools/go/go-1.4.inc| 15 ++
.../go/go-1.4/016-armhf-elf-header.patch | 24 +++
...ckport-cmd-link-support-new-386-amd64-rel.patch | 225 +
meta/recipes-devtools/go/go-1.4/syslog.patch | 62 ++
meta/recipes-devtools/go/go-1.6.inc| 19 ++
.../go/go-1.6/armhf-elf-header.patch | 23 +++
.../go/go-1.6/fix-cc-handling.patch| 50 +
.../go/go-1.6/fix-target-cc-for-build.patch| 17 ++
meta/recipes-devtools/go/go-1.6/gotooldir.patch| 30 +++
.../go/go-1.6/split-host-and-target-build.patch| 63 ++
meta/recipes-devtools/go/go-1.6/syslog.patch | 62 ++
meta/recipes-devtools/go/go-1.7.inc| 18 ++
.../go/go-1.7/armhf-elf-header.patch | 23 +++
.../go/go-1.7/fix-cc-handling.patch| 50 +
.../go/go-1.7/fix-target-cc-for-build.patch| 17 ++
meta/recipes-devtools/go/go-1.7/gotooldir.patch| 30 +++
.../go/go-1.7/split-host-and-target-build.patch| 62 ++
meta/recipes-devtools/go/go-1.7/syslog.patch | 62 ++
meta/recipes-devtools/go/go-common.inc | 21 ++
meta/recipes-devtools/go/go-native.inc | 54 +
meta/recipes-devtools/go/go-native_1.4.bb | 2 +
meta/recipes-devtools/go/go.inc| 74 +++
meta/recipes-devtools/go/go_1.6.bb | 4 +
meta/recipes-devtools/go/go_1.7.bb | 4 +
26 files changed, 1125 insertions(+)
create mode 100644 meta/classes/go.bbclass
create mode 100644 meta/classes/goarch.bbclass
create mode 100644 meta/recipes-devtools/go/go-1.4.inc
create mode 100644 meta/recipes-devtools/go/go-1.4/016-armhf-elf-header.patch
create mode 100644
meta/recipes-devtools/go/go-1.4/go-cross-backport-cmd-link-support-new-386-amd64-rel.patch
create mode 100644 meta/recipes-devtools/go/go-1.4/syslog.patch
create mode 100644 meta/recipes-devtools/go/go-1.6.inc
create mode 100644 meta/recipes-devtools/go/go-1.6/armhf-elf-header.patch
create mode 100644 meta/recipes-devtools/go/go-1.6/fix-cc-handling.patch
create mode 100644
meta/recipes-devtools/go/go-1.6/fix-target-cc-for-build.patch
create mode 100644 meta/recipes-devtools/go/go-1.6/gotooldir.patch
create mode 100644
meta/recipes-devtools/go/go-1.6/split-host-and-target-build.patch
create mode 100644 meta/recipes-devtools/go/go-1.6/syslog.patch
create mode 100644 meta/recipes-devtools/go/go-1.7.inc
create mode 100644 meta/recipes-devtools/go/go-1.7/armhf-elf-header.patch
create mode 100644 meta/recipes-devtools/go/go-1.7/fix-cc-handling.patch
create mode 100644
meta/recipes-devtools/go/go-1.7/fix-target-cc-for-build.patch
create mode 100644 meta/recipes-devtools/go/go-1.7/gotooldir.patch
create mode 100644
meta/recipes-devtools/go/go-1.7/split-host-and-target-build.patch
create mode 100644 meta/recipes-devtools/go/go-1.7/syslog.patch
create mode 100644 meta/recipes-devtools/go/go-common.inc
create mode 100644 meta/recipes-devtools/go/go-native.inc
create mode 100644 meta/recipes-devtools/go/go-native_1.4.bb
create mode 100644 meta/recipes-devtools/go/go.inc
create mode 100644 meta/recipes-devtools/go/go_1.6.bb
create mode 100644 meta/recipes-devtools/go/go_1.7.bb
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
new file mode 100644
index 000..e10864d
--- /dev/null
+++ b/meta/classes/go.bbclass
@@ -0,0 +1,74 @@
+inherit goarch
+
+GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go"
+GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
+GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin"
+GOBIN_FINAL = "${GOROOT_FINAL}/bin/${GOOS}_${GOARCH}"
+
+export GOOS = "${TARGET_GOOS}"
+export GOARCH = "${TARGET_GOARCH}"
+export GOARM = "${TARGET_GOARM}"
+export CGO_ENABLED = "1"
+export GOROOT
+export GOROOT_FINAL = "${libdir}/${TARGET_SYS}/go"
+export GOBIN_FINAL
+export GOPKG_FINAL = "${GOROOT_FINAL}/pkg/${GOOS}_${GOARCH}"
+export GOSRC_FINAL = "${GOROOT_FINAL}/src"
+export GO_GCFLAGS = "${TARGET_CFLAGS}"
+export GO_LDFLAGS = "${TARGET_LDFLAGS}"
+export CGO_CFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CFLAGS}"
+export CGO_CPPFLAGS = "${TARGET_CPPFLAGS}"
+export CGO_CXXFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}
${TARGET_CXXFLAGS}"
+export CGO_LDFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}"
+
+DEPENDS += "go-cross"
+DEPENDS_class-native += "go-native"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+FILES_${PN}-staticdev += "${GOSRC_FINAL}/${GO_IMPORT}"
+FILES_${PN}-staticdev += "${GOPKG_FINAL}/${GO_IMPORT}*"
+
+GO_INSTALL ?= "${GO_IMPORT}/..."
+
+do_go_compile() {
+
[OE-core] [PATCH 2/2] go-examples: Add an example, helloworld written in go
This should serve as temlate for writing go recipes
Signed-off-by: Khem Raj
---
meta/recipes-extended/go-examples/files/helloworld.go | 10 ++
meta/recipes-extended/go-examples/go-examples.inc | 10 ++
meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 15 +++
3 files changed, 35 insertions(+)
create mode 100644 meta/recipes-extended/go-examples/files/helloworld.go
create mode 100644 meta/recipes-extended/go-examples/go-examples.inc
create mode 100644 meta/recipes-extended/go-examples/go-helloworld_0.1.bb
diff --git a/meta/recipes-extended/go-examples/files/helloworld.go
b/meta/recipes-extended/go-examples/files/helloworld.go
new file mode 100644
index 000..0253c40
--- /dev/null
+++ b/meta/recipes-extended/go-examples/files/helloworld.go
@@ -0,0 +1,10 @@
+// You can edit this code!
+// Click here and start typing.
+// taken from https://golang.org/
+package main
+
+import "fmt"
+
+func main() {
+ fmt.Println("Hello, 世界")
+}
diff --git a/meta/recipes-extended/go-examples/go-examples.inc
b/meta/recipes-extended/go-examples/go-examples.inc
new file mode 100644
index 000..c632681
--- /dev/null
+++ b/meta/recipes-extended/go-examples/go-examples.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "This is a simple example recipe that cross-compiles a Go
program."
+SECTION = "examples"
+HOMEPAGE = "https://golang.org/";
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+S = "${WORKDIR}"
+
+inherit go
diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
new file mode 100644
index 000..af9d3b7
--- /dev/null
+++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
@@ -0,0 +1,15 @@
+require go-examples.inc
+
+
+SRC_URI += " \
+ file://helloworld.go \
+"
+
+do_compile() {
+ go build helloworld.go
+}
+
+do_install() {
+ install -d "${D}/${bindir}"
+ install -m 0755 "${S}/helloworld" "${D}/${bindir}"
+}
--
2.10.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Allow ${S} to be overridden
On Wed, Nov 9, 2016 at 10:08 AM, Paul Barker wrote:
> On Wed, 9 Nov 2016 08:09:09 -0500
> Bruce Ashfield wrote:
>
>> On Wed, Nov 9, 2016 at 5:04 AM, Burton, Ross wrote:
>>
>> >
>> > On 9 November 2016 at 02:23, Bruce Ashfield
>> > wrote:
>> >
>> >> I can ack this patch, since no defaults change .. there's no risk to
>> >> existing users.
>> >>
>> >
>> > Saying that of course doomed the patch:
>> >
>>
>> interesting.
>>
>> Paul: obviously you were building with this in place, and my local test did
>> work here
>> as well .. so any idea to the difference ?
>>
>> Let me know if you want any help looking into it.
>>
>> Cheers,
>>
>> Bruce
>>
>
> The reason for this patch is that I'm using a tarball for the kernel
> sources in the new meta-arduino layer. That tarball doesn't get
> extracted to ${STAGING_KERNEL_DIR} and so it needs to be copied over to
> there. Looking at kernel.bbclass, it looks like the logic to do this is
> present:
>
>
> # Old style kernels may set ${S} = ${WORKDIR}/git for example
> # We need to move these over to STAGING_KERNEL_DIR. We can't just
> # create the symlink in advance as the git fetcher can't cope with
> # the symlink.
> do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B}
> ${STAGING_KERNEL_BUILDDIR}"
> do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B}
> ${STAGING_KERNEL_BUILDDIR}"
> base_do_unpack_append () {
> s = d.getVar("S", True)
> if s[-1] == '/':
> # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use
> s as directory name and fail
> s=s[:-1]
> kernsrc = d.getVar("STAGING_KERNEL_DIR", True)
> if s != kernsrc:
> bb.utils.mkdirhier(kernsrc)
> bb.utils.remove(kernsrc, recurse=True)
> if d.getVar("EXTERNALSRC", True):
> # With EXTERNALSRC S will not be wiped so we can symlink to it
> os.symlink(s, kernsrc)
> else:
> import shutil
> shutil.move(s, kernsrc)
> os.symlink(kernsrc, s)
> }
>
> The problem is we can't set S to anything unless we can override it.
>
> I've now looked into this futher and it seems to be working for some
> kernel recipes but not others. The issue may be that we have an
> assignment for S in bitbake.conf:
>
> S = "${WORKDIR}/${BP}"
>
> That's obviously overriding the 'S ?= ...' assignment when my patch is
> applied where S isn't also explicitly assigned in the recipe, some
> other class or include file.
>
> I'm not sure on how precedence is determined if a variable is assigned
> using '=' multiple times.
>
> I'll have another look into it and see where I get. I have a workaround
> in place for the meta-arduino layer for now so it doesn't need an
> urgent fix.
>
> However, if it turns out we can't reliably override S in a kernel recipe
> then should we still have that comment and base_do_unpack_append() in
> kernel.bbclass?
The solution I use (learned the hard way) is to ensure that "S = ..."
comes after "inherit kernel" in the kernel recipe.
> Thanks,
> Paul
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-numpy: upgrade to 1.11.2
Signed-off-by: Edwin Plauchu
---
.../python-numpy/{python3-numpy_1.11.0.bb => python3-numpy_1.11.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.11.0.bb =>
python3-numpy_1.11.2.bb} (95%)
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
similarity index 95%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
index 3cca223..c34df6f 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
@@ -73,8 +73,8 @@ do_compile_prepend_class-target() {
FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
-SRC_URI[md5sum] = "bc56fb9fc2895aa4961802ffbdb31d0b"
-SRC_URI[sha256sum] =
"a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e"
+SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc"
+SRC_URI[sha256sum] =
"04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"
# install what is needed for numpy.test()
RDEPENDS_${PN} = "python3-unittest \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] krogoth 2.1.2 status
Hi Based on below comments we will start the QA cycle for 2.1.2, we will start tomorrow once the QA cycle for meta-intel is finished. Regards, José -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Wednesday, November 9, 2016 6:30 AM To: openembedded-core ; Armin Kuster Cc: Perez Carranza, Jose ; Jolley, Stephen K ; Delgado, Sonia Subject: krogoth 2.1.2 status I ran a krogoth 2.1.2 build. It did have some issues: * one runtime sanity test had a timeout issue * some urls are stale (perpetual problem) * musl runtime testing fails (never tested on krogoth previously) * no-x11 runtime testing had a failure (never tested on krogoth previously) I suspect we can call this good enough to put into QA but there were enough 'failures' I wanted to send this out in case someone objects. Part of the problem here is we apply our current autobuilder test setup to the older releases as well. I'm aware there may be better ways to do this but I don't know anyone with time to work on that, we have other more pressing problems. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Allow ${S} to be overridden
On Wed, 9 Nov 2016 08:09:09 -0500
Bruce Ashfield wrote:
> On Wed, Nov 9, 2016 at 5:04 AM, Burton, Ross wrote:
>
> >
> > On 9 November 2016 at 02:23, Bruce Ashfield
> > wrote:
> >
> >> I can ack this patch, since no defaults change .. there's no risk to
> >> existing users.
> >>
> >
> > Saying that of course doomed the patch:
> >
>
> interesting.
>
> Paul: obviously you were building with this in place, and my local test did
> work here
> as well .. so any idea to the difference ?
>
> Let me know if you want any help looking into it.
>
> Cheers,
>
> Bruce
>
The reason for this patch is that I'm using a tarball for the kernel
sources in the new meta-arduino layer. That tarball doesn't get
extracted to ${STAGING_KERNEL_DIR} and so it needs to be copied over to
there. Looking at kernel.bbclass, it looks like the logic to do this is
present:
# Old style kernels may set ${S} = ${WORKDIR}/git for example
# We need to move these over to STAGING_KERNEL_DIR. We can't just
# create the symlink in advance as the git fetcher can't cope with
# the symlink.
do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B}
${STAGING_KERNEL_BUILDDIR}"
do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B}
${STAGING_KERNEL_BUILDDIR}"
base_do_unpack_append () {
s = d.getVar("S", True)
if s[-1] == '/':
# drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s
as directory name and fail
s=s[:-1]
kernsrc = d.getVar("STAGING_KERNEL_DIR", True)
if s != kernsrc:
bb.utils.mkdirhier(kernsrc)
bb.utils.remove(kernsrc, recurse=True)
if d.getVar("EXTERNALSRC", True):
# With EXTERNALSRC S will not be wiped so we can symlink to it
os.symlink(s, kernsrc)
else:
import shutil
shutil.move(s, kernsrc)
os.symlink(kernsrc, s)
}
The problem is we can't set S to anything unless we can override it.
I've now looked into this futher and it seems to be working for some
kernel recipes but not others. The issue may be that we have an
assignment for S in bitbake.conf:
S = "${WORKDIR}/${BP}"
That's obviously overriding the 'S ?= ...' assignment when my patch is
applied where S isn't also explicitly assigned in the recipe, some
other class or include file.
I'm not sure on how precedence is determined if a variable is assigned
using '=' multiple times.
I'll have another look into it and see where I get. I have a workaround
in place for the meta-arduino layer for now so it doesn't need an
urgent fix.
However, if it turns out we can't reliably override S in a kernel recipe
then should we still have that comment and base_do_unpack_append() in
kernel.bbclass?
Thanks,
Paul
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Move the recommends on ca-certificates from epiphany to webkitgtk.
* The webkitgtk package should recommend the ca-certificates one,
because any program usign webkit (and not only epiphany) would
expect that the CAs certificates are available and that https
validation works as expected.
* For example, webkitgtk includes a MiniBrowser program that would
fail to proper verify https sites if the ca-certificate package
is not installed
* Instead of making each one of the webkitgtk consumers care about
the certificate package, do this in webkit itself.
Signed-off-by: Carlos Alberto Lopez Perez
---
meta/recipes-gnome/epiphany/epiphany_3.22.1.bb | 3 +--
meta/recipes-sato/webkit/webkitgtk_2.14.1.bb | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
b/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
index 3c63d33..2a9d200 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "WebKit based web browser for GNOME"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi
libnotify gcr \
+DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
gsettings-desktop-schemas gnome-desktop3 libxml2-native
intltool-native"
inherit gnomebase gsettings distro_features_check upstream-version-is-even
@@ -20,4 +20,3 @@ do_configure_prepend() {
FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1
${datadir}/gnome-shell/search-providers"
RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
-RRECOMMENDS_${PN} = "ca-certificates"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
index d6d9c14..39197bc 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
@@ -90,6 +90,8 @@ SECURITY_CFLAGS_append_aarch64 = " -fPIE"
FILES_${PN} +=
"${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
+RRECOMMENDS_${PN} += "ca-certificates"
+
# http://errors.yoctoproject.org/Errors/Details/20370/
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-networking: remove intltool dependency
glib-networking 2.50 moved away from intltool to modern gettext, so remove the build dependency. Signed-off-by: Ross Burton --- meta/recipes-core/glib-networking/glib-networking_2.50.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb index 0baaffd..2782bd9 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb @@ -7,7 +7,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "libs" -DEPENDS = "glib-2.0 intltool-native" +DEPENDS = "glib-2.0" SRC_URI[archive.md5sum] = "4d06d0224646f274918b1cb6da9a07f6" SRC_URI[archive.sha256sum] = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] krogoth 2.1.2 status
On 11/09/2016 04:30 AM, Richard Purdie wrote: I ran a krogoth 2.1.2 build. It did have some issues: * one runtime sanity test had a timeout issue * some urls are stale (perpetual problem) * musl runtime testing fails (never tested on krogoth previously) * no-x11 runtime testing had a failure (never tested on krogoth previously) Can we get those issues bugged ( if not done so already) so we can make decisions on what to do with each. I suspect we can call this good enough to put into QA but there were enough 'failures' I wanted to send this out in case someone objects. Part of the problem here is we apply our current autobuilder test setup to the older releases as well. I'm aware there may be better ways to do this but I don't know anyone with time to work on that, we have other more pressing problems. I suspect Jethro will have similar or worse issues. - Armin Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] curl: Upgrade 7.50.1.bb -> curl_7.51.0.bb
On 11/09/2016 03:58 AM, Sona Sarmadi wrote:
Hi guys,
curl 7.51.0-r0 addresses all these CVEs. I wonder if we can upgrade krogoth and
morty to curl 7.51.0-r0 as well?
Updating morty seems plausible . I appears the changes are mostly bug fixes.
Krogoth is a large jump and I would not recommend upgrading the package.
- Armin
Both package versions are using same share library version i.e.
libcurl.so.4.4.0 so I assume full ABI compatibility.
tmp/work/i586-poky-linux/curl/7.47.1-r0/sysroot-destdir/usr/lib/libcurl.so.4.4.0
tmp/work/i586-poky-linux/curl/7.51.0-r0/sysroot-destdir/usr/lib/libcurl.so.4.4.0
For more info see:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10617
Thanks
//Sona
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Sona
Sarmadi
Sent: den 8 november 2016 11:42
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH] curl: Upgrade 7.50.1.bb -> curl_7.51.0.bb
The upgrade addresses following CVEs:
CVE-2016-8615: cookie injection for other servers
CVE-2016-8616: case insensitive password comparison
CVE-2016-8617: OOB write via unchecked multiplication
CVE-2016-8618: double-free in curl_maprintf
CVE-2016-8619: double-free in krb5 code
CVE-2016-8620: glob parser write/read out of bounds
CVE-2016-8621: curl_getdate read out of bounds
CVE-2016-8622: URL unescape heap overflow via integer truncation
CVE-2016-8623: Use-after-free via shared cookies
CVE-2016-8624: invalid URL parsing with '#'
CVE-2016-8625: IDNA 2003 makes curl use wrong host
Reference:
https://curl.haxx.se/docs/security.html
Fixes [Yocto #10617]
Signed-off-by: Sona Sarmadi
---
meta/recipes-support/curl/{curl_7.50.1.bb => curl_7.51.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) rename
meta/recipes-support/curl/{curl_7.50.1.bb => curl_7.51.0.bb} (94%)
diff --git a/meta/recipes-support/curl/curl_7.50.1.bb
b/meta/recipes-support/curl/curl_7.51.0.bb
similarity index 94%
rename from meta/recipes-support/curl/curl_7.50.1.bb
rename to meta/recipes-support/curl/curl_7.51.0.bb
index a21419a..e1a996b 100644
--- a/meta/recipes-support/curl/curl_7.50.1.bb
+++ b/meta/recipes-support/curl/curl_7.51.0.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ #
SRC_URI += " file://configure_ac.patch"
-SRC_URI[md5sum] = "015f6a0217ca6f2c5442ca406476920b"
-SRC_URI[sha256sum] =
"3c12c5f54ccaa1d40abc65d672107dcc75d3e1fcb38c267484334280096e5156"
+SRC_URI[md5sum] = "09a7c5769a7eae676d5e2c86d51f167e"
+SRC_URI[sha256sum] =
"7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde"
inherit autotools pkgconfig binconfig multilib_header
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: fix bashism in c_rehash shell script
From: André Draszik
This script claims to be a /bin/sh script, but it uses
a bashism:
from checkbashisms:
possible bashism in
meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh line 151 (should
be 'b = a'):
if [ "x/" == "x$( echo ${FILE} | cut -c1 -)" ]
This causes build issues on systems that don't have
/bin/sh symlinked to bash:
Updating certificates in ${WORKDIR}/rootfs/etc/ssl/certs...
/tmp/sysroots/x86_64-linux/usr/bin/c_rehash: 151: [: x/: unexpected
operator
...
Fix this by using POSIX shell syntax for the comparison.
Signed-off-by: André Draszik
Reviewed-by: Sylvain Lemieux
---
meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
index 25ea729..6620fdc 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
@@ -148,7 +148,7 @@ hash_dir()
then
FILE=$( readlink ${FILE} )
# check the symlink is absolute (or dangling in other word)
- if [ "x/" == "x$( echo ${FILE} | cut -c1 -)" ]
+ if [ "x/" = "x$( echo ${FILE} | cut -c1 -)" ]
then
REAL_FILE=${SYSROOT}/${FILE}
fi
--
2.10.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston: upgrade from 1.11.1 to 1.12.0
On 9 November 2016 at 14:15, Burton, Ross wrote:
>
> On 8 November 2016 at 13:54, Fathi Boudra wrote:
>>
>> FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so"
>
>
> Because you didn't fix this patch the weston-xwayland package is never
> built, buildhistory is huge and core-image-weston with X11 enabled doesn't
> build.
I'll spin a v2 with Jussi suggested split.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] webkitgtk: Add an option to disable opengl support
Signed-off-by: Carlos Alberto Lopez Perez
---
meta/recipes-sato/webkit/webkitgtk_2.14.1.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
index 69c9f11..d6d9c14 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
@@ -41,7 +41,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt
libidn gnutls \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11',
'wayland' ,d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl',
'' ,d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl
opengl', '' ,d)} \
enchant \
libsecret \
"
@@ -53,6 +53,7 @@ PACKAGECONFIG[enchant] =
"-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant
PACKAGECONFIG[gtk2] =
"-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
+PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
PACKAGECONFIG[libsecret] =
"-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret"
PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
--
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/5] wic: bugfixes & --fixed-size support
On Wed, Nov 9, 2016 at 2:17 PM, Burton, Ross wrote: > I pulled this series into a test run on the autobuilder and it is throwing > quite a lot of exceptions, such as: > > Traceback (most recent call last): > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic", > line 319, in > sys.exit(main(sys.argv[1:])) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic", > line 314, in main > return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, > subcommands) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/help.py", > line 95, in invoke_subcommand > subcommands.get(args[0], subcommand_error)[0](args[1:], usage) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic", > line 247, in wic_create_subcommand > options.compressor, options.bmap, options.debug) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/engine.py", > line 195, in wic_create > crobj.main(cmdline) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/creator.py", > line 125, in main > return self._subcmds[pname](options, *args[1:]) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/plugins/imager/direct_plugin.py", > line 93, in do_create > creator.create() > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/baseimager.py", > line 159, in create > self._create() > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/direct.py", > line 305, in _create > system_id=part.system_id) > File > "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/utils/partitionedfs.py", > line 101, in add_partition > size = size * 1024 // self.sector_size > TypeError: unsupported operand type(s) for //: 'str' and 'int' > WARNING: > TOPDIR/tmp/work/genericx86_64-poky-linux/core-image-lsb/1.0-r0/temp/run.do_image_wic.15783:1 > exit 1 from 'BUILDDIR="TOPDIR" wic create "$wks" --vars > "TOPDIR/tmp/sysroots/genericx86-64/imgdata/" -e "core-image-lsb" -o "$out/"' > > See > http://errors.yoctoproject.org/Errors/Latest/Autobuilder/?filter=a44a6a635c9ed02edb2a3dee0a13b0067becc425&type=commit > for more examples and context. Thanks. I see now that bootimg-efi and rawcopy plugins do not convert partition size to int as they should be. > > Ross > > On 8 November 2016 at 15:56, Maciej Borzecki > wrote: >> >> The patch series is a follow-up after a previous attempt of adding >> --reserved-size option to wic[1]. >> >> The series introduces a number of fixes in patches 1 - 4. >> >> The last patch in the series introduces --fixed-size option as discussed >> in [1]. >> The patch also introduces minor refactoring to code responsible for >> computing >> partition size. >> >> Aside from new option, another user-visible change is how the size rootfs >> partitions with vfat is calculated. In previous code, vfat rootfs >> partition size >> did not account for --extra-space nor --overhead-factor. Now, all rootfs >> partitions (except for squashfs) are subject to the same rules of >> partition >> sizing. >> >> >> http://lists.openembedded.org/pipermail/openembedded-core/2016-October/127634.html >> >> Maciej Borzecki (5): >> wic: make sure that partition size is always an integer in internal >> processing >> wic: use partition size when creating empty partition files >> wic: check that filesystem is specified for a rootfs partition >> wic: fix function comment typos >> wic: add --fixed-size wks option >> >> scripts/lib/wic/help.py| 14 +++-- >> scripts/lib/wic/imager/direct.py | 2 +- >> scripts/lib/wic/ksparser.py| 41 +-- >> scripts/lib/wic/partition.py | 93 >> +- >> scripts/lib/wic/utils/partitionedfs.py | 6 +-- >> 5 files changed, 109 insertions(+), 47 deletions(-) >> >> -- >> 2.5.0 >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- Maciej Borzecki RnDity -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] krogoth 2.1.2 status
On Wed, 2016-11-09 at 12:30 +, Richard Purdie wrote: > I ran a krogoth 2.1.2 build. It did have some issues: > > * one runtime sanity test had a timeout issue > * some urls are stale (perpetual problem) > * musl runtime testing fails (never tested on krogoth previously) > * no-x11 runtime testing had a failure (never tested on krogoth > previously) We can update the autobuilder not to run these tests for krogoth. I've filed a bug for musl: https://bugzilla.yoctoproject.org/show_bug.cgi?id=10634 for no-x11 there's a single failure, it might be worthwhile backporting fixes to make that work? Regards, Joshua -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] wic: bugfixes & --fixed-size support
I pulled this series into a test run on the autobuilder and it is throwing quite a lot of exceptions, such as: Traceback (most recent call last): File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic", line 319, in sys.exit(main(sys.argv[1:])) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic", line 314, in main return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/help.py", line 95, in invoke_subcommand subcommands.get(args[0], subcommand_error)[0](args[1:], usage) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic", line 247, in wic_create_subcommand options.compressor, options.bmap, options.debug) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/engine.py", line 195, in wic_create crobj.main(cmdline) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/creator.py", line 125, in main return self._subcmds[pname](options, *args[1:]) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/plugins/imager/direct_plugin.py", line 93, in do_create creator.create() File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/baseimager.py", line 159, in create self._create() File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/direct.py", line 305, in _create system_id=part.system_id) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/utils/partitionedfs.py", line 101, in add_partition size = size * 1024 // self.sector_size TypeError: unsupported operand type(s) for //: 'str' and 'int' WARNING: TOPDIR/tmp/work/genericx86_64-poky-linux/core-image-lsb/1.0-r0/temp/run.do_image_wic.15783:1 exit 1 from 'BUILDDIR="TOPDIR" wic create "$wks" --vars "TOPDIR/tmp/sysroots/genericx86-64/imgdata/" -e "core-image-lsb" -o "$out/"' See http://errors.yoctoproject.org/Errors/Latest/Autobuilder/?filter=a44a6a635c9ed02edb2a3dee0a13b0067becc425&type=commit for more examples and context. Ross On 8 November 2016 at 15:56, Maciej Borzecki wrote: > The patch series is a follow-up after a previous attempt of adding > --reserved-size option to wic[1]. > > The series introduces a number of fixes in patches 1 - 4. > > The last patch in the series introduces --fixed-size option as discussed > in [1]. > The patch also introduces minor refactoring to code responsible for > computing > partition size. > > Aside from new option, another user-visible change is how the size rootfs > partitions with vfat is calculated. In previous code, vfat rootfs > partition size > did not account for --extra-space nor --overhead-factor. Now, all rootfs > partitions (except for squashfs) are subject to the same rules of partition > sizing. > > http://lists.openembedded.org/pipermail/openembedded-core/ > 2016-October/127634.html > > Maciej Borzecki (5): > wic: make sure that partition size is always an integer in internal > processing > wic: use partition size when creating empty partition files > wic: check that filesystem is specified for a rootfs partition > wic: fix function comment typos > wic: add --fixed-size wks option > > scripts/lib/wic/help.py| 14 +++-- > scripts/lib/wic/imager/direct.py | 2 +- > scripts/lib/wic/ksparser.py| 41 +-- > scripts/lib/wic/partition.py | 93 +- > > scripts/lib/wic/utils/partitionedfs.py | 6 +-- > 5 files changed, 109 insertions(+), 47 deletions(-) > > -- > 2.5.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Allow ${S} to be overridden
On Wed, Nov 9, 2016 at 5:04 AM, Burton, Ross wrote:
>
> On 9 November 2016 at 02:23, Bruce Ashfield
> wrote:
>
>> I can ack this patch, since no defaults change .. there's no risk to
>> existing users.
>>
>
> Saying that of course doomed the patch:
>
interesting.
Paul: obviously you were building with this in place, and my local test did
work here
as well .. so any idea to the difference ?
Let me know if you want any help looking into it.
Cheers,
Bruce
>
> ERROR: hello-mod-0.1-r0 do_make_scripts: Function failed: do_make_scripts
> (log file is located at /home/pokybuild/yocto-autobuilder/yocto-worker/
> nightly-qa-skeleton/build/build/tmp/work/qemux86_64-
> poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071)
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/
> temp/log.do_make_scripts.14071
> Log data follows:
> | DEBUG: Executing shell function do_make_scripts
> | make: Entering directory '/home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work-shared/qemux86-64/kernel-source'
> | make: *** No rule to make target 'scripts'. Stop.
> | make: Leaving directory '/home/pokybuild/yocto-autobuilder/yocto-worker/
> nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source'
> | WARNING: /home/pokybuild/yocto-autobuilder/yocto-worker/
> nightly-qa-skeleton/build/build/tmp/work/qemux86_64-
> poky-linux/hello-mod/0.1-r0/temp/run.do_make_scripts.14071:1 exit 2 from
> 'make CC="x86_64-poky-linux-gcc -fuse-ld=bfd" LD="x86_64-poky-linux-ld.bfd
> " AR="x86_64-poky-linux-ar " -C /home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work-shared/qemux86-64/kernel-source O=/home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work-shared/qemux86-64/kernel-build-artifacts scripts'
> | ERROR: Function failed: do_make_scripts (log file is located at
> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/
> temp/log.do_make_scripts.14071)
> NOTE: recipe hello-mod-0.1-r0: task do_make_scripts: Failed
>
> The autobuilder builds hello-mod from meta-skeleton, which inherits module
> and sets S=${WORKDIR}.
>
> Ross
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] krogoth 2.1.2 status
I ran a krogoth 2.1.2 build. It did have some issues: * one runtime sanity test had a timeout issue * some urls are stale (perpetual problem) * musl runtime testing fails (never tested on krogoth previously) * no-x11 runtime testing had a failure (never tested on krogoth previously) I suspect we can call this good enough to put into QA but there were enough 'failures' I wanted to send this out in case someone objects. Part of the problem here is we apply our current autobuilder test setup to the older releases as well. I'm aware there may be better ways to do this but I don't know anyone with time to work on that, we have other more pressing problems. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston: upgrade from 1.11.1 to 1.12.0
On 8 November 2016 at 13:54, Fathi Boudra wrote:
> FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so"
>
Because you didn't fix this patch the weston-xwayland package is never
built, buildhistory is huge and core-image-weston with X11 enabled doesn't
build.
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] wic: add --fixed-size wks option
On Wed, Nov 9, 2016 at 10:36 AM, Ed Bartosh wrote:
> On Tue, Nov 08, 2016 at 04:56:11PM +0100, Maciej Borzecki wrote:
>> Added new option --fixed-size to wks. The option can be used to indicate
>> the exact size of a partition. The option cannot be added together with
>> --size, in which case an error will be raised. Other options that
>> influence automatic partition size (--extra-space, --overhead-factor),
>> if specifiec along with --fixed-size, will raise an error.
>>
>> If it partition data is larger than the amount of space specified with
>> --fixed-size option wic will raise an error.
>>
>> Signed-off-by: Maciej Borzecki
>> ---
>> scripts/lib/wic/help.py| 14 --
>> scripts/lib/wic/imager/direct.py | 2 +-
>> scripts/lib/wic/ksparser.py| 41 +++--
>> scripts/lib/wic/partition.py | 83
>> --
>> scripts/lib/wic/utils/partitionedfs.py | 2 +-
>> 5 files changed, 100 insertions(+), 42 deletions(-)
>>
>> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
>> index
>> e5347ec4b7c900c68fc64351a5293e75de0672b3..daa11bf489c135627ddfe4cef968e48f8e3ad1d8
>> 100644
>> --- a/scripts/lib/wic/help.py
>> +++ b/scripts/lib/wic/help.py
>> @@ -646,6 +646,12 @@ DESCRIPTION
>> not specified, the size is in MB.
>> You do not need this option if you use --source.
>>
>> + --fixed-size: Exact partition size. Value format is the same
>> + as for --size option. This option cannot be
>> + specified along with --size. If partition data
>> + is larger than --fixed-size and error will be
>> + raised when assembling disk image.
>> +
>> --source: This option is a wic-specific option that names the
>> source of the data that will populate the
>> partition. The most common value for this option
>> @@ -719,13 +725,15 @@ DESCRIPTION
>> space after the space filled by the content
>> of the partition. The final size can go
>> beyond the size specified by --size.
>> -By default, 10MB.
>> +By default, 10MB. This option cannot be used
>> +with --fixed-size option.
>>
>> --overhead-factor: This option is specific to wic. The
>> size of the partition is multiplied by
>> this factor. It has to be greater than or
>> -equal to 1.
>> -The default value is 1.3.
>> +equal to 1. The default value is 1.3.
>> +This option cannot be used with --fixed-size
>> +option.
>>
>> --part-type: This option is specific to wic. It specifies partition
>>type GUID for GPT partitions.
>> diff --git a/scripts/lib/wic/imager/direct.py
>> b/scripts/lib/wic/imager/direct.py
>> index
>> 2bedef08d6450096c786def6f75a9ee53fcd4b3b..c01a1ea538428e36a75ac5b31a822e01901bea6a
>> 100644
>> --- a/scripts/lib/wic/imager/direct.py
>> +++ b/scripts/lib/wic/imager/direct.py
>> @@ -290,7 +290,7 @@ class DirectImageCreator(BaseImageCreator):
>> self.bootimg_dir, self.kernel_dir,
>> self.native_sysroot)
>>
>>
>> -self.__image.add_partition(int(part.size),
>> +self.__image.add_partition(part.get_size(),
>> part.disk,
>> part.mountpoint,
>> part.source_file,
>> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
>> index
>> 0894e2b199a299fbbed272f2e1c95e9d692e3ab1..62c490274aa92bf82aac304d9323250e3b728d0c
>> 100644
>> --- a/scripts/lib/wic/ksparser.py
>> +++ b/scripts/lib/wic/ksparser.py
>> @@ -113,6 +113,9 @@ def systemidtype(arg):
>> class KickStart():
>> Kickstart parser implementation."""
>>
>> +DEFAULT_EXTRA_SPACE = 10*1024
>> +DEFAULT_OVERHEAD_FACTOR = 1.3
>> +
>> def __init__(self, confpath):
>>
>> self.partitions = []
>> @@ -127,16 +130,24 @@ class KickStart():
>> part.add_argument('mountpoint', nargs='?')
>> part.add_argument('--active', action='store_true')
>> part.add_argument('--align', type=int)
>> -part.add_argument("--extra-space", type=sizetype, default=10*1024)
>> +part.add_argument("--extra-space", type=sizetype)
>> part.add_argument('--fsoptions', dest='fsopts')
>> part.add_argument('--fstype')
>> part.add_argument('--label')
>> part.add_argument('--no-table', action='store_true')
>> part.add_argument('--ondisk', '--ondrive', dest='disk')
>> -part.add_argument("--overhead-factor", type
Re: [OE-core] [PATCH] weston: upgrade from 1.11.1 to 1.12.0
On 8 November 2016 at 15:54, Fathi Boudra wrote:
> From: Daniel Díaz
>
> * Refresh patches to apply cleanly on 1.12.0 (no changes):
> - 0001-make-error-portable.patch
> - 0001-configure.ac-Fix-wayland-protocols-path.patch
> - 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
> - 0001-Add-configuration-option-for-no-input-device.patch
> * Remove 0001-shared-include-stdint.h-for-int32_t.patch applied
> upstream
> https://cgit.freedesktop.org/wayland/weston/commit/?id=649bbce6
> * Update license files checksum, compositor.c location has changed.
> No license changes.
> * Drop --disable-rpi-compositor from EXTRA_OE_CONF. Raspberry Pi backend
> and renderer have been removed upstream. The option doesn't exist
> anymore.
> * Adjust files names to the new naming: weston -> libweston-1.
>
These changes look good to me. That said I think we should start separating
the package into weston (compositor shells, plugins and essential tools)
and libweston (the public libraries) at this point since upstream is now
saying it should work. Can you do this as part of the upgrade?
libweston should contain {libdir}/*.so.* as usual but I believe also
{libdir}/libweston-1/* (the backends). The weston plugins
({libdir}/weston/*) should stay in weston itself
Cheers,
Jussi
> Signed-off-by: Daniel Díaz
> Signed-off-by: Fathi Boudra
> ---
> ...-configuration-option-for-no-input-device.patch | 39
> +++---
> ...1-configure.ac-Fix-wayland-protocols-path.patch | 4 +--
> .../wayland/weston/0001-make-error-portable.patch | 20 +--
> .../0001-shared-include-stdint.h-for-int32_t.patch | 23 -
> ...ch-Provide-a-default-version-that-doesn-t.patch | 28
> .../wayland/{weston_1.11.1.bb => weston_1.12.0.bb} | 12 +++
> 6 files changed, 51 insertions(+), 75 deletions(-)
> delete mode 100644 meta/recipes-graphics/wayland/
> weston/0001-shared-include-stdint.h-for-int32_t.patch
> rename meta/recipes-graphics/wayland/{weston_1.11.1.bb =>
> weston_1.12.0.bb} (92%)
>
> diff --git a/meta/recipes-graphics/wayland/weston/0001-Add-
> configuration-option-for-no-input-device.patch b/meta/recipes-graphics/
> wayland/weston/0001-Add-configuration-option-for-no-input-device.patch
> index c45f3ad..a822d4a 100644
> --- a/meta/recipes-graphics/wayland/weston/0001-Add-
> configuration-option-for-no-input-device.patch
> +++ b/meta/recipes-graphics/wayland/weston/0001-Add-
> configuration-option-for-no-input-device.patch
> @@ -31,24 +31,24 @@ Reviewed-by: Daniel Stone
> Upstream-Status: backport from
> https://cgit.freedesktop.org/wayland/weston/commit/?id=75b7197f
> ---
> - man/weston.ini.man |5 +
> - src/compositor.h|3 +++
> - src/libinput-seat.c |6 ++
> - src/main.c |5 +
> - weston.ini.in |1 +
> - 5 files changed, 20 insertions(+)
> + compositor/main.c |5 +
> + libweston/compositor.h|4
> + libweston/libinput-seat.c |6 ++
> + man/weston.ini.man|5 +
> + weston.ini.in |1 +
> + 5 files changed, 21 insertions(+)
>
> a/src/main.c
> -+++ b/src/main.c
> -@@ -1298,6 +1298,7 @@ int main(int argc, char *argv[])
> - struct wl_client *primary_client;
> +--- a/compositor/main.c
> b/compositor/main.c
> +@@ -1595,6 +1595,7 @@ int main(int argc, char *argv[])
> struct wl_listener primary_client_destroyed;
> struct weston_seat *seat;
> -+ int require_input;
> + struct wet_compositor user_data;
> ++ int require_input;
>
> const struct weston_option core_options[] = {
> { WESTON_OPTION_STRING, "backend", 'B', &backend },
> -@@ -1373,6 +1374,10 @@ int main(int argc, char *argv[])
> +@@ -1678,6 +1679,10 @@ int main(int argc, char *argv[])
> if (weston_compositor_init_config(ec, config) < 0)
> goto out;
>
> @@ -59,21 +59,22 @@ https://cgit.freedesktop.org/
> wayland/weston/commit/?id=75b7197f
> if (load_backend(ec, backend, &argc, argv, config) < 0) {
> weston_log("fatal: failed to create compositor backend\n");
> goto out;
> a/src/compositor.h
> -+++ b/src/compositor.h
> -@@ -803,6 +803,9 @@ struct weston_compositor {
> +--- a/libweston/compositor.h
> b/libweston/compositor.h
> +@@ -836,6 +836,10 @@ struct weston_compositor {
>
> void *user_data;
> void (*exit)(struct weston_compositor *c);
> +
> + /* Whether to let the compositor run without any input device. */
> + bool require_input;
> ++
> };
>
> struct weston_buffer {
> a/src/libinput-seat.c
> -+++ b/src/libinput-seat.c
> -@@ -255,6 +255,12 @@ udev_input_enable(struct udev_input *inp
> +--- a/libweston/libinput-seat.c
> b/libweston/libinput-seat.c
> +@@ -259,6 +259,12 @@ udev_input_enable(struct udev_input *inp
> devices_found = 1;
> }
>
> @@ -88,7 +89,7 @@ https://cgit.freedesktop.or
Re: [OE-core] [PATCH] curl: Upgrade 7.50.1.bb -> curl_7.51.0.bb
Hi guys,
curl 7.51.0-r0 addresses all these CVEs. I wonder if we can upgrade krogoth and
morty to curl 7.51.0-r0 as well? Both package versions are using same share
library version i.e. libcurl.so.4.4.0 so I assume full ABI compatibility.
tmp/work/i586-poky-linux/curl/7.47.1-r0/sysroot-destdir/usr/lib/libcurl.so.4.4.0
tmp/work/i586-poky-linux/curl/7.51.0-r0/sysroot-destdir/usr/lib/libcurl.so.4.4.0
For more info see:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10617
Thanks
//Sona
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Sona
Sarmadi
Sent: den 8 november 2016 11:42
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH] curl: Upgrade 7.50.1.bb -> curl_7.51.0.bb
The upgrade addresses following CVEs:
CVE-2016-8615: cookie injection for other servers
CVE-2016-8616: case insensitive password comparison
CVE-2016-8617: OOB write via unchecked multiplication
CVE-2016-8618: double-free in curl_maprintf
CVE-2016-8619: double-free in krb5 code
CVE-2016-8620: glob parser write/read out of bounds
CVE-2016-8621: curl_getdate read out of bounds
CVE-2016-8622: URL unescape heap overflow via integer truncation
CVE-2016-8623: Use-after-free via shared cookies
CVE-2016-8624: invalid URL parsing with '#'
CVE-2016-8625: IDNA 2003 makes curl use wrong host
Reference:
https://curl.haxx.se/docs/security.html
Fixes [Yocto #10617]
Signed-off-by: Sona Sarmadi
---
meta/recipes-support/curl/{curl_7.50.1.bb => curl_7.51.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) rename
meta/recipes-support/curl/{curl_7.50.1.bb => curl_7.51.0.bb} (94%)
diff --git a/meta/recipes-support/curl/curl_7.50.1.bb
b/meta/recipes-support/curl/curl_7.51.0.bb
similarity index 94%
rename from meta/recipes-support/curl/curl_7.50.1.bb
rename to meta/recipes-support/curl/curl_7.51.0.bb
index a21419a..e1a996b 100644
--- a/meta/recipes-support/curl/curl_7.50.1.bb
+++ b/meta/recipes-support/curl/curl_7.51.0.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
# SRC_URI += " file://configure_ac.patch"
-SRC_URI[md5sum] = "015f6a0217ca6f2c5442ca406476920b"
-SRC_URI[sha256sum] =
"3c12c5f54ccaa1d40abc65d672107dcc75d3e1fcb38c267484334280096e5156"
+SRC_URI[md5sum] = "09a7c5769a7eae676d5e2c86d51f167e"
+SRC_URI[sha256sum] =
"7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde"
inherit autotools pkgconfig binconfig multilib_header
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Allow ${S} to be overridden
On 9 November 2016 at 10:04, Burton, Ross wrote: > Saying that of course doomed the patch: > Double doomed, perf can't build either. ERROR: perf-1.0-r9 do_configure: Function failed: do_configure (log file is located at /data/poky-master/tmp-glibc/work/intel_corei7_64-poky-linux/perf/1.0-r9/temp/log.do_configure.23322) ERROR: Logfile of failure stored in: /data/poky-master/tmp-glibc/work/intel_corei7_64-poky-linux/perf/1.0-r9/temp/log.do_configure.23322 Log data follows: | DEBUG: Executing python function sysroot_cleansstate | DEBUG: Python function sysroot_cleansstate finished | DEBUG: Executing shell function do_configure | sed: can't read /data/poky-master/tmp-glibc/work-shared/intel-corei7-64/kernel-source/tools/perf/Makefile*: No such file or directory | WARNING: exit code 2 from a shell command. | ERROR: Function failed: do_configure (log file is located at /data/poky-master/tmp-glibc/work/intel_corei7_64-poky-linux/perf/1.0-r9/temp/log.do_configure.23322) Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] wic: check that filesystem is specified for a rootfs partition
On Wed, Nov 9, 2016 at 10:44 AM, Ed Bartosh wrote:
> On Tue, Nov 08, 2016 at 04:56:09PM +0100, Maciej Borzecki wrote:
>> Signed-off-by: Maciej Borzecki
>> ---
>> scripts/lib/wic/partition.py | 4
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
>> index
>> 8adc698240c8e3bd9f4118663a5d7a167e0bb4a4..24e657592738dc7c5cdff78e3740d7c373021e9d
>> 100644
>> --- a/scripts/lib/wic/partition.py
>> +++ b/scripts/lib/wic/partition.py
>> @@ -184,6 +184,10 @@ class Partition():
>> if os.path.isfile(rootfs):
>> os.remove(rootfs)
>>
>> +if not self.fstype:
>> +msger.error("File system for partition %s not specified in
>> kickstart, " \
>> +"use --fstype option" % (self.mountpoint))
>> +
> Would it make sense to make --fstype mandatory in ksparser?
I'm afraid that would make fstype mandatory in all cases, while we only
need it for rootfs source plugin.
--
Maciej Borzecki
RnDity
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Allow ${S} to be overridden
On 9 November 2016 at 02:23, Bruce Ashfield
wrote:
> I can ack this patch, since no defaults change .. there's no risk to
> existing users.
>
Saying that of course doomed the patch:
ERROR: hello-mod-0.1-r0 do_make_scripts: Function failed: do_make_scripts
(log file is located at
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071)
ERROR: Logfile of failure stored in:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071
Log data follows:
| DEBUG: Executing shell function do_make_scripts
| make: Entering directory
'/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source'
| make: *** No rule to make target 'scripts'. Stop.
| make: Leaving directory
'/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source'
| WARNING:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/run.do_make_scripts.14071:1
exit 2 from 'make CC="x86_64-poky-linux-gcc -fuse-ld=bfd"
LD="x86_64-poky-linux-ld.bfd " AR="x86_64-poky-linux-ar " -C
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source
O=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-build-artifacts
scripts'
| ERROR: Function failed: do_make_scripts (log file is located at
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071)
NOTE: recipe hello-mod-0.1-r0: task do_make_scripts: Failed
The autobuilder builds hello-mod from meta-skeleton, which inherits module
and sets S=${WORKDIR}.
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] wic: check that filesystem is specified for a rootfs partition
On Tue, Nov 08, 2016 at 04:56:09PM +0100, Maciej Borzecki wrote:
> Signed-off-by: Maciej Borzecki
> ---
> scripts/lib/wic/partition.py | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index
> 8adc698240c8e3bd9f4118663a5d7a167e0bb4a4..24e657592738dc7c5cdff78e3740d7c373021e9d
> 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -184,6 +184,10 @@ class Partition():
> if os.path.isfile(rootfs):
> os.remove(rootfs)
>
> +if not self.fstype:
> +msger.error("File system for partition %s not specified in
> kickstart, " \
> +"use --fstype option" % (self.mountpoint))
> +
Would it make sense to make --fstype mandatory in ksparser?
> for prefix in ("ext", "btrfs", "vfat", "squashfs"):
> if self.fstype.startswith(prefix):
> method = getattr(self, "prepare_rootfs_" + prefix)
> --
> 2.5.0
>
--
--
Regards,
Ed
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] wic: bugfixes & --fixed-size support
On Tue, Nov 08, 2016 at 04:56:06PM +0100, Maciej Borzecki wrote: > The patch series is a follow-up after a previous attempt of adding > --reserved-size option to wic[1]. > > The series introduces a number of fixes in patches 1 - 4. > > The last patch in the series introduces --fixed-size option as discussed in > [1]. > The patch also introduces minor refactoring to code responsible for computing > partition size. > > Aside from new option, another user-visible change is how the size rootfs > partitions with vfat is calculated. In previous code, vfat rootfs partition > size > did not account for --extra-space nor --overhead-factor. Now, all rootfs > partitions (except for squashfs) are subject to the same rules of partition > sizing. > Thank you for the patchset! +1 (if my comments are taken into account) It would be great if you add tests for this functionality to oe-selftest wic suite. > http://lists.openembedded.org/pipermail/openembedded-core/2016-October/127634.html > > Maciej Borzecki (5): > wic: make sure that partition size is always an integer in internal > processing > wic: use partition size when creating empty partition files > wic: check that filesystem is specified for a rootfs partition > wic: fix function comment typos > wic: add --fixed-size wks option > > scripts/lib/wic/help.py| 14 +++-- > scripts/lib/wic/imager/direct.py | 2 +- > scripts/lib/wic/ksparser.py| 41 +-- > scripts/lib/wic/partition.py | 93 > +- > scripts/lib/wic/utils/partitionedfs.py | 6 +-- > 5 files changed, 109 insertions(+), 47 deletions(-) > > -- > 2.5.0 > -- -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] wic: add --fixed-size wks option
On Tue, Nov 08, 2016 at 04:56:11PM +0100, Maciej Borzecki wrote:
> Added new option --fixed-size to wks. The option can be used to indicate
> the exact size of a partition. The option cannot be added together with
> --size, in which case an error will be raised. Other options that
> influence automatic partition size (--extra-space, --overhead-factor),
> if specifiec along with --fixed-size, will raise an error.
>
> If it partition data is larger than the amount of space specified with
> --fixed-size option wic will raise an error.
>
> Signed-off-by: Maciej Borzecki
> ---
> scripts/lib/wic/help.py| 14 --
> scripts/lib/wic/imager/direct.py | 2 +-
> scripts/lib/wic/ksparser.py| 41 +++--
> scripts/lib/wic/partition.py | 83
> --
> scripts/lib/wic/utils/partitionedfs.py | 2 +-
> 5 files changed, 100 insertions(+), 42 deletions(-)
>
> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
> index
> e5347ec4b7c900c68fc64351a5293e75de0672b3..daa11bf489c135627ddfe4cef968e48f8e3ad1d8
> 100644
> --- a/scripts/lib/wic/help.py
> +++ b/scripts/lib/wic/help.py
> @@ -646,6 +646,12 @@ DESCRIPTION
> not specified, the size is in MB.
> You do not need this option if you use --source.
>
> + --fixed-size: Exact partition size. Value format is the same
> + as for --size option. This option cannot be
> + specified along with --size. If partition data
> + is larger than --fixed-size and error will be
> + raised when assembling disk image.
> +
> --source: This option is a wic-specific option that names the
> source of the data that will populate the
> partition. The most common value for this option
> @@ -719,13 +725,15 @@ DESCRIPTION
> space after the space filled by the content
> of the partition. The final size can go
> beyond the size specified by --size.
> -By default, 10MB.
> +By default, 10MB. This option cannot be used
> +with --fixed-size option.
>
> --overhead-factor: This option is specific to wic. The
> size of the partition is multiplied by
> this factor. It has to be greater than or
> -equal to 1.
> -The default value is 1.3.
> +equal to 1. The default value is 1.3.
> +This option cannot be used with --fixed-size
> +option.
>
> --part-type: This option is specific to wic. It specifies partition
>type GUID for GPT partitions.
> diff --git a/scripts/lib/wic/imager/direct.py
> b/scripts/lib/wic/imager/direct.py
> index
> 2bedef08d6450096c786def6f75a9ee53fcd4b3b..c01a1ea538428e36a75ac5b31a822e01901bea6a
> 100644
> --- a/scripts/lib/wic/imager/direct.py
> +++ b/scripts/lib/wic/imager/direct.py
> @@ -290,7 +290,7 @@ class DirectImageCreator(BaseImageCreator):
> self.bootimg_dir, self.kernel_dir,
> self.native_sysroot)
>
>
> -self.__image.add_partition(int(part.size),
> +self.__image.add_partition(part.get_size(),
> part.disk,
> part.mountpoint,
> part.source_file,
> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
> index
> 0894e2b199a299fbbed272f2e1c95e9d692e3ab1..62c490274aa92bf82aac304d9323250e3b728d0c
> 100644
> --- a/scripts/lib/wic/ksparser.py
> +++ b/scripts/lib/wic/ksparser.py
> @@ -113,6 +113,9 @@ def systemidtype(arg):
> class KickStart():
> Kickstart parser implementation."""
>
> +DEFAULT_EXTRA_SPACE = 10*1024
> +DEFAULT_OVERHEAD_FACTOR = 1.3
> +
> def __init__(self, confpath):
>
> self.partitions = []
> @@ -127,16 +130,24 @@ class KickStart():
> part.add_argument('mountpoint', nargs='?')
> part.add_argument('--active', action='store_true')
> part.add_argument('--align', type=int)
> -part.add_argument("--extra-space", type=sizetype, default=10*1024)
> +part.add_argument("--extra-space", type=sizetype)
> part.add_argument('--fsoptions', dest='fsopts')
> part.add_argument('--fstype')
> part.add_argument('--label')
> part.add_argument('--no-table', action='store_true')
> part.add_argument('--ondisk', '--ondrive', dest='disk')
> -part.add_argument("--overhead-factor", type=overheadtype,
> default=1.3)
> +part.add_argument("--overhead-factor", type=overheadtype)
> part.add_argument('--part-ty
Re: [OE-core] [PATCH 2/5] wic: use partition size when creating empty partition files
On Tue, Nov 08, 2016 at 04:56:08PM +0100, Maciej Borzecki wrote: > It seems that prepare_empty_partition_ext() and > prepare_empty_partition_btrfs() got broken in commit > c8669749e37fe865c197c98d5671d9de176ff4dd, thus one could observe the > following backtrace: > > Backtrace: > File "/poky/scripts/lib/wic/plugins/imager/direct_plugin.py", line > 93, in do_create > creator.create() > File "/poky/scripts/lib/wic/imager/baseimager.py", line 159, in create > self._create() > File "/poky/scripts/lib/wic/imager/direct.py", line 290, in _create > self.bootimg_dir, self.kernel_dir, self.native_sysroot) > File "/poky/scripts/lib/wic/partition.py", line 146, in prepare > method(rootfs, oe_builddir, native_sysroot) > File "/poky/scripts/lib/wic/partition.py", line 325, in > prepare_empty_partition_ext > os.ftruncate(sparse.fileno(), rootfs_size * 1024) > NameError: name 'rootfs_size' is not defined > > Signed-off-by: Maciej Borzecki > --- > scripts/lib/wic/partition.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py > index > 4b8d769437120adadb5dba2f3919d4eb96141292..8adc698240c8e3bd9f4118663a5d7a167e0bb4a4 > 100644 > --- a/scripts/lib/wic/partition.py > +++ b/scripts/lib/wic/partition.py > @@ -308,7 +308,7 @@ class Partition(): > Prepare an empty ext2/3/4 partition. > """ > with open(rootfs, 'w') as sparse: > -os.ftruncate(sparse.fileno(), rootfs_size * 1024) > +os.ftruncate(sparse.fileno(), self.size * 1024) > > extra_imagecmd = "-i 8192" > > @@ -326,7 +326,7 @@ class Partition(): > Prepare an empty btrfs partition. > """ > with open(rootfs, 'w') as sparse: > -os.ftruncate(sparse.fileno(), rootfs_size * 1024) > +os.ftruncate(sparse.fileno(), self.size * 1024) > > label_str = "" > if self.label: Thank you for the fix. Sorry for breaking this. I thought I double-checked and all tests were passing :( -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mkefidisk.sh: add deprecation warning to the output
On Tue, Nov 08, 2016 at 01:05:23PM -0800, John Hawley wrote: > On 11/08/2016 12:44 PM, Randy Witt wrote: > We should also document, the wic steps in wiki pages e.g. > http://wiki.minnowboard.org/Yocto_Project > >>> It's already documented in README.hardware: > >>> https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/README.hardware > >>> > >>> And in Yocto manual: > >>> http://www.yoctoproject.org/docs/2.2/mega-manual/mega-manual.html#building-an-image-for-hardware > >>> > >> > >> Thanks, now can you also nudge the minnowboard.org to do the same ? > >> > > > > Pinging you John. :) > > So two obvious questions in reading the documentation off the YP site: > > 1) Does WIC actually handle the EFI partition for booting off of UEFI > systems? (guessing yes, but wanted to double check) Yes, it does. > 2) I assume it only creates MBR based images, seeing as the suggestion > is to DD the image down, how does GPT based images work since you can't > (exactly) DD a GPT image down and have it work "correctly"? > Please, elaborate on "correctly". Do you mean that kernel will complain that backup GPT header is not at the end of disk? This is not handled by wic obviously. However, even without this image is bootable and functional. > Sorry, I'm sure that's covered somewhere else, just want to double check > this will be ok before I update the documentation on MB -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
