Re: [OE-core] [PATCH v2 2/2] recipes-support/nspr: Add RISC-V support
On 2018-06-21 23:26, Alistair Francis wrote: Signed-off-by: Alistair Francis --- ...initions-for-the-RISC-V-architecture.patch | 150 ++ meta/recipes-support/nspr/nspr_4.19.bb| 1 + 2 files changed, 151 insertions(+) create mode 100644 meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch diff --git a/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch b/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch new file mode 100644 index 00..aa32908d13 --- /dev/null +++ b/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch @@ -0,0 +1,150 @@ +# HG changeset patch +# User Karsten Merker +# Date 1523974333 -7200 +# Node ID f47871e2aeb16b39d4f516690e25c81b04d6d05a +# Parent 776db96f834cb86e8863052201d55f60a2da91cb +Bug 1308584, Add type definitions for the RISC-V architecture, r=kaie + +Signed-off-by: Alistair Francis +[ Changes by AF: + - Rebase on other Yocto patches +] +Upstream-Status: Merged [ https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1 ] I don't think "merged" is a proper upstream status. Should be "backport" instead: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +--- a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +@@ -1015,16 +1015,108 @@ + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 4 + #define PR_ALIGN_OF_POINTER 4 + #define PR_ALIGN_OF_WORD4 + + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__riscv) && (__riscv_xlen == 32) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG25 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__riscv) && (__riscv_xlen == 64) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG25 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" + + #endif + + #ifndef HAVE_LONG_LONG + #define HAVE_LONG_LONG +diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h +--- a/pr/include/md/_linux.h b/pr/include/md/_linux.h +@@ -54,16 +54,20 @@ + #elif defined(__avr32__) + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" + #elif defined(__nios2__) + #define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" ++#elif defined(__riscv) && (__riscv_xlen == 32) ++#define _PR_SI_ARCHITECTURE "riscv32" ++#elif defined(__riscv) && (__riscv_xlen == 64)
Re: [OE-core] [PATCH] systemd: quote SYSTEMD_SERVICE in prerm and postinst
Hi,
On Fri, Jun 22, 2018 at 09:29:37AM +0800, ChenQi wrote:
> Hi Damien,
>
> If some recipe has more than one unit file, this patch will cause problem
> for it.
That's a good point, let me see if I can come up with a solution that
addresses that.
Regards,
--
Damien
>
> Best Regards,
> Chen Qi
>
>
> On 06/22/2018 04:35 AM, Damien Riegel wrote:
> > Systemd mount configuration file must have a name that match the mount
> > point directory they control. So for instance, if a mount file contains
> >
> > [Mount]
> > ...
> > Where=/mnt/my-data
> >
> > The file must be named `mnt-my\x2ddata.mount`, or systemd will refuse to
> > honour it.
> >
> > If this config file contains an [Install] section, it will silently fail
> > because the unit file is not quoted when systemctl is called. To fix
> > that, quote `${SYSTEMD_SERVICE}` in prerm and postinst hooks.
> >
> > Signed-off-by: Damien Riegel
> > ---
> > meta/classes/systemd.bbclass | 8
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
> > index 1b134322fb..589e73c855 100644
> > --- a/meta/classes/systemd.bbclass
> > +++ b/meta/classes/systemd.bbclass
> > @@ -34,10 +34,10 @@ if type systemctl >/dev/null 2>/dev/null; then
> > systemctl daemon-reload
> > fi
> > - systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
> > + systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} "${SYSTEMD_SERVICE}"
> > if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
> > - systemctl --no-block restart ${SYSTEMD_SERVICE}
> > + systemctl --no-block restart "${SYSTEMD_SERVICE}"
> > fi
> > fi
> > }
> > @@ -51,10 +51,10 @@ fi
> > if type systemctl >/dev/null 2>/dev/null; then
> > if [ -z "$D" ]; then
> > - systemctl stop ${SYSTEMD_SERVICE}
> > + systemctl stop "${SYSTEMD_SERVICE}"
> > fi
> > - systemctl $OPTS disable ${SYSTEMD_SERVICE}
> > + systemctl $OPTS disable "${SYSTEMD_SERVICE}"
> > fi
> > }
>
>
> --
> ___
> 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 V3 0/1] oeqa/runtime/cases/selftest.py: rename to _selftest.py
ping
I've tested this patch with `oe-selftest -r runtime_test', and the
result is correct.
Best Regards,
Chen Qi
On 06/12/2018 05:08 PM, Chen Qi wrote:
Changes in V3:
* Also rename selftest.json to _selftest.json to avoid runtime_test.py failure
in oe-selftest.
* Fixed a typo (sato -> full-cmdline)
Changes in V2:
* Fix to depend on _selftest.Selftest.test_install_package.
The following changes since commit fe6e6231441188c3ffe52ef5811a8f30d29ea952:
local.conf.sample: update libsdl mentions to libsdl2 (2018-06-07 08:53:19
+0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/rename_selftest
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/rename_selftest
Chen Qi (1):
oeqa/runtime/cases/selftest.py: rename to _selftest.py
.../lib/oeqa/runtime/cases/{selftest.json => _selftest.json} | 0
meta-selftest/lib/oeqa/runtime/cases/{selftest.py => _selftest.py}| 2 +-
meta/lib/oeqa/selftest/cases/runtime_test.py | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
rename meta-selftest/lib/oeqa/runtime/cases/{selftest.json => _selftest.json}
(100%)
rename meta-selftest/lib/oeqa/runtime/cases/{selftest.py => _selftest.py}
(94%)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: quote SYSTEMD_SERVICE in prerm and postinst
Hi Damien,
If some recipe has more than one unit file, this patch will cause
problem for it.
Best Regards,
Chen Qi
On 06/22/2018 04:35 AM, Damien Riegel wrote:
Systemd mount configuration file must have a name that match the mount
point directory they control. So for instance, if a mount file contains
[Mount]
...
Where=/mnt/my-data
The file must be named `mnt-my\x2ddata.mount`, or systemd will refuse to
honour it.
If this config file contains an [Install] section, it will silently fail
because the unit file is not quoted when systemctl is called. To fix
that, quote `${SYSTEMD_SERVICE}` in prerm and postinst hooks.
Signed-off-by: Damien Riegel
---
meta/classes/systemd.bbclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 1b134322fb..589e73c855 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -34,10 +34,10 @@ if type systemctl >/dev/null 2>/dev/null; then
systemctl daemon-reload
fi
- systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
+ systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} "${SYSTEMD_SERVICE}"
if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
- systemctl --no-block restart ${SYSTEMD_SERVICE}
+ systemctl --no-block restart "${SYSTEMD_SERVICE}"
fi
fi
}
@@ -51,10 +51,10 @@ fi
if type systemctl >/dev/null 2>/dev/null; then
if [ -z "$D" ]; then
- systemctl stop ${SYSTEMD_SERVICE}
+ systemctl stop "${SYSTEMD_SERVICE}"
fi
- systemctl $OPTS disable ${SYSTEMD_SERVICE}
+ systemctl $OPTS disable "${SYSTEMD_SERVICE}"
fi
}
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mdadm: fix one more issue when building with gcc8
Signed-off-by: Martin Jansa
---
.../files/0001-Disable-gcc8-warnings.patch| 24 ++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch
b/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch
index 8cf52406c4..739652cd55 100644
--- a/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch
@@ -6,6 +6,14 @@ Subject: [PATCH] Disable gcc8 warnings
This is needed until
https://bugzilla.redhat.com/show_bug.cgi?id=1553958
+Fix super0.c issue which is triggered only in DEBUG_BUILD with -O1 (or any
+configuration without -ftree-vrp or with -fno-tree-vrp)
+
+super0.c: In function 'examine_super0':
+super0.c:238:32: error: 'snprintf' output may be truncated before the last
format character [-Werror=format-truncation=]
+ snprintf(nb, sizeof(nb), "%4d", d);
+^
+
Upstream-Status: Inappropriate [Workaround]
Signed-off-by: Khem Raj
@@ -16,8 +24,22 @@ Signed-off-by: Khem Raj
super-ddf.c | 4
super-intel.c | 6 ++
super1.c | 5 +
- 5 files changed, 22 insertions(+), 1 deletion(-)
+ super0.c | 2 +-
+ 6 files changed, 22 insertions(+), 1 deletion(-)
+diff --git a/super0.c b/super0.c
+index f5b4507..264b598 100644
+--- a/super0.c
b/super0.c
+@@ -231,7 +231,7 @@
+d++) {
+ mdp_disk_t *dp;
+ char *dv;
+- char nb[11];
++ char nb[12];
+ int wonly, failfast;
+ if (d>=0) dp = >disks[d];
+ else dp = >this_disk;
diff --git a/Monitor.c b/Monitor.c
index 802a9d9..23b246b 100644
--- a/Monitor.c
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] mtd-utils: upgrade 2.0.1 -> 2.0.2
I'm sorry, it's one of those days where "mtd-utils" and "mdadm" look exactly the same to me - yeah both are in oe-core, both start with m and are related to block devices. And the build failure with mdadm is reproducible with DEBUG_BUILD, -O2 and above work fine thanks to -ftree-vrp (similarly like systemd gcc8 issue fixed in http://git.openembedded.org/openembedded-core/commit/?id=b0fdaedc6e9c233f357022b0fb706cb19757f5c4 ) On Thu, Jun 21, 2018 at 1:30 PM Martin Jansa wrote: > It might be DEBUG_BUILD enabled in my builds, let me check. > > On Thu, Jun 21, 2018 at 1:20 PM Burton, Ross > wrote: > >> Master builds fine for me, but interestingly I don't see that in my >> mtd-utils unpack. Do you have patches? >> >> Ross >> >> On 21 June 2018 at 12:10, Martin Jansa wrote: >> > Does this upgrade fix the build failure with gcc8? >> > >> > With current master I'm seeing: >> > super0.c:238:32: error: 'snprintf' output may be truncated before the >> last >> > format character [-Werror=format-truncation=] >> > >> > On Thu, Jun 21, 2018 at 12:33 PM Burton, Ross >> wrote: >> >> >> >> Sorry, no it doesn't. I've just picked this in ross/mut but a >> >> follow-up patch to remove that mystery patch (can't see it being used >> >> in image generation anywhere) would be good. >> >> >> >> Ross >> >> >> >> On 20 June 2018 at 00:53, Denys Dmytriyenko wrote: >> >> > On Tue, May 22, 2018 at 01:16:34PM +0100, Burton, Ross wrote: >> >> >> On 22 May 2018 at 08:49, Andrea Adami >> wrote: >> >> >> > I am just wondering about this patch:we carry it since 2009 [1] >> and >> >> >> > is still marked as pending. >> >> >> > Why was it necessary to ignore part of the filesystem? Can you >> >> >> > remember? >> >> >> >> >> >> Make that at least 2004. This commit in oe-classic touches it: >> >> >> >> >> >> commit c70605ebdca81412a93b4d867de7931543193f26 >> >> >> Author: Chris Larson >> >> >> Date: Thu Dec 23 21:24:57 2004 + >> >> >> >> >> >> Update mtd to a current snapshot, change the mkfs.jffs2 -i >> cmdline >> >> >> option to >> >> >> -I, and rename mtd and mtd-native to mtd-utils and >> >> >> mtd-utils-native, >> >> >> respectively. >> >> >> >> >> >> Prior history is lost to the git/bk migration unless anyone has a >> >> >> BitKeeper clone to mine... >> >> > >> >> > So, does this prevent the version upgrade from being merged? >> >> > >> >> > -- >> >> > Denys >> >> -- >> >> ___ >> >> 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] iproute2: upgrade 4.16.0 -> 4.17.0
Signed-off-by: Changhyeok Bae
---
.../iproute2/{iproute2_4.16.0.bb => iproute2_4.17.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/iproute2/{iproute2_4.16.0.bb =>
iproute2_4.17.0.bb} (72%)
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.16.0.bb
b/meta/recipes-connectivity/iproute2/iproute2_4.17.0.bb
similarity index 72%
rename from meta/recipes-connectivity/iproute2/iproute2_4.16.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_4.17.0.bb
index 4b0e893..12812b0 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.16.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.17.0.bb
@@ -6,8 +6,8 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://0001-ip-Remove-unneed-header.patch \
"
-SRC_URI[md5sum] = "1f12a70d767ef77ffa2d1a0c4ce48f1a"
-SRC_URI[sha256sum] =
"0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a"
+SRC_URI[md5sum] = "6f3a87fe2d97c28214fc2faab2c257d6"
+SRC_URI[sha256sum] =
"6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e"
# CFLAGS are computed in Makefile and reference CCOPTS
#
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] recipes-devtools/qemu: Add RISC-V support
Signed-off-by: Alistair Francis
---
meta/recipes-devtools/qemu/qemu.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 094a975177..b05c1cee9e 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -9,7 +9,7 @@ inherit pkgconfig bluetooth
BBCLASSEXTEND = "native nativesdk"
# QEMU_TARGETS is overridable variable
-QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
+QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc riscv32
riscv64 sh4 x86_64"
EXTRA_OECONF = " \
--prefix=${prefix} \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/2] recipes-support/nspr: Add RISC-V support
Signed-off-by: Alistair Francis --- ...initions-for-the-RISC-V-architecture.patch | 150 ++ meta/recipes-support/nspr/nspr_4.19.bb| 1 + 2 files changed, 151 insertions(+) create mode 100644 meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch diff --git a/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch b/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch new file mode 100644 index 00..aa32908d13 --- /dev/null +++ b/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch @@ -0,0 +1,150 @@ +# HG changeset patch +# User Karsten Merker +# Date 1523974333 -7200 +# Node ID f47871e2aeb16b39d4f516690e25c81b04d6d05a +# Parent 776db96f834cb86e8863052201d55f60a2da91cb +Bug 1308584, Add type definitions for the RISC-V architecture, r=kaie + +Signed-off-by: Alistair Francis +[ Changes by AF: + - Rebase on other Yocto patches +] +Upstream-Status: Merged [ https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1 ] + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +--- a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +@@ -1015,16 +1015,108 @@ + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 4 + #define PR_ALIGN_OF_POINTER 4 + #define PR_ALIGN_OF_WORD4 + + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__riscv) && (__riscv_xlen == 32) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG25 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__riscv) && (__riscv_xlen == 64) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG25 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" + + #endif + + #ifndef HAVE_LONG_LONG + #define HAVE_LONG_LONG +diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h +--- a/pr/include/md/_linux.h b/pr/include/md/_linux.h +@@ -54,16 +54,20 @@ + #elif defined(__avr32__) + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" + #elif defined(__nios2__) + #define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" ++#elif defined(__riscv) && (__riscv_xlen == 32) ++#define _PR_SI_ARCHITECTURE "riscv32" ++#elif defined(__riscv) && (__riscv_xlen == 64) ++#define _PR_SI_ARCHITECTURE "riscv64" + #else + #error "Unknown CPU architecture" + #endif + #define PR_DLL_SUFFIX ".so" + + #define _PR_VMBASE 0x3000 + #define _PR_STACK_VMBASE 0x5000 + #define
[OE-core] [PATCH 3/5] bbpath-intercepts.bbclass: add class
From: Christopher Larson
This class sets POSTINST_INTERCEPTS and POSTINST_INTERCEPTS_CHECKSUMS,
to allow us to pull intercepts from BBPATH. This is kept as a separate
class, as it's needed by both image construction and sdk construction,
the latter to support meta-toolchain & similar recipes.
Signed-off-by: Christopher Larson
---
meta/classes/bbpath-intercepts.bbclass | 23 +++
1 file changed, 23 insertions(+)
create mode 100644 meta/classes/bbpath-intercepts.bbclass
diff --git a/meta/classes/bbpath-intercepts.bbclass
b/meta/classes/bbpath-intercepts.bbclass
new file mode 100644
index 000..ed30bbd98d9
--- /dev/null
+++ b/meta/classes/bbpath-intercepts.bbclass
@@ -0,0 +1,23 @@
+# Gather existing and candidate postinst intercepts from BBPATH
+POSTINST_INTERCEPTS_DIR ?= "${COREBASE}/scripts/postinst-intercepts"
+POSTINST_INTERCEPTS_PATHS ?= "${@':'.join('%s/postinst-intercepts' % p for p
in '${BBPATH}'.split(':'))}:${POSTINST_INTERCEPTS_DIR}"
+
+python find_intercepts() {
+intercepts = {}
+search_paths = []
+paths = d.getVar('POSTINST_INTERCEPTS_PATHS').split(':')
+overrides = (':' + d.getVar('FILESOVERRIDES')).split(':') + ['']
+search_paths = [os.path.join(p, op) for p in paths for op in overrides]
+searched = oe.path.which_wild('*', ':'.join(search_paths), candidates=True)
+files, chksums = [], []
+for pathname, candidates in searched:
+if os.path.isfile(pathname):
+files.append(pathname)
+chksums.append('%s:True' % pathname)
+chksums.extend('%s:False' % c for c in candidates[:-1])
+
+d.setVar('POSTINST_INTERCEPT_CHECKSUMS', ' '.join(chksums))
+d.setVar('POSTINST_INTERCEPTS', ' '.join(files))
+}
+find_intercepts[eventmask] += "bb.event.RecipePreFinalise"
+addhandler find_intercepts
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] populate_sdk_base.bbclass: inherit and use bbpath-intercepts
From: Christopher Larson
Signed-off-by: Christopher Larson
---
meta/classes/populate_sdk_base.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index 3da350747e2..8b576e1bfde 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -1,4 +1,4 @@
-inherit meta
+inherit meta bbpath-intercepts
# Wildcards specifying complementary packages to install for every package
that has been explicitly
# installed into the rootfs
@@ -306,4 +306,5 @@ do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in
d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends',
False)}"
do_populate_sdk[rdepends] = "${@' '.join([x +
':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in
d.getVar('SDK_RDEPENDS').split()])}"
do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm
do_package_write_ipk do_package_write_deb"
+do_populate_sdk[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
addtask populate_sdk
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] oe.package_manager: support loading intercepts from multiple paths
From: Christopher Larson
- if POSTINST_INTERCEPTS is set, use the listed intercept files, or
- if POSTINST_INTERCEPTS_PATH is set, load from the listed paths, or
- if POSTINST_INTERCEPTS_DIR is set, load from it (for compatibility), or
- load from ${COREBASE}/meta/postinst-intercepts
Signed-off-by: Christopher Larson
---
meta/lib/oe/package_manager.py | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 5ac729455e9..7f9cbba7084 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -336,17 +336,24 @@ class PackageManager(object, metaclass=ABCMeta):
def _initialize_intercepts(self):
bb.note("Initializing intercept dir for %s" % self.target_rootfs)
-postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR")
-if not postinst_intercepts_dir:
-postinst_intercepts_dir =
self.d.expand("${COREBASE}/scripts/postinst-intercepts")
# As there might be more than one instance of PackageManager operating
at the same time
# we need to isolate the intercept_scripts directories from each other,
# hence the ugly hash digest in dir name.
-self.intercepts_dir = os.path.join(self.d.getVar('WORKDIR'),
- "intercept_scripts-%s"
%(hashlib.sha256(self.target_rootfs.encode()).hexdigest()) )
+self.intercepts_dir = os.path.join(self.d.getVar('WORKDIR'),
"intercept_scripts-%s" %
+
(hashlib.sha256(self.target_rootfs.encode()).hexdigest()))
+postinst_intercepts = (self.d.getVar("POSTINST_INTERCEPTS") or
"").split()
+if not postinst_intercepts:
+postinst_intercepts_path =
self.d.getVar("POSTINST_INTERCEPTS_PATH")
+if not postinst_intercepts_path:
+postinst_intercepts_path =
self.d.getVar("POSTINST_INTERCEPTS_DIR") or
self.d.expand("${COREBASE}/scripts/postinst-intercepts")
+postinst_intercepts = oe.path.which_wild('*',
postinst_intercepts_path)
+
+bb.debug(1, 'Collected intercepts:\n%s' % ''.join(' %s\n' % i for i
in postinst_intercepts))
bb.utils.remove(self.intercepts_dir, True)
-shutil.copytree(postinst_intercepts_dir, self.intercepts_dir)
+bb.utils.mkdirhier(self.intercepts_dir)
+for intercept in postinst_intercepts:
+bb.utils.copyfile(intercept, os.path.join(self.intercepts_dir,
os.path.basename(intercept)))
@abstractmethod
def _handle_intercept_failure(self, failed_script):
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] recipetool: add 'edit' subcommand
From: Christopher Larson
This edits the recipe and any bbappends for the specified target.
Signed-off-by: Christopher Larson
---
scripts/lib/recipetool/edit.py | 54 ++
1 file changed, 54 insertions(+)
create mode 100644 scripts/lib/recipetool/edit.py
diff --git a/scripts/lib/recipetool/edit.py b/scripts/lib/recipetool/edit.py
new file mode 100644
index 000..c4789a9994c
--- /dev/null
+++ b/scripts/lib/recipetool/edit.py
@@ -0,0 +1,54 @@
+# Recipe creation tool - edit plugin
+#
+# This sub-command edits the recipe and appends for the specified target
+#
+# Example: recipetool edit busybox
+#
+# Copyright (C) 2018 Mentor Graphics Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import argparse
+import errno
+import logging
+import os
+import re
+import subprocess
+import sys
+import scriptutils
+
+
+logger = logging.getLogger('recipetool')
+tinfoil = None
+
+
+def tinfoil_init(instance):
+global tinfoil
+tinfoil = instance
+
+
+def edit(args):
+import oe.recipeutils
+
+recipe_path = tinfoil.get_recipe_file(args.target)
+appends = tinfoil.get_file_appends(recipe_path)
+
+return scriptutils.run_editor([recipe_path] + appends, logger)
+
+
+def register_commands(subparsers):
+parser = subparsers.add_parser('edit',
+ help='Edit the recipe and appends for the
specified target. This obeys $VISUAL if set, otherwise $EDITOR, otherwise vi.')
+parser.add_argument('target', help='Target recipe/provide to edit')
+parser.set_defaults(func=edit, parserecipes=True)
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] image.bbclass: inherit and use bbpath-intercepts
From: Christopher Larson
Signed-off-by: Christopher Larson
---
meta/classes/image.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2247b305da8..29bd716f8d3 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -191,7 +191,7 @@ LINGUAS_INSTALL ?= "${@" ".join(map(lambda s:
"locale-base-%s" % s, d.getVar('IM
# aren't yet available.
PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"
-inherit rootfs-postcommands
+inherit rootfs-postcommands bbpath-intercepts
PACKAGE_EXCLUDE ??= ""
PACKAGE_EXCLUDE[type] = "list"
@@ -262,6 +262,7 @@ fakeroot python do_rootfs () {
do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
do_rootfs[umask] = "022"
+do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
addtask rootfs after do_prepare_recipe_sysroot
fakeroot python do_image () {
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Pull postinst-intercepts from BBPATH
From: Christopher Larson These are the bits to allow us to pull intercepts from BBPATH. This is kept as a separate class, as it's needed by both image construction and sdk construction, the latter to support meta-toolchain & similar recipes. The following changes since commit 83c9405df5748744ef673ac8757bb89d7050ad8d: alsa-tools: rewrite packaging (2018-06-15 11:18:15 +0100) are available in the git repository at: g...@github.com:kergoth/openembedded-core.git bbpath-intercepts for you to fetch changes up to 4bb748f4c9b177722a13a1f09dcd86b4595752ea: populate_sdk_base.bbclass: inherit and use bbpath-intercepts (2018-06-16 02:05:39 +0500) Christopher Larson (5): oe.path: add which_wild function oe.package_manager: support loading intercepts from multiple paths bbpath-intercepts.bbclass: add class image.bbclass: inherit and use bbpath-intercepts populate_sdk_base.bbclass: inherit and use bbpath-intercepts meta/classes/bbpath-intercepts.bbclass | 23 +++ meta/classes/image.bbclass | 3 ++- meta/classes/populate_sdk_base.bbclass | 3 ++- meta/lib/oe/package_manager.py | 19 +-- meta/lib/oe/path.py| 34 ++ 5 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 meta/classes/bbpath-intercepts.bbclass -- 2.11.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] rng-tools: drop unnecessary INHIBIT_UPDATERCD_BBCLASS
From: Christopher Larson
This was added as the recipe didn't inherit systemd, but it does inherit
systemd now.
Signed-off-by: Christopher Larson
---
meta/recipes-support/rng-tools/rng-tools_5.bb | 7 ---
1 file changed, 7 deletions(-)
diff --git a/meta/recipes-support/rng-tools/rng-tools_5.bb
b/meta/recipes-support/rng-tools/rng-tools_5.bb
index b3c9fd97455..24d545dc3fa 100644
--- a/meta/recipes-support/rng-tools/rng-tools_5.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_5.bb
@@ -16,13 +16,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \
SRC_URI[md5sum] = "6726cdc6fae1f5122463f24ae980dd68"
SRC_URI[sha256sum] =
"60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e"
-# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
-# manually to avoid unnecessary postinst/preinst generated.
-python () {
-if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
-
inherit autotools update-rc.d systemd
PACKAGECONFIG = "libgcrypt"
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] perf: drop the rdep on man
From: Christopher Larson
It's not common practice to make -doc rdep on man when man pages are
included, and doing so prevents the recipe from building for non-gplv3
Signed-off-by: Christopher Larson
---
meta/recipes-kernel/perf/perf.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 51f5597eb92..5e710f61834 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -239,7 +239,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
RDEPENDS_${PN} += "elfutils bash"
-RDEPENDS_${PN}-doc += "man"
RDEPENDS_${PN}-archive =+ "bash"
RDEPENDS_${PN}-python =+ "bash python python-modules
${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] A few misc fixes from meta-mentor-staging
From: Christopher Larson The following changes since commit 83c9405df5748744ef673ac8757bb89d7050ad8d: alsa-tools: rewrite packaging (2018-06-15 11:18:15 +0100) are available in the git repository at: g...@github.com:kergoth/openembedded-core.git misc-fixes for you to fetch changes up to 5ce7b09e00b4967d2c0efaad58049cf871fab57a: perf: drop the rdep on man (2018-06-16 02:04:35 +0500) Christopher Larson (6): oe.scriptutils.run_editor: ditch the error-prone argument quoting pcmciautils: depend on bison-native console-tools: add missing flex/bison deps ovmf: set PARALLEL_MAKE for target as well dmidecode: correct docdir perf: drop the rdep on man meta/recipes-bsp/pcmciautils/pcmciautils.inc | 2 +- .../console-tools/console-tools_0.3.2.bb | 1 + meta/recipes-core/ovmf/ovmf_git.bb | 2 +- meta/recipes-devtools/dmidecode/dmidecode_3.1.bb | 4 meta/recipes-kernel/perf/perf.bb | 1 - scripts/lib/scriptutils.py | 24 +++--- 6 files changed, 19 insertions(+), 15 deletions(-) -- 2.11.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] rng-tools: start earlier in the boot process
From: Christopher Larson
Entropy is needed earlier in the boot process in some cases, for example
connman can require it, and rgd doesn't require much, so move it earlier
in the boot process, 03 for sysvinit, and before sysinit for systemd.
Signed-off-by: Christopher Larson
---
meta/recipes-support/rng-tools/rng-tools/rngd.service | 3 +++
meta/recipes-support/rng-tools/rng-tools_5.bb | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service
b/meta/recipes-support/rng-tools/rng-tools/rngd.service
index b94ad50209c..cb8102442d6 100644
--- a/meta/recipes-support/rng-tools/rng-tools/rngd.service
+++ b/meta/recipes-support/rng-tools/rng-tools/rngd.service
@@ -1,5 +1,8 @@
[Unit]
Description=Hardware RNG Entropy Gatherer Daemon
+DefaultDependencies=no
+After=systemd-udev-settle.service
+Before=sysinit.target
[Service]
ExecStart=@SBINDIR@/rngd -f -r /dev/urandom
diff --git a/meta/recipes-support/rng-tools/rng-tools_5.bb
b/meta/recipes-support/rng-tools/rng-tools_5.bb
index 24d545dc3fa..6765667a59b 100644
--- a/meta/recipes-support/rng-tools/rng-tools_5.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_5.bb
@@ -43,6 +43,6 @@ do_install_append() {
}
INITSCRIPT_NAME = "rng-tools"
-INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 6 1 ."
+INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ."
SYSTEMD_SERVICE_${PN} = "rngd.service"
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] oe.path: add which_wild function
From: Christopher Larson
This is a function much like shutil.which or bb.utils.which, retaining
shutil.which-like function semantics, bb.utils.which's support for
returning available candidates for signatures, and most importantly,
supports wildcards, returning only the first occurrance of each found
pathname in the search path.
Signed-off-by: Christopher Larson
---
meta/lib/oe/path.py | 34 ++
1 file changed, 34 insertions(+)
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 76c58fa7601..be02218c31d 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -259,3 +259,37 @@ def is_path_parent(possible_parent, *paths):
if not path_abs.startswith(possible_parent_abs):
return False
return True
+
+def which_wild(pathname, path=None, mode=os.F_OK, *, reverse=False,
candidates=False):
+"""Search a search path for pathname, supporting wildcards.
+
+Return all paths in the specific search path matching the wildcard pattern
+in pathname, returning only the first encountered for each file. If
+candidates is True, information on all potential candidate paths are
+included.
+"""
+paths = (path or os.environ.get('PATH', os.defpath)).split(':')
+if reverse:
+paths.reverse()
+
+seen, files = set(), []
+for index, element in enumerate(paths):
+if not os.path.isabs(element):
+element = os.path.abspath(element)
+
+candidate = os.path.join(element, pathname)
+globbed = glob.glob(candidate)
+if globbed:
+for found_path in sorted(globbed):
+if not os.access(found_path, mode):
+continue
+rel = os.path.relpath(found_path, element)
+if rel not in seen:
+seen.add(rel)
+if candidates:
+files.append((found_path, [os.path.join(p, rel) for p
in paths[:index+1]]))
+else:
+files.append(found_path)
+
+return files
+
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] dmidecode: correct docdir
From: Christopher Larson
Without this, the package clutters up the root of /usr/share/doc.
Signed-off-by: Christopher Larson
---
meta/recipes-devtools/dmidecode/dmidecode_3.1.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
b/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
index f83281e2359..b423fda6d24 100644
--- a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
+++ b/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
@@ -9,6 +9,10 @@ COMPATIBLE_HOST =
"(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux"
EXTRA_OEMAKE = "-e MAKEFLAGS="
+# The upstream buildsystem uses 'docdir' as the path where it puts AUTHORS,
+# README, etc, but we don't want those in the root of our docdir.
+docdir .= "/${BPN}"
+
do_install() {
oe_runmake DESTDIR="${D}" install
}
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] rng-tools: start earlier in the boot process
From: Christopher Larson Entropy is needed earlier in the boot process in some cases, for example connman can require it, and rgd doesn't require much, so move it earlier in the boot process, 03 for sysvinit, and before sysinit for systemd. The following changes since commit 83c9405df5748744ef673ac8757bb89d7050ad8d: alsa-tools: rewrite packaging (2018-06-15 11:18:15 +0100) are available in the git repository at: g...@github.com:kergoth/openembedded-core.git rng-tools-early for you to fetch changes up to abb55c262e6dab31c0e77bf800e83cdba155fc13: rng-tools: start earlier in the boot process (2018-06-16 02:05:09 +0500) Christopher Larson (2): rng-tools: drop unnecessary INHIBIT_UPDATERCD_BBCLASS rng-tools: start earlier in the boot process meta/recipes-support/rng-tools/rng-tools/rngd.service | 3 +++ meta/recipes-support/rng-tools/rng-tools_5.bb | 9 + 2 files changed, 4 insertions(+), 8 deletions(-) -- 2.11.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] ovmf: set PARALLEL_MAKE for target as well
From: Christopher Larson
This can fail for target, not just native.
Signed-off-by: Christopher Larson
---
meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb
b/meta/recipes-core/ovmf/ovmf_git.bb
index 212530acbf9..e57fa097274 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -39,7 +39,7 @@ SRC_URI[openssl.sha256sum] =
"57be8618979d80c910728cfc99369bf97b2a1abd8f366ab6eb
inherit deploy
-PARALLEL_MAKE_class-native = ""
+PARALLEL_MAKE = ""
S = "${WORKDIR}/git"
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] console-tools: add missing flex/bison deps
From: Christopher Larson
Signed-off-by: Christopher Larson
---
meta/recipes-core/console-tools/console-tools_0.3.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 6b9c82834cb..ba44fbe60f9 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "Provides tools that enable the set-up and
manipulation of the lin
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
+DEPENDS = "flex-native bison-native"
PR = "r8"
SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] pcmciautils: depend on bison-native
From: Christopher Larson
pcmciautils needs yacc as well as lex.
Signed-off-by: Christopher Larson
---
meta/recipes-bsp/pcmciautils/pcmciautils.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 05249805098..26c6d75d4b7 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -5,7 +5,7 @@ SECTION = "kernel/userland"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "udev sysfsutils flex-native"
+DEPENDS = "udev sysfsutils flex-native bison-native"
RDEPENDS_${PN} = "udev module-init-tools"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz"
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] oe.scriptutils.run_editor: ditch the error-prone argument quoting
From: Christopher Larson
Rather than trying to construct a string by quoting the files in an
error-prone way, parse $EDITOR to pass a list to subprocess rather than
a string.
Signed-off-by: Christopher Larson
---
scripts/lib/scriptutils.py | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index 85b1c949bf5..470f76995f0 100644
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -15,16 +15,17 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-import sys
-import os
-import logging
-import glob
import argparse
-import subprocess
-import tempfile
-import shutil
+import glob
+import logging
+import os
import random
+import shlex
+import shutil
import string
+import subprocess
+import sys
+import tempfile
def logger_create(name, stream=None):
logger = logging.getLogger(name)
@@ -214,15 +215,14 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger,
preserve_tmp=False, mirr
def run_editor(fn, logger=None):
if isinstance(fn, str):
-params = '"%s"' % fn
+files = [fn]
else:
-params = ''
-for fnitem in fn:
-params += ' "%s"' % fnitem
+files = fn
editor = os.getenv('VISUAL', os.getenv('EDITOR', 'vi'))
try:
-return subprocess.check_call('%s %s' % (editor, params), shell=True)
+print(shlex.split(editor) + files)
+return subprocess.check_call(shlex.split(editor) + files)
except subprocess.CalledProcessError as exc:
logger.error("Execution of '%s' failed: %s" % (editor, exc))
return 1
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/4] recipes-extended/psmisc: Don't exclude autopoint for RISCV
On Thu, Jun 14, 2018 at 1:15 PM, Alexander Kanavin
wrote:
> Don't exclude why? Needs to be in recipe comment.
Apparently this is no longer required. I'll remove it.
Alistair
>
> Alex
>
> 2018-06-14 22:45 GMT+03:00 Alistair Francis :
>> Signed-off-by: Alistair Francis
>> ---
>> meta/recipes-extended/psmisc/psmisc.inc | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-extended/psmisc/psmisc.inc
>> b/meta/recipes-extended/psmisc/psmisc.inc
>> index 82ef947709..73b4c56f69 100644
>> --- a/meta/recipes-extended/psmisc/psmisc.inc
>> +++ b/meta/recipes-extended/psmisc/psmisc.inc
>> @@ -19,7 +19,9 @@ inherit autotools gettext
>> # Upstream has a custom autogen.sh which invokes po/update-potfiles as they
>> # don't ship a po/POTFILES.in (which is silly). Without that file gettext
>> # doesn't believe po/ is a gettext directory and won't generate po/Makefile.
>> -EXTRA_AUTORECONF_remove = "--exclude=autopoint"
>> +AUTORECONF_REMOVE_ARGS = "--exclude=autopoint"
>> +AUTORECONF_REMOVE_ARGS_riscv64 = ""
>> +EXTRA_AUTORECONF_remove = "${AUTORECONF_REMOVE_ARGS}"
>> do_configure_prepend() {
>> ( cd ${S} && po/update-potfiles )
>> }
>> --
>> 2.17.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
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: quote SYSTEMD_SERVICE in prerm and postinst
Systemd mount configuration file must have a name that match the mount
point directory they control. So for instance, if a mount file contains
[Mount]
...
Where=/mnt/my-data
The file must be named `mnt-my\x2ddata.mount`, or systemd will refuse to
honour it.
If this config file contains an [Install] section, it will silently fail
because the unit file is not quoted when systemctl is called. To fix
that, quote `${SYSTEMD_SERVICE}` in prerm and postinst hooks.
Signed-off-by: Damien Riegel
---
meta/classes/systemd.bbclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 1b134322fb..589e73c855 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -34,10 +34,10 @@ if type systemctl >/dev/null 2>/dev/null; then
systemctl daemon-reload
fi
- systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
+ systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} "${SYSTEMD_SERVICE}"
if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
- systemctl --no-block restart ${SYSTEMD_SERVICE}
+ systemctl --no-block restart "${SYSTEMD_SERVICE}"
fi
fi
}
@@ -51,10 +51,10 @@ fi
if type systemctl >/dev/null 2>/dev/null; then
if [ -z "$D" ]; then
- systemctl stop ${SYSTEMD_SERVICE}
+ systemctl stop "${SYSTEMD_SERVICE}"
fi
- systemctl $OPTS disable ${SYSTEMD_SERVICE}
+ systemctl $OPTS disable "${SYSTEMD_SERVICE}"
fi
}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wic: allow bitbake variables in kickstarter files
On 2018-03-22 14:44, Rasmus Villemoes wrote: image_types_wic.bbclass has a mechanism for doing variable substitution on .wks files by simply letting the input file be called .wks.in. However, that doesn't allow using variables in files included via the include directive. This adds (somewhat naive) support for variable substitution in all files parsed by wic. The user should add all required variables to WICVARS to get them exported appropriately. Signed-off-by: Rasmus Villemoes ping³ -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] harfbuzz: upgrade 1.7.5 -> 1.8.1
On 21 June 2018 at 18:48, Andre McCurdy wrote:
>> +FILES_${PN}-dev += "${libdir}/cmake/harfbuzz/harfbuzz-config.cmake"
>
> Perhaps we should move the cmake.bbclass packaging rule for these
> files into the default packaging rules set by bitbake.conf?
I was considering that too.
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/1] postinst-intercepts: do not execute any variant of delay_to_first_boot
As of commit 2c5c6e3ff we create multilib variants of intercept
hooks but we did not account for delay_to_first_boot variants.
This was covered up until commit a335e7867, but will now cause
an error.
Signed-off-by: Joe Slater
---
meta/lib/oe/package_manager.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 20a41d5..9aa5847 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -382,7 +382,8 @@ class PackageManager(object, metaclass=ABCMeta):
if script == "postinst_intercept" or not os.access(script_full,
os.X_OK):
continue
-if script == "delay_to_first_boot":
+# we do not want to run any multilib variant of this
+if script.startswith("delay_to_first_boot"):
self._postpone_to_first_boot(script_full)
continue
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] harfbuzz: upgrade 1.7.5 -> 1.8.1
On Thu, Jun 21, 2018 at 1:34 AM, Maxin B. John wrote:
> Signed-off-by: Maxin B. John
> ---
> .../harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.8.1.bb}| 5
> +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.5.bb =>
> harfbuzz_1.8.1.bb} (84%)
>
> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> similarity index 84%
> rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> index 0a9b029..a42bf8c 100644
> --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
>
> SRC_URI =
> "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2;
>
> -SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
> -SRC_URI[sha256sum] =
> "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
> +SRC_URI[md5sum] = "97cb89c6e2a914c05c8b7e858703885f"
> +SRC_URI[sha256sum] =
> "fbed6392ddb085e45e6090a9f389f72926d0e355f4b0a2ef51d35cf21686df45"
>
> inherit autotools pkgconfig lib_package gtk-doc
>
> @@ -35,5 +35,6 @@ FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
> ${libdir}/libharfbuzz-icu.so \
> ${libdir}/pkgconfig/harfbuzz-icu.pc \
> "
> +FILES_${PN}-dev += "${libdir}/cmake/harfbuzz/harfbuzz-config.cmake"
Perhaps we should move the cmake.bbclass packaging rule for these
files into the default packaging rules set by bitbake.conf?
>
> BBCLASSEXTEND = "native"
> --
> 2.4.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 v2] harfbuzz: upgrade 1.7.5 -> 1.8.1
Getting a buildhistory warnings that suggests packaging went wrong:
packages/corei7-64-poky-linux/harfbuzz/harfbuzz-bin: PKG changed from
libharfbuzz-bin to harfbuzz-bin [default] - may indicate debian
renaming failure
* PV changed from "1.7.5" to "1.8.1"
packages/corei7-64-poky-linux/harfbuzz/harfbuzz: FILELIST: removed
"/usr/lib/libharfbuzz.so.0.10705.0", added
"/usr/lib/libharfbuzz-subset.so.0.10800.1
/usr/lib/libharfbuzz.so.0.10800.1 /usr/lib/libharfbuzz-subset.so.0"
The problem is that harfbuzz-subset is in PN so it doesn't know what
to call the package. Either pull subset out into a separate package
(which sounds wrong considering the name) or set LEAD_SONAME.
Ross
On 21 June 2018 at 09:34, Maxin B. John wrote:
> Signed-off-by: Maxin B. John
> ---
> .../harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.8.1.bb}| 5
> +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.5.bb =>
> harfbuzz_1.8.1.bb} (84%)
>
> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> similarity index 84%
> rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> index 0a9b029..a42bf8c 100644
> --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
>
> SRC_URI =
> "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2;
>
> -SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
> -SRC_URI[sha256sum] =
> "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
> +SRC_URI[md5sum] = "97cb89c6e2a914c05c8b7e858703885f"
> +SRC_URI[sha256sum] =
> "fbed6392ddb085e45e6090a9f389f72926d0e355f4b0a2ef51d35cf21686df45"
>
> inherit autotools pkgconfig lib_package gtk-doc
>
> @@ -35,5 +35,6 @@ FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
> ${libdir}/libharfbuzz-icu.so \
> ${libdir}/pkgconfig/harfbuzz-icu.pc \
> "
> +FILES_${PN}-dev += "${libdir}/cmake/harfbuzz/harfbuzz-config.cmake"
>
> BBCLASSEXTEND = "native"
> --
> 2.4.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
[OE-core] [PATCH] oeqa: add Git mirror test
Add an automated test to exercise that fetching a git: recipe...
1) works over git without mirrors
2) fails without git connectivity or mirrors
3) works without git connectivity but with a mirror
(2) is done by setting GIT_PROXY_COMMAND to 'false' which should break any git
network operations.
Signed-off-by: Ross Burton
---
meta/lib/oeqa/selftest/cases/fetch.py | 49 +++
1 file changed, 49 insertions(+)
create mode 100644 meta/lib/oeqa/selftest/cases/fetch.py
diff --git a/meta/lib/oeqa/selftest/cases/fetch.py
b/meta/lib/oeqa/selftest/cases/fetch.py
new file mode 100644
index 000..4acc8cdcc8e
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/fetch.py
@@ -0,0 +1,49 @@
+import oe.path
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import bitbake
+from oeqa.core.decorator.oeid import OETestID
+
+class Fetch(OESelftestTestCase):
+@OETestID(1058)
+def test_git_mirrors(self):
+"""
+Verify that the git fetcher will fall back to the HTTP mirrors. The
+recipe needs to be one that we have on the Yocto Project source mirror
+and is hosted in git.
+"""
+
+# TODO: mktempd instead of hardcoding
+dldir = os.path.join(self.builddir, "download-git-mirrors")
+self.track_for_cleanup(dldir)
+
+# No mirrors, should use git to fetch successfully
+features = """
+DL_DIR = "%s"
+MIRRORS_forcevariable = ""
+PREMIRRORS_forcevariable = ""
+""" % dldir
+self.write_config(features)
+oe.path.remove(dldir, recurse=True)
+bitbake("dbus-wait -c fetch -f")
+
+# No mirrors and broken git, should fail
+features = """
+DL_DIR = "%s"
+GIT_PROXY_COMMAND = "false"
+MIRRORS_forcevariable = ""
+PREMIRRORS_forcevariable = ""
+""" % dldir
+self.write_config(features)
+oe.path.remove(dldir, recurse=True)
+with self.assertRaises(AssertionError):
+bitbake("dbus-wait -c fetch -f")
+
+# Broken git but a specific mirror
+features = """
+DL_DIR = "%s"
+GIT_PROXY_COMMAND = "false"
+MIRRORS_forcevariable = "git://.*/.*
http://downloads.yoctoproject.org/mirror/sources/;
+""" % dldir
+self.write_config(features)
+oe.path.remove(dldir, recurse=True)
+bitbake("dbus-wait -c fetch -f")
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] patchtest.sh: optionally specify start branch
ping?
On Tue, May 29, 2018 at 9:38 AM, Trevor Woerner wrote:
> Allow the user to optionally specify a starting branch, otherwise assume
> master.
>
> Signed-off-by: Trevor Woerner
> ---
> scripts/contrib/patchtest.sh | 19 ++-
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/contrib/patchtest.sh b/scripts/contrib/patchtest.sh
> index 7fe56e..2a4aea1d28 100755
> --- a/scripts/contrib/patchtest.sh
> +++ b/scripts/contrib/patchtest.sh
> @@ -2,7 +2,7 @@
> # ex:ts=4:sw=4:sts=4:et
> # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
> #
> -# patchtest: Run patchtest on commits starting at master
> +# patchtest: Run patchtest on commits starting at specified branch, or
> master
> #
> # Copyright (c) 2017, Intel Corporation.
> # All rights reserved.
> @@ -29,8 +29,9 @@ pokydir=''
> usage() {
> CMD=$(basename $0)
> cat < -Usage: $CMD [-h] [-p pokydir]
> - -p pokydir Defaults to current directory
> +Usage: $CMD [-h] [-p pokydir] [-b startbranch]
> + -p pokydirDefaults to current directory
> + -b startbranchDefaults to master
> EOM
> >&2
> exit 1
> @@ -46,11 +47,14 @@ function clone() {
> fi
> }
>
> -while getopts ":p:h" opt; do
> +while getopts ":p:hb:" opt; do
> case $opt in
> p)
> pokydir=$OPTARG
> ;;
> + b)
> + branch=$OPTARG
> + ;;
> h)
> usage
> ;;
> @@ -73,6 +77,11 @@ if [ -z "$pokydir" ]; then
> pokydir="$CDIR"
> fi
>
> +# default branch to master if the user did not specify otherwise
> +if [ -z "$branch" ]; then
> +branch="master"
> +fi
> +
> PTENV="$PWD/patchtest"
> PT="$PTENV/patchtest"
> PTOE="$PTENV/patchtest-oe"
> @@ -99,7 +108,7 @@ pip install -r $PTOE/requirements.txt --quiet
> PATH="$PT:$PT/scripts:$PATH"
>
> # loop through parent to HEAD and execute patchtest on each commit
> -for commit in $(git rev-list master..HEAD --reverse)
> +for commit in $(git rev-list ${branch}..HEAD --reverse)
> do
> shortlog="$(git log "$commit^1..$commit" --pretty='%h: %aN: %cd: %s')"
> log="$(git format-patch "$commit^1..$commit" --stdout | patchtest -
> -r $pokydir -s $PTOE/tests --base-commit $commit^1 --json 2>/dev/null |
> create-summary --fail --only-results)"
> --
> 2.17.0.582.gccdcbd54c
>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/5] arch-armv8a.inc: add tune include for armv8
On Fri, Jun 15, 2018 at 6:57 AM, Nicolas Dechesne wrote: > On Fri, Jun 15, 2018 at 5:22 AM, Randy Li wrote: >> There are some addtional instructions apart from bare armv8, >> also there is armv8.1, armv8.2. >> >> Most the processor would support crc, except X-gene 1. >> >> Signed-off-by: Randy Li >> --- >> meta/conf/machine/include/arm/arch-armv8.inc | 1 - >> meta/conf/machine/include/arm/arch-armv8a.inc | 28 >> +++ >> 2 files changed, 28 insertions(+), 1 deletion(-) >> delete mode 100644 meta/conf/machine/include/arm/arch-armv8.inc > > My previous comment still applies here. You can't just delete this > file. It's used by many BSP. and it's even used in oe-core itself: > > layers/openembedded-core/meta/conf/machine/include/tune-thunderx.inc:require > conf/machine/include/arm/arch-armv8.inc > layers/openembedded-core/meta/conf/machine/qemuarm64.conf:require > conf/machine/include/arm/arch-armv8.inc I think the rename is fine (of course, considering it handles the rename inside whole oe-core). Breaking existing BSP in new release is fine. People needs to handle it when upgrading the branches. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] linux-yocto: add ptest support
My general comment still stands from v1, That I don't see a lot of
value in creating a
whole set of custom tests and wrappers just for ptest use.
i.e. ltp already has a lot of these covered. kprobes, as do the
built-in self tests.
I want to be sure that we aren't creating custom wrappers that will
need to be maintained
for a long time.
Comments/documentation in the script don't exist, so it is difficult
to look at this and
understand what it is actually trying to test. A header block and
comments before each
test are required.
On Wed, Jun 13, 2018 at 10:49 PM, Dengke Du wrote:
>
> Signed-off-by: Dengke Du
> ---
> meta/recipes-kernel/linux/linux-yocto/run-ptest | 138
>
> meta/recipes-kernel/linux/linux-yocto_4.14.bb | 9 ++
> 2 files changed, 147 insertions(+)
> create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest
> b/meta/recipes-kernel/linux/linux-yocto/run-ptest
> new file mode 100644
> index 000..6db4d93
> --- /dev/null
> +++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest
> @@ -0,0 +1,138 @@
> +#!/bin/bash
> +depmod
> +touch kernel.log
> +
> +#dma-example bytestream-example inttype-example record-example
> +list1=("dma-example" "bytestream-example" "inttype-example" "record-example")
> +for i in "${list1[@]}"
> +do
> + dmesg -c
> + modprobe "$i"
All of the modprobes really should be checking for failure, I realize you are
doing some lsmod calls and checking those, but that isn't always the case
in this script.
Cheers,
Bruce
> + result=""
> + IFS="-" read -ra array <<< "$i"
> + len=${#array[@]}
> + if [ $len -eq 2 ];then
> +result="${array[0]}_${array[1]}"
> + elif [ $len -eq 3 ];then
> +result="${array[0]}_${array[1]}_${array[2]}"
> + fi
> + lsmod | grep -q "$result"
> + if [ $? -eq 0 ];then
> +dmesg | grep "test passed"
> +if [ $? -eq 0 ];then
> + echo "$i: PASS" >> kernel.log
> +fi
> + else
> +echo "$i: FAILED" >> kernel.log
> + fi
> + rmmod "$i"
> +done
> +
> +#kobject-example kset-example
> +list2=("kobject-example" "kset-example")
> +for i in "${list2[@]}"
> +do
> + dmesg -c
> + modprobe "$i"
> + result=""
> + IFS="-" read -ra array <<< "$i"
> + len=${#array[@]}
> + if [ $len -eq 2 ];then
> +result="${array[0]}_${array[1]}"
> + elif [ $len -eq 3 ];then
> +result="${array[0]}_${array[1]}_${array[2]}"
> + fi
> + basedir="/sys/kernel/${result}"
> + echo "$basedir"
> + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then
> +echo "$i: PASS" >> kernel.log
> + else
> +echo "$i: FAILED" >> kernel.log
> + fi
> + rmmod "$i"
> +done
> +
> +#trace-events-sample
> +list3="trace-events-sample"
> +result=""
> +IFS="-" read -ra array <<< "$list3"
> +len=${#array[@]}
> +if [ $len -eq 2 ];then
> + result="${array[0]}_${array[1]}"
> +elif [ $len -eq 3 ];then
> + result="${array[0]}_${array[1]}_${array[2]}"
> +fi
> +modprobe "$list3"
> +lsmod | grep "$result"
> +if [ $? -eq 0 ];then
> + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then
> +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable
> +sleep 5
> +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut
> -d':' -f2`
> +if [ "$ret" = " foo_bar" ];then
> + echo "$list3: PASS" >> kernel.log
> +else
> + echo "$list3: FAILED-" >> kernel.log
> +fi
> + else
> +echo "$list3: FAILED--" >> kernel.log
> + fi
> +else
> + echo "$list3: FAILED---" >> kernel.log
> +fi
> +rmmod "$list3"
> +
> +#trace-printk
> +list4="trace-printk"
> +modprobe "$list4"
> +lsmod | grep "trace_printk"
> +if [ $? -eq 0 ];then
> + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 |
> cut -d':' -f2`
> + if [ "$ret" = " trace_printk_irq_work" ];then
> +echo "$list4: PASS" >> kernel.log
> +rmmod "$list4"
> + else
> +echo "$list4: FAILED" >> kernel.log
> + fi
> +else
> + echo "$list4: FAILED" >> kernel.log
> +fi
> +rmmod "$list4"
> +
> +#kprobe_example
> +list5="kprobe_example"
> +dmesg -c
> +modprobe "$list5"
> +lsmod | grep "$list5"
> +if [ $? -eq 0 ];then
> + dmesg | grep "_do_fork"
> + if [ $? -eq 0 ];then
> +echo "$list5: PASS" >> kernel.log
> + else
> +echo "$list5: FAILED" >> kernel.log
> + fi
> +else
> + echo "$list5: FAILED" >> kernel.log
> +fi
> +rmmod "$list5"
> +
> +#kretprobe_example
> +list6="kretprobe_example"
> +dmesg -c
> +modprobe "$list6"
> +lsmod | grep "$list6"
> +if [ $? -eq 0 ];then
> + dmesg | grep "_do_fork returned"
> + if [ $? -eq 0 ];then
> +echo "$list6: PASS" >> kernel.log
> + else
> +echo "$list6: FAILED" >> kernel.log
> + fi
> +else
> + echo "$list6: FAILED" >> kernel.log
> +fi
> +rmmod "$list6"
> +
> +echo "#result#"
> +cat kernel.log
> +rm kernel.log
> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb
> b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
> index 0449213..9650ee2 100644
> ---
Re: [OE-core] [PATCH 3/4] mtd-utils: upgrade 2.0.1 -> 2.0.2
It might be DEBUG_BUILD enabled in my builds, let me check. On Thu, Jun 21, 2018 at 1:20 PM Burton, Ross wrote: > Master builds fine for me, but interestingly I don't see that in my > mtd-utils unpack. Do you have patches? > > Ross > > On 21 June 2018 at 12:10, Martin Jansa wrote: > > Does this upgrade fix the build failure with gcc8? > > > > With current master I'm seeing: > > super0.c:238:32: error: 'snprintf' output may be truncated before the > last > > format character [-Werror=format-truncation=] > > > > On Thu, Jun 21, 2018 at 12:33 PM Burton, Ross > wrote: > >> > >> Sorry, no it doesn't. I've just picked this in ross/mut but a > >> follow-up patch to remove that mystery patch (can't see it being used > >> in image generation anywhere) would be good. > >> > >> Ross > >> > >> On 20 June 2018 at 00:53, Denys Dmytriyenko wrote: > >> > On Tue, May 22, 2018 at 01:16:34PM +0100, Burton, Ross wrote: > >> >> On 22 May 2018 at 08:49, Andrea Adami > wrote: > >> >> > I am just wondering about this patch:we carry it since 2009 [1] > and > >> >> > is still marked as pending. > >> >> > Why was it necessary to ignore part of the filesystem? Can you > >> >> > remember? > >> >> > >> >> Make that at least 2004. This commit in oe-classic touches it: > >> >> > >> >> commit c70605ebdca81412a93b4d867de7931543193f26 > >> >> Author: Chris Larson > >> >> Date: Thu Dec 23 21:24:57 2004 + > >> >> > >> >> Update mtd to a current snapshot, change the mkfs.jffs2 -i > cmdline > >> >> option to > >> >> -I, and rename mtd and mtd-native to mtd-utils and > >> >> mtd-utils-native, > >> >> respectively. > >> >> > >> >> Prior history is lost to the git/bk migration unless anyone has a > >> >> BitKeeper clone to mine... > >> > > >> > So, does this prevent the version upgrade from being merged? > >> > > >> > -- > >> > Denys > >> -- > >> ___ > >> 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 3/4] mtd-utils: upgrade 2.0.1 -> 2.0.2
Master builds fine for me, but interestingly I don't see that in my mtd-utils unpack. Do you have patches? Ross On 21 June 2018 at 12:10, Martin Jansa wrote: > Does this upgrade fix the build failure with gcc8? > > With current master I'm seeing: > super0.c:238:32: error: 'snprintf' output may be truncated before the last > format character [-Werror=format-truncation=] > > On Thu, Jun 21, 2018 at 12:33 PM Burton, Ross wrote: >> >> Sorry, no it doesn't. I've just picked this in ross/mut but a >> follow-up patch to remove that mystery patch (can't see it being used >> in image generation anywhere) would be good. >> >> Ross >> >> On 20 June 2018 at 00:53, Denys Dmytriyenko wrote: >> > On Tue, May 22, 2018 at 01:16:34PM +0100, Burton, Ross wrote: >> >> On 22 May 2018 at 08:49, Andrea Adami wrote: >> >> > I am just wondering about this patch:we carry it since 2009 [1] and >> >> > is still marked as pending. >> >> > Why was it necessary to ignore part of the filesystem? Can you >> >> > remember? >> >> >> >> Make that at least 2004. This commit in oe-classic touches it: >> >> >> >> commit c70605ebdca81412a93b4d867de7931543193f26 >> >> Author: Chris Larson >> >> Date: Thu Dec 23 21:24:57 2004 + >> >> >> >> Update mtd to a current snapshot, change the mkfs.jffs2 -i cmdline >> >> option to >> >> -I, and rename mtd and mtd-native to mtd-utils and >> >> mtd-utils-native, >> >> respectively. >> >> >> >> Prior history is lost to the git/bk migration unless anyone has a >> >> BitKeeper clone to mine... >> > >> > So, does this prevent the version upgrade from being merged? >> > >> > -- >> > Denys >> -- >> ___ >> 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 3/4] mtd-utils: upgrade 2.0.1 -> 2.0.2
Does this upgrade fix the build failure with gcc8? With current master I'm seeing: super0.c:238:32: error: 'snprintf' output may be truncated before the last format character [-Werror=format-truncation=] On Thu, Jun 21, 2018 at 12:33 PM Burton, Ross wrote: > Sorry, no it doesn't. I've just picked this in ross/mut but a > follow-up patch to remove that mystery patch (can't see it being used > in image generation anywhere) would be good. > > Ross > > On 20 June 2018 at 00:53, Denys Dmytriyenko wrote: > > On Tue, May 22, 2018 at 01:16:34PM +0100, Burton, Ross wrote: > >> On 22 May 2018 at 08:49, Andrea Adami wrote: > >> > I am just wondering about this patch:we carry it since 2009 [1] and > >> > is still marked as pending. > >> > Why was it necessary to ignore part of the filesystem? Can you > remember? > >> > >> Make that at least 2004. This commit in oe-classic touches it: > >> > >> commit c70605ebdca81412a93b4d867de7931543193f26 > >> Author: Chris Larson > >> Date: Thu Dec 23 21:24:57 2004 + > >> > >> Update mtd to a current snapshot, change the mkfs.jffs2 -i cmdline > option to > >> -I, and rename mtd and mtd-native to mtd-utils and mtd-utils-native, > >> respectively. > >> > >> Prior history is lost to the git/bk migration unless anyone has a > >> BitKeeper clone to mine... > > > > So, does this prevent the version upgrade from being merged? > > > > -- > > Denys > -- > ___ > 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] cryptodev: Fix build errors with v4.17+
Backport from upstream to update internal syscall function usage.
https://github.com/cryptodev-linux/cryptodev-linux
f60aa08c63fc02780554a0a12180a478ca27d49f
Signed-off-by: He Zhe
---
.../cryptodev/cryptodev-module_1.9.bb | 1 +
.../0001-ioctl.c-Fix-build-with-linux-4.17.patch | 43 ++
2 files changed, 44 insertions(+)
create mode 100644
meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.17.patch
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
b/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
index ed6d0ecae97..6052650c955 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
@@ -10,6 +10,7 @@ DEPENDS += "cryptodev-linux"
SRC_URI += " \
file://0001-Disable-installing-header-file-provided-by-another-p.patch \
file://0001-ioctl.c-Fix-build-with-linux-4.13.patch \
+file://0001-ioctl.c-Fix-build-with-linux-4.17.patch \
"
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git
a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.17.patch
b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.17.patch
new file mode 100644
index 000..5881d1c4eec
--- /dev/null
+++
b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.17.patch
@@ -0,0 +1,43 @@
+From f60aa08c63fc02780554a0a12180a478ca27d49f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Horia=20Geant=C4=83?=
+Date: Wed, 23 May 2018 18:43:39 +0300
+Subject: [PATCH] ioctl.c: Fix build with linux 4.17
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since kernel 4.17-rc1, sys_* syscalls can no longer be called directly:
+819671ff849b ("syscalls: define and explain goal to not call syscalls in the
kernel")
+
+Since cryptodev uses sys_close() - and this has been removed in commit:
+2ca2a09d6215 ("fs: add ksys_close() wrapper; remove in-kernel calls to
sys_close()")
+cryptodev has to be updated to use the ksys_close() wrapper.
+
+Signed-off-by: Horia Geantă
+
+Upstream-Status: Backport
+
+Signed-off-by: He Zhe
+---
+ ioctl.c | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ioctl.c b/ioctl.c
+index d831b0c..2571034 100644
+--- a/ioctl.c
b/ioctl.c
+@@ -828,7 +828,11 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg_)
+ fd = clonefd(filp);
+ ret = put_user(fd, p);
+ if (unlikely(ret)) {
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0))
+ sys_close(fd);
++#else
++ ksys_close(fd);
++#endif
+ return ret;
+ }
+ return ret;
+--
+2.7.4
+
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] mtd-utils: upgrade 2.0.1 -> 2.0.2
Sorry, no it doesn't. I've just picked this in ross/mut but a follow-up patch to remove that mystery patch (can't see it being used in image generation anywhere) would be good. Ross On 20 June 2018 at 00:53, Denys Dmytriyenko wrote: > On Tue, May 22, 2018 at 01:16:34PM +0100, Burton, Ross wrote: >> On 22 May 2018 at 08:49, Andrea Adami wrote: >> > I am just wondering about this patch:we carry it since 2009 [1] and >> > is still marked as pending. >> > Why was it necessary to ignore part of the filesystem? Can you remember? >> >> Make that at least 2004. This commit in oe-classic touches it: >> >> commit c70605ebdca81412a93b4d867de7931543193f26 >> Author: Chris Larson >> Date: Thu Dec 23 21:24:57 2004 + >> >> Update mtd to a current snapshot, change the mkfs.jffs2 -i cmdline >> option to >> -I, and rename mtd and mtd-native to mtd-utils and mtd-utils-native, >> respectively. >> >> Prior history is lost to the git/bk migration unless anyone has a >> BitKeeper clone to mine... > > So, does this prevent the version upgrade from being merged? > > -- > Denys -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] piglit: upgrade to latest revision
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/piglit/piglit_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index b936ad8..c186ca9 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "git://anongit.freedesktop.org/piglit \
"
UPSTREAM_CHECK_COMMITS = "1"
-# From 2018-02-26
-SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b"
+# From 2018-06-18
+SRCREV = "431bcc74ff54521ed1c498af9b13e629f949bda6"
# (when PV goes above 1.0 remove the trailing r)
PV = "1.0+gitr${SRCPV}"
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] piglit: upgrade to latest revision
Hi Khem,
On Wed, Jun 20, 2018 at 10:19:52AM -0700, Khem Raj wrote:
> On Wed, Jun 20, 2018 at 7:07 AM Maxin B. John wrote:
> >
> > Signed-off-by: Maxin B. John
> > ---
> > meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
> > b/meta/recipes-graphics/piglit/piglit_git.bb
> > index b936ad8..1a3e888 100644
> > --- a/meta/recipes-graphics/piglit/piglit_git.bb
> > +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> > @@ -9,7 +9,7 @@ SRC_URI = "git://anongit.freedesktop.org/piglit \
> > UPSTREAM_CHECK_COMMITS = "1"
> >
> > # From 2018-02-26
> > -SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b"
> > +SRCREV = "3aa8c1cfe1a9ddae40c60d9dc76fe8dce47b15cc"
>
> Can you update the comment about the date as well
Will do that. Thanks !
> > # (when PV goes above 1.0 remove the trailing r)
> > PV = "1.0+gitr${SRCPV}"
> >
> > --
> > 2.4.0
> >
Best Regards,
Maxin
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] harfbuzz: upgrade 1.7.5 -> 1.8.1
Signed-off-by: Maxin B. John
---
.../harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.8.1.bb}| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.8.1.bb}
(84%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
similarity index 84%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
index 0a9b029..a42bf8c 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2;
-SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
-SRC_URI[sha256sum] =
"84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
+SRC_URI[md5sum] = "97cb89c6e2a914c05c8b7e858703885f"
+SRC_URI[sha256sum] =
"fbed6392ddb085e45e6090a9f389f72926d0e355f4b0a2ef51d35cf21686df45"
inherit autotools pkgconfig lib_package gtk-doc
@@ -35,5 +35,6 @@ FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
${libdir}/libharfbuzz-icu.so \
${libdir}/pkgconfig/harfbuzz-icu.pc \
"
+FILES_${PN}-dev += "${libdir}/cmake/harfbuzz/harfbuzz-config.cmake"
BBCLASSEXTEND = "native"
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] harfbuzz: upgrade 1.7.5 -> 1.8.1
Hi Khem, Ross,
On Wed, Jun 20, 2018 at 07:07:58PM +0100, Burton, Ross wrote:
> Yes, those should be in the -dev package.
I will update it and send a v2 soon.
> Ross
Best Regards,
Maxin
> On 20 June 2018 at 18:18, Khem Raj wrote:
> > On Wed, Jun 20, 2018 at 7:07 AM Maxin B. John wrote:
> >>
> >> Signed-off-by: Maxin B. John
> >> ---
> >> .../harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.8.1.bb} | 8
> >> ++--
> >> 1 file changed, 6 insertions(+), 2 deletions(-)
> >> rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.5.bb =>
> >> harfbuzz_1.8.1.bb} (82%)
> >>
> >> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> >> b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> >> similarity index 82%
> >> rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> >> rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> >> index 0a9b029..f8b0056 100644
> >> --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> >> +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.1.bb
> >> @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
> >>
> >> SRC_URI =
> >> "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2;
> >>
> >> -SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
> >> -SRC_URI[sha256sum] =
> >> "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
> >> +SRC_URI[md5sum] = "97cb89c6e2a914c05c8b7e858703885f"
> >> +SRC_URI[sha256sum] =
> >> "fbed6392ddb085e45e6090a9f389f72926d0e355f4b0a2ef51d35cf21686df45"
> >>
> >> inherit autotools pkgconfig lib_package gtk-doc
> >>
> >> @@ -27,6 +27,10 @@ EXTRA_OECONF = " \
> >> --with-glib \
> >> --without-graphite2 \
> >> "
> >> +do_install_append() {
> >> +# Remove unnecessary cmake files
> >> +rm -rf ${D}${libdir}/cmake
> >> +}
> >
> > perhaps they should go into -dev package instead.
> >
> >>
> >> PACKAGES =+ "${PN}-icu ${PN}-icu-dev"
> >>
> >> --
> >> 2.4.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
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] linux-yocto: add ptest support
On 2018年06月14日 10:49, Dengke Du wrote:
Signed-off-by: Dengke Du
---
meta/recipes-kernel/linux/linux-yocto/run-ptest | 138
meta/recipes-kernel/linux/linux-yocto_4.14.bb | 9 ++
2 files changed, 147 insertions(+)
create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest
diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest
b/meta/recipes-kernel/linux/linux-yocto/run-ptest
new file mode 100644
index 000..6db4d93
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest
@@ -0,0 +1,138 @@
+#!/bin/bash
+depmod
+touch kernel.log
+
+#dma-example bytestream-example inttype-example record-example
+list1=("dma-example" "bytestream-example" "inttype-example" "record-example")
+for i in "${list1[@]}"
+do
+ dmesg -c
+ modprobe "$i"
+ result=""
+ IFS="-" read -ra array <<< "$i"
+ len=${#array[@]}
+ if [ $len -eq 2 ];then
+result="${array[0]}_${array[1]}"
+ elif [ $len -eq 3 ];then
+result="${array[0]}_${array[1]}_${array[2]}"
+ fi
if you want to substitute "-" to "_" here, using bash pattern
substitution will be much easier
# i="xx-yy-zz-ff"
# echo ${i//-/_}
xx_yy_zz_ff
+ lsmod | grep -q "$result"
+ if [ $? -eq 0 ];then
+dmesg | grep "test passed"
+if [ $? -eq 0 ];then
+ echo "$i: PASS" >> kernel.log
+fi
+ else
+echo "$i: FAILED" >> kernel.log
+ fi
most ptest (but not all) result format are following the same rule
"[PASS|SKIP|FAIL]" : testname
look at here
https://www.yoctoproject.org/docs/2.5/dev-manual/dev-manual.html#testing-packages-with-ptest
PS: unified test output matters for LAVA testparse patten.
+ rmmod "$i"
+done
+
+#kobject-example kset-example
+list2=("kobject-example" "kset-example")
+for i in "${list2[@]}"
+do
+ dmesg -c
+ modprobe "$i"
+ result=""
+ IFS="-" read -ra array <<< "$i"
+ len=${#array[@]}
+ if [ $len -eq 2 ];then
+result="${array[0]}_${array[1]}"
+ elif [ $len -eq 3 ];then
+result="${array[0]}_${array[1]}_${array[2]}"
+ fi
+ basedir="/sys/kernel/${result}"
+ echo "$basedir"
+ if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then
+echo "$i: PASS" >> kernel.log
+ else
+echo "$i: FAILED" >> kernel.log
+ fi
+ rmmod "$i"
+done
+
+#trace-events-sample
+list3="trace-events-sample"
+result=""
+IFS="-" read -ra array <<< "$list3"
+len=${#array[@]}
+if [ $len -eq 2 ];then
+ result="${array[0]}_${array[1]}"
+elif [ $len -eq 3 ];then
+ result="${array[0]}_${array[1]}_${array[2]}"
+fi
+modprobe "$list3"
+lsmod | grep "$result"
+if [ $? -eq 0 ];then
+ if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then
+echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable
+sleep 5
+ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut
-d':' -f2`
+if [ "$ret" = " foo_bar" ];then
+ echo "$list3: PASS" >> kernel.log
+else
+ echo "$list3: FAILED-" >> kernel.log
+fi
+ else
+echo "$list3: FAILED--" >> kernel.log
+ fi
+else
+ echo "$list3: FAILED---" >> kernel.log
+fi
+rmmod "$list3"
+
+#trace-printk
+list4="trace-printk"
+modprobe "$list4"
+lsmod | grep "trace_printk"
+if [ $? -eq 0 ];then
+ ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 |
cut -d':' -f2`
+ if [ "$ret" = " trace_printk_irq_work" ];then
+echo "$list4: PASS" >> kernel.log
+rmmod "$list4"
+ else
+echo "$list4: FAILED" >> kernel.log
+ fi
+else
+ echo "$list4: FAILED" >> kernel.log
+fi
+rmmod "$list4"
+
+#kprobe_example
+list5="kprobe_example"
+dmesg -c
+modprobe "$list5"
+lsmod | grep "$list5"
+if [ $? -eq 0 ];then
+ dmesg | grep "_do_fork"
+ if [ $? -eq 0 ];then
+echo "$list5: PASS" >> kernel.log
+ else
+echo "$list5: FAILED" >> kernel.log
+ fi
+else
+ echo "$list5: FAILED" >> kernel.log
+fi
+rmmod "$list5"
+
+#kretprobe_example
+list6="kretprobe_example"
+dmesg -c
+modprobe "$list6"
+lsmod | grep "$list6"
+if [ $? -eq 0 ];then
+ dmesg | grep "_do_fork returned"
+ if [ $? -eq 0 ];then
+echo "$list6: PASS" >> kernel.log
+ else
+echo "$list6: FAILED" >> kernel.log
+ fi
+else
+ echo "$list6: FAILED" >> kernel.log
+fi
+rmmod "$list6"
+
+echo "#result#"
+cat kernel.log
+rm kernel.log
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb
b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
index 0449213..9650ee2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
only enable ptest for linux-yocto_4.14 is not good.
we can still have one copy of run-ptest for different kernel version,
but we need to make it works for different kernel.
To be clear, for example, linux-yocto-4.14, you might have 10 test
cases, while in linux-yocto-4.15, you might have 12 test cases
so run-ptest might be like
a) run whatever test case we have, and the first thing is the check
whether the test case exists, for example, if directory
"samples/trace_printk" exists, run it, if not , do nothing
