Re: [OE-core] [PATCH v2] libtasn1: Upgrade 4.9 -> 4.10

[Maxin B. John]

Hi Ross,

>On Tue, Jan 31, 2017 at 08:02:41PM +, Burton, Ross wrote:
>>
>>On 31 January 2017 at 15:05, Maxin B. John  wrote:
>>
>>Somehow we have an old wint_t.m4 provided by gettext-0.18.2 in the  
>> aclocal search path.
>>Looking into that now.
>
> I've a branch (ross/autoargh) that changes how we autoreconf and might solve 
> this, but
> it would depend on packages correctly versioning the macros so aclocal knows 
> what one
> of the many copies it finds is newest.

Tested the libtasn1-4.10 musl build on "ross/autoargh" branch and it still 
fails to build.

>Ross

Best Regards,
Maxin
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] verify-bashisms + shellcheck (was: Re: [PATCH 0/8] verify-bashisms: fix script and one issue found by it)

[Patrick Ohly]

On Tue, 2017-01-31 at 13:50 +0100, Patrick Ohly wrote:
> The script broke when introducing tinfoil2. The patches also include
> several usability enhancements, like making the output less redundant
> and including information about the actual file and line where the
> offending script can be found.

I've further modified verify-bashisms so that it can optionally run the
scripts through shellcheck (https://www.shellcheck.net/).

I'm quite impressed with how much real issues shellcheck finds and I
also found the recommendations useful. However, it is too verbose to be
applied to all scripts in OE. For example, it warns about missing
quotation marks around variables a lot.

There is no simple "check for bashisms" command line flag or "enable
just these checks" mode. One can disable warnings, so perhaps excluding
a long list of know "harmless" checks would be a way how shellcheck
could replace checkbashisms.pl?

My current solution always calls checkbashisms.pl, and shellcheck only
when a function is annotated:

foobar () {
   echo hello world
}
foobar[shellcheck] = "sh"

This sets "sh" as expected shell flavor. I did it this way because I can
imagine that someone might want to have some functions with bash
features and then ensure that bash is used to execute the code.

I can also imagine that this varflag could be used to exclude certain
checks with "sh SC2001 SC2002 ...", although the same can also be done
with inline comments for specific lines:

foobar () {
   # shellcheck disable=SC2003
   i=$( expr $i + 1 )  
}

Using expr triggers a warning because usually $(( )) is a better
alternative. However, that currently can't be used in bitbake functions
because the shell parser chokes on it:

   NotImplementedError: $((

So I've disabled that check by default.

Any suggestions how to proceed with this?

Note that shellcheck is written in Haskell. Getting it installed
automatically via a recipe would imply adding Haskell support to
OE-core. OTOH it seems to be packaged quite widely, so assuming it to be
installed on the host seems okay.

The "verify-bashisms" name of the script no longer quite matches the
actual functionality when using shellcheck, but that's minor (?).

FWIW, current additional patch is here:

diff --git a/scripts/verify-bashisms b/scripts/verify-bashisms
index dab64ef5019..000ed3f1764 100755
--- a/scripts/verify-bashisms
+++ b/scripts/verify-bashisms
@@ -24,8 +24,9 @@ def is_whitelisted(s):
 
 SCRIPT_LINENO_RE = re.compile(r' line (\d+) ')
 BASHISM_WARNING = re.compile(r'^(possible bashism in.*)$', re.MULTILINE)
+SHELLCHECK_LINENO_RE = re.compile(r'^(In .* line )(\d+):$', re.MULTILINE)
 
-def process(filename, function, lineno, script):
+def process(filename, function, lineno, script, shellcheck):
 import tempfile
 
 if not script.startswith("#!"):
@@ -35,10 +36,10 @@ def process(filename, function, lineno, script):
 fn.write(script)
 fn.flush()
 
+results = []
 try:
 subprocess.check_output(("checkbashisms.pl", fn.name), 
universal_newlines=True, stderr=subprocess.STDOUT)
-# No bashisms, so just return
-return
+# No bashisms, so just continue
 except subprocess.CalledProcessError as e:
 # TODO check exit code is 1
 
@@ -48,33 +49,53 @@ def process(filename, function, lineno, script):
 # Probably starts with or contains only warnings. Dump verbatim
 # with one space indention. Can't do the splitting and whitelist
 # checking below.
-return '\n'.join([filename,
-  ' Unexpected output from checkbashisms.pl'] +
- [' ' + x for x in output.splitlines()])
-
-# We know that the first line matches and that therefore the first
-# list entry will be empty - skip it.
-output = BASHISM_WARNING.split(output)[1:]
-# Turn the output into a single string like this:
-# /.../foobar.bb
-#  possible bashism in updatercd_postrm line 2 (type):
-#   if ${@use_updatercd(d)} && type update-rc.d >/dev/null 
2>/dev/null; then
-#  ...
-#   ...
-result = []
-# Check the results against the whitelist
-for message, source in zip(output[0::2], output[1::2]):
-if not is_whitelisted(source):
-if lineno is not None:
-message = SCRIPT_LINENO_RE.sub(lambda m: ' line %d ' % 
(int(m.group(1)) + int(lineno) - 1),
-   message)
-result.append(' ' + message.strip())
-result.extend(['  %s' % x for x in source.splitlines()])
-if result:
-result.insert(0, filename)
-return '\n'.join(result)
+results.extend([' Unexpected output from checkbashisms.pl'] +
+   [' ' + x for x in output.splitlines()])
 else:
-return None
+# We know that the first line match

[OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Jussi Kukkonen]

Recipe-specific sysroots broke make_relative_symlink(), which
turns absolute symlinks in sysroots into relative ones. Use the
difference between the (in-sysroot) paths to construct the relative
symlink.

This fixes links in openssl-native, fontconfig-native and bzip2-native.

Signed-off-by: Jussi Kukkonen 
---

sstate is not an area I'm familiar with, please take a good look.

As far as I could see outputpath (based on state[2]) was never really
needed so I did not use it in the new version.


Thanks,
 Jussi


 meta/classes/sstate.bbclass | 35 ---
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index aeb7466..7f99cd3 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -583,32 +583,27 @@ python sstate_hardcode_path () {
 def sstate_package(ss, d):
 import oe.path
 
-def make_relative_symlink(path, outputpath, d):
-# Replace out absolute TMPDIR paths in symlinks with relative ones
+def make_relative_symlink(path, workdir, d):
+# Replace absolute sysroot paths in symlinks with relative ones
 if not os.path.islink(path):
 return
 link = os.readlink(path)
 if not os.path.isabs(link):
 return
-if not link.startswith(tmpdir):
+if not link.startswith(workdir):
 return
 
-#base = os.path.relpath(link, os.path.dirname(path))
+directory = os.path.dirname(path.rpartition(workdir)[2])
+base_link = link.rpartition(workdir)[2]
+rel_path = os.path.relpath(base_link,directory)
 
-depth = outputpath.rpartition(tmpdir)[2].count('/')
-base = link.partition(tmpdir)[2].strip()
-while depth > 1:
-base = "/.." + base
-depth -= 1
-base = "." + base
-
-bb.debug(2, "Replacing absolute path %s with relative path %s for %s" 
% (link, base, outputpath))
+bb.debug(2, "Replacing absolute path %s with relative path %s for %s" 
% (link, rel_path, path))
 os.remove(path)
-os.symlink(base, path)
+os.symlink(rel_path, path)
 
-tmpdir = d.getVar('TMPDIR')
+workdir = d.getVar('WORKDIR')
 
-sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task'])
+sstatebuild = workdir + "/sstate-build-" +ss['task'] + "/"
 sstatepkg = d.getVar('SSTATE_PKG') + '_'+ ss['task'] + ".tgz"
 bb.utils.remove(sstatebuild, recurse=True)
 bb.utils.mkdirhier(sstatebuild)
@@ -620,18 +615,12 @@ def sstate_package(ss, d):
 continue
 srcbase = state[0].rstrip("/").rsplit('/', 1)[0]
 for walkroot, dirs, files in os.walk(state[1]):
-for file in files:
+for file in files + dirs:
 srcpath = os.path.join(walkroot, file)
-dstpath = srcpath.replace(state[1], state[2])
-make_relative_symlink(srcpath, dstpath, d)
-for dir in dirs:
-srcpath = os.path.join(walkroot, dir)
-dstpath = srcpath.replace(state[1], state[2])
-make_relative_symlink(srcpath, dstpath, d)
+make_relative_symlink(srcpath, workdir, d)
 bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], 
sstatebuild + state[0]))
 os.rename(state[1], sstatebuild + state[0])
 
-workdir = d.getVar('WORKDIR')
 for plain in ss['plaindirs']:
 pdir = plain.replace(workdir, sstatebuild)
 bb.utils.mkdirhier(plain)
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Richard Purdie]

On Wed, 2017-02-01 at 12:03 +0200, Jussi Kukkonen wrote:
> Recipe-specific sysroots broke make_relative_symlink(), which
> turns absolute symlinks in sysroots into relative ones. Use the
> difference between the (in-sysroot) paths to construct the relative
> symlink.
> 
> This fixes links in openssl-native, fontconfig-native and bzip2-
> native.
> 
> Signed-off-by: Jussi Kukkonen 
> ---
> 
> sstate is not an area I'm familiar with, please take a good look.
> 
> As far as I could see outputpath (based on state[2]) was never really
> needed so I did not use it in the new version.

I don't think we can hardcode workdir into here as for tasks like
do_deploy, this makes no sense. I think we removed most of the absolute
links from the deploy tasks so we currently don't need this, at least
in the common case but the sstate code is meant to be generic.

I am wondering if we need to pass in anything at all, can't we just
call relpath on the original path and turn it into a relative one
directly without referencing it back to TMPDIR/WORKDIR?

Cheers,

Richard
> 
> Thanks,
>  Jussi
> 
> 
>  meta/classes/sstate.bbclass | 35 ---
>  1 file changed, 12 insertions(+), 23 deletions(-)
> 
> diff --git a/meta/classes/sstate.bbclass
> b/meta/classes/sstate.bbclass
> index aeb7466..7f99cd3 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -583,32 +583,27 @@ python sstate_hardcode_path () {
>  def sstate_package(ss, d):
>  import oe.path
>  
> -def make_relative_symlink(path, outputpath, d):
> -# Replace out absolute TMPDIR paths in symlinks with
> relative ones
> +def make_relative_symlink(path, workdir, d):
> +# Replace absolute sysroot paths in symlinks with relative
> ones
>  if not os.path.islink(path):
>  return
>  link = os.readlink(path)
>  if not os.path.isabs(link):
>  return
> -if not link.startswith(tmpdir):
> +if not link.startswith(workdir):
>  return
>  
> -#base = os.path.relpath(link, os.path.dirname(path))
> +directory = os.path.dirname(path.rpartition(workdir)[2])
> +base_link = link.rpartition(workdir)[2]
> +rel_path = os.path.relpath(base_link,directory)
>  
> -depth = outputpath.rpartition(tmpdir)[2].count('/')
> -base = link.partition(tmpdir)[2].strip()
> -while depth > 1:
> -base = "/.." + base
> -depth -= 1
> -base = "." + base
> -
> -bb.debug(2, "Replacing absolute path %s with relative path
> %s for %s" % (link, base, outputpath))
> +bb.debug(2, "Replacing absolute path %s with relative path
> %s for %s" % (link, rel_path, path))
>  os.remove(path)
> -os.symlink(base, path)
> +os.symlink(rel_path, path)
>  
> -tmpdir = d.getVar('TMPDIR')
> +workdir = d.getVar('WORKDIR')
>  
> -sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" %
> ss['task'])
> +sstatebuild = workdir + "/sstate-build-" +ss['task'] + "/"
>  sstatepkg = d.getVar('SSTATE_PKG') + '_'+ ss['task'] + ".tgz"
>  bb.utils.remove(sstatebuild, recurse=True)
>  bb.utils.mkdirhier(sstatebuild)
> @@ -620,18 +615,12 @@ def sstate_package(ss, d):
>  continue
>  srcbase = state[0].rstrip("/").rsplit('/', 1)[0]
>  for walkroot, dirs, files in os.walk(state[1]):
> -for file in files:
> +for file in files + dirs:
>  srcpath = os.path.join(walkroot, file)
> -dstpath = srcpath.replace(state[1], state[2])
> -make_relative_symlink(srcpath, dstpath, d)
> -for dir in dirs:
> -srcpath = os.path.join(walkroot, dir)
> -dstpath = srcpath.replace(state[1], state[2])
> -make_relative_symlink(srcpath, dstpath, d)
> +make_relative_symlink(srcpath, workdir, d)
>  bb.debug(2, "Preparing tree %s for packaging at %s" %
> (state[1], sstatebuild + state[0]))
>  os.rename(state[1], sstatebuild + state[0])
>  
> -workdir = d.getVar('WORKDIR')
>  for plain in ss['plaindirs']:
>  pdir = plain.replace(workdir, sstatebuild)
>  bb.utils.mkdirhier(plain)
> -- 
> 2.1.4
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] xserver-xorg: Fix X server 1.19 crash

[Jussi Kukkonen]

On 1 February 2017 at 03:22, Tom Hochstein  wrote:

> Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
> useSIGIO option:
>
> xfree86 SIGIO support is reworked to use internal versions of
> OsBlockSIGIO and OsReleaseSIGIO
>
> The check for useSIGIO is no longer needed.
>

Can you explain what the crash is or how to reproduce, I can't figure it
out from the patch. Link to possible upstream ML discussion is fine as well.

Thanks,
  Jussi
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Jussi Kukkonen]

On 1 February 2017 at 13:23, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

> On Wed, 2017-02-01 at 12:03 +0200, Jussi Kukkonen wrote:
> > Recipe-specific sysroots broke make_relative_symlink(), which
> > turns absolute symlinks in sysroots into relative ones. Use the
> > difference between the (in-sysroot) paths to construct the relative
> > symlink.
> >
> > This fixes links in openssl-native, fontconfig-native and bzip2-
> > native.
> >
> > Signed-off-by: Jussi Kukkonen 
> > ---
> >
> > sstate is not an area I'm familiar with, please take a good look.
> >
> > As far as I could see outputpath (based on state[2]) was never really
> > needed so I did not use it in the new version.
>
> I don't think we can hardcode workdir into here as for tasks like
> do_deploy, this makes no sense. I think we removed most of the absolute
> links from the deploy tasks so we currently don't need this, at least
> in the common case but the sstate code is meant to be generic.
>
> I am wondering if we need to pass in anything at all, can't we just
> call relpath on the original path and turn it into a relative one
> directly without referencing it back to TMPDIR/WORKDIR?
>
>
The actual file path during do_populate_sysroot is something like

/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/sysroot-destdir/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs

and the link before make_relative_symlink() points to

/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/recipe-sysroot-native/etc/ssl/certs

Assuming those are correct, I don't see how to do this without referencing
WORKDIR or TMPDIR?

Jussi
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] xserver-xorg: Fix X server 1.19 crash

[Andreas Müller]

On Wed, Feb 1, 2017 at 12:38 PM, Jussi Kukkonen
 wrote:
> On 1 February 2017 at 03:22, Tom Hochstein  wrote:
>>
>> Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
>> useSIGIO option:
>>
>> xfree86 SIGIO support is reworked to use internal versions of
>> OsBlockSIGIO and OsReleaseSIGIO
>>
>> The check for useSIGIO is no longer needed.
>
>
> Can you explain what the crash is or how to reproduce, I can't figure it out
> from the patch. Link to possible upstream ML discussion is fine as well.
>
> Thanks,
>   Jussi
>
While we are at it: This patch conflicts whit the patch fixing
xserver@beaglebone-black [1-2].

What do people think of the patch - would it make sense to rebase this
one against it?

[1] 
http://lists.openembedded.org/pipermail/openembedded-core/2017-January/131843.html
[2] https://patchwork.openembedded.org/patch/136497/

Andreas
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] cups: add missing pkgconfig inherit

[Ross Burton]

Signed-off-by: Ross Burton 
---
 meta/recipes-extended/cups/cups.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/cups/cups.inc 
b/meta/recipes-extended/cups/cups.inc
index 2ce9c7a..e69f178 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -16,7 +16,7 @@ LEAD_SONAME = "libcupsdriver.so"
 
 CLEANBROKEN = "1"
 
-inherit autotools-brokensep binconfig useradd systemd
+inherit autotools-brokensep binconfig useradd systemd pkgconfig
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system lpadmin"
-- 
2.8.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] pkg-config: depend on pkgconfig-native for target builds

[Ross Burton]

When building for the target, pkg-config uses the target glib-2.0 instead of
it's own minimal fork. To find this it needs to use pkg-config so ensure this
dependency exists in case it doesn't exist on the host already.

Signed-off-by: Ross Burton 
---
 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb 
b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index ff8254c..66b02f1 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -8,7 +8,7 @@ SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 pkgconfig-native"
 DEPENDS_class-native = ""
 DEPENDS_class-nativesdk = ""
 
-- 
2.8.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Richard Purdie]

On Wed, 2017-02-01 at 13:44 +0200, Jussi Kukkonen wrote:
> On 1 February 2017 at 13:23, Richard Purdie  dation.org> wrote:
> > On Wed, 2017-02-01 at 12:03 +0200, Jussi Kukkonen wrote:
> > > Recipe-specific sysroots broke make_relative_symlink(), which
> > > turns absolute symlinks in sysroots into relative ones. Use the
> > > difference between the (in-sysroot) paths to construct the
> > relative
> > > symlink.
> > >
> > > This fixes links in openssl-native, fontconfig-native and bzip2-
> > > native.
> > >
> > > Signed-off-by: Jussi Kukkonen 
> > > ---
> > >
> > > sstate is not an area I'm familiar with, please take a good look.
> > >
> > > As far as I could see outputpath (based on state[2]) was never
> > really
> > > needed so I did not use it in the new version.
> > 
> > I don't think we can hardcode workdir into here as for tasks like
> > do_deploy, this makes no sense. I think we removed most of the
> > absolute
> > links from the deploy tasks so we currently don't need this, at
> > least
> > in the common case but the sstate code is meant to be generic.
> > 
> > I am wondering if we need to pass in anything at all, can't we just
> > call relpath on the original path and turn it into a relative one
> > directly without referencing it back to TMPDIR/WORKDIR?
> > 
> The actual file path during do_populate_sysroot is something like
>   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> r0/sysroot-destdir/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-
> native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs
> 
> and the link before make_relative_symlink() points to 
>   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> r0/recipe-sysroot-native/etc/ssl/certs
> 
> Assuming those are correct, I don't see how to do this without
> referencing WORKDIR or TMPDIR?

