[OE-core] meta globus (grid toolkit)
Hello, Is anyone working on adding Globus toolkit as a meta layer? I started on one and have several packages building. It is a bit rough. It is located at https://github.com/akuster/meta-globus regards, Armin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Why is systemd installed to / (was: [yocto] Export bitbake variables between recipes)
On Thursday 04 December 2014 21.46:50 Mark Hatle wrote:
> On 12/4/14, 9:00 PM, ChenQi wrote:
> > On 12/04/2014 09:34 PM, Peter Kjellerstedt wrote:
> >>> -Original Message-
> >>> From: openembedded-core-boun...@lists.openembedded.org
> >>> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> >>> Mark Hatle
> >>> Sent: den 3 december 2014 16:47
> >>> To: Peter Kjellerstedt; openembedded-core@lists.openembedded.org
> >>> Subject: Re: [OE-core] Why is systemd installed to / (was: [yocto]
> >>> Export bitbake variables between recipes)
> >>>
> >>> On 12/3/14, 9:36 AM, Peter Kjellerstedt wrote:
> >> Can anyone please explain why OE-core installs systemd to /
> >> rather than /usr? Because I have traced the recipe all the
> >> way back to its introduction in OE classic, and I cannot
> >> find any rationale for this odd decision. And it is extra
> >> weird given the systemd authors' agenda that everything
> >> should be in /usr (and /etc)...
> > It's only strange compared to Fedora. We're not Fedora.. and
> > I've got systems that need to boot from a small '/' before
> > mounting '/usr'.
> Speaking of Fedora, would an official image feature, e.g.,
> "unified-fs", be acceptable for OE-Core that sets up the file
> system with /bin, /sbin and /lib* as links to their /usr
> counterparts? That would alleviate our problems with the
> differences in how systemd is installed.
> >>> The system permits developers to set the paths for the various pieces.
> >>> To get a Fedora like unified filesystem, you could do something like:
> >>>
> >>> * provide your own fs-perms.txt:
> >> I had not noticed fs-perms.txt before. And it seems easy enough
> >> to extend via the FILESYSTEMS_PERMS_TABLES variable. :)
> >>
> >>> /usr/bin link${base_bindir}
> >>> /usr/sbin link${base_sbindir}
> >>> /usr/lib link${base_libdir}
> >>>
> >>> Then in your local.conf:
> >>>
> >>> bindir = "${base_bindir}"
> >>> sbindir = "${base_sbindir}"
> >>> libdir = "${base_libdir}"
> >> I think you mean the opposite, i.e., that /bin should be a
> >> link to ${bindir} and ${base_bindir} should be set to ${bindir},
> >> but I get your point.
> >>
> >>> This will result in /usr/bin, sbin and lib being linked to /bin,
> >>> /sbin, /lib -- and all of the package produced for your
> >>> configuration will only reference '/'.
> >>>
> >>> This isn't that unusual of a configuration from what I've been told.
> >> Which is why I think it warrants an official distro feature (an
> >> image feature, as I originally suggested, will of course not do
> >> if it is done the way you suggest since the packages' contents
> >> are modified). That way people would not have to invent the wheel
> >> over and over again (and somehow find out that there is such a
> >> thing as fs-perms.txt which up until now had eluded me).
> >>
> >>> --Mark
> >> //Peter
> >>
> >
> > Hi Peter,
> >
> > It's easy to link /usr/bin to /bin, /usr/sbin to /sbin and make things
> > work in OE.
> > But if we want the opposite to work, we might need several additional
> > patches to OE.
>
> Exactly.. and going back to the FHS, the FHS says that '/' is required to
> boot,
> /usr is not. So /usr should be linked to / for those items.
>
> There is a fairly standard OE configuration some people do where they don't
> define a /usr at all. They just set the prefix (normally /usr) to '/'.
>
> That SHOULD be working still, at least it used to be a well tested
> configuration...
>
> > Several days ago, I tried to do /usr merge in OE (like what Fedora and
> > Arch does). It turned out that we need to patch several packages to make
> > things work.
> >
> > (I haven't sent out the patches because it's just some initial
> > investigation and I'm not sure if people want this feature or not.)
> >
> > If you want this feature in OE, please open a bug/enhancement in
> > bugzilla https://bugzilla.yoctoproject.org/ to see if the community
> > wants it or not.
> >
> > Regards,
> > Chen Qi
> >
> >
>
>
Hi Mark
Lennard Poettering and others have good arguments to have no /bin, /lib and
/sbin folder at all. There is an interesting blog here:
http://0pointer.net/blog/revisiting-how-we-put-together-linux-systems.html[1].
In short: The goal is to have one mount point (/usr) where all the read only
binaries are in. Having /usr on a read only btrfs partition would allow to use
the send receive feature (binary diff on filesystem level) of btrfs to deploy
software updates to many devices. This approach could provide a generic, robust
and optimized SW update procedure for embedded systems as well.
Regards,
Adrian
Adrian Freihofer
Gschwaderweg 29
8610 Uster
043 497 84 01
[1] http://0pointer.net/blog/revisiting-how-we-put-together-linux-systems.html
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openem
[OE-core] [PATCH] apr: avoid absolute paths for grep
From: Jackie Huang
The apr provides usr/share/build-1/libtool which is required by
the recipe such as apache2, and it will find grep on the host
and set absolute paths in libtool: GREP="/usr/bin/grep"
If we build apr/apr-native on a host that grep is in "/usr/bin/grep",
and re-use the sstate on another host with "/bin/grep", it will fail
when build apache2/apache2-native with:
| tmp/sysroots/x86_64-linux/usr/share/build-1/libtool: line 1093:
/usr/bin/grep: No such file or directory
| tmp/sysroots/intel-x86-64/usr/share/build-1/libtool: line 1093:
/usr/bin/grep: No such file or directory
Signed-off-by: Jackie Huang
---
meta/recipes-support/apr/apr_1.5.1.bb | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb
b/meta/recipes-support/apr/apr_1.5.1.bb
index 49a08b0..a27b233 100644
--- a/meta/recipes-support/apr/apr_1.5.1.bb
+++ b/meta/recipes-support/apr/apr_1.5.1.bb
@@ -32,6 +32,11 @@ CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes"
CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no
ac_cv_header_netinet_sctp_uio_h=no"
do_configure_prepend() {
+ # Avoid absolute paths for grep since it causes failures
+ # when using sstate between different hosts with different
+ # install paths for grep.
+ export GREP="grep"
+
cd ${S}
./buildconf
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] syslinux.bbclass: use single variable to set baud rate
Use SERIAL_CONSOLE to set baud rate in syslinux.cfg file.
[YOCTO #6331]
Signed-off-by: Chong Lu
---
meta/classes/syslinux.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index d6498d9..b5eea07 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -27,8 +27,8 @@ SYSLINUXDIR = "/"
# The kernel has an internal default console, which you can override with
# a console=...some_tty...
SYSLINUX_DEFAULT_CONSOLE ?= ""
-SYSLINUX_SERIAL ?= "0 115200"
-SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200"
+SYSLINUX_SERIAL ?= "${@filter(str.isdigit, d.getVar('SERIAL_CONSOLE',
True).split()[1])} ${@d.getVar('SERIAL_CONSOLE', True).split()[0]}"
+SYSLINUX_SERIAL_TTY ?= "console=${@d.getVar('SERIAL_CONSOLE',
True).split()[1]},${@d.getVar('SERIAL_CONSOLE', True).split()[0]}"
ISO_BOOTIMG = "isolinux/isolinux.bin"
ISO_BOOTCAT = "isolinux/boot.cat"
MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] cpio: fix bug CVE-2014-9112 for cpio-2.8
Obtain detain from following URL.
http://lists.gnu.org/archive/html/bug-cpio/2014-12/msg0.html
http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d
Signed-off-by: Bian Naimeng
---
.../cpio/cpio-2.8/fix-memory-overrun.patch | 217 +
meta/recipes-extended/cpio/cpio_2.8.bb | 7 +-
2 files changed, 221 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
b/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
new file mode 100644
index 000..0148e70
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
@@ -0,0 +1,217 @@
+cpio: Fix memory overrun on reading improperly created link records
+
+Signed-off-by: Bian Naimeng
+
+http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d
+
+ * src/copyin.c (get_link_name): New function.
+ (list_file, copyin_link): use get_link_name
+
+ * tests/symlink-bad-length.at: New file.
+ * tests/symlink-long.at: New file.
+ * tests/Makefile.am: Add new files.
+ * tests/testsuite.at: Likewise.
+
+ See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg7.html
+
+Upstream-Status: Backport
+
+Signed-off-by: Sergey Poznyakoff
+
+diff -Nurp cpio-2.8.orig/src/copyin.c cpio-2.8/src/copyin.c
+--- cpio-2.8.orig/src/copyin.c 2007-06-07 19:58:03.0 +0800
cpio-2.8/src/copyin.c 2014-12-08 11:30:01.159791484 +0800
+@@ -126,6 +126,28 @@ tape_skip_padding (int in_file_des, int
+ }
+
+
++static char *
++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des)
++{
++ off_t n = file_hdr->c_filesize + 1;
++ char *link_name;
++
++ if (n == 0 || n > SIZE_MAX)
++{
++ error (0, 0, _("%s: stored filename length too big"), file_hdr->c_name);
++ link_name = NULL;
++}
++ else
++{
++ link_name = xmalloc (n);
++ tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
++ link_name[file_hdr->c_filesize] = '\0';
++ tape_skip_padding (in_file_des, file_hdr->c_filesize);
++}
++ return link_name;
++}
++
++
+ static void
+ list_file(struct cpio_file_stat* file_hdr, int in_file_des)
+ {
+@@ -136,21 +158,16 @@ list_file(struct cpio_file_stat* file_hd
+ {
+ if (archive_format != arf_tar && archive_format != arf_ustar)
+ {
+-char *link_name = NULL; /* Name of hard and symbolic links. */
+-
+-link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize
+ 1);
+-link_name[file_hdr->c_filesize] = '\0';
+-tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
+-long_format (file_hdr, link_name);
+-free (link_name);
+-tape_skip_padding (in_file_des, file_hdr->c_filesize);
+-return;
++char *link_name = get_link_name (file_hdr, in_file_des);
++if (link_name)
++ {
++long_format (file_hdr, link_name);
++free (link_name);
++ }
+ }
+ else
+- {
+ long_format (file_hdr, file_hdr->c_tar_linkname);
+-return;
+- }
++return;
+ }
+ else
+ #endif
+@@ -732,10 +749,7 @@ copyin_link(struct cpio_file_stat *file_
+
+ if (archive_format != arf_tar && archive_format != arf_ustar)
+ {
+- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1);
+- link_name[file_hdr->c_filesize] = '\0';
+- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
+- tape_skip_padding (in_file_des, file_hdr->c_filesize);
++ link_name = get_link_name (file_hdr, in_file_des);
+ }
+ else
+ {
+diff -Nurp cpio-2.8.orig/tests/Makefile.am cpio-2.8/tests/Makefile.am
+--- cpio-2.8.orig/tests/Makefile.am2006-10-24 18:32:13.0 +0800
cpio-2.8/tests/Makefile.am 2014-12-08 11:30:52.387789482 +0800
+@@ -45,6 +45,8 @@ TESTSUITE_AT = \
+ testsuite.at\
+ inout.at\
+ symlink.at\
++ symlink-bad-length.at\
++ symlink-long.at\
+ version.at
+
+ TESTSUITE = $(srcdir)/testsuite
+diff -Nurp cpio-2.8.orig/tests/symlink-bad-length.at
cpio-2.8/tests/symlink-bad-length.at
+--- cpio-2.8.orig/tests/symlink-bad-length.at 1970-01-01 08:00:00.0
+0800
cpio-2.8/tests/symlink-bad-length.at 2014-12-08 11:33:25.283783507
+0800
+@@ -0,0 +1,49 @@
++# Process this file with autom4te to create testsuite. -*- Autotest -*-
++# Copyright (C) 2014 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRA
[OE-core] [PATCH 2/2] grub-efi.bbclass: use single variable to set baud rate
Use SERIAL_CONSOLE to set baud rate in grub.cfg file.
[YOCTO #6331]
Signed-off-by: Chong Lu
---
meta/classes/grub-efi.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 47bd35e..37c21f9 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -18,11 +18,12 @@
do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy"
do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy"
-GRUB_SERIAL ?= "console=ttyS0,115200"
+GRUB_SERIAL ?= "console=${@d.getVar('SERIAL_CONSOLE',
True).split()[1]},${@d.getVar('SERIAL_CONSOLE', True).split()[0]}"
GRUBCFG = "${S}/grub.cfg"
GRUB_TIMEOUT ?= "10"
#FIXME: build this from the machine config
-GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
+GRUB_OPTS ?= "serial --unit=${@filter(str.isdigit, d.getVar('SERIAL_CONSOLE',
True).split()[1])} \
+--speed=${@d.getVar('SERIAL_CONSOLE', True).split()[0]} --word=8 --parity=no
--stop=1"
EFIDIR = "/EFI/BOOT"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] use single variable to set baud rate
The following changes since commit b813bdebb36501500e86fea5f7e15b4b15ea0902: qemu/libc-package: Fix qemu option handling (2014-12-05 18:01:08 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib chonglu/baudrate http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/baudrate Chong Lu (2): syslinux.bbclass: use single variable to set baud rate grub-efi.bbclass: use single variable to set baud rate meta/classes/grub-efi.bbclass | 5 +++-- meta/classes/syslinux.bbclass | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] cpio: fix bug CVE-2014-9112 for cpio-2.11
Obtain detain from following URL.
http://lists.gnu.org/archive/html/bug-cpio/2014-12/msg0.html
http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d
Signed-off-by: Bian Naimeng
---
.../cpio/cpio-2.11/fix-memory-overrun.patch| 220 +
meta/recipes-extended/cpio/cpio_2.11.bb| 3 +-
2 files changed, 222 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
new file mode 100644
index 000..89cd3cf
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
@@ -0,0 +1,220 @@
+cpio: Fix memory overrun on reading improperly created link records
+
+Signed-off-by: Bian Naimeng
+
+http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d
+
+ * src/copyin.c (get_link_name): New function.
+ (list_file, copyin_link): use get_link_name
+
+ * tests/symlink-bad-length.at: New file.
+ * tests/symlink-long.at: New file.
+ * tests/Makefile.am: Add new files.
+ * tests/testsuite.at: Likewise.
+
+ See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg7.html
+
+Upstream-Status: Backport
+
+Signed-off-by: Sergey Poznyakoff
+
+diff -Nurp cpio-2.11.orig/src/copyin.c cpio-2.11/src/copyin.c
+--- cpio-2.11.orig/src/copyin.c2010-02-15 18:02:23.0 +0800
cpio-2.11/src/copyin.c 2014-12-08 13:14:04.355547508 +0800
+@@ -126,6 +126,28 @@ tape_skip_padding (int in_file_des, off_
+ }
+
+
++static char *
++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des)
++{
++ off_t n = file_hdr->c_filesize + 1;
++ char *link_name;
++
++ if (n == 0 || n > SIZE_MAX)
++{
++ error (0, 0, _("%s: stored filename length too big"), file_hdr->c_name);
++ link_name = NULL;
++}
++ else
++{
++ link_name = xmalloc (n);
++ tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
++ link_name[file_hdr->c_filesize] = '\0';
++ tape_skip_padding (in_file_des, file_hdr->c_filesize);
++}
++ return link_name;
++}
++
++
+ static void
+ list_file(struct cpio_file_stat* file_hdr, int in_file_des)
+ {
+@@ -136,21 +158,16 @@ list_file(struct cpio_file_stat* file_hd
+ {
+ if (archive_format != arf_tar && archive_format != arf_ustar)
+ {
+-char *link_name = NULL; /* Name of hard and symbolic links. */
+-
+-link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize
+ 1);
+-link_name[file_hdr->c_filesize] = '\0';
+-tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
+-long_format (file_hdr, link_name);
+-free (link_name);
+-tape_skip_padding (in_file_des, file_hdr->c_filesize);
+-return;
++char *link_name = get_link_name (file_hdr, in_file_des);
++if (link_name)
++ {
++long_format (file_hdr, link_name);
++free (link_name);
++ }
+ }
+ else
+- {
+ long_format (file_hdr, file_hdr->c_tar_linkname);
+-return;
+- }
++return;
+ }
+ else
+ #endif
+@@ -650,10 +667,7 @@ copyin_link(struct cpio_file_stat *file_
+
+ if (archive_format != arf_tar && archive_format != arf_ustar)
+ {
+- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1);
+- link_name[file_hdr->c_filesize] = '\0';
+- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
+- tape_skip_padding (in_file_des, file_hdr->c_filesize);
++ link_name = get_link_name (file_hdr, in_file_des);
+ }
+ else
+ {
+diff -Nurp cpio-2.11.orig/tests/Makefile.am cpio-2.11/tests/Makefile.am
+--- cpio-2.11.orig/tests/Makefile.am 2010-02-15 18:02:23.0 +0800
cpio-2.11/tests/Makefile.am2014-12-08 13:14:49.931545727 +0800
+@@ -52,6 +52,8 @@ TESTSUITE_AT = \
+ setstat04.at\
+ setstat05.at\
+ symlink.at\
++ symlink-bad-length.at\
++ symlink-long.at\
+ version.at
+
+ TESTSUITE = $(srcdir)/testsuite
+diff -Nurp cpio-2.11.orig/tests/symlink-bad-length.at
cpio-2.11/tests/symlink-bad-length.at
+--- cpio-2.11.orig/tests/symlink-bad-length.at 1970-01-01 08:00:00.0
+0800
cpio-2.11/tests/symlink-bad-length.at 2014-12-08 13:17:45.979538847
+0800
+@@ -0,0 +1,49 @@
++# Process this file with autom4te to create testsuite. -*- Autotest -*-
++# Copyright (C) 2014 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will
[OE-core] [PATCH 0/2] cpio: backport patch of CVE-2014-9112
cpio: Fix memory overrun on reading improperly created link records Signed-off-by: Bian Naimeng http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d * src/copyin.c (get_link_name): New function. (list_file, copyin_link): use get_link_name * tests/symlink-bad-length.at: New file. * tests/symlink-long.at: New file. * tests/Makefile.am: Add new files. * tests/testsuite.at: Likewise. See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg7.html Upstream-Status: Backport Signed-off-by: Sergey Poznyakoff Bian Naimeng (2): cpio: fix bug CVE-2014-9112 for cpio-2.8 cpio: fix bug CVE-2014-9112 for cpio-2.11 .../cpio/cpio-2.11/fix-memory-overrun.patch| 220 + .../cpio/cpio-2.8/fix-memory-overrun.patch | 217 meta/recipes-extended/cpio/cpio_2.11.bb| 3 +- meta/recipes-extended/cpio/cpio_2.8.bb | 7 +- 4 files changed, 443 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification
Ping .
Could someone give me some suggestions ?
Cheers
Lei Maohui
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Lei,
> Maohui
> Sent: Monday, December 01, 2014 9:37 AM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet
> SPDX 1.2 Version Specification
>
> ping
>
>
>
> > -Original Message-
> > From: openembedded-core-boun...@lists.openembedded.org
> > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> > Lei, Maohui
> > Sent: Tuesday, November 25, 2014 9:32 AM
> > To: openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file
> > that meet SPDX 1.2 Version Specification
> >
> > Hi all
> >
> > Sorry, commit log is too simple.
> >
> > These two patches aim to make the spdx file meet the SPDX 1.2 Version
> > Specification. The main changes are:
> >
> > 1. use "curl" command instead of "wget" when get spdx file from
> > FOSSologySPDX instance server.
> >
> >Before apply these patches, the command is :
> >wget -qO - --no-check-certificate --timeout=0
> > --post-file=xxx/yyy/zzz.tar.gz
> > http://localhost//?mod=spdx_license_once&noCopyright=${FOSS_COPYRIGHT}
> > &rec
> > ursiveUnpack=${FOSS_RECURSIVE_UNPACK}
> >
> >After apply these patches, the command is :
> >curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F
> > "mod=spdx_license_once" -F "noCopyright=false" -F "jsonOutput=false"
> > -F "fullSPDXFlag=true" -F "file=@ xxx/yyy/zzz.tar.gz" -o
> > xxx/yyy/zzz.spdx
> >
> >Because if use "wget" command,the Mandatory fields of the SPDX
> > Specification such as the following can't be obtained.
> >1) PackageLicenseInfoFromFiles(Package Information)
> >2) PackageLicenseDeclared(Package Information)
> >3) LicenseID(License Information)
> >4) ExtractedText(License Information)
> >5) LicenseName(License Information)
> >
> > 2. In order to avoid the SPDX_S be polluted in the rebuild, I make
> > ${WORKDIR}/${SPDX_TEMP_DIR} to save the source after do_patch.
> >
> > 3. In addition, this patch add some more info that meet the SPDX 1.2
> > Version Specification.
> >
> > After apply this patch, users only have to add " INHERIT += "spdx" in
> > the local.conf file, they can get spdx file that meet the SPDX 1.2
> > Version Specification.
> >
> >
> > Cheers
> >
> > Lei Maohui
> >
> >
> >
> > > -Original Message-
> > > From: Lei, Maohui/雷 茂慧
> > > Sent: Monday, November 24, 2014 9:49 PM
> > > To: openembedded-core@lists.openembedded.org
> > > Cc: Lei, Maohui/雷 茂慧
> > > Subject: [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX
> > > 1.2 Version Specification
> > >
> > > Signed-off-by: leimaohui
> > > ---
> > > meta/classes/spdx.bbclass | 427
> > > --
> > > 1 file changed, 150 insertions(+), 277 deletions(-)
> > >
> > > diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass
> > > index
> > > 454c53e..9f0f120 100644
> > > --- a/meta/classes/spdx.bbclass
> > > +++ b/meta/classes/spdx.bbclass
> > > @@ -15,178 +15,179 @@
> > > # SPDX file will be output to the path which is defined
> > > as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf.
> > >
> > > +SPDXOUTPUTDIR = "${WORKDIR}/spdx_output_dir"
> > > SPDXSSTATEDIR = "${WORKDIR}/spdx_sstate_dir"
> > >
> > > # If ${S} isn't actually the top-level source directory, set SPDX_S
> > > to point at # the real top-level directory.
> > > +
> > > SPDX_S ?= "${S}"
> > >
> > > python do_spdx () {
> > > import os, sys
> > > -import json, shutil
> > > +import json
> > >
> > > info = {}
> > > info['workdir'] = d.getVar('WORKDIR', True)
> > > -info['sourcedir'] = d.getVar('SPDX_S', True)
> > > -info['pn'] = d.getVar('PN', True)
> > > -info['pv'] = d.getVar('PV', True)
> > > +info['pn'] = d.getVar( 'PN', True )
> > > +info['pv'] = d.getVar( 'PV', True )
> > > +info['package_download_location'] = d.getVar( 'SRC_URI', True
> > > + ).split()[0]
> > > info['spdx_version'] = d.getVar('SPDX_VERSION', True)
> > > info['data_license'] = d.getVar('DATA_LICENSE', True)
> > > +info['creator'] = {}
> > > +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True)
> > > +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True)
> > > +info['package_homepage'] = d.getVar('HOMEPAGE', True)
> > > +info['package_summary'] = d.getVar('SUMMARY', True)
> > >
> > > -sstatedir = d.getVar('SPDXSSTATEDIR', True)
> > > -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] +
> ".spdx")
> > > -
> > > +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True)
> > > manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True)
> > > info['outfile'] = os.path.join(manifest_dir, info['pn'] + ".spdx"
> > > )
> > > -
> > > -info['spd
Re: [OE-core] [PATCH v3 2/2] u-boot.inc : add compile multiple u-boot feature
Hello Chunrong,
On Thu, Dec 4, 2014 at 3:49 AM, Chunrong Guo wrote:
> Signed-off-by: Chunrong Guo
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 72
> +-
> 1 file changed, 47 insertions(+), 25 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
> b/meta/recipes-bsp/u-boot/u-boot.inc
> index c695b73..9b93946 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -63,25 +63,32 @@ do_compile () {
> echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
> fi
>
> - oe_runmake ${UBOOT_MACHINE}
> - oe_runmake ${UBOOT_MAKE_TARGET}
> +for type in ${UBOOT_MACHINE}; do
> +oe_runmake O=${type} ${type}
> +oe_runmake O=${type} ${UBOOT_MAKE_TARGET}
> +cp ${S}/${type}/${UBOOT_BINARY}
> ${S}/${type}/u-boot-${type}.${UBOOT_SUFFIX}
> +done
> +
> }
I don't see how you map the type to the UBOOT_MACHINE here. If I am
reading the code correctly the for would be:
for config in ${UBOOT_MACHINE); do ...
and it is technically correct. The problem I see here is that we lose
the 'type' conception. So the 'sd', 'flash', ... configuration type is
lost and not propagated to the binary filename which I think we should
try to improve.
> do_install () {
> -install -d ${D}/boot
> -install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
> -ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
> +for type in ${UBOOT_MACHINE}; do
> +install -d ${D}/boot
> +install ${S}/${type}/u-boot-${type}.${UBOOT_SUFFIX}
> ${D}/boot/u-boot-${type}.${UBOOT_SUFFIX}
> +done
Same here.
> if [ -e ${WORKDIR}/fw_env.config ] ; then
> install -d ${D}${sysconfdir}
> install -m 644 ${WORKDIR}/fw_env.config
> ${D}${sysconfdir}/fw_env.config
> fi
>
> -if [ "x${SPL_BINARY}" != "x" ]
> -then
> -install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
> -ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
> -fi
> +for type in ${UBOOT_MACHINE}; do
> +if [ "x${SPL_BINARY}" != "x" ] && [ -d "${S}/${type}/${SPL_BINARY}"]
> +then
> +install ${S}/${type}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
> +ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
> +fi
> +done
We ought to have one SPL binary with each 'type' assigned; here you
are overriding it with the last SPL binary built.
> if [ "x${UBOOT_ENV}" != "x" ]
> then
> @@ -93,21 +100,36 @@ do_install () {
> FILES_${PN} = "/boot ${sysconfdir}"
>
> do_deploy () {
> -install -d ${DEPLOYDIR}
> -install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
> -
> -cd ${DEPLOYDIR}
> -rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
> -ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
> -ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
> -
> -if [ "x${SPL_BINARY}" != "x" ]
> -then
> -install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
> -rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
> -ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
> -ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
> -fi
> +for type in ${UBOOT_MACHINE}; do
> +for imagetype in in ${UBOOT_CONFIG}; do
> +if [ "${imagetype}"x = "in"x ]
> +then
> +continue
> +fi
> +if [ -d "${DEPLOYDIR}/u-boot-${imagetype}.${UBOOT_SUFFIX}"]
> +then
> +break
> +else
> +install -d ${DEPLOYDIR}
> +install ${S}/${type}/u-boot-${type}.${UBOOT_SUFFIX}
> ${DEPLOYDIR}/u-boot-${imagetype}.${UBOOT_SUFFIX}
> +if [ "${imagetype}"x = "sd"x ] || [ "${imagetype}"x =
> "mfgtool"x ]
> +then
> +cp ${DEPLOYDIR}/u-boot-${imagetype}.${UBOOT_SUFFIX}
> ${DEPLOYDIR}/u-boot-${MACHINE}.${UBOOT_SUFFIX}
> +fi
> +fi
Way nicer (and should have some similar code on the install and
compile tasks) however I didn't get why you're adding the 'sd' or
'mfgtool' specific case here. This is a FSL specific thing and
shouldn't be part of OE-Core.
> +done
> +done
> +
> +
> +for type in ${UBOOT_MACHINE}; do
> +if [ "x${SPL_BINARY}" != "x" ] && [ -d "${S}/${type}/${SPL_BINARY}"]
> +then
> +install ${S}/${type}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
> +rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
> +ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
> +ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
> +fi
> +done
Same comment as the SPL binary above.
> if [ "x${UBOOT_ENV}" != "x" ]
> then
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
--
___
Openembedded-core mailing list
[OE-core] perl installation in the SDK references $OECORE_NATIVE_SYSROOT ?
Hi, Like the topic says, I grepped for "OECORE" in the native sysroot of my SDK installation, and the only hit I got was this: usr/bin/perl:export PERL5LIB=$PERL5LIB:$OECORE_NATIVE_SYSROOT//usr/lib/perl:$OECORE_NATIVE_SYSROOT//usr/lib/perl/5.20.0 I'm wondering if this reference is intentional, or if its something that should have been sed:ed out during sdk installation ? Jacob -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