Good point, I knew I was missing something. How about passing in
walkroot/state[1] into the function, then you can subtract that from
the actual file, then run relpath between the (srcpath - walkroot) and
the link?

Cheers,

Richard



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] scripts/runqemu: fix a typo

[liu . ming50]

From: Ming Liu 

Signed-off-by: Ming Liu 
---
 scripts/runqemu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 31eff5a..d74f252 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -96,7 +96,7 @@ Examples:
 """)
 
 def check_tun():
-"""Check /dev/net/run"""
+"""Check /dev/net/tun"""
 dev_tun = '/dev/net/tun'
 if not os.path.exists(dev_tun):
 raise Exception("TUN control device %s is unavailable; you may need to 
enable TUN (e.g. sudo modprobe tun)" % dev_tun)
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] sstate/staging: Batch log messages for performance

[Richard Purdie]

According to profile data, repeated calls to bb.debug and bb.note in
the extend_recipe_sysroot() codepath were accounting for 75% of the time
(1.5s) in calls from tasks like do_image_complete.

This batches up the log messages into one call into the logging system
which gives similar behaviour to disabling the logging but retains the
debug information.

Since setscene_depvalid is also called from bitbake's setscene code,
we have to be a little creative with the function parameters and leave
the other debug output mechanism in place. This should hopefully
speed up recipe specific sysroots.

Signed-off-by: Richard Purdie 
---
 meta/classes/sstate.bbclass  | 14 ++
 meta/classes/staging.bbclass | 11 +++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index aeb7466..ada6fe5 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -909,13 +909,19 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, 
sq_hashfn, d, siginfo=False):
 
 BB_SETSCENE_DEPVALID = "setscene_depvalid"
 
-def setscene_depvalid(task, taskdependees, notneeded, d):
+def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
 # taskdependees is a dict of tasks which depend on task, each being a 3 
item list of [PN, TASKNAME, FILENAME]
 # task is included in taskdependees too
 # Return - False - We need this dependency
 #- True - We can skip this dependency
 
-bb.debug(2, "Considering setscene task: %s" % (str(taskdependees[task])))
+def logit(msg, log):
+if log is not None:
+log.append(msg)
+else:
+bb.debug(2, msg)
+
+logit("Considering setscene task: %s" % (str(taskdependees[task])), log)
 
 def isNativeCross(x):
 return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x or 
x.endswith("-cross")
@@ -933,7 +939,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
 return True
 
 for dep in taskdependees:
-bb.debug(2, "  considering dependency: %s" % (str(taskdependees[dep])))
+logit("  considering dependency: %s" % (str(taskdependees[dep])), log)
 if task == dep:
 continue
 if dep in notneeded:
@@ -987,7 +993,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
 
 
 # Safe fallthrough default
-bb.debug(2, " Default setscene dependency fall through due to 
dependency: %s" % (str(taskdependees[dep])))
+logit(" Default setscene dependency fall through due to dependency: 
%s" % (str(taskdependees[dep])), log)
 return False
 return True
 
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index b9c84a4..35e53fe 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -441,6 +441,7 @@ python extend_recipe_sysroot() {
 bb.note("Direct dependencies are %s" % str(configuredeps))
 #bb.note(" or %s" % str(start))
 
+msgbuf = []
 # Call into setscene_depvalid for each sub-dependency and only copy 
sysroot files
 # for ones that would be restored from sstate.
 done = list(start)
@@ -455,19 +456,21 @@ python extend_recipe_sysroot() {
 taskdeps = {}
 taskdeps[dep] = setscenedeps[dep][:2]
 taskdeps[datadep] = setscenedeps[datadep][:2]
-retval = setscene_depvalid(datadep, taskdeps, [], d)
+retval = setscene_depvalid(datadep, taskdeps, [], d, msgbuf)
 if retval:
-bb.note("Skipping setscene dependency %s for installation 
into the sysroot" % datadep)
+msgbuf.append("Skipping setscene dependency %s for 
installation into the sysroot")
 continue
 done.append(datadep)
 new.append(datadep)
 if datadep not in configuredeps and setscenedeps[datadep][1] 
== "do_populate_sysroot":
 configuredeps.append(datadep)
-bb.note("Adding dependency on %s" % 
setscenedeps[datadep][0])
+msgbuf.append("Adding dependency on %s" % 
setscenedeps[datadep][0])
 else:
-bb.note("Following dependency on %s" % 
setscenedeps[datadep][0])
+msgbuf.append("Following dependency on %s" % 
setscenedeps[datadep][0])
 next = new
 
+bb.note("\n".join(msgbuf))
+
 stagingdir = d.getVar("STAGING_DIR")
 recipesysroot = d.getVar("RECIPE_SYSROOT")
 recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] staging: Reduce the number of mkdirs calls

[Richard Purdie]

The number of mkdir calls was showing up high on the profile charts since
it was getting called once per file which is excessive. Each call results
in one or more syscalls which is bad for performance. Cache which
directories we've seen to reduce the calls to a more reasonable number
and speed up recipe specific sysroots.

Signed-off-by: Richard Purdie 
---
 meta/classes/staging.bbclass | 27 +--
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 35e53fe..93d31eb 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -244,7 +244,7 @@ python do_populate_sysroot_setscene () {
 }
 addtask do_populate_sysroot_setscene
 
-def staging_copyfile(c, target, fixme, postinsts, stagingdir):
+def staging_copyfile(c, target, fixme, postinsts, stagingdir, seendirs):
 import errno
 
 if c.endswith("/fixmepath"):
@@ -255,7 +255,10 @@ def staging_copyfile(c, target, fixme, postinsts, 
stagingdir):
 #bb.warn(c)
 dest = c.replace(stagingdir, "")
 dest = target + "/" + "/".join(dest.split("/")[3:])
-bb.utils.mkdirhier(os.path.dirname(dest))
+destdir = os.path.dirname(dest)
+if destdir not in seendirs:
+bb.utils.mkdirhier(destdir)
+seendirs.add(destdir)
 if "/usr/bin/postinst-" in c:
 postinsts.append(dest)
 if os.path.islink(c):
@@ -278,10 +281,12 @@ def staging_copyfile(c, target, fixme, postinsts, 
stagingdir):
 raise
 return dest
 
-def staging_copydir(c, target, stagingdir):
+def staging_copydir(c, target, stagingdir, seendirs):
 dest = c.replace(stagingdir, "")
 dest = target + "/" + "/".join(dest.split("/")[3:])
-bb.utils.mkdirhier(dest)
+if dest not in seendirs:
+bb.utils.mkdirhier(dest)
+seendirs.add(dest)
 
 def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d):
 import subprocess
@@ -302,6 +307,7 @@ def staging_populate_sysroot_dir(targetsysroot, 
nativesysroot, native, d):
 
 fixme = []
 postinsts = []
+seendirs = set()
 stagingdir = d.getVar("STAGING_DIR")
 if native:
 pkgarchs = ['${BUILD_ARCH}', '${BUILD_ARCH}_*']
@@ -332,10 +338,10 @@ def staging_populate_sysroot_dir(targetsysroot, 
nativesysroot, native, d):
 for l in f:
 l = l.strip()
 if l.endswith("/"):
-staging_copydir(l, targetdir, stagingdir)
+staging_copydir(l, targetdir, stagingdir, seendirs)
 continue
 try:
-staging_copyfile(l, targetdir, fixme, postinsts, 
stagingdir)
+staging_copyfile(l, targetdir, fixme, postinsts, 
stagingdir, seendirs)
 except FileExistsError:
 continue
 
@@ -492,6 +498,7 @@ python extend_recipe_sysroot() {
 fixme = {}
 fixme[''] = []
 fixme['native'] = []
+seendirs = set()
 postinsts = []
 multilibs = {}
 manifests = {}
@@ -570,14 +577,14 @@ python extend_recipe_sysroot() {
 l = l.strip()
 if l.endswith("/"):
 if native:
-dest = staging_copydir(l, recipesysrootnative, 
stagingdir)
+dest = staging_copydir(l, recipesysrootnative, 
stagingdir, seendirs)
 else:
-dest = staging_copydir(l, destsysroot, stagingdir)
+dest = staging_copydir(l, destsysroot, stagingdir, 
seendirs)
 continue
 if native:
-dest = staging_copyfile(l, recipesysrootnative, 
fixme['native'], postinsts, stagingdir)
+dest = staging_copyfile(l, recipesysrootnative, 
fixme['native'], postinsts, stagingdir, seendirs)
 else:
-dest = staging_copyfile(l, destsysroot, fixme[''], 
postinsts, stagingdir)
+dest = staging_copyfile(l, destsysroot, fixme[''], 
postinsts, stagingdir, seendirs)
 if dest:
 m.write(dest.replace(workdir + "/", "") + "\n")
 
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] meta-environment: Clean up the task structure to reduce manifest warnings

[Richard Purdie]

This puts the dependencies on the correct task and removes pointless
noexec tasks allowing for a slightly cleaner task structure.

Signed-off-by: Richard Purdie 
---
 meta/recipes-core/meta/meta-environment.bb | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/meta/meta-environment.bb 
b/meta/recipes-core/meta/meta-environment.bb
index 1128a56..c7ac05d 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -19,12 +19,10 @@ SDKTARGETSYSROOT = 
"${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
 
 inherit cross-canadian
 
-# Need to ensure we have the virtual mappings and site files for all multtilib 
-# variants
-DEPENDS += "${@all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE')}"
-
 do_generate_content[cleandirs] = "${SDK_OUTPUT}"
 do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}"
+# Need to ensure we have the virtual mappings and site files for all multtilib 
variants
+do_generate_content[depends] = 
"${@oe.utils.build_depends_string(all_multilib_tune_values(d, 
'TOOLCHAIN_NEED_CONFIGSITE_CACHE'), 'do_populate_sysroot')}"
 python do_generate_content() {
 # Handle multilibs in the SDK environment, siteconfig, etc files...
 localdata = bb.data.createCopy(d)
@@ -74,6 +72,6 @@ FILES_${PN}= " \
 deltask do_fetch
 deltask do_unpack
 deltask do_patch
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
+deltask do_configure
+deltask do_compile
+deltask do_populate_sysroot
-- 
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] xserver-xorg: Fix X server 1.19 crash

[Andreas Müller]

On Wed, Feb 1, 2017 at 12:47 PM, Andreas Müller
 wrote:
> On Wed, Feb 1, 2017 at 12:38 PM, Jussi Kukkonen
>  wrote:
>> On 1 February 2017 at 03:22, Tom Hochstein  wrote:
>>>
>>> Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
>>> useSIGIO option:
>>>
>>> xfree86 SIGIO support is reworked to use internal versions of
>>> OsBlockSIGIO and OsReleaseSIGIO
>>>
>>> The check for useSIGIO is no longer needed.
>>
>>
>> Can you explain what the crash is or how to reproduce, I can't figure it out
>> from the patch. Link to possible upstream ML discussion is fine as well.
>>
>> Thanks,
>>   Jussi
>>
> While we are at it: This patch conflicts whit the patch fixing
> xserver@beaglebone-black [1-2].
>
> What do people think of the patch - would it make sense to rebase this
> one against it?
>
> [1] 
> http://lists.openembedded.org/pipermail/openembedded-core/2017-January/131843.html
> [2] https://patchwork.openembedded.org/patch/136497/
>
FWIW: Just tested: I can conform that this patch fixes xserver on imx6
(vivante accelerated).

Andreas
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Jussi Kukkonen]

On 1 February 2017 at 14:00, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

> On Wed, 2017-02-01 at 13:44 +0200, Jussi Kukkonen wrote:
> > On 1 February 2017 at 13:23, Richard Purdie  > dation.org> wrote:
> > > On Wed, 2017-02-01 at 12:03 +0200, Jussi Kukkonen wrote:
> > > > Recipe-specific sysroots broke make_relative_symlink(), which
> > > > turns absolute symlinks in sysroots into relative ones. Use the
> > > > difference between the (in-sysroot) paths to construct the
> > > relative
> > > > symlink.
> > > >
> > > > This fixes links in openssl-native, fontconfig-native and bzip2-
> > > > native.
> > > >
> > > > Signed-off-by: Jussi Kukkonen 
> > > > ---
> > > >
> > > > sstate is not an area I'm familiar with, please take a good look.
> > > >
> > > > As far as I could see outputpath (based on state[2]) was never
> > > really
> > > > needed so I did not use it in the new version.
> > >
> > > I don't think we can hardcode workdir into here as for tasks like
> > > do_deploy, this makes no sense. I think we removed most of the
> > > absolute
> > > links from the deploy tasks so we currently don't need this, at
> > > least
> > > in the common case but the sstate code is meant to be generic.
> > >
> > > I am wondering if we need to pass in anything at all, can't we just
> > > call relpath on the original path and turn it into a relative one
> > > directly without referencing it back to TMPDIR/WORKDIR?
> > >
> > The actual file path during do_populate_sysroot is something like
> >   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> > r0/sysroot-destdir/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-
> > native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs
> >
> > and the link before make_relative_symlink() points to
> >   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> > r0/recipe-sysroot-native/etc/ssl/certs
> >
> > Assuming those are correct, I don't see how to do this without
> > referencing WORKDIR or TMPDIR?
>
> Good point, I knew I was missing something. How about passing in
> walkroot/state[1] into the function, then you can subtract that from
> the actual file, then run relpath between the (srcpath - walkroot) and
> the link?
>

Figuring out a sysroot-based path for srcpath is indeed possible (and
nicer) using state[1] but then I have:
  path /usr/lib/ssl/certs
  link
/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/recipe-sysroot-native/etc/ssl/certs

Without knowledge of TMPDIR or WORKDIR, I don't see how I can turn link
into anything like
   ../../../etc/ssl/certs

Maybe I'm missing something?

Jussi
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Richard Purdie]

On Wed, 2017-02-01 at 14:38 +0200, Jussi Kukkonen wrote:
> On 1 February 2017 at 14:00, Richard Purdie  dation.org> wrote:
> > On Wed, 2017-02-01 at 13:44 +0200, Jussi Kukkonen wrote:
> > > On 1 February 2017 at 13:23, Richard Purdie  > foun
> > > dation.org> wrote:
> > > > On Wed, 2017-02-01 at 12:03 +0200, Jussi Kukkonen wrote:
> > > > > Recipe-specific sysroots broke make_relative_symlink(), which
> > > > > turns absolute symlinks in sysroots into relative ones. Use
> > the
> > > > > difference between the (in-sysroot) paths to construct the
> > > > relative
> > > > > symlink.
> > > > >
> > > > > This fixes links in openssl-native, fontconfig-native and
> > bzip2-
> > > > > native.
> > > > >
> > > > > Signed-off-by: Jussi Kukkonen 
> > > > > ---
> > > > >
> > > > > sstate is not an area I'm familiar with, please take a good
> > look.
> > > > >
> > > > > As far as I could see outputpath (based on state[2]) was
> > never
> > > > really
> > > > > needed so I did not use it in the new version.
> > > >
> > > > I don't think we can hardcode workdir into here as for tasks
> > like
> > > > do_deploy, this makes no sense. I think we removed most of the
> > > > absolute
> > > > links from the deploy tasks so we currently don't need this, at
> > > > least
> > > > in the common case but the sstate code is meant to be generic.
> > > >
> > > > I am wondering if we need to pass in anything at all, can't we
> > just
> > > > call relpath on the original path and turn it into a relative
> > one
> > > > directly without referencing it back to TMPDIR/WORKDIR?
> > > >
> > > The actual file path during do_populate_sysroot is something like
> > >   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> > > r0/sysroot-destdir/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-
> > > native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs
> > >
> > > and the link before make_relative_symlink() points to 
> > >   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> > > r0/recipe-sysroot-native/etc/ssl/certs
> > >
> > > Assuming those are correct, I don't see how to do this without
> > > referencing WORKDIR or TMPDIR?
> > 
> > Good point, I knew I was missing something. How about passing in
> > walkroot/state[1] into the function, then you can subtract that
> > from
> > the actual file, then run relpath between the (srcpath - walkroot)
> > and
> > the link?
>
> Figuring out a sysroot-based path for srcpath is indeed possible (and
> nicer) using state[1] but then I have:
>   path /usr/lib/ssl/certs

Are you sure path isn't /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-
native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs ?

>   link /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> r0/recipe-sysroot-native/etc/ssl/certs
> 
> Without knowledge of TMPDIR or WORKDIR, I don't see how I can turn
> link into anything like
>    ../../../etc/ssl/certs
> 
> Maybe I'm missing something?

I think you haven't realised path in this (native) case includes
$base_prefix which is the long path. I could well be missing something
too though...

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] sstate: Fix make_relative_symlink() for RSS

[Jussi Kukkonen]

On 1 February 2017 at 14:53, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

> On Wed, 2017-02-01 at 14:38 +0200, Jussi Kukkonen wrote:
> > On 1 February 2017 at 14:00, Richard Purdie  > dation.org> wrote:
> > > On Wed, 2017-02-01 at 13:44 +0200, Jussi Kukkonen wrote:
> > > > On 1 February 2017 at 13:23, Richard Purdie  > > foun
> > > > dation.org> wrote:
> > > > > On Wed, 2017-02-01 at 12:03 +0200, Jussi Kukkonen wrote:
> > > > > > Recipe-specific sysroots broke make_relative_symlink(), which
> > > > > > turns absolute symlinks in sysroots into relative ones. Use
> > > the
> > > > > > difference between the (in-sysroot) paths to construct the
> > > > > relative
> > > > > > symlink.
> > > > > >
> > > > > > This fixes links in openssl-native, fontconfig-native and
> > > bzip2-
> > > > > > native.
> > > > > >
> > > > > > Signed-off-by: Jussi Kukkonen 
> > > > > > ---
> > > > > >
> > > > > > sstate is not an area I'm familiar with, please take a good
> > > look.
> > > > > >
> > > > > > As far as I could see outputpath (based on state[2]) was
> > > never
> > > > > really
> > > > > > needed so I did not use it in the new version.
> > > > >
> > > > > I don't think we can hardcode workdir into here as for tasks
> > > like
> > > > > do_deploy, this makes no sense. I think we removed most of the
> > > > > absolute
> > > > > links from the deploy tasks so we currently don't need this, at
> > > > > least
> > > > > in the common case but the sstate code is meant to be generic.
> > > > >
> > > > > I am wondering if we need to pass in anything at all, can't we
> > > just
> > > > > call relpath on the original path and turn it into a relative
> > > one
> > > > > directly without referencing it back to TMPDIR/WORKDIR?
> > > > >
> > > > The actual file path during do_populate_sysroot is something like
> > > >   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> > > > r0/sysroot-destdir/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-
> > > > native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs
> > > >
> > > > and the link before make_relative_symlink() points to
> > > >   /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-
> > > > r0/recipe-sysroot-native/etc/ssl/certs
> > > >
> > > > Assuming those are correct, I don't see how to do this without
> > > > referencing WORKDIR or TMPDIR?
> > >
> > > Good point, I knew I was missing something. How about passing in
> > > walkroot/state[1] into the function, then you can subtract that
> > > from
> > > the actual file, then run relpath between the (srcpath - walkroot)
> > > and
> > > the link?
> >
> > Figuring out a sysroot-based path for srcpath is indeed possible (and
> > nicer) using state[1] but then I have:
> >   path /usr/lib/ssl/certs
>
> Are you sure path isn't /mnt/extra-ssd/tmp/work/x86_64-linux/openssl-
> native/1.0.2j-r0/recipe-sysroot-native/usr/lib/ssl/certs ?
>

state[1] really is the whole thing until and including
"recipe-sysroot-native":

/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/sysroot-destdir/mnt/extra-ssd/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/recipe-sysroot-native
removing that prefix from path leaves me with
  /usr/lib/ssl/certs
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] mesa: update to 13.0.4

[Nicolas Dechesne]

Bug fixes release.

This is really needed for Qualcomm based h/w since freedreno
driver had a regression in 13.0.x branch which is fixed in 13.0.4.

Signed-off-by: Nicolas Dechesne 
---
 meta/recipes-graphics/mesa/{mesa-gl_13.0.2.bb => mesa-gl_13.0.4.bb} | 0
 meta/recipes-graphics/mesa/{mesa_13.0.2.bb => mesa_13.0.4.bb}   | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_13.0.2.bb => mesa-gl_13.0.4.bb} 
(100%)
 rename meta/recipes-graphics/mesa/{mesa_13.0.2.bb => mesa_13.0.4.bb} (83%)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb 
b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb
rename to meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa_13.0.2.bb 
b/meta/recipes-graphics/mesa/mesa_13.0.4.bb
similarity index 83%
rename from meta/recipes-graphics/mesa/mesa_13.0.2.bb
rename to meta/recipes-graphics/mesa/mesa_13.0.4.bb
index bef1fa5c38..1416c9f8b8 100644
--- a/meta/recipes-graphics/mesa/mesa_13.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_13.0.4.bb
@@ -6,8 +6,8 @@ SRC_URI = 
"ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \
file://0001-Use-wayland-scanner-in-the-path.patch \
 "
 
-SRC_URI[md5sum] = "9442c2dee914cde3d1f090371ab04113"
-SRC_URI[sha256sum] = 
"a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5"
+SRC_URI[md5sum] = "d088a921e935218833a8071cb672a574"
+SRC_URI[sha256sum] = 
"a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 00/18] #10619: refactor wic codebase (start)

[Ed Bartosh]

Hi,

This patchset consolidates wic APIs in a more maintainable way,
removes unused APIs and cleans up wic code.

This is a first series of a refactoring work. The changes in this patchset are
relatively simple. They're a preparation for upcoming heavy work on making wic
codebase less complex and more maintainable.

The following changes since commit ec3d83f9a90288403b96be25da855fa280aadd8d:

  xmlto: Don't hardcode the path to tail (2017-01-31 23:47:33 +)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ed/wic/refactoring-10619
  
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/refactoring-10619

Ed Bartosh (18):
  wic: creator: stop using config manager
  wic: direct_plugin: stop using config manager
  wic: removed conf.py and empty config file.
  wic: moved content of direct.py to direct_plugin
  wic: get rid of __rootfs_dir_to_dict method
  wic: improve naming in direct_plugin classes
  wic: pylinted direct_plugin
  wic: simplified code of direct_plugin
  wic: renamd direct_plugin.py -> direct.py
  wic: removed test file
  wic: partition: simlify calling plugin methods
  wci: misc: removed build_name API
  wic: move 2 APIs to wic.engine
  wic: move oe/misc.py one level up
  wic: removed code from __init__.py
  wic: msger.py: remove unused APIs
  wic: code cleanup
  wic: remove syslinux.py

 scripts/lib/wic/__init__.py|   4 -
 scripts/lib/wic/__version__.py |   1 -
 scripts/lib/wic/conf.py| 103 
 scripts/lib/wic/config/wic.conf|   6 -
 scripts/lib/wic/creator.py |  19 --
 scripts/lib/wic/engine.py  |  39 ++-
 scripts/lib/wic/help.py|   4 +-
 scripts/lib/wic/imager/__init__.py |   0
 scripts/lib/wic/ksparser.py|   2 +-
 scripts/lib/wic/msger.py   |  26 --
 scripts/lib/wic/partition.py   |  66 ++---
 scripts/lib/wic/plugin.py  |   5 +-
 scripts/lib/wic/pluginbase.py  |   1 -
 scripts/lib/wic/{ => plugins}/imager/direct.py | 139 ++-
 scripts/lib/wic/plugins/imager/direct_plugin.py| 103 
 scripts/lib/wic/plugins/source/bootimg-efi.py  |  20 +-
 .../lib/wic/plugins/source/bootimg-partition.py|   6 +-
 scripts/lib/wic/plugins/source/bootimg-pcbios.py   |  12 +-
 scripts/lib/wic/plugins/source/fsimage.py  |   2 +-
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |  15 +-
 scripts/lib/wic/plugins/source/rawcopy.py  |   3 +-
 scripts/lib/wic/plugins/source/rootfs.py   |   6 +-
 .../lib/wic/plugins/source/rootfs_pcbios_ext.py|  46 +++-
 scripts/lib/wic/test   |   1 -
 scripts/lib/wic/utils/misc.py  | 274 +++--
 scripts/lib/wic/utils/oe/misc.py   | 247 ---
 scripts/lib/wic/utils/partitionedfs.py |   7 +-
 scripts/lib/wic/utils/syslinux.py  |  58 -
 scripts/wic|   2 +-
 29 files changed, 426 insertions(+), 791 deletions(-)
 delete mode 100644 scripts/lib/wic/__version__.py
 delete mode 100644 scripts/lib/wic/conf.py
 delete mode 100644 scripts/lib/wic/config/wic.conf
 delete mode 100644 scripts/lib/wic/imager/__init__.py
 rename scripts/lib/wic/{ => plugins}/imager/direct.py (80%)
 delete mode 100644 scripts/lib/wic/plugins/imager/direct_plugin.py
 delete mode 100644 scripts/lib/wic/test
 delete mode 100644 scripts/lib/wic/utils/oe/misc.py
 delete mode 100644 scripts/lib/wic/utils/syslinux.py

-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 01/18] wic: creator: stop using config manager

[Ed Bartosh]

This is a preparation to removing conf.py and config/wic.conf
from the codebase.

confmgr object is complicated for no reason and almost
useless as all configuration info comes from command line and
bitbake variables. It's used it creator.py to store information
about output directory, logs and some never used functionality
like tmpfs for future use, which doesn't actually happen.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/creator.py | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/scripts/lib/wic/creator.py b/scripts/lib/wic/creator.py
index 8f7d150..74db83c 100644
--- a/scripts/lib/wic/creator.py
+++ b/scripts/lib/wic/creator.py
@@ -20,10 +20,8 @@ from optparse import OptionParser, SUPPRESS_HELP
 
 from wic import msger
 from wic.utils import errors
-from wic.conf import configmgr
 from wic.plugin import pluginmgr
 
-
 class Creator():
 """${name}: create an image
 
@@ -89,23 +87,6 @@ class Creator():
 os.makedirs(os.path.dirname(logfile_abs_path))
 msger.set_interactive(False)
 msger.set_logfile(logfile_abs_path)
-configmgr.create['logfile'] = options.logfile
-
-if options.config:
-configmgr.reset()
-configmgr._siteconf = options.config
-
-if options.outdir is not None:
-configmgr.create['outdir'] = abspath(options.outdir)
-
-cdir = 'outdir'
-if os.path.exists(configmgr.create[cdir]) \
-   and not os.path.isdir(configmgr.create[cdir]):
-msger.error('Invalid directory specified: %s' \
-% configmgr.create[cdir])
-
-if options.enabletmpfs:
-configmgr.create['enabletmpfs'] = options.enabletmpfs
 
 def main(self, argv=None):
 if argv is None:
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/18] wic: moved content of direct.py to direct_plugin

[Ed Bartosh]

This move simplifies directory structure and makes
further refactoring easier. The code from direct.py was used
only in direct_plugin, so it's safe to move it there.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/imager/__init__.py  |   0
 scripts/lib/wic/imager/direct.py| 402 
 scripts/lib/wic/plugins/imager/direct_plugin.py | 396 ++-
 3 files changed, 380 insertions(+), 418 deletions(-)
 delete mode 100644 scripts/lib/wic/imager/__init__.py
 delete mode 100644 scripts/lib/wic/imager/direct.py

diff --git a/scripts/lib/wic/imager/__init__.py 
b/scripts/lib/wic/imager/__init__.py
deleted file mode 100644
index e69de29..000
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
deleted file mode 100644
index ff06b50..000
--- a/scripts/lib/wic/imager/direct.py
+++ /dev/null
@@ -1,402 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (c) 2013, Intel Corporation.
-# All rights reserved.
-#
-# 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.
-#
-# DESCRIPTION
-# This implements the 'direct' image creator class for 'wic'
-#
-# AUTHORS
-# Tom Zanussi 
-#
-
-import os
-import shutil
-import uuid
-import tempfile
-
-from wic import msger
-from wic.utils.oe.misc import get_bitbake_var
-from wic.utils.partitionedfs import Image
-from wic.utils.errors import CreatorError, ImageError
-from wic.plugin import pluginmgr
-from wic.utils.oe.misc import exec_cmd, exec_native_cmd
-
-disk_methods = {
-"do_install_disk":None,
-}
-
-class DiskImage():
-"""
-A Disk backed by a file.
-"""
-def __init__(self, device, size):
-self.size = size
-self.device = device
-self.created = False
-
-def exists(self):
-return os.path.exists(self.device)
-
-def create(self):
-if self.created:
-return
-# create sparse disk image
-with open(self.device, 'w') as sparse:
-os.ftruncate(sparse.fileno(), self.size)
-
-self.created = True
-
-class DirectImageCreator:
-"""
-Installs a system into a file containing a partitioned disk image.
-
-DirectImageCreator is an advanced ImageCreator subclass; an image
-file is formatted with a partition table, each partition created
-from a rootfs or other OpenEmbedded build artifact and dd'ed into
-the virtual disk. The disk image can subsequently be dd'ed onto
-media and used on actual hardware.
-"""
-
-def __init__(self, image_name, ksobj, oe_builddir, image_output_dir,
- rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
- compressor, bmap=False):
-"""
-Initialize a DirectImageCreator instance.
-
-This method takes the same arguments as ImageCreator.__init__()
-"""
-self.name = image_name
-self.outdir = image_output_dir
-self.workdir = tempfile.mktemp(prefix='wic')
-self.ks = ksobj
-
-self.__image = None
-self.__disks = {}
-self.__disk_format = "direct"
-self._disk_names = []
-self.ptable_format = self.ks.bootloader.ptable
-
-self.oe_builddir = oe_builddir
-self.rootfs_dir = rootfs_dir
-self.bootimg_dir = bootimg_dir
-self.kernel_dir = kernel_dir
-self.native_sysroot = native_sysroot
-self.compressor = compressor
-self.bmap = bmap
-
-def _get_part_num(self, num, parts):
-"""calculate the real partition number, accounting for partitions not
-in the partition table and logical partitions
-"""
-realnum = 0
-for pnum, part in enumerate(parts, 1):
-if not part.no_table:
-realnum += 1
-if pnum == num:
-if  part.no_table:
-return 0
-if self.ptable_format == 'msdos' and realnum > 3:
-# account for logical partition numbering, ex. sda5..
-return realnum + 1
-return realnum
-
-def _write_fstab(self, image_rootfs):
-"""overriden to generate fstab (temporarily) in rootfs. This is called
-from _create, make sure it doesn't get called from
-BaseImage.create()
-"""
-if not image_ro

[OE-core] [PATCH 03/18] wic: removed conf.py and empty config file.

[Ed Bartosh]

Removed as they're not used anymore in wic code.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/conf.py | 103 
 scripts/lib/wic/config/wic.conf |   6 ---
 2 files changed, 109 deletions(-)
 delete mode 100644 scripts/lib/wic/conf.py
 delete mode 100644 scripts/lib/wic/config/wic.conf

diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py
deleted file mode 100644
index 070ec30..000
--- a/scripts/lib/wic/conf.py
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env python -tt
-#
-# Copyright (c) 2011 Intel, 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; version 2 of the License
-#
-# 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., 59
-# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-import os
-
-from wic.ksparser import KickStart, KickStartError
-from wic import msger
-from wic.utils import misc
-
-
-def get_siteconf():
-wic_path = os.path.dirname(__file__)
-eos = wic_path.find('scripts') + len('scripts')
-scripts_path = wic_path[:eos]
-
-return scripts_path + "/lib/image/config/wic.conf"
-
-class ConfigMgr(object):
-DEFAULTS = {
-'common': {
-"distro_name": "Default Distribution",
-"plugin_dir": "/usr/lib/wic/plugins"}, # TODO use prefix also?
-'create': {
-"tmpdir": '/var/tmp/wic',
-"outdir": './wic-output',
-"release": None,
-"logfile": None,
-"name_prefix": None,
-"name_suffix": None}
-}
-
-# make the manager class as singleton
-_instance = None
-def __new__(cls, *args, **kwargs):
-if not cls._instance:
-cls._instance = super(ConfigMgr, cls).__new__(cls, *args, **kwargs)
-
-return cls._instance
-
-def __init__(self, ksconf=None, siteconf=None):
-# reset config options
-self.reset()
-
-if not siteconf:
-siteconf = get_siteconf()
-
-# initial options from siteconf
-self._siteconf = siteconf
-
-if ksconf:
-self._ksconf = ksconf
-
-def reset(self):
-self.__ksconf = None
-self.__siteconf = None
-self.create = {}
-
-# initialize the values with defaults
-for sec, vals in self.DEFAULTS.items():
-setattr(self, sec, vals)
-
-def __set_ksconf(self, ksconf):
-if not os.path.isfile(ksconf):
-msger.error('Cannot find ks file: %s' % ksconf)
-
-self.__ksconf = ksconf
-self._parse_kickstart(ksconf)
-def __get_ksconf(self):
-return self.__ksconf
-_ksconf = property(__get_ksconf, __set_ksconf)
-
-def _parse_kickstart(self, ksconf=None):
-if not ksconf:
-return
-
-try:
-ksobj = KickStart(ksconf)
-except KickStartError as err:
-msger.error(str(err))
-
-self.create['ks'] = ksobj
-self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0]
-
-self.create['name'] = misc.build_name(ksconf,
-  self.create['release'],
-  self.create['name_prefix'],
-  self.create['name_suffix'])
-
-configmgr = ConfigMgr()
diff --git a/scripts/lib/wic/config/wic.conf b/scripts/lib/wic/config/wic.conf
deleted file mode 100644
index a51bcb5..000
--- a/scripts/lib/wic/config/wic.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[common]
-; general settings
-distro_name = OpenEmbedded
-
-[create]
-; settings for create subcommand
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 02/18] wic: direct_plugin: stop using config manager

[Ed Bartosh]

This is a preparation to removing conf.py and config/wic.conf
from the codebase.

Got rid of using configmgr global object in direct_plugin and direct
modules. It was used to implicitly parse kickstart file and set
couple of variables.

Replaced usage of configmgr by passing parameters directly to the
DirectImageCreator.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/imager/direct.py| 10 +-
 scripts/lib/wic/plugins/imager/direct_plugin.py | 22 +++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 575fd95..ff06b50 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -72,18 +72,18 @@ class DirectImageCreator:
 media and used on actual hardware.
 """
 
-def __init__(self, oe_builddir, image_output_dir, rootfs_dir,
- bootimg_dir, kernel_dir, native_sysroot, compressor,
- creatoropts, bmap=False):
+def __init__(self, image_name, ksobj, oe_builddir, image_output_dir,
+ rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
+ compressor, bmap=False):
 """
 Initialize a DirectImageCreator instance.
 
 This method takes the same arguments as ImageCreator.__init__()
 """
-self.name = creatoropts['name']
+self.name = image_name
 self.outdir = image_output_dir
 self.workdir = tempfile.mktemp(prefix='wic')
-self.ks = creatoropts['ks']
+self.ks = ksobj
 
 self.__image = None
 self.__disks = {}
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py 
b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 8fe3930..e839d2f 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -24,8 +24,12 @@
 # Tom Zanussi 
 #
 
+from time import strftime
+
+from os.path import basename, splitext
 from wic.utils import errors
-from wic.conf import configmgr
+from wic.ksparser import KickStart, KickStartError
+from wic import msger
 
 import wic.imager.direct as direct
 from wic.pluginbase import ImagerPlugin
@@ -68,27 +72,31 @@ class DirectPlugin(ImagerPlugin):
 bootimg_dir = args[2]
 rootfs_dir = args[3]
 
-creatoropts = configmgr.create
 ksconf = args[4]
 
 image_output_dir = args[5]
 oe_builddir = args[6]
 compressor = args[7]
 
-krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
+try:
+ksobj = KickStart(ksconf)
+except KickStartError as err:
+msger.error(str(err))
 
-configmgr._ksconf = ksconf
+image_name = "%s-%s" % (splitext(basename(ksconf))[0],
+  strftime("%Y%m%d%H%M"))
+krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
 
-creator = direct.DirectImageCreator(oe_builddir,
+creator = direct.DirectImageCreator(image_name,
+ksobj,
+oe_builddir,
 image_output_dir,
 krootfs_dir,
 bootimg_dir,
 kernel_dir,
 native_sysroot,
 compressor,
-creatoropts,
 opts.bmap)
-
 try:
 creator.create()
 creator.assemble()
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 05/18] wic: get rid of __rootfs_dir_to_dict method

[Ed Bartosh]

Replaced class method __rootfs_dir_to_dict with a list
comprehension.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct_plugin.py | 21 +
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py 
b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 91a9792..c6df5fb 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -53,21 +53,8 @@ class DirectPlugin(ImagerPlugin):
 
 name = 'direct'
 
-@classmethod
-def __rootfs_dir_to_dict(cls, rootfs_dirs):
-"""
-Gets a string that contain 'connection=dir' splitted by
-space and return a dict
-"""
-krootfs_dir = {}
-for rootfs_dir in rootfs_dirs.split(' '):
-key, val = rootfs_dir.split('=')
-krootfs_dir[key] = val
-
-return krootfs_dir
-
-@classmethod
-def do_create(cls, opts, *args):
+@staticmethod
+def do_create(opts, *args):
 """
 Create direct image, called from creator as 'direct' cmd
 """
@@ -92,7 +79,9 @@ class DirectPlugin(ImagerPlugin):
 
 image_name = "%s-%s" % (splitext(basename(ksconf))[0],
   strftime("%Y%m%d%H%M"))
-krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
+
+# parse possible 'rootfs=name' items
+krootfs_dir = dict(rdir.split('=') for rdir in rootfs_dir.split(' '))
 
 creator = DirectImageCreator(image_name, ksobj, oe_builddir,
  image_output_dir, krootfs_dir,
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 09/18] wic: renamd direct_plugin.py -> direct.py

[Ed Bartosh]

As this files is located in plugins/imager subdirectory it's
obvious that it's an imager plugin. Renamed to direct.py to
be consistent with plugin naming scheme.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/{direct_plugin.py => direct.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/lib/wic/plugins/imager/{direct_plugin.py => direct.py} (100%)

diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py 
b/scripts/lib/wic/plugins/imager/direct.py
similarity index 100%
rename from scripts/lib/wic/plugins/imager/direct_plugin.py
rename to scripts/lib/wic/plugins/imager/direct.py
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 08/18] wic: simplified code of direct_plugin

[Ed Bartosh]

Removed unused methods.
Got rid of get_default_source_plugin and _full_name methods.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct_plugin.py | 24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py 
b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 1d0d3ff..9cd7068 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -93,9 +93,6 @@ class DiskImage():
 self.device = device
 self.created = False
 
-def exists(self):
-return os.path.exists(self.device)
-
 def create(self):
 if self.created:
 return
@@ -229,26 +226,9 @@ class DirectImageCreator:
 # partitions list from kickstart file
 return self.ks.partitions
 
-def _full_name(self, name, extention):
-""" Construct full file name for a file we generate. """
-return "%s-%s.%s" % (self.name, name, extention)
-
 def _full_path(self, path, name, extention):
 """ Construct full file path to a file we generate. """
-return os.path.join(path, self._full_name(name, extention))
-
-def get_default_source_plugin(self):
-"""
-The default source plugin i.e. the plugin that's consulted for
-overall image generation tasks outside of any particular
-partition.  For convenience, we just hang it off the
-bootloader handler since it's the one non-partition object in
-any setup.  By default the default plugin is set to the same
-plugin as the /boot partition; since we hang it off the
-bootloader object, the default can be explicitly set using the
---source bootloader param.
-"""
-return self.ks.bootloader.source
+return os.path.join(path, "%s-%s.%s" % (self.name, name, extention))
 
 #
 # Actual implemention
@@ -346,7 +326,7 @@ class DirectImageCreator:
 For example, prepare the image to be bootable by e.g.
 creating and installing a bootloader configuration.
 """
-source_plugin = self.get_default_source_plugin()
+source_plugin = self.ks.bootloader.source
 if source_plugin:
 name = "do_install_disk"
 methods = pluginmgr.get_source_plugin_methods(source_plugin,
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 07/18] wic: pylinted direct_plugin

[Ed Bartosh]

Fixed wrong continued indentation, unused import and
trailing new line pyling warnings.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct_plugin.py | 22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py 
b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 48588db..1d0d3ff 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -27,7 +27,6 @@ import os
 import shutil
 import uuid
 import tempfile
-import time
 
 from time import strftime
 from os.path import basename, splitext
@@ -307,19 +306,13 @@ class DirectImageCreator:
  self.bootimg_dir, self.kernel_dir, 
self.native_sysroot)
 
 
-self._image.add_partition(part.disk_size,
-   part.disk,
-   part.mountpoint,
-   part.source_file,
-   part.fstype,
-   part.label,
-   fsopts=part.fsopts,
-   boot=part.active,
-   align=part.align,
-   no_table=part.no_table,
-   part_type=part.part_type,
-   uuid=part.uuid,
-   system_id=part.system_id)
+self._image.add_partition(part.disk_size, part.disk,
+  part.mountpoint, part.source_file,
+  part.fstype, part.label,
+  fsopts=part.fsopts, boot=part.active,
+  align=part.align, no_table=part.no_table,
+  part_type=part.part_type, uuid=part.uuid,
+  system_id=part.system_id)
 
 if fstab_path:
 shutil.move(fstab_path + ".orig", fstab_path)
@@ -443,4 +436,3 @@ class DirectImageCreator:
 
 # remove work directory
 shutil.rmtree(self.workdir, ignore_errors=True)
-
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/18] wic: improve naming in direct_plugin classes

[Ed Bartosh]

Synchronized attribure names in DirectImageCreator and
DirectPlugin for better readability. Simplified code,
removed unneeded global variable disk_methods.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct_plugin.py | 62 +
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py 
b/scripts/lib/wic/plugins/imager/direct_plugin.py
index c6df5fb..48588db 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -58,50 +58,33 @@ class DirectPlugin(ImagerPlugin):
 """
 Create direct image, called from creator as 'direct' cmd
 """
-if len(args) != 8:
-raise errors.Usage("Extra arguments given")
-
-native_sysroot = args[0]
-kernel_dir = args[1]
-bootimg_dir = args[2]
-rootfs_dir = args[3]
-
-ksconf = args[4]
-
-image_output_dir = args[5]
-oe_builddir = args[6]
-compressor = args[7]
+native_sysroot, kernel_dir, bootimg_dir, rootfs_dir, ksconf, \
+outdir, oe_builddir, compressor = args
 
 try:
 ksobj = KickStart(ksconf)
 except KickStartError as err:
 msger.error(str(err))
 
-image_name = "%s-%s" % (splitext(basename(ksconf))[0],
+name = "%s-%s" % (splitext(basename(ksconf))[0],
   strftime("%Y%m%d%H%M"))
 
 # parse possible 'rootfs=name' items
 krootfs_dir = dict(rdir.split('=') for rdir in rootfs_dir.split(' '))
 
-creator = DirectImageCreator(image_name, ksobj, oe_builddir,
- image_output_dir, krootfs_dir,
- bootimg_dir, kernel_dir, native_sysroot,
- compressor, opts.bmap)
+creator = DirectImageCreator(name, ksobj, oe_builddir, outdir,
+ krootfs_dir, bootimg_dir, kernel_dir,
+ native_sysroot, compressor, opts.bmap)
 try:
 creator.create()
 creator.assemble()
 creator.finalize()
-creator.print_outimage_info()
-
+creator.print_info()
 except errors.CreatorError:
 raise
 finally:
 creator.cleanup()
 
-disk_methods = {
-"do_install_disk":None,
-}
-
 class DiskImage():
 """
 A Disk backed by a file.
@@ -134,22 +117,22 @@ class DirectImageCreator:
 media and used on actual hardware.
 """
 
-def __init__(self, image_name, ksobj, oe_builddir, image_output_dir,
- rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
- compressor, bmap=False):
+def __init__(self, name, ksobj, oe_builddir, outdir,
+ rootfs_dir, bootimg_dir, kernel_dir,
+ native_sysroot, compressor, bmap=False):
 """
 Initialize a DirectImageCreator instance.
 
 This method takes the same arguments as ImageCreator.__init__()
 """
-self.name = image_name
-self.outdir = image_output_dir
+self.name = name
+self.outdir = outdir
 self.workdir = tempfile.mktemp(prefix='wic')
 self.ks = ksobj
 
-self.__image = None
-self.__disks = {}
-self.__disk_format = "direct"
+self._image = None
+self._disks = {}
+self._disk_format = "direct"
 self._disk_names = []
 self.ptable_format = self.ks.bootloader.ptable
 
@@ -372,14 +355,13 @@ class DirectImageCreator:
 """
 source_plugin = self.get_default_source_plugin()
 if source_plugin:
-self._source_methods = 
pluginmgr.get_source_plugin_methods(source_plugin, disk_methods)
+name = "do_install_disk"
+methods = pluginmgr.get_source_plugin_methods(source_plugin,
+  {name: None})
 for disk_name, disk in self._image.disks.items():
-self._source_methods["do_install_disk"](disk, disk_name, self,
-self.workdir,
-self.oe_builddir,
-self.bootimg_dir,
-self.kernel_dir,
-self.native_sysroot)
+methods["do_install_disk"](disk, disk_name, self, self.workdir,
+   self.oe_builddir, self.bootimg_dir,
+   self.kernel_dir, 
self.native_sysroot)
 
 for disk_name, disk in self._image.disks.items():
 full_path = self._full_path(self.workdir, disk_name, "direct")
@@ -393,7 +375,7 @@ class DirectImageCreator:
  

[OE-core] [PATCH 10/18] wic: removed test file

[Ed Bartosh]

This file is not used anywhere in the wic code.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/test | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 scripts/lib/wic/test

diff --git a/scripts/lib/wic/test b/scripts/lib/wic/test
deleted file mode 100644
index 9daeafb..000
--- a/scripts/lib/wic/test
+++ /dev/null
@@ -1 +0,0 @@
-test
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 11/18] wic: partition: simlify calling plugin methods

[Ed Bartosh]

Replaced parse_sourceparams function with list comprehension.
Used local variables instead of attributes.
Moved global variable to the local scope.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/partition.py | 53 +++-
 scripts/lib/wic/utils/oe/misc.py | 23 -
 2 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 49d1327..094a8c3 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -27,16 +27,10 @@
 import os
 import tempfile
 
-from wic.utils.oe.misc import msger, parse_sourceparams
+from wic.utils.oe.misc import msger
 from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
 from wic.plugin import pluginmgr
 
-partition_methods = {
-"do_stage_partition":None,
-"do_prepare_partition":None,
-"do_configure_partition":None,
-}
-
 class Partition():
 
 def __init__(self, args, lineno):
@@ -129,9 +123,6 @@ class Partition():
 Prepare content for individual partitions, depending on
 partition command parameters.
 """
-if self.sourceparams:
-self.sourceparams_dict = parse_sourceparams(self.sourceparams)
-
 if not self.source:
 if not self.size and not self.fixed_size:
 msger.error("The %s partition has a size of zero. Please "
@@ -164,24 +155,30 @@ class Partition():
 "details on adding a new source plugin." % \
 (self.source, self.mountpoint))
 
-self._source_methods = pluginmgr.get_source_plugin_methods(\
-   self.source, partition_methods)
-self._source_methods["do_configure_partition"](self, 
self.sourceparams_dict,
-   creator, cr_workdir,
-   oe_builddir,
-   bootimg_dir,
-   kernel_dir,
-   native_sysroot)
-self._source_methods["do_stage_partition"](self, 
self.sourceparams_dict,
-   creator, cr_workdir,
-   oe_builddir,
-   bootimg_dir, kernel_dir,
-   native_sysroot)
-self._source_methods["do_prepare_partition"](self, 
self.sourceparams_dict,
- creator, cr_workdir,
- oe_builddir,
- bootimg_dir, kernel_dir, 
rootfs_dir,
- native_sysroot)
+srcparams_dict = {}
+if self.sourceparams:
+# Split sourceparams string of the form key1=val1[,key2=val2,...]
+# into a dict.  Also accepts valueless keys i.e. without =
+splitted = self.sourceparams.split(',')
+srcparams_dict = dict(par.split('=') for par in splitted if par)
+
+partition_methods = {
+"do_stage_partition": None,
+"do_prepare_partition": None,
+"do_configure_partition": None
+}
+
+methods = pluginmgr.get_source_plugin_methods(self.source,
+  partition_methods)
+methods["do_configure_partition"](self, srcparams_dict, creator,
+  cr_workdir, oe_builddir, bootimg_dir,
+  kernel_dir, native_sysroot)
+methods["do_stage_partition"](self, srcparams_dict, creator,
+  cr_workdir, oe_builddir, bootimg_dir,
+  kernel_dir, native_sysroot)
+methods["do_prepare_partition"](self, srcparams_dict, creator,
+cr_workdir, oe_builddir, bootimg_dir,
+kernel_dir, rootfs_dir, native_sysroot)
 
 # further processing required Partition.size to be an integer, make
 # sure that it is one
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
index 3737c4b..6781d83 100644
--- a/scripts/lib/wic/utils/oe/misc.py
+++ b/scripts/lib/wic/utils/oe/misc.py
@@ -222,26 +222,3 @@ def get_bitbake_var(var, image=None, cache=True):
 get_var method of BB_VARS singleton.
 """
 return BB_VARS.get_var(var, image, cache)
-
-def parse_sourceparams(sourceparams):
-"""
-Split sourceparams string of the form key1=val1[,key2=val2,...]
-into a dict.  Also accepts valueless keys i.e. without =.
-
-Returns dict of param key/val pairs (note that val may be None).
-"""
-   

[OE-core] [PATCH 13/18] wic: move 2 APIs to wic.engine

[Ed Bartosh]

Moved find_canned and get_custom_config APIs to engine module.
Removed empty wic.utils.misc module.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/engine.py  | 33 -
 scripts/lib/wic/ksparser.py|  2 +-
 scripts/lib/wic/plugins/source/bootimg-efi.py  |  2 +-
 scripts/lib/wic/plugins/source/bootimg-pcbios.py   |  4 +-
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |  2 +-
 scripts/lib/wic/utils/misc.py  | 56 --
 6 files changed, 37 insertions(+), 62 deletions(-)
 delete mode 100644 scripts/lib/wic/utils/misc.py

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 2adef2f..4abea87 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -32,7 +32,6 @@ import os
 import sys
 
 from wic import msger, creator
-from wic.utils import misc
 from wic.plugin import pluginmgr
 from wic.utils.oe import misc
 
@@ -226,3 +225,35 @@ def wic_list(args, scripts_path):
 return True
 
 return False
+
+def find_canned(scripts_path, file_name):
+"""
+Find a file either by its path or by name in the canned files dir.
+
+Return None if not found
+"""
+if os.path.exists(file_name):
+return file_name
+
+layers_canned_wks_dir = build_canned_image_list(scripts_path)
+for canned_wks_dir in layers_canned_wks_dir:
+for root, dirs, files in os.walk(canned_wks_dir):
+for fname in files:
+if fname == file_name:
+fullpath = os.path.join(canned_wks_dir, fname)
+return fullpath
+
+def get_custom_config(boot_file):
+"""
+Get the custom configuration to be used for the bootloader.
+
+Return None if the file can't be found.
+"""
+# Get the scripts path of poky
+scripts_path = os.path.abspath("%s/../.." % os.path.dirname(__file__))
+
+cfg_file = find_canned(scripts_path, boot_file)
+if cfg_file:
+with open(cfg_file, "r") as f:
+config = f.read()
+return config
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 62c4902..41d3cc6 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -30,8 +30,8 @@ import shlex
 from argparse import ArgumentParser, ArgumentError, ArgumentTypeError
 
 from wic import msger
+from wic.engine import find_canned
 from wic.partition import Partition
-from wic.utils.misc import find_canned
 
 class KickStartError(Exception):
 """Custom exception."""
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py 
b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 74a1557..28b941e 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -28,8 +28,8 @@ import os
 import shutil
 
 from wic import msger
+from wic.engine import get_custom_config
 from wic.pluginbase import SourcePlugin
-from wic.utils.misc import get_custom_config
 from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
   BOOTDD_EXTRA_SPACE
 
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py 
b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index cff8aec..283b834 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -26,10 +26,10 @@
 
 import os
 
-from wic.utils.errors import ImageError
 from wic import msger
+from wic.engine import get_custom_config
 from wic.utils import runner
-from wic.utils.misc import get_custom_config
+from wic.utils.errors import ImageError
 from wic.pluginbase import SourcePlugin
 from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \
   get_bitbake_var, BOOTDD_EXTRA_SPACE
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py 
b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index bceaa84..4979d8e 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -26,8 +26,8 @@ import shutil
 import glob
 
 from wic import msger
+from wic.engine import get_custom_config
 from wic.pluginbase import SourcePlugin
-from wic.utils.misc import get_custom_config
 from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
 
 class IsoImagePlugin(SourcePlugin):
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
deleted file mode 100644
index 7d09f6f..000
--- a/scripts/lib/wic/utils/misc.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python -tt
-#
-# Copyright (c) 2010, 2011 Intel 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; version 2 of the License
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty 

[OE-core] [PATCH 12/18] wci: misc: removed build_name API

[Ed Bartosh]

This API is not used in wic code.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/utils/misc.py | 39 ---
 1 file changed, 39 deletions(-)

diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index 1415ae9..7d09f6f 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
@@ -19,45 +19,6 @@ import os
 import time
 import wic.engine
 
-def build_name(kscfg, release=None, prefix=None, suffix=None):
-"""Construct and return an image name string.
-
-This is a utility function to help create sensible name and fslabel
-strings. The name is constructed using the sans-prefix-and-extension
-kickstart filename and the supplied prefix and suffix.
-
-kscfg -- a path to a kickstart file
-release --  a replacement to suffix for image release
-prefix -- a prefix to prepend to the name; defaults to None, which causes
-  no prefix to be used
-suffix -- a suffix to append to the name; defaults to None, which causes
-  a MMDDHHMM suffix to be used
-
-Note, if maxlen is less then the len(suffix), you get to keep both pieces.
-
-"""
-name = os.path.basename(kscfg)
-idx = name.rfind('.')
-if idx >= 0:
-name = name[:idx]
-
-if release is not None:
-suffix = ""
-if prefix is None:
-prefix = ""
-if suffix is None:
-suffix = time.strftime("%Y%m%d%H%M")
-
-if name.startswith(prefix):
-name = name[len(prefix):]
-
-prefix = "%s-" % prefix if prefix else ""
-suffix = "-%s" % suffix if suffix else ""
-
-ret = prefix + name + suffix
-
-return ret
-
 def find_canned(scripts_path, file_name):
 """
 Find a file either by its path or by name in the canned files dir.
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 15/18] wic: removed code from __init__.py

[Ed Bartosh]

The code deals with non-existing directory
and can be removed.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/__init__.py | 4 
 1 file changed, 4 deletions(-)

diff --git a/scripts/lib/wic/__init__.py b/scripts/lib/wic/__init__.py
index 63c1d9c..e69de29 100644
--- a/scripts/lib/wic/__init__.py
+++ b/scripts/lib/wic/__init__.py
@@ -1,4 +0,0 @@
-import os, sys
-
-cur_path = os.path.dirname(__file__) or '.'
-sys.path.insert(0, cur_path + '/3rdparty')
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 14/18] wic: move oe/misc.py one level up

[Ed Bartosh]

Flattened directory structure:
   moved wic/utils/oe/misc.py -> wic/utils/misc.py

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/engine.py| 4 ++--
 scripts/lib/wic/partition.py | 4 ++--
 scripts/lib/wic/plugin.py| 2 +-
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 scripts/lib/wic/plugins/source/bootimg-efi.py| 4 ++--
 scripts/lib/wic/plugins/source/bootimg-partition.py  | 2 +-
 scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 ++--
 scripts/lib/wic/plugins/source/fsimage.py| 2 +-
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 +-
 scripts/lib/wic/plugins/source/rawcopy.py| 2 +-
 scripts/lib/wic/plugins/source/rootfs.py | 2 +-
 scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py  | 8 
 scripts/lib/wic/utils/{oe => }/misc.py   | 0
 scripts/lib/wic/utils/partitionedfs.py   | 2 +-
 scripts/wic  | 2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)
 rename scripts/lib/wic/utils/{oe => }/misc.py (100%)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 4abea87..685bc88 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -33,7 +33,7 @@ import sys
 
 from wic import msger, creator
 from wic.plugin import pluginmgr
-from wic.utils.oe import misc
+from wic.utils.misc import get_bitbake_var
 
 
 def verify_build_env():
@@ -54,7 +54,7 @@ SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
 WIC_DIR = "wic"
 
 def build_canned_image_list(path):
-layers_path = misc.get_bitbake_var("BBLAYERS")
+layers_path = get_bitbake_var("BBLAYERS")
 canned_wks_layer_dirs = []
 
 if layers_path is not None:
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 094a8c3..31a0350 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -27,8 +27,8 @@
 import os
 import tempfile
 
-from wic.utils.oe.misc import msger
-from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
+from wic import msger
+from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
 from wic.plugin import pluginmgr
 
 class Partition():
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index 306b324..6b06ed6 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -20,7 +20,7 @@ import os, sys
 from wic import msger
 from wic import pluginbase
 from wic.utils import errors
-from wic.utils.oe.misc import get_bitbake_var
+from wic.utils.misc import get_bitbake_var
 
 __ALL__ = ['PluginMgr', 'pluginmgr']
 
diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index 9cd7068..592412a 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -37,7 +37,7 @@ from wic.plugin import pluginmgr
 from wic.pluginbase import ImagerPlugin
 from wic.utils import errors
 from wic.utils.errors import CreatorError, ImageError
-from wic.utils.oe.misc import get_bitbake_var, exec_cmd, exec_native_cmd
+from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
 from wic.utils.partitionedfs import Image
 
 class DirectPlugin(ImagerPlugin):
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py 
b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 28b941e..2b66a58 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -30,8 +30,8 @@ import shutil
 from wic import msger
 from wic.engine import get_custom_config
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
-  BOOTDD_EXTRA_SPACE
+from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var,
+BOOTDD_EXTRA_SPACE)
 
 class BootimgEFIPlugin(SourcePlugin):
 """
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py 
b/scripts/lib/wic/plugins/source/bootimg-partition.py
index b76c121..f94dfab 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -28,7 +28,7 @@ import re
 
 from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import exec_cmd, get_bitbake_var
+from wic.utils.misc import exec_cmd, get_bitbake_var
 from glob import glob
 
 class BootimgPartitionPlugin(SourcePlugin):
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py 
b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 283b834..d796433 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -31,8 +31,8 @@ from wic.engine import get_custom_config
 from wic.utils import runner
 from wic.utils.errors import ImageError
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe

[OE-core] [PATCH 16/18] wic: msger.py: remove unused APIs

[Ed Bartosh]

Removed unused enable_logstderr and disable_logstderr APIs.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/msger.py | 26 --
 1 file changed, 26 deletions(-)

diff --git a/scripts/lib/wic/msger.py b/scripts/lib/wic/msger.py
index fb8336d..dc9b734 100644
--- a/scripts/lib/wic/msger.py
+++ b/scripts/lib/wic/msger.py
@@ -207,29 +207,3 @@ def set_logfile(fpath):
 
 import atexit
 atexit.register(_savelogf)
-
-def enable_logstderr(fpath):
-global CATCHERR_BUFFILE_FD
-global CATCHERR_BUFFILE_PATH
-global CATCHERR_SAVED_2
-
-if os.path.exists(fpath):
-os.remove(fpath)
-CATCHERR_BUFFILE_PATH = fpath
-CATCHERR_BUFFILE_FD = os.open(CATCHERR_BUFFILE_PATH, os.O_RDWR|os.O_CREAT)
-CATCHERR_SAVED_2 = os.dup(2)
-os.dup2(CATCHERR_BUFFILE_FD, 2)
-
-def disable_logstderr():
-global CATCHERR_BUFFILE_FD
-global CATCHERR_BUFFILE_PATH
-global CATCHERR_SAVED_2
-
-raw(msg=None) # flush message buffer and print it.
-os.dup2(CATCHERR_SAVED_2, 2)
-os.close(CATCHERR_SAVED_2)
-os.close(CATCHERR_BUFFILE_FD)
-os.unlink(CATCHERR_BUFFILE_PATH)
-CATCHERR_BUFFILE_FD = -1
-CATCHERR_BUFFILE_PATH = None
-CATCHERR_SAVED_2 = -1
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 17/18] wic: code cleanup

[Ed Bartosh]

Fixed indentation, unused imports, trailing lines etc.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/__version__.py   |  1 -
 scripts/lib/wic/engine.py|  2 +-
 scripts/lib/wic/help.py  |  4 ++--
 scripts/lib/wic/partition.py | 11 +++
 scripts/lib/wic/plugin.py|  3 ++-
 scripts/lib/wic/pluginbase.py|  1 -
 scripts/lib/wic/plugins/imager/direct.py |  3 +--
 scripts/lib/wic/plugins/source/bootimg-efi.py| 14 +++---
 scripts/lib/wic/plugins/source/bootimg-partition.py  |  4 ++--
 scripts/lib/wic/plugins/source/bootimg-pcbios.py |  4 +---
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 11 +--
 scripts/lib/wic/plugins/source/rawcopy.py|  1 -
 scripts/lib/wic/plugins/source/rootfs.py |  4 ++--
 scripts/lib/wic/utils/misc.py|  9 +++--
 scripts/lib/wic/utils/partitionedfs.py   |  7 +++
 15 files changed, 36 insertions(+), 43 deletions(-)
 delete mode 100644 scripts/lib/wic/__version__.py

diff --git a/scripts/lib/wic/__version__.py b/scripts/lib/wic/__version__.py
deleted file mode 100644
index 5452a46..000
--- a/scripts/lib/wic/__version__.py
+++ /dev/null
@@ -1 +0,0 @@
-VERSION = "2.00"
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 685bc88..592ef77 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -190,7 +190,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, 
kernel_dir,
 crobj = creator.Creator()
 
 cmdline = ["direct", native_sysroot, kernel_dir, bootimg_dir, rootfs_dir,
-wks_file, image_output_dir, oe_builddir, compressor or ""]
+   wks_file, image_output_dir, oe_builddir, compressor or ""]
 if bmap:
 cmdline.append('--bmap')
 
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index daa11bf..1bd411d 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -31,7 +31,7 @@ import logging
 from wic.plugin import pluginmgr, PLUGIN_TYPES
 
 def subcommand_error(args):
-logging.info("invalid subcommand %s" % args[0])
+logging.info("invalid subcommand %s", args[0])
 
 
 def display_help(subcommand, subcommands):
@@ -87,7 +87,7 @@ def invoke_subcommand(args, parser, main_command_usage, 
subcommands):
 elif args[0] == "help":
 wic_help(args, main_command_usage, subcommands)
 elif args[0] not in subcommands:
-logging.error("Unsupported subcommand %s, exiting\n" % (args[0]))
+logging.error("Unsupported subcommand %s, exiting\n", args[0])
 parser.print_help()
 return 1
 else:
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 31a0350..69b369c 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -182,7 +182,7 @@ class Partition():
 
 # further processing required Partition.size to be an integer, make
 # sure that it is one
-if type(self.size) is not int:
+if not isinstance(self.size, int):
 msger.error("Partition %s internal size is not an integer. " \
   "This a bug in source plugin %s and needs to be 
fixed." \
   % (self.mountpoint, self.source))
@@ -242,7 +242,10 @@ class Partition():
 # IMAGE_OVERHEAD_FACTOR and IMAGE_ROOTFS_EXTRA_SPACE
 rsize_bb = get_bitbake_var('ROOTFS_SIZE')
 if rsize_bb:
-msger.warning('overhead-factor was specified, but size was 
not, so bitbake variables will be used for the size. In this case both 
IMAGE_OVERHEAD_FACTOR and --overhead-factor will be applied')
+msger.warning('overhead-factor was specified, but size was 
not,'
+  ' so bitbake variables will be used for the 
size.'
+  ' In this case both IMAGE_OVERHEAD_FACTOR and '
+  '--overhead-factor will be applied')
 self.size = int(round(float(rsize_bb)))
 
 for prefix in ("ext", "btrfs", "vfat", "squashfs"):
@@ -402,7 +405,8 @@ class Partition():
   "Proceeding as requested." % self.mountpoint)
 
 path = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
-os.path.isfile(path) and os.remove(path)
+if os.path.isfile(path):
+os.remove(path)
 
 # it is not possible to create a squashfs without source data,
 # thus prepare an empty temp dir that is used as source
@@ -436,4 +440,3 @@ class Partition():
 label_str = "-L %s" % self.label
 mkswap_cmd = "mkswap %s -U %s %s" % (label_str, str(uuid.uuid1()), 
path)
 exec_native_cmd(mkswap_cmd, native_sysroot)
-
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index 6b06ed6..f04a034 100644

[OE-core] [PATCH 18/18] wic: remove syslinux.py

[Ed Bartosh]

This module contains singe function serial_console_form_kargs, which
is used only by rootfs_pcbios_ext plugin. Moved it there and removed
syslinux module to make it easy to find and mainain plugin code.

[YOCTO #10619]

Signed-off-by: Ed Bartosh 
---
 .../lib/wic/plugins/source/rootfs_pcbios_ext.py| 38 +-
 scripts/lib/wic/utils/syslinux.py  | 58 --
 2 files changed, 37 insertions(+), 59 deletions(-)
 delete mode 100644 scripts/lib/wic/utils/syslinux.py

diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py 
b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index 1032019..bd6fd6c 100644
--- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
+++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
@@ -19,13 +19,49 @@
 #
 
 import os
+import re
+
 from wic import msger
-from wic.utils import syslinux
 from wic.utils import runner
 from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
 from wic.utils.errors import ImageError
 from wic.pluginbase import SourcePlugin
 
+def serial_console_form_kargs(kernel_args):
+"""
+Create SERIAL... line from kernel parameters
+
+syslinux needs a line SERIAL port [baudrate [flowcontrol]]
+in the syslinux.cfg file. The config line is generated based
+on kernel boot parameters. The the parameters of the first
+ttyS console are considered for syslinux config.
+@param kernel_args kernel command line
+@return line for syslinux config file e.g. "SERIAL 0 115200"
+"""
+syslinux_conf = ""
+for param in kernel_args.split():
+param_match = 
re.match("console=ttyS([0-9]+),?([0-9]*)([noe]?)([0-9]?)(r?)", param)
+if param_match:
+syslinux_conf += "SERIAL " + param_match.group(1)
+# baudrate
+if param_match.group(2):
+syslinux_conf += " " + param_match.group(2)
+# parity
+if param_match.group(3) and param_match.group(3) != 'n':
+msger.warning("syslinux does not support parity for console. 
{} is ignored."
+  .format(param_match.group(3)))
+# number of bits
+if param_match.group(4) and param_match.group(4) != '8':
+msger.warning("syslinux supports 8 bit console configuration 
only. {} is ignored."
+  .format(param_match.group(4)))
+# flow control
+if param_match.group(5) and param_match.group(5) != '':
+msger.warning("syslinux console flowcontrol configuration. {} 
is ignored."
+  .format(param_match.group(5)))
+break
+
+return syslinux_conf
+
 
 # pylint: disable=no-init
 class RootfsPlugin(SourcePlugin):
diff --git a/scripts/lib/wic/utils/syslinux.py 
b/scripts/lib/wic/utils/syslinux.py
deleted file mode 100644
index aace286..000
--- a/scripts/lib/wic/utils/syslinux.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# 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; version 2 of the License
-#
-# 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., 59
-# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# AUTHOR
-# Adrian Freihofer 
-
-
-import re
-from wic import msger
-
-
-def serial_console_form_kargs(kernel_args):
-"""
-Create SERIAL... line from kernel parameters
-
-syslinux needs a line SERIAL port [baudrate [flowcontrol]]
-in the syslinux.cfg file. The config line is generated based
-on kernel boot parameters. The the parameters of the first
-ttyS console are considered for syslinux config.
-@param kernel_args kernel command line
-@return line for syslinux config file e.g. "SERIAL 0 115200"
-"""
-syslinux_conf = ""
-for param in kernel_args.split():
-param_match = 
re.match("console=ttyS([0-9]+),?([0-9]*)([noe]?)([0-9]?)(r?)", param)
-if param_match:
-syslinux_conf += "SERIAL " + param_match.group(1)
-# baudrate
-if param_match.group(2):
-syslinux_conf += " " + param_match.group(2)
-# parity
-if param_match.group(3) and param_match.group(3) != 'n':
-msger.warning("syslinux does not support parity for console. 
{} is ignored."
-  .format(param_match.group(3)))
-# number of bits
-if param_match.group(4) and param_match.group(

Re: [OE-core] [PATCH v2] xserver-xorg: Fix X server 1.19 crash

[Tom Hochstein]

https://lists.yoctoproject.org/pipermail/meta-freescale/2017-January/019980.html


From: Jussi Kukkonen [mailto:jussi.kukko...@intel.com]
Sent: Wednesday, February 01, 2017 5:38 AM
To: Tom Hochstein 
Cc: Patches and discussions about the oe-core layer 

Subject: Re: [OE-core] [PATCH v2] xserver-xorg: Fix X server 1.19 crash

On 1 February 2017 at 03:22, Tom Hochstein 
mailto:tom.hochst...@nxp.com>> wrote:
Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
useSIGIO option:

xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO

The check for useSIGIO is no longer needed.

Can you explain what the crash is or how to reproduce, I can't figure it out 
from the patch. Link to possible upstream ML discussion is fine as well.

Thanks,
  Jussi
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/4] selftest/buildoptions: use a thinner image to test 'read-only-rootfs' feature

[Leonardo Sandoval]

On 01/31/2017 05:16 PM, Richard Purdie wrote:

On Tue, 2017-01-31 at 16:50 -0600,
leonardo.sandoval.gonza...@linux.intel.com wrote:

From: Leonardo Sandoval 

The minimal is much faster to build that sato, so use the former to
test
read-only feature.

Signed-off-by: Leonardo Sandoval 
---
  meta/lib/oeqa/selftest/buildoptions.py | 5 +
  1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/buildoptions.py
b/meta/lib/oeqa/selftest/buildoptions.py
index d40eb00..004b2dd 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -44,11 +44,8 @@ class ImageOptionsTests(oeSelfTest):
  
  @testcase(1435)

  def test_read_only_image(self):
-distro_features = get_bb_var('DISTRO_FEATURES')
-if not ('x11' in distro_features and 'opengl' in
distro_features):
-self.skipTest('core-image-sato requires x11 and opengl
in distro features')
  self.write_config('IMAGE_FEATURES += "read-only-rootfs"')
-bitbake("core-image-sato")
+bitbake("core-image-minimal")
  # do_image will fail if there are any pending postinsts

Whilst this is certainly going to be a touch faster, I believe we do
want to test read only rootfs with a larger image like sato to make
sure the postinsts really do work with a read only system?


I don't get it. What would make the test different using a larger image?


Cheers,

Richard



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] xserver-xorg: Fix X server 1.19 crash

[Leonardo Sandoval]

On 01/31/2017 01:48 PM, Tom Hochstein wrote:

Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
useSIGIO option:

xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO

The check for useSIGIO is no longer needed.

Upstream-Status: Pending


patchtest complained because the Upstream-Status must be in the patch 
you are adding, not inside the commit description.




Signed-off-by: Tom Hochstein 
---
  .../0003-Remove-check-for-useSIGIO-option.patch| 45 ++
  .../xorg-xserver/xserver-xorg_1.19.1.bb|  1 +
  2 files changed, 46 insertions(+)
  create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch

diff --git 
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
new file mode 100644
index 000..db2d845
--- /dev/null
+++ 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
@@ -0,0 +1,45 @@
+From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj 
+Date: Mon, 30 Jan 2017 16:32:06 -0600
+Subject: [PATCH] Remove check for useSIGIO option
+
+Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of 
useSIGIO
+option.
+
+As the xfree86 SIGIO support is reworked to use internal versions of 
OsBlockSIGIO
+and OsReleaseSIGIO.
+
+No longer the check for useSIGIO is needed
+
+Signed-off-by: Prabhu Sundararaj 
+---
+ hw/xfree86/os-support/shared/sigio.c | 6 --
+ 1 file changed, 6 deletions(-)
+
+diff --git a/hw/xfree86/os-support/shared/sigio.c 
b/hw/xfree86/os-support/shared/sigio.c
+index 884a71c..be76498 100644
+--- a/hw/xfree86/os-support/shared/sigio.c
 b/hw/xfree86/os-support/shared/sigio.c
+@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), 
void *closure)
+ int i;
+ int installed = FALSE;
+
+-if (!xf86Info.useSIGIO)
+-return 0;
+-
+ for (i = 0; i < MAX_FUNCS; i++) {
+ if (!xf86SigIOFuncs[i].f) {
+ if (xf86IsPipe(fd))
+@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
+ int max;
+ int ret;
+
+-if (!xf86Info.useSIGIO)
+-return 0;
+-
+ max = 0;
+ ret = 0;
+ for (i = 0; i < MAX_FUNCS; i++) {
+--
+2.7.4
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
index 987a2be..5a657e0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
@@ -3,6 +3,7 @@ require xserver-xorg.inc
  SRC_URI += "file://musl-arm-inb-outb.patch \
  file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
  
file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
+file://0003-Remove-check-for-useSIGIO-option.patch \
  "
  SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6"
  SRC_URI[sha256sum] = 
"79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb"


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

[Ed Bartosh]

BTW, to be consistent with this approach we also need to rename
image-live and image-vm, right?  Actually, image-live name was the
reason for me to name image-wic.

On Mon, Jan 30, 2017 at 11:07:22AM -0800, Rick Altherr wrote:
> LGTM
> 
> On Mon, Jan 30, 2017 at 10:42 AM, Ed Bartosh 
> wrote:
> 
> > On Mon, Jan 30, 2017 at 10:41:27AM -0800, Rick Altherr wrote:
> > > Agreed.  What if it was image_types_wic.bbclass and you did something
> > > similar to build_uboot() in image.bbclass?
> > >
> >
> > I can do this for now:
> > IMAGE_TYPE_wic = "image_type_wic"
> > inherit ${IMAGE_TYPE_wic}
> >
> > which is the same as 'inherit image_type_wic', just takes 2 lines, but
> > looks more consistent.
> >
> > does this look ok?
> >
> > > On Mon, Jan 30, 2017 at 10:15 AM, Ed Bartosh  > >
> > > wrote:
> > >
> > > > On Mon, Jan 30, 2017 at 10:25:59AM -0800, Rick Altherr wrote:
> > > > > I'm not clear on which path is the preferred one.  There are lots of
> > bits
> > > > > and pieces in image_types.bbclass that implement various image types.
> > > > >  uboot got added as a separate class at some point.  The comments in
> > > > > local.conf.sample.extended imply IMAGE_CLASSES should be used to load
> > > > > additional image_types_* classes to add support for additional image
> > > > > types.  Having the wic image type implemented in a separate
> > > > > image-wic.bbclass that is directly inherited by image.bbclass adds a
> > 3rd
> > > > > approach.  Which one do we want contributors to use in the future?
> > > > >
> > > >
> > > > I didn't want to create even more confusion. What I wanted is stated
> > in the
> > > > commit message - to put existing wic code into a file for better
> > > > maintenance. If this is more confusing than having wic code in
> > different
> > > > places of image.class and image_types.class then we can just drop this
> > > > patch. However, I personally find it more maintainable this way.
> > > >
> > > > Suggesting people to change machine configs just because wic code is
> > > > moved to separate file doesn't look good to me either.
> > > >
> > > > > On Mon, Jan 30, 2017 at 9:45 AM, Ed Bartosh <
> > ed.bart...@linux.intel.com>
> > > > > wrote:
> > > > >
> > > > > > On Mon, Jan 30, 2017 at 09:47:42AM -0800, Rick Altherr wrote:
> > > > > > > Hmm.  In local.conf.sample.extended, I find:
> > > > > > >
> > > > > > > # Additional image generation features
> > > > > > > #
> > > > > > > # The following is a list of classes to import to use in the
> > > > generation
> > > > > > of
> > > > > > > images
> > > > > > > # currently an example class is image_types_uboot
> > > > > > > # IMAGE_CLASSES = " image_types_uboot"
> > > > > > >
> > > > > > > Indeed, image_types_uboot isn't part of IMAGE_CLASSES by default.
> > > > I'd
> > > > > > > expect a machine config to add wic to IMAGE_CLASSES if it needs
> > wic
> > > > > > output.
> > > > > > >
> > > > > >
> > > > > > So far all machine configs add wic to IMAGE_TYPES and it works just
> > > > > > fine. Why to change?
> > > > > >
> > > > > > > On Mon, Jan 30, 2017 at 9:18 AM, Ed Bartosh <
> > > > ed.bart...@linux.intel.com>
> > > > > > > wrote:
> > > > > > >
> > > > > > > > On Mon, Jan 30, 2017 at 09:27:54AM -0800, Rick Altherr wrote:
> > > > > > > > > Why didn't you make this image_types_wic.bbclass and use
> > > > > > IMAGE_CLASSES to
> > > > > > > > > load it?
> > > > > > > >
> > > > > > > > Because of the following:
> > > > > > > > - IMAGE_CLASSES[doc] = "A list of classes that all images
> > should
> > > > > > > >   inherit." I'm not sure all images should include wic class.
> > I'll
> > > > > > probably
> > > > > > > >   make this inheritance conditional.
> > > > > > > > - so far IMAGE_CLASSES is used for qemuboot, image_types,
> > > > > > > >   image_types_uboot and testimage,
> > > > > > > >   so the usage is more or less follows the description. wic is
> > out
> > > > of
> > > > > > > >   that usage scenario, I believe.
> > > > > > > > - 'inherit image_wic' is more explicit than IMAGE_CLASSES +=
> > > > > > > >   "image_types"\n inherit ${IMAGE_CLASSES}
> > > > > > > >
> > > > > > > >
> > > > > > > > >
> > > > > > > > > On Fri, Jan 27, 2017 at 12:19 PM, Ed Bartosh <
> > > > > > ed.bart...@linux.intel.com
> > > > > > > > >
> > > > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > > There is a lot of wic code in image.bbclass and
> > > > image_types.bbclass
> > > > > > > > > > Having all code separated in one file should make it more
> > > > readable
> > > > > > > > > > and easier to maintain.
> > > > > > > > > >
> > > > > > > > > > Signed-off-by: Ed Bartosh 
> > > > > > > > > > ---
> > > > > > > > > >  meta/classes/image-wic.bbclass   | 120
> > > > > > ++
> > > > > > > > > > +
> > > > > > > > > >  meta/classes/image.bbclass   |  25 +---
> > > > > > > > > >  meta/classes/image_types.bbclass |  95
> > > > > > --
> > > > > > > > -
> > > > > > > > > >  3 files changed, 122 insertions(+

[OE-core] [PATCH v3] xserver-xorg: Fix X server 1.19 crash

[Tom Hochstein]

Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
useSIGIO option:

xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO

The check for useSIGIO is no longer needed.

Signed-off-by: Tom Hochstein 
---
 .../0003-Remove-check-for-useSIGIO-option.patch| 47 ++
 .../xorg-xserver/xserver-xorg_1.19.1.bb|  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch

diff --git 
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
new file mode 100644
index 000..beed6cb
--- /dev/null
+++ 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
@@ -0,0 +1,47 @@
+From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj 
+Date: Mon, 30 Jan 2017 16:32:06 -0600
+Subject: [PATCH] Remove check for useSIGIO option
+
+Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of 
useSIGIO
+option.
+
+As the xfree86 SIGIO support is reworked to use internal versions of 
OsBlockSIGIO
+and OsReleaseSIGIO.
+
+No longer the check for useSIGIO is needed
+
+Upstream-Status: Pending
+
+Signed-off-by: Prabhu Sundararaj 
+---
+ hw/xfree86/os-support/shared/sigio.c | 6 --
+ 1 file changed, 6 deletions(-)
+
+diff --git a/hw/xfree86/os-support/shared/sigio.c 
b/hw/xfree86/os-support/shared/sigio.c
+index 884a71c..be76498 100644
+--- a/hw/xfree86/os-support/shared/sigio.c
 b/hw/xfree86/os-support/shared/sigio.c
+@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), 
void *closure)
+ int i;
+ int installed = FALSE;
+ 
+-if (!xf86Info.useSIGIO)
+-return 0;
+-
+ for (i = 0; i < MAX_FUNCS; i++) {
+ if (!xf86SigIOFuncs[i].f) {
+ if (xf86IsPipe(fd))
+@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
+ int max;
+ int ret;
+ 
+-if (!xf86Info.useSIGIO)
+-return 0;
+-
+ max = 0;
+ ret = 0;
+ for (i = 0; i < MAX_FUNCS; i++) {
+-- 
+2.7.4
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
index 987a2be..5a657e0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.1.bb
@@ -3,6 +3,7 @@ require xserver-xorg.inc
 SRC_URI += "file://musl-arm-inb-outb.patch \
 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
 
file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
+file://0003-Remove-check-for-useSIGIO-option.patch \
 "
 SRC_URI[md5sum] = "caa8ee7b2950abbf734347d137529fb6"
 SRC_URI[sha256sum] = 
"79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb"
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/10] kernel-yocto: ecryptfs, NFC and CAN bus config updates

[Bruce Ashfield]

Integrating the following kernel config updates:

  f7f388ec4d89 Add support and drivers for CAN bus as feature
  2b20935eb14b Filesystem encryption support
  8520e18f2956 Update NFC support
  a079d66845cd Add eCryptFS filesystem feature

Signed-off-by: Jussi Laako 
Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 7b214e40531b..a0adb3830c41 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
-SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
+SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 12f19f313ab3..8d8c082612a5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
+SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index 81a42489f53c..0ca3d2c8f77c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= 
"6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
+SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 01/10] linux-yocto/4.9: update to 4.9.4

[Bruce Ashfield]

Integrating the korg -stable release with the following changes:

   75353ac8ff43 Linux 4.9.4
   6fea974494af rtlwifi: rtl_usb: Fix missing entry in USB driver's private data
   7dae85b5c355 rtlwifi: Fix enter/exit power_save
   3f41ee3a45cb drm/i915/gen9: Fix PCODE polling during CDCLK change 
notification
   93f2976eb027 ALSA: usb-audio: Add a quirk for Plantronics BT600
   f52e670a5b29 spi: mvebu: fix baudrate calculation for armada variant
   05b7bdf1c3d8 ARM: omap2+: am437x: rollback to use omap3_gptimer_timer_init()
   b8ba5faa7a6b ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() 
for mass registration
   87dbf3dc1652 ARM: OMAP4+: Fix bad fallthrough for cpuidle
   b336dc57bc92 ARM: OMAP5: Fix build for PM code
   0f665deba9bc ARM: OMAP5: Fix mpuss_early_init
   aa1c7b01c9c7 bus: arm-ccn: Prevent hotplug callback leak
   bd99e7a6036e svcrdma: Clear xpt_bc_xps in xprt_setup_rdma_bc() error exit arm
   c2ce1c4133b3 ARM: qcom_defconfig: Fix MDM9515 LCC and GCC config
   e925eb342659 ARM: zynq: Reserve correct amount of non-DMA RAM
   78e2d9405e2d ARM: pxa: fix pxa25x interrupt init
   596ff0afbe8e ARM64: dts: bcm2835: Fix bcm2837 compatible string
   e3937bc1cc0b ARM64: dts: bcm2837-rpi-3-b: remove incorrect pwr LED
   d40152d5ac67 arm64: dts: mt8173: Fix auxadc node
   08aed6e8883d tools/virtio: fix READ_ONCE()
   e7d05ec1923e powerpc: Fix build warning on 32-bit PPC
   2fc33ff4ba81 ALSA: firewire-tascam: Fix to handle error from initialization 
of stream data
   2c867216c555 HID: hid-cypress: validate length of report
   e425ed1d3c75 net: vrf: do not allow table id 0
   7b7a5a85b1d9 net: ipv4: Fix multipath selection with vrf
   7cc73483a4c7 net/mlx5e: Remove WARN_ONCE from adaptive moderation code
   17a561b19a27 gro: Disable frag0 optimization on IPv6 ext headers
   934ca017c850 gro: use min_t() in skb_gro_reset_offset()
   ec0fdcb88c6f gro: Enter slow-path if there is no tailroom
   33364eee1fe4 net: add the AF_QIPCRTR entries to family name tables
   2ff4a0243c9e net: dsa: Ensure validity of dst->ds[0]
   66f24d624baa r8152: fix rx issue for runtime suspend
   c8a89b4f5248 r8152: split rtl8152_suspend function
   294f2c889637 net: dsa: bcm_sf2: Utilize nested MDIO read/write
   ac77aab46168 net: dsa: bcm_sf2: Do not clobber b53_switch_ops
   b55f6ca7380d bpf: change back to orig prog on too many passes
   a4d205a59521 net: vrf: Add missing Rx counters
   efc455f08ea8 ipv4: Do not allow MAIN to be alias for new LOCAL w/ custom 
rules
   fe1e13cfe2c4 igmp: Make igmp group member RFC 3376 compliant
   7826d11cf44c flow_dissector: Update pptp handling to avoid null pointer 
deref.
   9f65f5d4746b drop_monitor: consider inserted data in genlmsg_end
   9f7551e05b0f drop_monitor: add missing call to genlmsg_end
   a8a213f296ae net: ipv4: dst for local input routes should use l3mdev if 
relevant
   e7422080e35d net: fix incorrect original ingress device index in PKTINFO
   2ffc694b5727 rtnl: stats - add missing netlink message size checks
   8cb7d6277f01 net/mlx5e: Disable netdev after close
   ee9f2fd3f6b6 net/mlx5e: Don't sync netdev state when not registered
   33c782dd1514 net/mlx5: Prevent setting multicast macs for VFs
   b22c86ff8e78 net/mlx5: Mask destination mac value in ethtool steering rules
   efbbc75c00fc net/mlx5: Avoid shadowing numa_node
   ca8a64467f2a net/mlx5: Cancel recovery work in remove flow
   7bf1de7f2749 net/mlx5: Check FW limitations on log_max_qp before setting it
   9b4a34ff8987 net/sched: cls_flower: Fix missing addr_type in classify
   99f40c6bf565 net: stmmac: Fix race between stmmac_drv_probe and stmmac_open
   09babe4ce12e net, sched: fix soft lockup in tc_classify
   ee99e2bc5e8a ipv6: handle -EFAULT from skb_copy_bits
   d36a1cb1e328 inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets
   ed3cc329c7bc sctp: sctp_transport_lookup_process should rcu_read_unlock when 
transport is null
   8b8fbe5c25ab net: vrf: Drop conntrack data after pass through VRF device on 
Tx
   d4a0b2e40c46 net: vrf: Fix NAT within a VRF

Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 20 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index e745ff76ea18..1c26ef3ac97b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,13 +11,13 @@ python () {
 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to 
linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "2751bf0b7339c4f3227b3a7d45b2dbe5726906aa"
-SRCREV_meta ?= "03a2d3f7f999a555c8725b5f1fd69660ebd4af83"
+SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
+SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
 
 SRC_URI = 
"git://git.yoc

[OE-core] [PATCH 05/10] ver_linux: Use /usr/bin/awk instead of /bin/awk

[Bruce Ashfield]

To avoid kernel-devsrc failing with missing a dependency on "/bin/awk".
Due to the way this script is invoked, using #!/usr/bin/env can run into
issue when invoked.

Since most distros have awk in /usr/bin and not /bin, we change the
script while this is sorted out upstream.

Signed-off-by: Saul Wold 
Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 18 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index a0adb3830c41..904a8465b32c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to 
linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
-SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
+SRCREV_machine ?= "0898601446c6bde63cb97fb6236d114886ed5f2a"
+SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 8d8c082612a5..c2931df20188 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.9.4"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
+SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index 0ca3d2c8f77c..eb3f027e70e9 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "9027d6fa2661251146c08851a13ca623bc2c1156"
-SRCREV_machine_qemuarm64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemumips ?= "ce10acbd809335dd0c6f697770b3279ae168d145"
-SRCREV_machine_qemuppc ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemux86 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
-SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
+SRCREV_machine_qemuarm ?= "ebd7956fb8f43632fff9537579d2788532ec5dad"
+SRCREV_machine_qemuarm64 ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemumips ?= "2e81d7a5cc2cbfae377f4d07d85c34800c04e3c2"
+SRCREV_machine_qemuppc ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemux86 ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemux86-64 ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemumips64 ?= "af223adb1634de8cb279ff809c6d13266b87e5dc"
+SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/10] linux-yocto/4.9: update to v4.9.6

[Bruce Ashfield]

Integrating the 4.9.5 and 4.9.6 -stable updates. The commit logs
are as follows:

   09f886dc5a69 Linux 4.9.6
   f77ef5348d4b libceph: stop allocating a new cipher on every crypto request
   5b482bf58868 libceph: uninline ceph_crypto_key_destroy()
   12274f2c17f2 tools/virtio/ringtest: fix run-on-all.sh for offline cpus
   fa555d021d2b selftest/powerpc: Wrong PMC initialized in pmc56_overflow test
   f37b7a3004bb soc: ti: wkup_m3_ipc: Fix error return code in 
wkup_m3_ipc_probe()
   97d5e2057564 spi: pxa2xx: add missed break
   d21814a8068a dmaengine: pl330: Fix runtime PM support for terminated 
transfers
   172270c74348 dmaengine: rcar-dmac: unmap slave resource when channel is freed
   3bef7578e05f s5p-mfc: Fix clock management in s5p_mfc_release() function
   d47e1e7c46fe s5p-cec: mark PM functions as __maybe_unused again
   dfe8e5730fa1 st-hva: fix some error handling in hva_hw_probe()
   b9dc16170dbf ite-cir: initialize use_demodulator before using it
   278997a8e002 gs1662: drop kfree for memory allocated with devm_kzalloc
   cec5ef6ac520 platform: pxa_camera: add VIDEO_V4L2 dependency
   2a3060531768 blackfin: check devm_pinctrl_get() for errors
   fcdab6ca9c31 rpmsg: virtio_rpmsg_bus: fix channel creation
   0f3418442d7b mtd: spi-nor: Fix some error codes in cqspi_setup_flash()
   e55e6c026b7c mtd: spi-nor: Off by one in cqspi_setup_flash()
   ebdfcaa14eef PM / devfreq: Fix the bug of devfreq_add_device when governor 
is NULL
   795983547317 PM / devfreq: exynos-bus: Fix the wrong return value
   16236802bfec scsi: mpt3sas: fix hang on ata passthrough commands
   a07a122ad2a2 scsi: ses: Fix SAS device detection in enclosure
   41c6b3e8989e swiotlb: Add swiotlb=noforce debug option
   1fd1e6cd6314 swiotlb: Convert swiotlb_force from int to enum
   776c2b2d165d arm64: Fix swiotlb fallback allocation
   962957889d74 arm64: mm: avoid name clash in __page_to_voff()
   d34b6684e60f xprtrdma: Squelch "max send, max recv" messages at connect time
   8ade1c2b4530 xprtrdma: Make FRWR send queue entry accounting more accurate
   a193c7247596 libceph: make sure ceph_aes_crypt() IV is aligned
   6e9fa67c58cc ceph: fix endianness bug in frag_tree_split_cmp
   2e4f2131b66f ceph: fix endianness of getattr mask in ceph_d_revalidate
   8934e069674a ceph: fix ceph_get_caps() interruption
   48baa924108e ceph: fix scheduler warning due to nested blocking
   04c9fe63166f ARM: 8613/1: Fix the uaccess crash on PB11MPCore
   dd8334a5e17e ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation
   cd9601caa2fa ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD 
SOM-LV
   a075ac9c0a40 ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init
   cfcb94b3a498 ARM: dts: omap2: Add an empty chosen node to top level DTSI
   5921b26bf744 ARM: dts: omap3: Add an empty chosen node to top level DTSI
   bec062cd47bd ARM: dts: am4372: Add an empty chosen node to top level DTSI
   c3f7ca43b2d4 ARM: dts: omap5: Add an empty chosen node to top level DTSI
   835bf872d924 ARM: dts: omap4: Add an empty chosen node to top level DTSI
   355a8fced2bf ARM: dts: am33xx: Add an empty chosen node to top level DTSI
   3e1c70972204 ARM: dts: dm814x: Add an empty chosen node to top level DTSI
   ab6dc01db1f7 ARM: dts: dm816x: Add an empty chosen node to top level DTSI
   d4f12aa133db ARM: dts: dra7: Add an empty chosen node to top level DTSI
   b8add6715c9a libceph: remove now unused ceph_*{en,de}crypt*() functions
   2982b9c92a66 libceph: switch ceph_x_decrypt() to ceph_crypt()
   717a145bd5a9 libceph: switch ceph_x_encrypt() to ceph_crypt()
   6e371f9a4144 libceph: tweak calcu_signature() a little
   788a0bbc7011 libceph: rename and align ceph_x_authorizer::reply_buf
   ecf7ced85628 libceph: introduce ceph_crypt() for in-place en/decryption
   0548b8298938 libceph: introduce ceph_x_encrypt_offset()
   be60457612a2 libceph: old_key in process_one_ticket() is redundant
   2e62bf3c6fe9 libceph: ceph_x_encrypt_buflen() takes in_len
   6d9b544d88a4 Input: ALPS - fix TrackStick support for SS5 hardware
   6e53a62a0d52 arm64/ptrace: Reject attempts to set incomplete hardware 
breakpoint fields
   f9081dd0c8be arm64/ptrace: Avoid uninitialised struct padding in fpr_set()
   5c5839be0842 arm64/ptrace: Preserve previous registers for short regset 
write - 3
   a4aafb8c4204 arm64/ptrace: Preserve previous registers for short regset 
write - 2
   357cfd6c83ee arm64/ptrace: Preserve previous registers for short regset write
   de327948c009 arm64: avoid returning from bad_mode
   71c496495514 ARM: dts: da850-evm: fix read access to SPI flash
   5b6618615215 ARM: dts: OMAP5 / DRA7: indicate that SATA port 0 is available.
   1f75575aca7b ceph: fix bad endianness handling in parse_reply_info_extra
   a14aeccb65e5 ibmvscsis: Fix max transfer length
   51cff2c64d20 ibmvscsis: Fix sleeping in interrupt context
   df35a8f51fcb ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs
   73a2e2405d30 svcrdma: avoid duplicate dma unmapping during error recovery
   c49b3

[OE-core] [PATCH 00/10] kernel-yocto: consolidated pull request

[Bruce Ashfield]

Hi all,

Here is the next batch of kernel updates. These were gathered in preparation
for the removal of the 4.8 kernel and to make 4.9 the default/latest available.

I'll follow up with patches to make 4.9 the default to the appropriate lists.

Change summary:

  - stable updates
  - 4.9-rt refresh (via Paul Gortmaker)
  - kernel configuration tweaks.

  - I fixed the configuration warning that Martin Jansa reported in commit:

   [ kernel-yocto/meta: common-pc: add pci-siov to feature fragments ]

  - the kern-tools capability of merging feature branches at build time:

   [ kern-tools: re-enable scc merge command ]

   - Saul fixed and issue with kernel-devsrc packaging, and that fix will head
 upstream as well.

   [ ver_linux: Use /usr/bin/awk instead of /bin/awk ]

Cheers,

Bruce

The following changes since commit ec3d83f9a90288403b96be25da855fa280aadd8d:

  xmlto: Don't hardcode the path to tail (2017-01-31 23:47:33 +)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (10):
  linux-yocto/4.9: update to 4.9.4
  kernel-yocto/features: enable TPM
  kern-tools: re-enable scc merge command
  kernel-yocto: ecryptfs, NFC and CAN bus config updates
  ver_linux: Use /usr/bin/awk instead of /bin/awk
  linux-yocto/4.9: update to v4.9.6
  kernel-yocto/meta: common-pc: add pci-siov to feature fragments
  linux-yocto/4.9: update to -rt3
  kernel-yocto: log the BSP definition file
  linux-yocto/4.9: yaffs2 fixes

 meta/classes/kernel-yocto.bbclass| 17 -
 .../kern-tools/kern-tools-native_git.bb  |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb  |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb  |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb|  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb|  6 +++---
 meta/recipes-kernel/linux/linux-yocto_4.8.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb | 20 ++--
 8 files changed, 36 insertions(+), 21 deletions(-)

-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 03/10] kern-tools: re-enable scc merge command

[Bruce Ashfield]

The ability to merge two branches directly from a .scc file was
dropped during the streamlining of the tools.

As was pointed out by David Vincent , there is
once again a valid use case for this functionality, so we restore the
capability.

Signed-off-by: Bruce Ashfield 
---
 meta/classes/kernel-yocto.bbclass   | 16 +++-
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass 
b/meta/classes/kernel-yocto.bbclass
index 5cfd8aff5007..36f61c5694fb 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -148,7 +148,7 @@ do_kernel_metadata() {
# run1: pull all the configuration fragments, no matter where they come 
from
elements="`echo -n ${bsp_definition} ${sccs} ${patches} 
${KERNEL_FEATURES}`"
if [ -n "${elements}" ]; then
-   scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} 
${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+   scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} 
${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
if [ $? -ne 0 ]; then
bbfatal_log "Could not generate configuration queue for 
${KMACHINE}."
fi
@@ -165,6 +165,7 @@ do_kernel_metadata() {
 }
 
 do_patch() {
+   set +e
cd ${S}
 
check_git_config
@@ -177,6 +178,19 @@ do_patch() {
bbfatal_log "Patch failures can be resolved in the 
linux source directory ${S})"
fi
fi
+
+   if [ -f "${meta_dir}/merge.queue" ]; then
+   # we need to merge all these branches
+   for b in $(cat ${meta_dir}/merge.queue); do
+   git show-ref --verify --quiet refs/heads/${b}
+   if [ $? -eq 0 ]; then
+   bbnote "Merging branch ${b}"
+   git merge -q --no-ff -m "Merge branch ${b}" ${b}
+   else
+   bbfatal "branch ${b} does not exist, cannot 
merge"
+   fi
+   done
+   fi
 }
 
 do_kernel_checkout() {
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb 
b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 9e3e968a46aa..4b1de5752c93 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = 
"file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1b
 
 DEPENDS = "git-native"
 
-SRCREV = "bf2942f7559d114e96f7c7f1287bf7e5120632a3"
+SRCREV = "c14440d4e7ae0160c260ed65c3e123be5dc97ae8"
 PR = "r12"
 PV = "0.2+git${SRCPV}"
 
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 07/10] kernel-yocto/meta: common-pc: add pci-siov to feature fragments

[Bruce Ashfield]

The common-pc ethernet selection has drivers that depend on pci_iov
being defined. As such, we should include that feature fragment
or we get build warnings:

-- CONFIG_BNX2X_SRIOV -
Config: CONFIG_BNX2X_SRIOV
From:   
work-shared/qemux86-64/kernel-source/.kernel-meta/configs/standard/bsp/common-pc/common-pc-eth.cfg
Requested value:  CONFIG_BNX2X_SRIOV=y
Actual value:

Config 'BNX2X_SRIOV' has the following conditionals:
BNX2X && PCI_IOV (value: "n")
BNX2X && PCI_IOV (value: "n")
Dependency values are:
  BNX2X [m] PCI_IOV [n] y [y]

-- CONFIG_BNXT_SRIOV -
Config: CONFIG_BNXT_SRIOV
From: 
work-shared/qemux86-64/kernel-source/.kernel-meta/configs/standard/bsp/common-pc/common-pc-eth.cfg
Requested value:  CONFIG_BNXT_SRIOV=y
Actual value:

Config 'BNXT_SRIOV' has the following conditionals:
BNXT && PCI_IOV (value: "n")
BNXT && PCI_IOV (value: "n")
Dependency values are:
  y [y] BNXT [m] PCI_IOV [n]

Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index e85d7c7b18c0..155815e5df09 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d"
-SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
+SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index a052dad5d1fa..beb2d4de30e4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
+SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index a61bb137b999..241eb94f6ab0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= 
"0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
+SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 08/10] linux-yocto/4.9: update to -rt3

[Bruce Ashfield]

Paul Gortmaker has refreshed the 4.9 -rt support to -rt3.

Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   | 4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 155815e5df09..b2986e32afd8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to 
linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d"
-SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
+SRCREV_machine ?= "35cfaa68bf6ceaf59cf2bcd020d4e66155e19c46"
+SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index beb2d4de30e4..a9d17549d6dd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
+SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index 241eb94f6ab0..e5f6064fc939 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= 
"0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
+SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 10/10] linux-yocto/4.9: yaffs2 fixes

[Bruce Ashfield]

Merging three fixes to yaffs2, which adjust to mainline changes in the
vfs subsystem:

  4700f2f8b9db fs: yaffs2: fix the prototype of function yaffs_rename()
  56e654cab1db fs: yaffs2: switch to the generic xattr handler
  102082f3c245 fs/yaffs2: adjust to the change of inode_change_ok()

Signed-off-by: Kevin Hao 
Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 18 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index b2986e32afd8..8eaec528d62b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to 
linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "35cfaa68bf6ceaf59cf2bcd020d4e66155e19c46"
-SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
+SRCREV_machine ?= "71569cd064e02564211737430c31a4b0e9c810fb"
+SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index a9d17549d6dd..5510b0f8ff3d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.9.6"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
+SRCREV_machine ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index e5f6064fc939..a7593848f61c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "9dc59f0efe6cd1dd806b5b6089faf803db9018a4"
-SRCREV_machine_qemuarm64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemumips ?= "0ed887a8c24e2c2a8a2f136b9ef5031bdf6cde8c"
-SRCREV_machine_qemuppc ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemux86 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
-SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
+SRCREV_machine_qemuarm ?= "103383d270939399bc73365c31cd6f93c567114f"
+SRCREV_machine_qemuarm64 ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemumips ?= "c8425cad333ec85f61d63054051fe17df53ece29"
+SRCREV_machine_qemuppc ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemux86 ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemux86-64 ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemumips64 ?= "42fe7d605fc92985c8ba10363de487ea06bd068a"
+SRCREV_machine ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 09/10] kernel-yocto: log the BSP definition file

[Bruce Ashfield]

When debugging a kernel configuration issue, one of the first questions
is "what BSP was used". To answer this qusetion, we log the BSP .scc
file that was used to generate the kernel configuration in the kernel
source meta directory.

Signed-off-by: Bruce Ashfield 
---
 meta/classes/kernel-yocto.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/kernel-yocto.bbclass 
b/meta/classes/kernel-yocto.bbclass
index 36f61c5694fb..a7b635638186 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -148,6 +148,7 @@ do_kernel_metadata() {
# run1: pull all the configuration fragments, no matter where they come 
from
elements="`echo -n ${bsp_definition} ${sccs} ${patches} 
${KERNEL_FEATURES}`"
if [ -n "${elements}" ]; then
+   echo "${bsp_definition}}" > ${S}/${meta_dir}/bsp_definition
scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} 
${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
if [ $? -ne 0 ]; then
bbfatal_log "Could not generate configuration queue for 
${KMACHINE}."
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 02/10] kernel-yocto/features: enable TPM

[Bruce Ashfield]

Adding a feature fragment that enables a broad range of TPM
drivers. They service as a baseline for production kernels.

Signed-off-by: Patrick Ohly 
Signed-off-by: Bruce Ashfield 
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.8.bb  | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
index c0ff503676ad..f76b590055ef 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "9c4f52cb2bafd9657c51cef2166db2b73a95aaa9"
-SRCREV_meta ?= "3edb4de355873d32da9307a011adea2542bd05a7"
+SRCREV_meta ?= "ceb1eeb63f96e903a4caee1bad4dda238192fb6a"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 1c26ef3ac97b..7b214e40531b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
-SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
+SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
index 11b0dc9ea4b0..1f0406b30468 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "b62f29ac5c15d6333a13811db030d704b35ace8f"
-SRCREV_meta ?= "3edb4de355873d32da9307a011adea2542bd05a7"
+SRCREV_meta ?= "ceb1eeb63f96e903a4caee1bad4dda238192fb6a"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 12a64887d677..12f19f313ab3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
+SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
index 0ebd071463de..dba7a4aa115e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= 
"9bcb4ea3fa107f1a8790c8c3408eb250e8d1d66e"
 SRCREV_machine_qemux86-64 ?= "9bcb4ea3fa107f1a8790c8c3408eb250e8d1d66e"
 SRCREV_machine_qemumips64 ?= "b90b544d7a5b004b635cf337b29e15294cb17553"
 SRCREV_machine ?= "9bcb4ea3fa107f1a8790c8c3408eb250e8d1d66e"
-SRCREV_meta ?= "3edb4de355873d32da9307a011adea2542bd05a7"
+SRCREV_meta ?= "ceb1eeb63f96e903a4caee1bad4dda238192fb6a"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb 
b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index b42603bad2c6..81a42489f53c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= 
"6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
+SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
 
 SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; 
\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/

[OE-core] [PATCH] image: rename image-wic -> image_types_wic

[Ed Bartosh]

Make name of the wic image type class consistent with
existing naming scheme for image types.

Signed-off-by: Ed Bartosh 
---
 meta/classes/image.bbclass  | 5 +++--
 meta/classes/{image-wic.bbclass => image_types_wic.bbclass} | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename meta/classes/{image-wic.bbclass => image_types_wic.bbclass} (100%)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 613cd92..b5a4fb4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -151,6 +151,9 @@ def build_uboot(d):
 IMAGE_TYPE_uboot = "${@build_uboot(d)}"
 inherit ${IMAGE_TYPE_uboot}
 
+IMAGE_TYPE_wic = "image_types_wic"
+inherit ${IMAGE_TYPE_wic}
+
 python () {
 deps = " " + imagetypes_getdepends(d)
 d.appendVarFlag('do_rootfs', 'depends', deps)
@@ -187,8 +190,6 @@ python () {
 IMAGE_CLASSES += "image_types"
 inherit ${IMAGE_CLASSES}
 
-inherit image-wic
-
 IMAGE_POSTPROCESS_COMMAND ?= ""
 
 # some default locales
diff --git a/meta/classes/image-wic.bbclass 
b/meta/classes/image_types_wic.bbclass
similarity index 100%
rename from meta/classes/image-wic.bbclass
rename to meta/classes/image_types_wic.bbclass
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/4] selftest/buildoptions: use a thinner image to test 'read-only-rootfs' feature

[Richard Purdie]

On Wed, 2017-02-01 at 09:02 -0600, Leonardo Sandoval wrote:
> 
> On 01/31/2017 05:16 PM, Richard Purdie wrote:
> > 
> > On Tue, 2017-01-31 at 16:50 -0600,
> > leonardo.sandoval.gonza...@linux.intel.com wrote:
> > > 
> > > From: Leonardo Sandoval  > > om>
> > > 
> > > The minimal is much faster to build that sato, so use the former
> > > to
> > > test
> > > read-only feature.
> > > 
> > > Signed-off-by: Leonardo Sandoval  > > x.in
> > > tel.com>
> > > ---
> > >   meta/lib/oeqa/selftest/buildoptions.py | 5 +
> > >   1 file changed, 1 insertion(+), 4 deletions(-)
> > > 
> > > diff --git a/meta/lib/oeqa/selftest/buildoptions.py
> > > b/meta/lib/oeqa/selftest/buildoptions.py
> > > index d40eb00..004b2dd 100644
> > > --- a/meta/lib/oeqa/selftest/buildoptions.py
> > > +++ b/meta/lib/oeqa/selftest/buildoptions.py
> > > @@ -44,11 +44,8 @@ class ImageOptionsTests(oeSelfTest):
> > >   
> > >   @testcase(1435)
> > >   def test_read_only_image(self):
> > > -distro_features = get_bb_var('DISTRO_FEATURES')
> > > -if not ('x11' in distro_features and 'opengl' in
> > > distro_features):
> > > -self.skipTest('core-image-sato requires x11 and
> > > opengl
> > > in distro features')
> > >   self.write_config('IMAGE_FEATURES += "read-only-
> > > rootfs"')
> > > -bitbake("core-image-sato")
> > > +bitbake("core-image-minimal")
> > >   # do_image will fail if there are any pending postinsts
> > Whilst this is certainly going to be a touch faster, I believe we
> > do
> > want to test read only rootfs with a larger image like sato to make
> > sure the postinsts really do work with a read only system?
> I don't get it. What would make the test different using a larger
> image?

The large image is more complex, it has more complex post-installs and
more utilities using update alternatives. The areas read-only rootfs
tends to break is in these areas as for example if certain postinstalls
get deferred to "on device at first boot", read-only rootfs breaks.

Cheers,

Richard


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/4] selftest/buildoptions: use a thinner image to test 'read-only-rootfs' feature

[Patrick Ohly]

On Wed, 2017-02-01 at 09:02 -0600, Leonardo Sandoval wrote:
> 
> On 01/31/2017 05:16 PM, Richard Purdie wrote:
> > On Tue, 2017-01-31 at 16:50 -0600,
> > leonardo.sandoval.gonza...@linux.intel.com wrote:
> >> From: Leonardo Sandoval 
> >> -bitbake("core-image-sato")
> >> +bitbake("core-image-minimal")
> >>   # do_image will fail if there are any pending postinsts
> > Whilst this is certainly going to be a touch faster, I believe we do
> > want to test read only rootfs with a larger image like sato to make
> > sure the postinsts really do work with a read only system?
> 
> I don't get it. What would make the test different using a larger image?

The postinst of each component installed into the image must work
properly in a read-only rootfs configuration. So the test is partly for
image creation, partly for the components, and thus more comprehensive
when using a larger image.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] selftest: wic: stop using hddimg in FSTYPES

[Ed Bartosh]

Removed hddimg from FSTYPES in wic test suite as
wic doesn't depend on hddimg anymore.

[YOCTO #10835]

Signed-off-by: Ed Bartosh 
---
 meta/lib/oeqa/selftest/wic.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 6a6b54c..ebf3d18 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -151,7 +151,7 @@ class Wic(oeSelfTest):
 @testcase(1346)
 def test_iso_image(self):
 """Test creation of hybrid iso image with legacy and EFI boot"""
-config = 'IMAGE_FSTYPES += " hddimg "\nMACHINE_FEATURES_append = " 
efi"\n'
+config = 'MACHINE_FEATURES_append = " efi"\n'
 self.append_config(config)
 bitbake('core-image-minimal')
 self.remove_config(config)
@@ -184,7 +184,7 @@ class Wic(oeSelfTest):
 @testcase(1560)
 def test_systemd_bootdisk(self):
 """Test creation of systemd-bootdisk image"""
-config = 'IMAGE_FSTYPES += " hddimg "\nMACHINE_FEATURES_append = " 
efi"\n'
+config = 'MACHINE_FEATURES_append = " efi"\n'
 self.append_config(config)
 bitbake('core-image-minimal')
 self.remove_config(config)
@@ -406,7 +406,7 @@ class Wic(oeSelfTest):
 @testcase(1351)
 def test_wic_image_type(self):
 """Test building wic images by bitbake"""
-config = 'IMAGE_FSTYPES += " hddimg wic"\nWKS_FILE = 
"wic-image-minimal"\n'\
+config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
  'MACHINE_FEATURES_append = " efi"\n'
 self.append_config(config)
 self.assertEqual(0, bitbake('wic-image-minimal').status)
@@ -425,7 +425,7 @@ class Wic(oeSelfTest):
 @testcase(1422)
 def test_qemu(self):
 """Test wic-image-minimal under qemu"""
-config = 'IMAGE_FSTYPES += " hddimg wic"\nWKS_FILE = 
"wic-image-minimal"\n'\
+config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
  'MACHINE_FEATURES_append = " efi"\n'
 self.append_config(config)
 self.assertEqual(0, bitbake('wic-image-minimal').status)
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 2/7] python3-manifest: move htlm.py to python3-html

[Khem Raj]

On 1/30/17 11:18 PM, Anders Darander wrote:
> This allows us to use html.py without importing misc.
> 

html.py is provided by many packages. Does is make more sense to package
html.py on a package of its own ?

> Signed-off-by: Anders Darander 
> ---
>  meta/recipes-devtools/python/python-3.5-manifest.inc | 2 +-
>  scripts/contrib/python/generate-manifest-3.5.py  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc 
> b/meta/recipes-devtools/python/python-3.5-manifest.inc
> index b92048f..6093c28 100644
> --- a/meta/recipes-devtools/python/python-3.5-manifest.inc
> +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc
> @@ -103,7 +103,7 @@ 
> FILES_${PN}-gdbm="${libdir}/python3.5/lib-dynload/_gdbm.*.so 
> ${libdir}/python3.5
>  
>  SUMMARY_${PN}-html="Python HTML processing support"
>  RDEPENDS_${PN}-html="${PN}-core"
> -FILES_${PN}-html="${libdir}/python3.5/formatter.* 
> ${libdir}/python3.5/__pycache__/formatter.* 
> ${libdir}/python3.5/htmlentitydefs.* 
> ${libdir}/python3.5/__pycache__/htmlentitydefs.* 
> ${libdir}/python3.5/htmllib.* ${libdir}/python3.5/__pycache__/htmllib.* 
> ${libdir}/python3.5/markupbase.* ${libdir}/python3.5/__pycache__/markupbase.* 
> ${libdir}/python3.5/sgmllib.* ${libdir}/python3.5/__pycache__/sgmllib.* 
> ${libdir}/python3.5/HTMLParser.* ${libdir}/python3.5/__pycache__/HTMLParser.* 
> "
> +FILES_${PN}-html="${libdir}/python3.5/formatter.* 
> ${libdir}/python3.5/__pycache__/formatter.* 
> ${libdir}/python3.5/htmlentitydefs.* 
> ${libdir}/python3.5/__pycache__/htmlentitydefs.* ${libdir}/python3.5/html 
> ${libdir}/python3.5/html/__pycache__ ${libdir}/python3.5/htmllib.* 
> ${libdir}/python3.5/__pycache__/htmllib.* ${libdir}/python3.5/markupbase.* 
> ${libdir}/python3.5/__pycache__/markupbase.* ${libdir}/python3.5/sgmllib.* 
> ${libdir}/python3.5/__pycache__/sgmllib.* ${libdir}/python3.5/HTMLParser.* 
> ${libdir}/python3.5/__pycache__/HTMLParser.* "
>  
>  SUMMARY_${PN}-idle="Python Integrated Development Environment"
>  RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter"
> diff --git a/scripts/contrib/python/generate-manifest-3.5.py 
> b/scripts/contrib/python/generate-manifest-3.5.py
> index cf19f47..cc2e561 100755
> --- a/scripts/contrib/python/generate-manifest-3.5.py
> +++ b/scripts/contrib/python/generate-manifest-3.5.py
> @@ -276,7 +276,7 @@ if __name__ == "__main__":
>  "lib-dynload/fcntl.*.so" )
>  
>  m.addPackage( "${PN}-html", "Python HTML processing support", 
> "${PN}-core",
> -"formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* 
> HTMLParser.* " )
> +"formatter.* htmlentitydefs.* html htmllib.* markupbase.* sgmllib.* 
> HTMLParser.* " )
>  
>  m.addPackage( "${PN}-importlib", "Python import implementation library", 
> "${PN}-core ${PN}-lang",
>  "importlib imp.*" )
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] ✗ patchtest: failure for Python3 packaging fixes (rev2)

[Khem Raj]

On 1/30/17 11:46 PM, Anders Darander wrote:
> * Patchwork  [170131 08:23]:
> 
>> Series: Python3 packaging fixes (rev2)
>> Revision: 2
>> URL   : https://patchwork.openembedded.org/series/5024/
>> State : failure
> 
> 
>> * Issue Series does not apply on top of target branch 
>> [test_series_merge_on_head] 
>>   Suggested fixRebase your series on top of targeted branch
>>   Targeted branch  master (currently at d7d26488f2)
> 
> Again, the patch series was just rebased on master; but as there are a
> single (non-modified) line in that >998 characters long, one pacht won't
> apply from the e-mail. Please pull directly from my github repo.
> 
> 

I wonder if we should consider finer packaging and move stuff out of
misc, since its a junk bin for all unaccounted files
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] libtasn1: depends on yacc

[Khem Raj]

On 1/31/17 1:05 AM, Patrick Ohly wrote:
> This fixes a potential pollution by the build host and build error
> when yacc isn't installed on the build host:
> 
>  | ../../libtasn1-4.9/build-aux/ylwrap: line 175: yacc: command not found
>  | Makefile:1116: recipe for target 'ASN1.c' failed
>  | make[3]: *** [ASN1.c] Error 127
> 
> Signed-off-by: Patrick Ohly 
> ---
>  meta/recipes-support/gnutls/libtasn1_4.9.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/recipes-support/gnutls/libtasn1_4.9.bb 
> b/meta/recipes-support/gnutls/libtasn1_4.9.bb
> index b8ff9eaf7a9..3da5d4bcc56 100644
> --- a/meta/recipes-support/gnutls/libtasn1_4.9.bb
> +++ b/meta/recipes-support/gnutls/libtasn1_4.9.bb
> @@ -16,6 +16,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
> file://0004-tools-eliminated-compiler-warnings.patch \
> "
>  
> +DEPENDS = "bison-native"
> +

nit on style, you generally put checksum assignments immediately after
SRC_URI containing the origninal src location. Secondly, if we use +=
then we dont run the risk of it overwriting prior assignments if any

>  SRC_URI[md5sum] = "3018d0f466a32b66dde41bb122e6cab6"
>  SRC_URI[sha256sum] = 
> "4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920"
>  
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] potential bashism in guile_2.0.13.bb

[Khem Raj]

On 1/31/17 4:29 AM, Patrick Ohly wrote:
> Hello!
> 
> verify-bashisms (after some fixing of the script) reports:
> 
> /work/iot-ref-kit/openembedded-core/meta/recipes-devtools/guile/guile_2.0.13.bb
>  possible bashism in guile_cross_config line 94 ($'...' should be "$(printf 
> '...')"):  
>   echo '#!'`which ${BUILD_SYS}-guile`$' \\\n--no-auto-compile -e 
> main -s\n!#\n(define %guile-build-info '\'\( \
>   > ${B}/guile-config.cross
> 
> 
> This is for:
> 
> guile_cross_config() {
>   # this is only for target recipe
>   if [ "${PN}" = "guile" ]
>   then
>   # Create guile-config returning target values instead of native 
> values
>   install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
>   echo '#!'`which ${BUILD_SYS}-guile`$' \\\n--no-auto-compile -e 
> main -s\n!#\n(define %guile-build-info '\'\( \
>   > ${B}/guile-config.cross
> 
> And the resulting guile-config.cross has (when /bin/sh -> /bin/dash):
> 
> #!/fast/build/refkit/intel-corei7-64/tmp-glibc/work/corei7-64-refkit-linux/guile/2.0.13-r0/recipe-sysroot-native/usr/bin/x86_64-linux-guile$
>  \
> --no-auto-compile -e main -s
> !#
> (define %guile-build-info '(
> ...
> 
> This looks rather strange to me and I've no idea how the Linux kernel
> will interpret that first shebang line, which literally ends in
> ...guile$ \
> 
> Is the content as intended?

it should have come out as path to native guile with options, I think if
this is not happening it might just be installing wrong wrapper when
used it should complain. In any case its better to make it shell
independent.

> 
> It builds, whatever that means.
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] xserver-xorg: Fix X server 1.19 crash

[Khem Raj]

It seems this should be submitted upstream as well.

On 2/1/17 6:41 AM, Tom Hochstein wrote:
> https://lists.yoctoproject.org/pipermail/meta-freescale/2017-January/019980.html
> 
>  
> 
>  
> 
> *From:*Jussi Kukkonen [mailto:jussi.kukko...@intel.com]
> *Sent:* Wednesday, February 01, 2017 5:38 AM
> *To:* Tom Hochstein 
> *Cc:* Patches and discussions about the oe-core layer
> 
> *Subject:* Re: [OE-core] [PATCH v2] xserver-xorg: Fix X server 1.19 crash
> 
>  
> 
> On 1 February 2017 at 03:22, Tom Hochstein  > wrote:
> 
> Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of
> useSIGIO option:
> 
> xfree86 SIGIO support is reworked to use internal versions of
> OsBlockSIGIO and OsReleaseSIGIO
> 
> The check for useSIGIO is no longer needed.
> 
>  
> 
> Can you explain what the crash is or how to reproduce, I can't figure it
> out from the patch. Link to possible upstream ML discussion is fine as well.
> 
>  
> 
> Thanks,
> 
>   Jussi
> 
> 
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] State of bitbake world, Failed tasks 2017-01-31

[Martin Jansa]

On Tue, Jan 31, 2017 at 08:08:20PM +, Burton, Ross wrote:
> On 31 January 2017 at 17:10, Martin Jansa  wrote:
> 
> > There is a lot more failures this time (mostly because of RSS), but
> > I wanted to share it anyway, to be clear about the current state of
> > other layers.
> >
> 
> I presume you'll be changing this script as the minimal/maximal build runs
> are redundant now that recipe-specific-sysroots has landed?

Yes, I've changed it so next time it won't show the results from
test-dependencies jobs.

-- 
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com


signature.asc
Description: Digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] selftest/bbtests: use write_config instead of local.conf file

[leonardo . sandoval . gonzalez]

From: Leonardo Sandoval 

Extra configuration data should be write using the write_config
method instead of manually appending to the local.conf file

Signed-off-by: Leonardo Sandoval 
---
 meta/lib/oeqa/selftest/bbtests.py | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/bbtests.py 
b/meta/lib/oeqa/selftest/bbtests.py
index c4e50cb..9dbac95 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -229,10 +229,7 @@ INHERIT_remove = \"report-error\"
 
 @testcase(1119)
 def test_non_gplv3(self):
-data = 'INCOMPATIBLE_LICENSE = "GPLv3"'
-conf = os.path.join(self.builddir, 'conf/local.conf')
-ftools.append_file(conf ,data)
-self.addCleanup(ftools.remove_from_file, conf ,data)
+self.write_config('INCOMPATIBLE_LICENSE = "GPLv3"')
 result = bitbake('readline', ignore_status=True)
 self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, 
output %s" % (result.status, result.output))
 lic_dir = get_bb_var('LICENSE_DIRECTORY')
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] selftest/archiver: invalidate stamps instead of removing TMPDIR

[leonardo . sandoval . gonzalez]

From: Leonardo Sandoval 

There is no need to remove the whole TMPDIR, instead just invalidate
stamps and build again the targets. Local runs demostrate the patch reduces
the execution time considerably (see below), indicating the extra work done
by rmtree. In the other hand, the following checks after archiver were affected
because they started from a clean TMPDIR.

Before:
2017-01-31 17:39:39 -   test_archiver_allows_to_filter_on_recipe_name 
(oeqa.selftest.archiver.Archiver) ... OK (468.928s)

After:
2017-01-31 18:00:08 -   test_archiver_allows_to_filter_on_recipe_name 
(oeqa.selftest.archiver.Archiver) ... OK (297.524s)

Signed-off-by: Leonardo Sandoval 
---
 meta/lib/oeqa/selftest/archiver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/archiver.py 
b/meta/lib/oeqa/selftest/archiver.py
index 97b6f5b..c8c4533 100644
--- a/meta/lib/oeqa/selftest/archiver.py
+++ b/meta/lib/oeqa/selftest/archiver.py
@@ -28,8 +28,8 @@ class Archiver(oeSelfTest):
 features += 'COPYLEFT_PN_EXCLUDE = "%s"\n' % exclude_recipe
 self.write_config(features)
 
-shutil.rmtree(get_bb_var('TMPDIR'))
-bitbake("%s %s" % (include_recipe, exclude_recipe))
+bitbake("-C fetch %s" % include_recipe)
+bitbake("-C fetch %s" % exclude_recipe)
 
 src_path = os.path.join(get_bb_var('DEPLOY_DIR_SRC'), 
get_bb_var('TARGET_SYS'))
 
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] selftest/archiver: invalidate stamps instead of removing TMPDIR

[Burton, Ross]

On 1 February 2017 at 18:05, 
wrote:

> -shutil.rmtree(get_bb_var('TMPDIR'))
> -bitbake("%s %s" % (include_recipe, exclude_recipe))
> +bitbake("-C fetch %s" % include_recipe)
> +bitbake("-C fetch %s" % exclude_recipe)
>

You'll probably want to have a cleanup of the recipes to remove the tainted
stamps: bitbake -cclean for the recipes will do it.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] selftest/archiver: invalidate stamps instead of removing TMPDIR

[Leonardo Sandoval]

On 02/01/2017 02:42 PM, Burton, Ross wrote:


On 1 February 2017 at 18:05, 
> wrote:


-   shutil.rmtree(get_bb_var('TMPDIR'))
-bitbake("%s %s" % (include_recipe, exclude_recipe))
+bitbake("-C fetch %s" % include_recipe)
+bitbake("-C fetch %s" % exclude_recipe)


You'll probably want to have a cleanup of the recipes to remove the 
tainted stamps: bitbake -cclean for the recipes will do it.

Got it, so -c and -C left .taint files. I send a v2 soon.

Leo


Ross


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] OEDEM minutes review for Portland

[akuster808]

Hello all,

I add the Title and conclusion for each issue noted in the last years 
OEDEM in Berlin. For those who signed up to take an action, please 
review http://openembedded.org/wiki/OEDAM_2017/  Either update the 
status on the wiki or send me an email if you want me to do it.   I am 
trying to get a current state for those issues before our next meeting 
in Feb.



kind regards,

Armin

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe] OEDEM minutes review for Portland

[Tim Orling]

For anyone else that had trouble with the link:

http://openembedded.org/wiki/OEDAM_2017 


without the trailing slash.


> On Feb 1, 2017, at 4:07 PM, akuster808  wrote:
> 
> Hello all,
> 
> I add the Title and conclusion for each issue noted in the last years OEDEM 
> in Berlin. For those who signed up to take an action, please review 
> http://openembedded.org/wiki/OEDAM_2017/  Either update the status on the 
> wiki or send me an email if you want me to do it.   I am trying to get a 
> current state for those issues before our next meeting in Feb.
> 
> 
> kind regards,
> 
> Armin
> 
> -- 
> ___
> Openembedded-devel mailing list
> openembedded-de...@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 2/7] python3-manifest: move htlm.py to python3-html

[Anders Darander]

* Khem Raj  [170201 17:52]:

> On 1/30/17 11:18 PM, Anders Darander wrote:
> > This allows us to use html.py without importing misc.

> html.py is provided by many packages. Does is make more sense to package
> html.py on a package of its own ?

I'm not against that.

I can easily provide an updated patch, if this is desired. I put html.py
in this package only becaused a few of the other modules seemed quite
close. For me, my image would likely be reduced in size, if I move
html.py to it's own package. Thus, I wouldn't mind it.

Cheers,
Anders

-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core