* [PATCH] webkitgtk: Add an option to disable opengl support
From: Carlos Alberto Lopez Perez @ 2016-11-09 14:39 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>
---
meta/recipes-sato/webkit/webkitgtk_2.14.1.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
index 69c9f11..d6d9c14 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
@@ -41,7 +41,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
enchant \
libsecret \
"
@@ -53,6 +53,7 @@ PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant
PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
+PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret"
PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
--
2.1.4
^ permalink raw reply related
* Re: [PATCH 0/5] wic: bugfixes & --fixed-size support
From: Maciej Borzęcki @ 2016-11-09 13:49 UTC (permalink / raw)
To: Burton, Ross; +Cc: Maciej Borzecki, OE-core
In-Reply-To: <CAJTo0LaARkjM1C1D=k_NdoCRy5ivQdnbT+C_X-7WnnpnuQN0Ew@mail.gmail.com>
On Wed, Nov 9, 2016 at 2:17 PM, Burton, Ross <ross.burton@intel.com> wrote:
> I pulled this series into a test run on the autobuilder and it is throwing
> quite a lot of exceptions, such as:
>
> Traceback (most recent call last):
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic",
> line 319, in <module>
> sys.exit(main(sys.argv[1:]))
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic",
> line 314, in main
> return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage,
> subcommands)
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/help.py",
> line 95, in invoke_subcommand
> subcommands.get(args[0], subcommand_error)[0](args[1:], usage)
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic",
> line 247, in wic_create_subcommand
> options.compressor, options.bmap, options.debug)
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/engine.py",
> line 195, in wic_create
> crobj.main(cmdline)
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/creator.py",
> line 125, in main
> return self._subcmds[pname](options, *args[1:])
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/plugins/imager/direct_plugin.py",
> line 93, in do_create
> creator.create()
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/baseimager.py",
> line 159, in create
> self._create()
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/direct.py",
> line 305, in _create
> system_id=part.system_id)
> File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/utils/partitionedfs.py",
> line 101, in add_partition
> size = size * 1024 // self.sector_size
> TypeError: unsupported operand type(s) for //: 'str' and 'int'
> WARNING:
> TOPDIR/tmp/work/genericx86_64-poky-linux/core-image-lsb/1.0-r0/temp/run.do_image_wic.15783:1
> exit 1 from 'BUILDDIR="TOPDIR" wic create "$wks" --vars
> "TOPDIR/tmp/sysroots/genericx86-64/imgdata/" -e "core-image-lsb" -o "$out/"'
>
> See
> http://errors.yoctoproject.org/Errors/Latest/Autobuilder/?filter=a44a6a635c9ed02edb2a3dee0a13b0067becc425&type=commit
> for more examples and context.
Thanks. I see now that bootimg-efi and rawcopy plugins do not convert partition
size to int as they should be.
>
> Ross
>
> On 8 November 2016 at 15:56, Maciej Borzecki <maciej.borzecki@rndity.com>
> wrote:
>>
>> The patch series is a follow-up after a previous attempt of adding
>> --reserved-size option to wic[1].
>>
>> The series introduces a number of fixes in patches 1 - 4.
>>
>> The last patch in the series introduces --fixed-size option as discussed
>> in [1].
>> The patch also introduces minor refactoring to code responsible for
>> computing
>> partition size.
>>
>> Aside from new option, another user-visible change is how the size rootfs
>> partitions with vfat is calculated. In previous code, vfat rootfs
>> partition size
>> did not account for --extra-space nor --overhead-factor. Now, all rootfs
>> partitions (except for squashfs) are subject to the same rules of
>> partition
>> sizing.
>>
>>
>> http://lists.openembedded.org/pipermail/openembedded-core/2016-October/127634.html
>>
>> Maciej Borzecki (5):
>> wic: make sure that partition size is always an integer in internal
>> processing
>> wic: use partition size when creating empty partition files
>> wic: check that filesystem is specified for a rootfs partition
>> wic: fix function comment typos
>> wic: add --fixed-size wks option
>>
>> scripts/lib/wic/help.py | 14 +++--
>> scripts/lib/wic/imager/direct.py | 2 +-
>> scripts/lib/wic/ksparser.py | 41 +++++++++++++--
>> scripts/lib/wic/partition.py | 93
>> +++++++++++++++++++++-------------
>> scripts/lib/wic/utils/partitionedfs.py | 6 +--
>> 5 files changed, 109 insertions(+), 47 deletions(-)
>>
>> --
>> 2.5.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
--
Maciej Borzecki
RnDity
^ permalink raw reply
* Re: krogoth 2.1.2 status
From: Joshua Lock @ 2016-11-09 13:26 UTC (permalink / raw)
To: Richard Purdie, openembedded-core, Armin Kuster
In-Reply-To: <1478694607.23123.176.camel@linuxfoundation.org>
On Wed, 2016-11-09 at 12:30 +0000, Richard Purdie wrote:
> I ran a krogoth 2.1.2 build. It did have some issues:
>
> * one runtime sanity test had a timeout issue
> * some urls are stale (perpetual problem)
> * musl runtime testing fails (never tested on krogoth previously)
> * no-x11 runtime testing had a failure (never tested on krogoth
> previously)
We can update the autobuilder not to run these tests for krogoth.
I've filed a bug for musl:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10634
for no-x11 there's a single failure, it might be worthwhile backporting
fixes to make that work?
Regards,
Joshua
^ permalink raw reply
* Re: [PATCH 0/5] wic: bugfixes & --fixed-size support
From: Burton, Ross @ 2016-11-09 13:17 UTC (permalink / raw)
To: Maciej Borzecki; +Cc: Maciej Borzecki, OE-core
In-Reply-To: <cover.1478619682.git.maciej.borzecki@rndity.com>
[-- Attachment #1: Type: text/plain, Size: 4207 bytes --]
I pulled this series into a test run on the autobuilder and it is throwing
quite a lot of exceptions, such as:
Traceback (most recent call last):
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic",
line 319, in <module>
sys.exit(main(sys.argv[1:]))
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic",
line 314, in main
return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage,
subcommands)
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/help.py",
line 95, in invoke_subcommand
subcommands.get(args[0], subcommand_error)[0](args[1:], usage)
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/wic",
line 247, in wic_create_subcommand
options.compressor, options.bmap, options.debug)
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/engine.py",
line 195, in wic_create
crobj.main(cmdline)
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/creator.py",
line 125, in main
return self._subcmds[pname](options, *args[1:])
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/plugins/imager/direct_plugin.py",
line 93, in do_create
creator.create()
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/baseimager.py",
line 159, in create
self._create()
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/imager/direct.py",
line 305, in _create
system_id=part.system_id)
File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-x86-64-lsb/build/scripts/lib/wic/utils/partitionedfs.py",
line 101, in add_partition
size = size * 1024 // self.sector_size
TypeError: unsupported operand type(s) for //: 'str' and 'int'
WARNING:
TOPDIR/tmp/work/genericx86_64-poky-linux/core-image-lsb/1.0-r0/temp/run.do_image_wic.15783:1
exit 1 from 'BUILDDIR="TOPDIR" wic create "$wks" --vars
"TOPDIR/tmp/sysroots/genericx86-64/imgdata/" -e "core-image-lsb" -o "$out/"'
See
http://errors.yoctoproject.org/Errors/Latest/Autobuilder/?filter=a44a6a635c9ed02edb2a3dee0a13b0067becc425&type=commit
for more examples and context.
Ross
On 8 November 2016 at 15:56, Maciej Borzecki <maciej.borzecki@rndity.com>
wrote:
> The patch series is a follow-up after a previous attempt of adding
> --reserved-size option to wic[1].
>
> The series introduces a number of fixes in patches 1 - 4.
>
> The last patch in the series introduces --fixed-size option as discussed
> in [1].
> The patch also introduces minor refactoring to code responsible for
> computing
> partition size.
>
> Aside from new option, another user-visible change is how the size rootfs
> partitions with vfat is calculated. In previous code, vfat rootfs
> partition size
> did not account for --extra-space nor --overhead-factor. Now, all rootfs
> partitions (except for squashfs) are subject to the same rules of partition
> sizing.
>
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2016-October/127634.html
>
> Maciej Borzecki (5):
> wic: make sure that partition size is always an integer in internal
> processing
> wic: use partition size when creating empty partition files
> wic: check that filesystem is specified for a rootfs partition
> wic: fix function comment typos
> wic: add --fixed-size wks option
>
> scripts/lib/wic/help.py | 14 +++--
> scripts/lib/wic/imager/direct.py | 2 +-
> scripts/lib/wic/ksparser.py | 41 +++++++++++++--
> scripts/lib/wic/partition.py | 93 +++++++++++++++++++++---------
> ----
> scripts/lib/wic/utils/partitionedfs.py | 6 +--
> 5 files changed, 109 insertions(+), 47 deletions(-)
>
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 5439 bytes --]
^ permalink raw reply
* Re: [PATCH] kernel.bbclass: Allow ${S} to be overridden
From: Bruce Ashfield @ 2016-11-09 13:09 UTC (permalink / raw)
To: Burton, Ross; +Cc: OpenEmbedded Core
In-Reply-To: <CAJTo0LZxGYzpjUetPspX6mKktoL_XnDqfncyHFWN5Kzfij8-UQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2577 bytes --]
On Wed, Nov 9, 2016 at 5:04 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 9 November 2016 at 02:23, Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
>
>> I can ack this patch, since no defaults change .. there's no risk to
>> existing users.
>>
>
> Saying that of course doomed the patch:
>
interesting.
Paul: obviously you were building with this in place, and my local test did
work here
as well .. so any idea to the difference ?
Let me know if you want any help looking into it.
Cheers,
Bruce
>
> ERROR: hello-mod-0.1-r0 do_make_scripts: Function failed: do_make_scripts
> (log file is located at /home/pokybuild/yocto-autobuilder/yocto-worker/
> nightly-qa-skeleton/build/build/tmp/work/qemux86_64-
> poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071)
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/
> temp/log.do_make_scripts.14071
> Log data follows:
> | DEBUG: Executing shell function do_make_scripts
> | make: Entering directory '/home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work-shared/qemux86-64/kernel-source'
> | make: *** No rule to make target 'scripts'. Stop.
> | make: Leaving directory '/home/pokybuild/yocto-autobuilder/yocto-worker/
> nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source'
> | WARNING: /home/pokybuild/yocto-autobuilder/yocto-worker/
> nightly-qa-skeleton/build/build/tmp/work/qemux86_64-
> poky-linux/hello-mod/0.1-r0/temp/run.do_make_scripts.14071:1 exit 2 from
> 'make CC="x86_64-poky-linux-gcc -fuse-ld=bfd" LD="x86_64-poky-linux-ld.bfd
> " AR="x86_64-poky-linux-ar " -C /home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work-shared/qemux86-64/kernel-source O=/home/pokybuild/yocto-
> autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work-shared/qemux86-64/kernel-build-artifacts scripts'
> | ERROR: Function failed: do_make_scripts (log file is located at
> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/
> build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/
> temp/log.do_make_scripts.14071)
> NOTE: recipe hello-mod-0.1-r0: task do_make_scripts: Failed
>
> The autobuilder builds hello-mod from meta-skeleton, which inherits module
> and sets S=${WORKDIR}.
>
> Ross
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 3891 bytes --]
^ permalink raw reply
* krogoth 2.1.2 status
From: Richard Purdie @ 2016-11-09 12:30 UTC (permalink / raw)
To: openembedded-core, Armin Kuster
I ran a krogoth 2.1.2 build. It did have some issues:
* one runtime sanity test had a timeout issue
* some urls are stale (perpetual problem)
* musl runtime testing fails (never tested on krogoth previously)
* no-x11 runtime testing had a failure (never tested on krogoth
previously)
I suspect we can call this good enough to put into QA but there were
enough 'failures' I wanted to send this out in case someone objects.
Part of the problem here is we apply our current autobuilder test setup
to the older releases as well. I'm aware there may be better ways to do
this but I don't know anyone with time to work on that, we have other
more pressing problems.
Cheers,
Richard
^ permalink raw reply
* Re: [PATCH] weston: upgrade from 1.11.1 to 1.12.0
From: Burton, Ross @ 2016-11-09 12:15 UTC (permalink / raw)
To: Fathi Boudra; +Cc: OE-core
In-Reply-To: <20161108135457.13249-1-fathi.boudra@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
On 8 November 2016 at 13:54, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so"
>
Because you didn't fix this patch the weston-xwayland package is never
built, buildhistory is huge and core-image-weston with X11 enabled doesn't
build.
Ross
[-- Attachment #2: Type: text/html, Size: 714 bytes --]
^ permalink raw reply
* Re: [PATCH 5/5] wic: add --fixed-size wks option
From: Maciej Borzęcki @ 2016-11-09 12:08 UTC (permalink / raw)
To: Ed Bartosh
Cc: Maciej Borzecki, Patches and discussions about the oe-core layer
In-Reply-To: <20161109093627.GB10823@linux.intel.com>
On Wed, Nov 9, 2016 at 10:36 AM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> On Tue, Nov 08, 2016 at 04:56:11PM +0100, Maciej Borzecki wrote:
>> Added new option --fixed-size to wks. The option can be used to indicate
>> the exact size of a partition. The option cannot be added together with
>> --size, in which case an error will be raised. Other options that
>> influence automatic partition size (--extra-space, --overhead-factor),
>> if specifiec along with --fixed-size, will raise an error.
>>
>> If it partition data is larger than the amount of space specified with
>> --fixed-size option wic will raise an error.
>>
>> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
>> ---
>> scripts/lib/wic/help.py | 14 ++++--
>> scripts/lib/wic/imager/direct.py | 2 +-
>> scripts/lib/wic/ksparser.py | 41 +++++++++++++++--
>> scripts/lib/wic/partition.py | 83 ++++++++++++++++++++--------------
>> scripts/lib/wic/utils/partitionedfs.py | 2 +-
>> 5 files changed, 100 insertions(+), 42 deletions(-)
>>
>> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
>> index e5347ec4b7c900c68fc64351a5293e75de0672b3..daa11bf489c135627ddfe4cef968e48f8e3ad1d8 100644
>> --- a/scripts/lib/wic/help.py
>> +++ b/scripts/lib/wic/help.py
>> @@ -646,6 +646,12 @@ DESCRIPTION
>> not specified, the size is in MB.
>> You do not need this option if you use --source.
>>
>> + --fixed-size: Exact partition size. Value format is the same
>> + as for --size option. This option cannot be
>> + specified along with --size. If partition data
>> + is larger than --fixed-size and error will be
>> + raised when assembling disk image.
>> +
>> --source: This option is a wic-specific option that names the
>> source of the data that will populate the
>> partition. The most common value for this option
>> @@ -719,13 +725,15 @@ DESCRIPTION
>> space after the space filled by the content
>> of the partition. The final size can go
>> beyond the size specified by --size.
>> - By default, 10MB.
>> + By default, 10MB. This option cannot be used
>> + with --fixed-size option.
>>
>> --overhead-factor: This option is specific to wic. The
>> size of the partition is multiplied by
>> this factor. It has to be greater than or
>> - equal to 1.
>> - The default value is 1.3.
>> + equal to 1. The default value is 1.3.
>> + This option cannot be used with --fixed-size
>> + option.
>>
>> --part-type: This option is specific to wic. It specifies partition
>> type GUID for GPT partitions.
>> diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
>> index 2bedef08d6450096c786def6f75a9ee53fcd4b3b..c01a1ea538428e36a75ac5b31a822e01901bea6a 100644
>> --- a/scripts/lib/wic/imager/direct.py
>> +++ b/scripts/lib/wic/imager/direct.py
>> @@ -290,7 +290,7 @@ class DirectImageCreator(BaseImageCreator):
>> self.bootimg_dir, self.kernel_dir, self.native_sysroot)
>>
>>
>> - self.__image.add_partition(int(part.size),
>> + self.__image.add_partition(part.get_size(),
>> part.disk,
>> part.mountpoint,
>> part.source_file,
>> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
>> index 0894e2b199a299fbbed272f2e1c95e9d692e3ab1..62c490274aa92bf82aac304d9323250e3b728d0c 100644
>> --- a/scripts/lib/wic/ksparser.py
>> +++ b/scripts/lib/wic/ksparser.py
>> @@ -113,6 +113,9 @@ def systemidtype(arg):
>> class KickStart():
>> """"Kickstart parser implementation."""
>>
>> + DEFAULT_EXTRA_SPACE = 10*1024
>> + DEFAULT_OVERHEAD_FACTOR = 1.3
>> +
>> def __init__(self, confpath):
>>
>> self.partitions = []
>> @@ -127,16 +130,24 @@ class KickStart():
>> part.add_argument('mountpoint', nargs='?')
>> part.add_argument('--active', action='store_true')
>> part.add_argument('--align', type=int)
>> - part.add_argument("--extra-space", type=sizetype, default=10*1024)
>> + part.add_argument("--extra-space", type=sizetype)
>> part.add_argument('--fsoptions', dest='fsopts')
>> part.add_argument('--fstype')
>> part.add_argument('--label')
>> part.add_argument('--no-table', action='store_true')
>> part.add_argument('--ondisk', '--ondrive', dest='disk')
>> - part.add_argument("--overhead-factor", type=overheadtype, default=1.3)
>> + part.add_argument("--overhead-factor", type=overheadtype)
>> part.add_argument('--part-type')
>> part.add_argument('--rootfs-dir')
>> - part.add_argument('--size', type=sizetype, default=0)
>> +
>> + # --size and --fixed-size cannot be specified together; options
>> + # ----extra-space and --overhead-factor should also raise a parser
>> + # --error, but since nesting mutually exclusive groups does not work,
>> + # ----extra-space/--overhead-factor are handled later
>> + sizeexcl = part.add_mutually_exclusive_group()
>> + sizeexcl.add_argument('--size', type=sizetype, default=0)
>> + sizeexcl.add_argument('--fixed-size', type=sizetype, default=0)
>> +
>> part.add_argument('--source')
>> part.add_argument('--sourceparams')
>> part.add_argument('--system-id', type=systemidtype)
>> @@ -170,11 +181,33 @@ class KickStart():
>> lineno += 1
>> if line and line[0] != '#':
>> try:
>> - parsed = parser.parse_args(shlex.split(line))
>> + line_args = shlex.split(line)
>> + parsed = parser.parse_args(line_args)
>> except ArgumentError as err:
>> raise KickStartError('%s:%d: %s' % \
>> (confpath, lineno, err))
>> if line.startswith('part'):
>> + # using ArgumentParser one cannot easily tell if option
>> + # was passed as argument, if said option has a default
>> + # value; --overhead-factor/--extra-space cannot be used
>> + # with --fixed-size, so at least detect when these were
>> + # passed with non-0 values ...
> I'd suggest to handle this using argparse mutual exclusion:
> https://docs.python.org/2/library/argparse.html#mutual-exclusion
I don't think argpare.ArgumentParser() can handle nested groups. Right
now --fixed-size and --size are in exclusive group, there's this part in
the patch:
>> + sizeexcl = part.add_mutually_exclusive_group()
>> + sizeexcl.add_argument('--size', type=sizetype, default=0)
>> + sizeexcl.add_argument('--fixed-size', type=sizetype, default=0)
The most logical way to express a conflict between options would be
using a snippet like this:
sizeexcl = part.add_mutually_exclusive_group()
sizeexcl.add_argument('--fixed-size', type=sizetype, default=0)
szg = sizeexcl.add_argument_group()
szg.add_argument('--size', type=sizetype, default=0)
szg.add_argument('--overhead-factor', type=sizetype, default=0)
szg.add_argument('--extra-space', type=sizetype, default=0)
Unfortunately, this does not work as expected with vanilla
ArgumentParser. That's why I've added this workaround, along with a
lengthy comment.
>
>> + if parsed.fixed_size:
>> + if parsed.overhead_factor or parsed.extra_space:
>> + err = "%s:%d: arguments --overhead-factor and --extra-space not "\
>> + "allowed with argument --fixed-size" \
>> + % (confpath, lineno)
>> + raise KickStartError(err)
>> + else:
>> + # ... and provide defaults if not using
>> + # --fixed-size iff given option was not used
>> + # (again, one cannot tell if option was passed but
>> + # with value equal to 0)
>> + if '--overhead-factor' not in line_args:
>> + parsed.overhead_factor = self.DEFAULT_OVERHEAD_FACTOR
>> + if '--extra-space' not in line_args:
>> + parsed.extra_space = self.DEFAULT_EXTRA_SPACE
>> +
>> self.partnum += 1
>> self.partitions.append(Partition(parsed, self.partnum))
>> elif line.startswith('include'):
>> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
>> index 24e657592738dc7c5cdff78e3740d7c373021e9d..354d4b44c50c77baa54331e95ce0876c32d09339 100644
>> --- a/scripts/lib/wic/partition.py
>> +++ b/scripts/lib/wic/partition.py
>> @@ -54,6 +54,7 @@ class Partition():
>> self.part_type = args.part_type
>> self.rootfs_dir = args.rootfs_dir
>> self.size = args.size
>> + self.fixed_size = args.fixed_size
>> self.source = args.source
>> self.sourceparams = args.sourceparams
>> self.system_id = args.system_id
>> @@ -87,6 +88,39 @@ class Partition():
>> else:
>> return 0
>>
>> + def get_rootfs_size(self, actual_rootfs_size=0):
>> + """
>> + Calculate the required size of rootfs taking into consideration
>> + --size/--fixed-size flags as well as overhead and extra space, as
>> + specified in kickstart file. Raises an error if the
>> + `actual_rootfs_size` is larger than fixed-size rootfs.
>> +
>> + """
>> + if self.fixed_size:
>> + rootfs_size = self.fixed_size
>> + if actual_rootfs_size > rootfs_size:
>> + msger.error("Actual rootfs size (%d kB) is larger than allowed size %d kB" \
>> + %(actual_rootfs_size, rootfs_size))
>> + else:
>> + extra_blocks = self.get_extra_block_count(actual_rootfs_size)
>> + if extra_blocks < self.extra_space:
>> + extra_blocks = self.extra_space
>> +
>> + rootfs_size = actual_rootfs_size + extra_blocks
>> + rootfs_size *= self.overhead_factor
>> +
>> + msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
>> + (extra_blocks, self.mountpoint, rootfs_size))
>> +
>> + return rootfs_size
>> +
>> + def get_size(self):
>> + """
>> + Obtain partition size taking into consideration --size/--fixed-size
>> + options.
>> + """
>> + return self.fixed_size if self.fixed_size else self.size
>> +
>> def prepare(self, creator, cr_workdir, oe_builddir, rootfs_dir,
>> bootimg_dir, kernel_dir, native_sysroot):
> Can you make self.size and self.fixed_size getters as properties(use @property decorator)?
> It should make code look more pythonic.
>
Good point. I'll incorporate this in v2.
>> """
>> @@ -97,9 +131,9 @@ class Partition():
>> self.sourceparams_dict = parse_sourceparams(self.sourceparams)
>>
>> if not self.source:
>> - if not self.size:
>> - msger.error("The %s partition has a size of zero. Please "
>> - "specify a non-zero --size for that partition." % \
>> + if not self.size and not self.fixed_size:
>> + msger.error("The %s partition has a size of zero. Please "
>> + "specify a non-zero --size/--fixed-size for that partition." % \
>> self.mountpoint)
>> if self.fstype and self.fstype == "swap":
>> self.prepare_swap_partition(cr_workdir, oe_builddir,
>> @@ -146,6 +180,10 @@ class Partition():
>> oe_builddir,
>> bootimg_dir, kernel_dir, rootfs_dir,
>> native_sysroot)
>> + if self.fixed_size and self.size > self.fixed_size:
>> + msger.error("File system image of partition %s is larger (%d kB) than its"\
>> + "allowed size %d kB" % (self.mountpoint,
>> + self.size, self.fixed_size))
>>
>> def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir,
>> rootfs_dir):
>> @@ -211,15 +249,7 @@ class Partition():
>> out = exec_cmd(du_cmd)
>> actual_rootfs_size = int(out.split()[0])
>>
>> - extra_blocks = self.get_extra_block_count(actual_rootfs_size)
>> - if extra_blocks < self.extra_space:
>> - extra_blocks = self.extra_space
>> -
>> - rootfs_size = actual_rootfs_size + extra_blocks
>> - rootfs_size *= self.overhead_factor
>> -
>> - msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
>> - (extra_blocks, self.mountpoint, rootfs_size))
>> + rootfs_size = self.get_rootfs_size(actual_rootfs_size)
>>
>> with open(rootfs, 'w') as sparse:
>> os.ftruncate(sparse.fileno(), rootfs_size * 1024)
>> @@ -245,15 +275,7 @@ class Partition():
>> out = exec_cmd(du_cmd)
>> actual_rootfs_size = int(out.split()[0])
>>
>> - extra_blocks = self.get_extra_block_count(actual_rootfs_size)
>> - if extra_blocks < self.extra_space:
>> - extra_blocks = self.extra_space
>> -
>> - rootfs_size = actual_rootfs_size + extra_blocks
>> - rootfs_size *= self.overhead_factor
>> -
>> - msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
>> - (extra_blocks, self.mountpoint, rootfs_size))
>> + rootfs_size = self.get_rootfs_size(actual_rootfs_size)
>>
>> with open(rootfs, 'w') as sparse:
>> os.ftruncate(sparse.fileno(), rootfs_size * 1024)
>> @@ -275,20 +297,13 @@ class Partition():
>> out = exec_cmd(du_cmd)
>> blocks = int(out.split()[0])
>>
>> - extra_blocks = self.get_extra_block_count(blocks)
>> - if extra_blocks < self.extra_space:
>> - extra_blocks = self.extra_space
>> -
>> - blocks += extra_blocks
>> -
>> - msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
>> - (extra_blocks, self.mountpoint, blocks))
>> + rootfs_size = self.get_rootfs_size(blocks)
>>
>> label_str = "-n boot"
>> if self.label:
>> label_str = "-n %s" % self.label
>>
>> - dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, rootfs, blocks)
>> + dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, rootfs, rootfs_size)
>> exec_native_cmd(dosfs_cmd, native_sysroot)
>>
>> mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
>> @@ -311,8 +326,9 @@ class Partition():
>> """
>> Prepare an empty ext2/3/4 partition.
>> """
>> + size = self.get_size()
>> with open(rootfs, 'w') as sparse:
>> - os.ftruncate(sparse.fileno(), self.size * 1024)
>> + os.ftruncate(sparse.fileno(), size * 1024)
>>
>> extra_imagecmd = "-i 8192"
>>
>> @@ -329,8 +345,9 @@ class Partition():
>> """
>> Prepare an empty btrfs partition.
>> """
>> + size = self.get_size()
>> with open(rootfs, 'w') as sparse:
>> - os.ftruncate(sparse.fileno(), self.size * 1024)
>> + os.ftruncate(sparse.fileno(), size * 1024)
>>
>> label_str = ""
>> if self.label:
>> @@ -345,7 +362,7 @@ class Partition():
>> """
>> Prepare an empty vfat partition.
>> """
>> - blocks = self.size
>> + blocks = self.get_size()
>>
>> label_str = "-n boot"
>> if self.label:
>> diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
>> index 9e76487844eebfffc7227d053a65dc9fdab3678b..cfa5f5ce09b764c1c2a9b7a3f7bf7d677a6811c4 100644
>> --- a/scripts/lib/wic/utils/partitionedfs.py
>> +++ b/scripts/lib/wic/utils/partitionedfs.py
>> @@ -209,7 +209,7 @@ class Image():
>> msger.debug("Assigned %s to %s%d, sectors range %d-%d size %d "
>> "sectors (%d bytes)." \
>> % (part['mountpoint'], part['disk_name'], part['num'],
>> - part['start'], part['start'] + part['size'] - 1,
>> + part['start'], disk['offset'] - 1,
>> part['size'], part['size'] * self.sector_size))
>>
>> # Once all the partitions have been layed out, we can calculate the
>> --
>> 2.5.0
>>
>
> --
> --
> Regards,
> Ed
--
Maciej Borzecki
RnDity
^ permalink raw reply
* Re: [PATCH] weston: upgrade from 1.11.1 to 1.12.0
From: Jussi Kukkonen @ 2016-11-09 12:07 UTC (permalink / raw)
To: Fathi Boudra; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161108135457.13249-1-fathi.boudra@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 17778 bytes --]
On 8 November 2016 at 15:54, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> From: Daniel Díaz <daniel.diaz@linaro.org>
>
> * Refresh patches to apply cleanly on 1.12.0 (no changes):
> - 0001-make-error-portable.patch
> - 0001-configure.ac-Fix-wayland-protocols-path.patch
> - 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
> - 0001-Add-configuration-option-for-no-input-device.patch
> * Remove 0001-shared-include-stdint.h-for-int32_t.patch applied
> upstream
> https://cgit.freedesktop.org/wayland/weston/commit/?id=649bbce6
> * Update license files checksum, compositor.c location has changed.
> No license changes.
> * Drop --disable-rpi-compositor from EXTRA_OE_CONF. Raspberry Pi backend
> and renderer have been removed upstream. The option doesn't exist
> anymore.
> * Adjust files names to the new naming: weston -> libweston-1.
>
These changes look good to me. That said I think we should start separating
the package into weston (compositor shells, plugins and essential tools)
and libweston (the public libraries) at this point since upstream is now
saying it should work. Can you do this as part of the upgrade?
libweston should contain {libdir}/*.so.* as usual but I believe also
{libdir}/libweston-1/* (the backends). The weston plugins
({libdir}/weston/*) should stay in weston itself
Cheers,
Jussi
> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
> ---
> ...-configuration-option-for-no-input-device.patch | 39
> +++++++++++-----------
> ...1-configure.ac-Fix-wayland-protocols-path.patch | 4 +--
> .../wayland/weston/0001-make-error-portable.patch | 20 +++++------
> .../0001-shared-include-stdint.h-for-int32_t.patch | 23 -------------
> ...ch-Provide-a-default-version-that-doesn-t.patch | 28 ++++++++--------
> .../wayland/{weston_1.11.1.bb => weston_1.12.0.bb} | 12 +++----
> 6 files changed, 51 insertions(+), 75 deletions(-)
> delete mode 100644 meta/recipes-graphics/wayland/
> weston/0001-shared-include-stdint.h-for-int32_t.patch
> rename meta/recipes-graphics/wayland/{weston_1.11.1.bb =>
> weston_1.12.0.bb} (92%)
>
> diff --git a/meta/recipes-graphics/wayland/weston/0001-Add-
> configuration-option-for-no-input-device.patch b/meta/recipes-graphics/
> wayland/weston/0001-Add-configuration-option-for-no-input-device.patch
> index c45f3ad..a822d4a 100644
> --- a/meta/recipes-graphics/wayland/weston/0001-Add-
> configuration-option-for-no-input-device.patch
> +++ b/meta/recipes-graphics/wayland/weston/0001-Add-
> configuration-option-for-no-input-device.patch
> @@ -31,24 +31,24 @@ Reviewed-by: Daniel Stone <daniels@collabora.com>
> Upstream-Status: backport from
> https://cgit.freedesktop.org/wayland/weston/commit/?id=75b7197f
> ---
> - man/weston.ini.man | 5 +++++
> - src/compositor.h | 3 +++
> - src/libinput-seat.c | 6 ++++++
> - src/main.c | 5 +++++
> - weston.ini.in | 1 +
> - 5 files changed, 20 insertions(+)
> + compositor/main.c | 5 +++++
> + libweston/compositor.h | 4 ++++
> + libweston/libinput-seat.c | 6 ++++++
> + man/weston.ini.man | 5 +++++
> + weston.ini.in | 1 +
> + 5 files changed, 21 insertions(+)
>
> ---- a/src/main.c
> -+++ b/src/main.c
> -@@ -1298,6 +1298,7 @@ int main(int argc, char *argv[])
> - struct wl_client *primary_client;
> +--- a/compositor/main.c
> ++++ b/compositor/main.c
> +@@ -1595,6 +1595,7 @@ int main(int argc, char *argv[])
> struct wl_listener primary_client_destroyed;
> struct weston_seat *seat;
> -+ int require_input;
> + struct wet_compositor user_data;
> ++ int require_input;
>
> const struct weston_option core_options[] = {
> { WESTON_OPTION_STRING, "backend", 'B', &backend },
> -@@ -1373,6 +1374,10 @@ int main(int argc, char *argv[])
> +@@ -1678,6 +1679,10 @@ int main(int argc, char *argv[])
> if (weston_compositor_init_config(ec, config) < 0)
> goto out;
>
> @@ -59,21 +59,22 @@ https://cgit.freedesktop.org/
> wayland/weston/commit/?id=75b7197f
> if (load_backend(ec, backend, &argc, argv, config) < 0) {
> weston_log("fatal: failed to create compositor backend\n");
> goto out;
> ---- a/src/compositor.h
> -+++ b/src/compositor.h
> -@@ -803,6 +803,9 @@ struct weston_compositor {
> +--- a/libweston/compositor.h
> ++++ b/libweston/compositor.h
> +@@ -836,6 +836,10 @@ struct weston_compositor {
>
> void *user_data;
> void (*exit)(struct weston_compositor *c);
> +
> + /* Whether to let the compositor run without any input device. */
> + bool require_input;
> ++
> };
>
> struct weston_buffer {
> ---- a/src/libinput-seat.c
> -+++ b/src/libinput-seat.c
> -@@ -255,6 +255,12 @@ udev_input_enable(struct udev_input *inp
> +--- a/libweston/libinput-seat.c
> ++++ b/libweston/libinput-seat.c
> +@@ -259,6 +259,12 @@ udev_input_enable(struct udev_input *inp
> devices_found = 1;
> }
>
> @@ -88,7 +89,7 @@ https://cgit.freedesktop.org/wayland/weston/commit/?id=
> 75b7197f
> "warning: no input devices on entering Weston. "
> --- a/man/weston.ini.man
> +++ b/man/weston.ini.man
> -@@ -169,6 +169,11 @@ time, the one specified in the command-l
> +@@ -168,6 +168,11 @@ time, the one specified in the command-l
> hand, if none of these sets the value, default idle timeout will be
> set to 300 seconds.
> .RS
> diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.
> ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/
> wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
> index edd3b91..39000d4 100644
> --- a/meta/recipes-graphics/wayland/weston/0001-configure.
> ac-Fix-wayland-protocols-path.patch
> +++ b/meta/recipes-graphics/wayland/weston/0001-configure.
> ac-Fix-wayland-protocols-path.patch
> @@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [embedded specific]
>
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
> +@@ -229,7 +229,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
> PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
>
> - PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
> + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7],
> - [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`])
> + [ac_wayland_protocols_pkgdatadir=${WAYLAND_
> PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir
> wayland-protocols`])
> AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
> diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> index f7b5284..c41ea49 100644
> --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> @@ -7,18 +7,18 @@ error() is not posix but gnu extension so may not be
> available on all
> kind of systemsi e.g. musl.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Submitted
>
> - configure.ac | 2 ++
> - src/weston-error.h | 20 ++++++++++++++++++++
> - src/weston-launch.c | 2 +-
> +Upstream-Status: Submitted
> +---
> + configure.ac | 2 ++
> + libweston/weston-error.h | 20 ++++++++++++++++++++
> + libweston/weston-launch.c | 2 +-
> 3 files changed, 23 insertions(+), 1 deletion(-)
> - create mode 100644 src/weston-error.h
> + create mode 100644 libweston/weston-error.h
>
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
> +@@ -102,6 +102,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
> [[#include <time.h>]])
> AC_CHECK_HEADERS([execinfo.h])
>
> @@ -28,7 +28,7 @@ Upstream-Status: Submitted
>
> COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1
> >= 0.25.2"
> --- /dev/null
> -+++ b/src/weston-error.h
> ++++ b/libweston/weston-error.h
> @@ -0,0 +1,20 @@
> +#ifndef _WESTON_ERROR_H
> +#define _WESTON_ERROR_H
> @@ -50,8 +50,8 @@ Upstream-Status: Submitted
> +
> +#endif
> +
> ---- a/src/weston-launch.c
> -+++ b/src/weston-launch.c
> +--- a/libweston/weston-launch.c
> ++++ b/libweston/weston-launch.c
> @@ -33,7 +33,6 @@
> #include <poll.h>
> #include <errno.h>
> diff --git a/meta/recipes-graphics/wayland/weston/0001-shared-
> include-stdint.h-for-int32_t.patch b/meta/recipes-graphics/
> wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
> deleted file mode 100644
> index ee66c20..0000000
> --- a/meta/recipes-graphics/wayland/weston/0001-shared-
> include-stdint.h-for-int32_t.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From ba02b8abe4e2afac2bfbf2559972d5059d75a041 Mon Sep 17 00:00:00 2001
> -From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> -Date: Sat, 16 Jul 2016 22:50:19 +0300
> -Subject: [PATCH weston] shared: include stdint.h for int32_t
> -
> -This fixes build on musl.
> -
> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> -Upstream-Status: Submitted
> ----
> - shared/xalloc.h | 1 +
> - 1 file changed, 1 insertion(+)
> -
> ---- a/shared/xalloc.h
> -+++ b/shared/xalloc.h
> -@@ -30,6 +30,7 @@
> - extern "C" {
> - #endif
> -
> -+#include <stdint.h>
> - #include <stdlib.h>
> - #include <string.h>
> -
> diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-
> launch-Provide-a-default-version-that-doesn-t.patch
> b/meta/recipes-graphics/wayland/weston/0001-weston-
> launch-Provide-a-default-version-that-doesn-t.patch
> index d684b1c..3d12d53 100644
> --- a/meta/recipes-graphics/wayland/weston/0001-weston-
> launch-Provide-a-default-version-that-doesn-t.patch
> +++ b/meta/recipes-graphics/wayland/weston/0001-weston-
> launch-Provide-a-default-version-that-doesn-t.patch
> @@ -14,13 +14,13 @@ Upstream-Status: Pending
>
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
> - configure.ac | 9 +++++++--
> - src/weston-launch.c | 20 ++++++++++++++++++++
> + configure.ac | 9 +++++++--
> + libweston/weston-launch.c | 20 ++++++++++++++++++++
> 2 files changed, 27 insertions(+), 2 deletions(-)
>
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization,
> +@@ -441,13 +441,17 @@ AC_ARG_ENABLE(resize-optimization,
> AS_IF([test "x$enable_resize_optimization" = "xyes"],
> [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a
> performance optimization])])
>
> @@ -40,7 +40,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> fi
>
> AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
> -@@ -673,6 +677,7 @@ AC_MSG_RESULT([
> +@@ -704,6 +708,7 @@ AC_MSG_RESULT([
> Enable developer documentation ${enable_devdocs}
>
> weston-launch utility ${enable_weston_launch}
> @@ -48,8 +48,8 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> systemd-login support ${have_systemd_login}
> systemd notify support ${enable_systemd_notify}
>
> ---- a/src/weston-launch.c
> -+++ b/src/weston-launch.c
> +--- a/libweston/weston-launch.c
> ++++ b/libweston/weston-launch.c
> @@ -51,7 +51,9 @@
>
> #include <pwd.h>
> @@ -103,7 +103,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
>
> if (ioctl(wl->tty, KDSKBMUTE, 0) &&
> ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
> -@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl)
> +@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl,
> setenv("HOME", wl->pw->pw_dir, 1);
> setenv("SHELL", wl->pw->pw_shell, 1);
>
> @@ -111,15 +111,15 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> env = pam_getenvlist(wl->ph);
> if (env) {
> for (i = 0; env[i]; ++i) {
> -@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl)
> +@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl,
> }
> free(env);
> }
> +#endif
> - }
>
> - static void
> -@@ -665,7 +675,9 @@ static void
> + /*
> + * We open a new session, so it makes sense
> +@@ -675,7 +685,9 @@ static void
> help(const char *name)
> {
> fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n",
> name);
> @@ -129,7 +129,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> fprintf(stderr, " -t, --tty Start session on alternative
> tty\n");
> fprintf(stderr, " -v, --verbose Be verbose\n");
> fprintf(stderr, " -h, --help Display this help message\n");
> -@@ -678,7 +690,9 @@ main(int argc, char *argv[])
> +@@ -688,7 +700,9 @@ main(int argc, char *argv[])
> int i, c;
> char *tty = NULL;
> struct option opts[] = {
> @@ -139,7 +139,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> { "tty", required_argument, NULL, 't' },
> { "verbose", no_argument, NULL, 'v' },
> { "help", no_argument, NULL, 'h' },
> -@@ -690,9 +704,13 @@ main(int argc, char *argv[])
> +@@ -700,9 +714,13 @@ main(int argc, char *argv[])
> while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
> switch (c) {
> case 'u':
> @@ -153,7 +153,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> break;
> case 't':
> tty = optarg;
> -@@ -732,8 +750,10 @@ main(int argc, char *argv[])
> +@@ -740,8 +758,10 @@ main(int argc, char *argv[])
> if (setup_tty(&wl, tty) < 0)
> exit(EXIT_FAILURE);
>
> diff --git a/meta/recipes-graphics/wayland/weston_1.11.1.bb
> b/meta/recipes-graphics/wayland/weston_1.12.0.bb
> similarity index 92%
> rename from meta/recipes-graphics/wayland/weston_1.11.1.bb
> rename to meta/recipes-graphics/wayland/weston_1.12.0.bb
> index 7e75cf7..f944646 100644
> --- a/meta/recipes-graphics/wayland/weston_1.11.1.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.12.0.bb
> @@ -3,20 +3,19 @@ DESCRIPTION = "Weston is the reference implementation of
> a Wayland compositor"
> HOMEPAGE = "http://wayland.freedesktop.org"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
> - file://src/compositor.c;endline=23;md5=
> 1d535fed266cf39f6d8c0647f52ac331"
> + file://libweston/compositor.c;endline=23;md5=
> 1d535fed266cf39f6d8c0647f52ac331"
>
> SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> file://weston.png \
> file://weston.desktop \
> file://0001-make-error-portable.patch \
> file://0001-configure.ac-Fix-wayland-protocols-path.patch \
> - file://0001-shared-include-stdint.h-for-int32_t.patch \
> file://xwayland.weston-start \
> file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
> \
> file://0001-Add-configuration-option-for-no-input-device.patch
> \
> "
> -SRC_URI[md5sum] = "c5fdc02ab67d33c0fca8f72d341facdf"
> -SRC_URI[sha256sum] = "548973496a5c8613d6690f9120f210
> 66946a544df65ce4fe0ef153a8dc0bf6de"
> +SRC_URI[md5sum] = "310af6d7f8ba03c3418cec8ad72ea748"
> +SRC_URI[sha256sum] = "ac7ac2a32e3b9f50131fccded5d232
> 6bd36b2226712d90b61999118a09af5033"
>
> inherit autotools pkgconfig useradd distro_features_check
> # depends on virtual/egl
> @@ -26,7 +25,6 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0
> jpeg"
> DEPENDS += "wayland wayland-protocols libinput virtual/egl pango
> wayland-native"
>
> EXTRA_OECONF = "--enable-setuid-install \
> - --disable-rpi-compositor \
> --disable-rdp-compositor \
> WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \
> "
> @@ -84,7 +82,7 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
>
> do_install_append() {
> # Weston doesn't need the .la files to load modules, so wipe them
> - rm -f ${D}/${libdir}/weston/*.la
> + rm -f ${D}/${libdir}/libweston-1/*.la
>
> # If X11, ship a desktop file to launch it
> if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '',
> d)}" = "x11" ]; then
> @@ -103,7 +101,7 @@ do_install_append() {
> PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland',
> '${PN}-xwayland', '', d)}"
> PACKAGES += "${PN}-examples"
>
> -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal
> ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode
> ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
> +FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal
> ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode
> ${libexecdir} ${libdir}/*${SOLIBS} ${libdir}/${BPN}/*.so
> ${libdir}/libweston-1/*.so ${datadir}"
> FILES_${PN}-examples = "${bindir}/*"
>
> FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so"
> --
> 2.10.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 24036 bytes --]
^ permalink raw reply
* Re: [PATCH] curl: Upgrade 7.50.1.bb -> curl_7.51.0.bb
From: Sona Sarmadi @ 2016-11-09 11:58 UTC (permalink / raw)
To: Richard Purdie (richard.purdie@linuxfoundation.org),
Armin Kuster (akuster808@gmail.com)
Cc: openembedded-core@lists.openembedded.org
In-Reply-To: <1478601718-12481-1-git-send-email-sona.sarmadi@enea.com>
Hi guys,
curl 7.51.0-r0 addresses all these CVEs. I wonder if we can upgrade krogoth and morty to curl 7.51.0-r0 as well? Both package versions are using same share library version i.e. libcurl.so.4.4.0 so I assume full ABI compatibility.
tmp/work/i586-poky-linux/curl/7.47.1-r0/sysroot-destdir/usr/lib/libcurl.so.4.4.0
tmp/work/i586-poky-linux/curl/7.51.0-r0/sysroot-destdir/usr/lib/libcurl.so.4.4.0
For more info see:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10617
Thanks
//Sona
-----Original Message-----
From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Sona Sarmadi
Sent: den 8 november 2016 11:42
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH] curl: Upgrade 7.50.1.bb -> curl_7.51.0.bb
The upgrade addresses following CVEs:
CVE-2016-8615: cookie injection for other servers
CVE-2016-8616: case insensitive password comparison
CVE-2016-8617: OOB write via unchecked multiplication
CVE-2016-8618: double-free in curl_maprintf
CVE-2016-8619: double-free in krb5 code
CVE-2016-8620: glob parser write/read out of bounds
CVE-2016-8621: curl_getdate read out of bounds
CVE-2016-8622: URL unescape heap overflow via integer truncation
CVE-2016-8623: Use-after-free via shared cookies
CVE-2016-8624: invalid URL parsing with '#'
CVE-2016-8625: IDNA 2003 makes curl use wrong host
Reference:
https://curl.haxx.se/docs/security.html
Fixes [Yocto #10617]
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
---
meta/recipes-support/curl/{curl_7.50.1.bb => curl_7.51.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/curl/{curl_7.50.1.bb => curl_7.51.0.bb} (94%)
diff --git a/meta/recipes-support/curl/curl_7.50.1.bb b/meta/recipes-support/curl/curl_7.51.0.bb
similarity index 94%
rename from meta/recipes-support/curl/curl_7.50.1.bb
rename to meta/recipes-support/curl/curl_7.51.0.bb
index a21419a..e1a996b 100644
--- a/meta/recipes-support/curl/curl_7.50.1.bb
+++ b/meta/recipes-support/curl/curl_7.51.0.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch"
-SRC_URI[md5sum] = "015f6a0217ca6f2c5442ca406476920b"
-SRC_URI[sha256sum] = "3c12c5f54ccaa1d40abc65d672107dcc75d3e1fcb38c267484334280096e5156"
+SRC_URI[md5sum] = "09a7c5769a7eae676d5e2c86d51f167e"
+SRC_URI[sha256sum] = "7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde"
inherit autotools pkgconfig binconfig multilib_header
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply related
* Re: [PATCH] kernel.bbclass: Allow ${S} to be overridden
From: Burton, Ross @ 2016-11-09 11:34 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: OpenEmbedded Core
In-Reply-To: <CAJTo0LZxGYzpjUetPspX6mKktoL_XnDqfncyHFWN5Kzfij8-UQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]
On 9 November 2016 at 10:04, Burton, Ross <ross.burton@intel.com> wrote:
> Saying that of course doomed the patch:
>
Double doomed, perf can't build either.
ERROR: perf-1.0-r9 do_configure: Function failed: do_configure (log file is
located at
/data/poky-master/tmp-glibc/work/intel_corei7_64-poky-linux/perf/1.0-r9/temp/log.do_configure.23322)
ERROR: Logfile of failure stored in:
/data/poky-master/tmp-glibc/work/intel_corei7_64-poky-linux/perf/1.0-r9/temp/log.do_configure.23322
Log data follows:
| DEBUG: Executing python function sysroot_cleansstate
| DEBUG: Python function sysroot_cleansstate finished
| DEBUG: Executing shell function do_configure
| sed: can't read
/data/poky-master/tmp-glibc/work-shared/intel-corei7-64/kernel-source/tools/perf/Makefile*:
No such file or directory
| WARNING: exit code 2 from a shell command.
| ERROR: Function failed: do_configure (log file is located at
/data/poky-master/tmp-glibc/work/intel_corei7_64-poky-linux/perf/1.0-r9/temp/log.do_configure.23322)
Ross
[-- Attachment #2: Type: text/html, Size: 1800 bytes --]
^ permalink raw reply
* Re: [PATCH 3/5] wic: check that filesystem is specified for a rootfs partition
From: Maciej Borzęcki @ 2016-11-09 10:42 UTC (permalink / raw)
To: Ed Bartosh
Cc: Maciej Borzecki, Patches and discussions about the oe-core layer
In-Reply-To: <20161109094451.GD10823@linux.intel.com>
On Wed, Nov 9, 2016 at 10:44 AM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> On Tue, Nov 08, 2016 at 04:56:09PM +0100, Maciej Borzecki wrote:
>> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
>> ---
>> scripts/lib/wic/partition.py | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
>> index 8adc698240c8e3bd9f4118663a5d7a167e0bb4a4..24e657592738dc7c5cdff78e3740d7c373021e9d 100644
>> --- a/scripts/lib/wic/partition.py
>> +++ b/scripts/lib/wic/partition.py
>> @@ -184,6 +184,10 @@ class Partition():
>> if os.path.isfile(rootfs):
>> os.remove(rootfs)
>>
>> + if not self.fstype:
>> + msger.error("File system for partition %s not specified in kickstart, " \
>> + "use --fstype option" % (self.mountpoint))
>> +
> Would it make sense to make --fstype mandatory in ksparser?
I'm afraid that would make fstype mandatory in all cases, while we only
need it for rootfs source plugin.
--
Maciej Borzecki
RnDity
^ permalink raw reply
* Re: [PATCH] kernel.bbclass: Allow ${S} to be overridden
From: Burton, Ross @ 2016-11-09 10:04 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: OpenEmbedded Core
In-Reply-To: <CADkTA4OaRgUJwFwT=S_h41EW4OO_Koa+QQr=t3t+X+6pszrzBQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2059 bytes --]
On 9 November 2016 at 02:23, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
> I can ack this patch, since no defaults change .. there's no risk to
> existing users.
>
Saying that of course doomed the patch:
ERROR: hello-mod-0.1-r0 do_make_scripts: Function failed: do_make_scripts
(log file is located at
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071)
ERROR: Logfile of failure stored in:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071
Log data follows:
| DEBUG: Executing shell function do_make_scripts
| make: Entering directory
'/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source'
| make: *** No rule to make target 'scripts'. Stop.
| make: Leaving directory
'/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source'
| WARNING:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/run.do_make_scripts.14071:1
exit 2 from 'make CC="x86_64-poky-linux-gcc -fuse-ld=bfd"
LD="x86_64-poky-linux-ld.bfd " AR="x86_64-poky-linux-ar " -C
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-source
O=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work-shared/qemux86-64/kernel-build-artifacts
scripts'
| ERROR: Function failed: do_make_scripts (log file is located at
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-skeleton/build/build/tmp/work/qemux86_64-poky-linux/hello-mod/0.1-r0/temp/log.do_make_scripts.14071)
NOTE: recipe hello-mod-0.1-r0: task do_make_scripts: Failed
The autobuilder builds hello-mod from meta-skeleton, which inherits module
and sets S=${WORKDIR}.
Ross
[-- Attachment #2: Type: text/html, Size: 2543 bytes --]
^ permalink raw reply
* Re: [PATCH 3/5] wic: check that filesystem is specified for a rootfs partition
From: Ed Bartosh @ 2016-11-09 9:44 UTC (permalink / raw)
To: Maciej Borzecki; +Cc: Maciej Borzecki, openembedded-core
In-Reply-To: <9d17d4a574a0a2b809f832b33a0af41fb7682ea4.1478619682.git.maciej.borzecki@rndity.com>
On Tue, Nov 08, 2016 at 04:56:09PM +0100, Maciej Borzecki wrote:
> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
> ---
> scripts/lib/wic/partition.py | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index 8adc698240c8e3bd9f4118663a5d7a167e0bb4a4..24e657592738dc7c5cdff78e3740d7c373021e9d 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -184,6 +184,10 @@ class Partition():
> if os.path.isfile(rootfs):
> os.remove(rootfs)
>
> + if not self.fstype:
> + msger.error("File system for partition %s not specified in kickstart, " \
> + "use --fstype option" % (self.mountpoint))
> +
Would it make sense to make --fstype mandatory in ksparser?
> for prefix in ("ext", "btrfs", "vfat", "squashfs"):
> if self.fstype.startswith(prefix):
> method = getattr(self, "prepare_rootfs_" + prefix)
> --
> 2.5.0
>
--
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH 0/5] wic: bugfixes & --fixed-size support
From: Ed Bartosh @ 2016-11-09 9:39 UTC (permalink / raw)
To: Maciej Borzecki; +Cc: Maciej Borzecki, openembedded-core
In-Reply-To: <cover.1478619682.git.maciej.borzecki@rndity.com>
On Tue, Nov 08, 2016 at 04:56:06PM +0100, Maciej Borzecki wrote:
> The patch series is a follow-up after a previous attempt of adding
> --reserved-size option to wic[1].
>
> The series introduces a number of fixes in patches 1 - 4.
>
> The last patch in the series introduces --fixed-size option as discussed in [1].
> The patch also introduces minor refactoring to code responsible for computing
> partition size.
>
> Aside from new option, another user-visible change is how the size rootfs
> partitions with vfat is calculated. In previous code, vfat rootfs partition size
> did not account for --extra-space nor --overhead-factor. Now, all rootfs
> partitions (except for squashfs) are subject to the same rules of partition
> sizing.
>
Thank you for the patchset!
+1 (if my comments are taken into account)
It would be great if you add tests for this functionality to oe-selftest
wic suite.
> http://lists.openembedded.org/pipermail/openembedded-core/2016-October/127634.html
>
> Maciej Borzecki (5):
> wic: make sure that partition size is always an integer in internal
> processing
> wic: use partition size when creating empty partition files
> wic: check that filesystem is specified for a rootfs partition
> wic: fix function comment typos
> wic: add --fixed-size wks option
>
> scripts/lib/wic/help.py | 14 +++--
> scripts/lib/wic/imager/direct.py | 2 +-
> scripts/lib/wic/ksparser.py | 41 +++++++++++++--
> scripts/lib/wic/partition.py | 93 +++++++++++++++++++++-------------
> scripts/lib/wic/utils/partitionedfs.py | 6 +--
> 5 files changed, 109 insertions(+), 47 deletions(-)
>
> --
> 2.5.0
>
--
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH 5/5] wic: add --fixed-size wks option
From: Ed Bartosh @ 2016-11-09 9:36 UTC (permalink / raw)
To: Maciej Borzecki; +Cc: Maciej Borzecki, openembedded-core
In-Reply-To: <1135a635b723fcf1eb2ce8d2b9f8463a577f6acd.1478619682.git.maciej.borzecki@rndity.com>
On Tue, Nov 08, 2016 at 04:56:11PM +0100, Maciej Borzecki wrote:
> Added new option --fixed-size to wks. The option can be used to indicate
> the exact size of a partition. The option cannot be added together with
> --size, in which case an error will be raised. Other options that
> influence automatic partition size (--extra-space, --overhead-factor),
> if specifiec along with --fixed-size, will raise an error.
>
> If it partition data is larger than the amount of space specified with
> --fixed-size option wic will raise an error.
>
> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
> ---
> scripts/lib/wic/help.py | 14 ++++--
> scripts/lib/wic/imager/direct.py | 2 +-
> scripts/lib/wic/ksparser.py | 41 +++++++++++++++--
> scripts/lib/wic/partition.py | 83 ++++++++++++++++++++--------------
> scripts/lib/wic/utils/partitionedfs.py | 2 +-
> 5 files changed, 100 insertions(+), 42 deletions(-)
>
> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
> index e5347ec4b7c900c68fc64351a5293e75de0672b3..daa11bf489c135627ddfe4cef968e48f8e3ad1d8 100644
> --- a/scripts/lib/wic/help.py
> +++ b/scripts/lib/wic/help.py
> @@ -646,6 +646,12 @@ DESCRIPTION
> not specified, the size is in MB.
> You do not need this option if you use --source.
>
> + --fixed-size: Exact partition size. Value format is the same
> + as for --size option. This option cannot be
> + specified along with --size. If partition data
> + is larger than --fixed-size and error will be
> + raised when assembling disk image.
> +
> --source: This option is a wic-specific option that names the
> source of the data that will populate the
> partition. The most common value for this option
> @@ -719,13 +725,15 @@ DESCRIPTION
> space after the space filled by the content
> of the partition. The final size can go
> beyond the size specified by --size.
> - By default, 10MB.
> + By default, 10MB. This option cannot be used
> + with --fixed-size option.
>
> --overhead-factor: This option is specific to wic. The
> size of the partition is multiplied by
> this factor. It has to be greater than or
> - equal to 1.
> - The default value is 1.3.
> + equal to 1. The default value is 1.3.
> + This option cannot be used with --fixed-size
> + option.
>
> --part-type: This option is specific to wic. It specifies partition
> type GUID for GPT partitions.
> diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
> index 2bedef08d6450096c786def6f75a9ee53fcd4b3b..c01a1ea538428e36a75ac5b31a822e01901bea6a 100644
> --- a/scripts/lib/wic/imager/direct.py
> +++ b/scripts/lib/wic/imager/direct.py
> @@ -290,7 +290,7 @@ class DirectImageCreator(BaseImageCreator):
> self.bootimg_dir, self.kernel_dir, self.native_sysroot)
>
>
> - self.__image.add_partition(int(part.size),
> + self.__image.add_partition(part.get_size(),
> part.disk,
> part.mountpoint,
> part.source_file,
> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
> index 0894e2b199a299fbbed272f2e1c95e9d692e3ab1..62c490274aa92bf82aac304d9323250e3b728d0c 100644
> --- a/scripts/lib/wic/ksparser.py
> +++ b/scripts/lib/wic/ksparser.py
> @@ -113,6 +113,9 @@ def systemidtype(arg):
> class KickStart():
> """"Kickstart parser implementation."""
>
> + DEFAULT_EXTRA_SPACE = 10*1024
> + DEFAULT_OVERHEAD_FACTOR = 1.3
> +
> def __init__(self, confpath):
>
> self.partitions = []
> @@ -127,16 +130,24 @@ class KickStart():
> part.add_argument('mountpoint', nargs='?')
> part.add_argument('--active', action='store_true')
> part.add_argument('--align', type=int)
> - part.add_argument("--extra-space", type=sizetype, default=10*1024)
> + part.add_argument("--extra-space", type=sizetype)
> part.add_argument('--fsoptions', dest='fsopts')
> part.add_argument('--fstype')
> part.add_argument('--label')
> part.add_argument('--no-table', action='store_true')
> part.add_argument('--ondisk', '--ondrive', dest='disk')
> - part.add_argument("--overhead-factor", type=overheadtype, default=1.3)
> + part.add_argument("--overhead-factor", type=overheadtype)
> part.add_argument('--part-type')
> part.add_argument('--rootfs-dir')
> - part.add_argument('--size', type=sizetype, default=0)
> +
> + # --size and --fixed-size cannot be specified together; options
> + # ----extra-space and --overhead-factor should also raise a parser
> + # --error, but since nesting mutually exclusive groups does not work,
> + # ----extra-space/--overhead-factor are handled later
> + sizeexcl = part.add_mutually_exclusive_group()
> + sizeexcl.add_argument('--size', type=sizetype, default=0)
> + sizeexcl.add_argument('--fixed-size', type=sizetype, default=0)
> +
> part.add_argument('--source')
> part.add_argument('--sourceparams')
> part.add_argument('--system-id', type=systemidtype)
> @@ -170,11 +181,33 @@ class KickStart():
> lineno += 1
> if line and line[0] != '#':
> try:
> - parsed = parser.parse_args(shlex.split(line))
> + line_args = shlex.split(line)
> + parsed = parser.parse_args(line_args)
> except ArgumentError as err:
> raise KickStartError('%s:%d: %s' % \
> (confpath, lineno, err))
> if line.startswith('part'):
> + # using ArgumentParser one cannot easily tell if option
> + # was passed as argument, if said option has a default
> + # value; --overhead-factor/--extra-space cannot be used
> + # with --fixed-size, so at least detect when these were
> + # passed with non-0 values ...
I'd suggest to handle this using argparse mutual exclusion:
https://docs.python.org/2/library/argparse.html#mutual-exclusion
> + if parsed.fixed_size:
> + if parsed.overhead_factor or parsed.extra_space:
> + err = "%s:%d: arguments --overhead-factor and --extra-space not "\
> + "allowed with argument --fixed-size" \
> + % (confpath, lineno)
> + raise KickStartError(err)
> + else:
> + # ... and provide defaults if not using
> + # --fixed-size iff given option was not used
> + # (again, one cannot tell if option was passed but
> + # with value equal to 0)
> + if '--overhead-factor' not in line_args:
> + parsed.overhead_factor = self.DEFAULT_OVERHEAD_FACTOR
> + if '--extra-space' not in line_args:
> + parsed.extra_space = self.DEFAULT_EXTRA_SPACE
> +
> self.partnum += 1
> self.partitions.append(Partition(parsed, self.partnum))
> elif line.startswith('include'):
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index 24e657592738dc7c5cdff78e3740d7c373021e9d..354d4b44c50c77baa54331e95ce0876c32d09339 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -54,6 +54,7 @@ class Partition():
> self.part_type = args.part_type
> self.rootfs_dir = args.rootfs_dir
> self.size = args.size
> + self.fixed_size = args.fixed_size
> self.source = args.source
> self.sourceparams = args.sourceparams
> self.system_id = args.system_id
> @@ -87,6 +88,39 @@ class Partition():
> else:
> return 0
>
> + def get_rootfs_size(self, actual_rootfs_size=0):
> + """
> + Calculate the required size of rootfs taking into consideration
> + --size/--fixed-size flags as well as overhead and extra space, as
> + specified in kickstart file. Raises an error if the
> + `actual_rootfs_size` is larger than fixed-size rootfs.
> +
> + """
> + if self.fixed_size:
> + rootfs_size = self.fixed_size
> + if actual_rootfs_size > rootfs_size:
> + msger.error("Actual rootfs size (%d kB) is larger than allowed size %d kB" \
> + %(actual_rootfs_size, rootfs_size))
> + else:
> + extra_blocks = self.get_extra_block_count(actual_rootfs_size)
> + if extra_blocks < self.extra_space:
> + extra_blocks = self.extra_space
> +
> + rootfs_size = actual_rootfs_size + extra_blocks
> + rootfs_size *= self.overhead_factor
> +
> + msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
> + (extra_blocks, self.mountpoint, rootfs_size))
> +
> + return rootfs_size
> +
> + def get_size(self):
> + """
> + Obtain partition size taking into consideration --size/--fixed-size
> + options.
> + """
> + return self.fixed_size if self.fixed_size else self.size
> +
> def prepare(self, creator, cr_workdir, oe_builddir, rootfs_dir,
> bootimg_dir, kernel_dir, native_sysroot):
Can you make self.size and self.fixed_size getters as properties(use @property decorator)?
It should make code look more pythonic.
> """
> @@ -97,9 +131,9 @@ class Partition():
> self.sourceparams_dict = parse_sourceparams(self.sourceparams)
>
> if not self.source:
> - if not self.size:
> - msger.error("The %s partition has a size of zero. Please "
> - "specify a non-zero --size for that partition." % \
> + if not self.size and not self.fixed_size:
> + msger.error("The %s partition has a size of zero. Please "
> + "specify a non-zero --size/--fixed-size for that partition." % \
> self.mountpoint)
> if self.fstype and self.fstype == "swap":
> self.prepare_swap_partition(cr_workdir, oe_builddir,
> @@ -146,6 +180,10 @@ class Partition():
> oe_builddir,
> bootimg_dir, kernel_dir, rootfs_dir,
> native_sysroot)
> + if self.fixed_size and self.size > self.fixed_size:
> + msger.error("File system image of partition %s is larger (%d kB) than its"\
> + "allowed size %d kB" % (self.mountpoint,
> + self.size, self.fixed_size))
>
> def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir,
> rootfs_dir):
> @@ -211,15 +249,7 @@ class Partition():
> out = exec_cmd(du_cmd)
> actual_rootfs_size = int(out.split()[0])
>
> - extra_blocks = self.get_extra_block_count(actual_rootfs_size)
> - if extra_blocks < self.extra_space:
> - extra_blocks = self.extra_space
> -
> - rootfs_size = actual_rootfs_size + extra_blocks
> - rootfs_size *= self.overhead_factor
> -
> - msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
> - (extra_blocks, self.mountpoint, rootfs_size))
> + rootfs_size = self.get_rootfs_size(actual_rootfs_size)
>
> with open(rootfs, 'w') as sparse:
> os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> @@ -245,15 +275,7 @@ class Partition():
> out = exec_cmd(du_cmd)
> actual_rootfs_size = int(out.split()[0])
>
> - extra_blocks = self.get_extra_block_count(actual_rootfs_size)
> - if extra_blocks < self.extra_space:
> - extra_blocks = self.extra_space
> -
> - rootfs_size = actual_rootfs_size + extra_blocks
> - rootfs_size *= self.overhead_factor
> -
> - msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
> - (extra_blocks, self.mountpoint, rootfs_size))
> + rootfs_size = self.get_rootfs_size(actual_rootfs_size)
>
> with open(rootfs, 'w') as sparse:
> os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> @@ -275,20 +297,13 @@ class Partition():
> out = exec_cmd(du_cmd)
> blocks = int(out.split()[0])
>
> - extra_blocks = self.get_extra_block_count(blocks)
> - if extra_blocks < self.extra_space:
> - extra_blocks = self.extra_space
> -
> - blocks += extra_blocks
> -
> - msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
> - (extra_blocks, self.mountpoint, blocks))
> + rootfs_size = self.get_rootfs_size(blocks)
>
> label_str = "-n boot"
> if self.label:
> label_str = "-n %s" % self.label
>
> - dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, rootfs, blocks)
> + dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, rootfs, rootfs_size)
> exec_native_cmd(dosfs_cmd, native_sysroot)
>
> mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
> @@ -311,8 +326,9 @@ class Partition():
> """
> Prepare an empty ext2/3/4 partition.
> """
> + size = self.get_size()
> with open(rootfs, 'w') as sparse:
> - os.ftruncate(sparse.fileno(), self.size * 1024)
> + os.ftruncate(sparse.fileno(), size * 1024)
>
> extra_imagecmd = "-i 8192"
>
> @@ -329,8 +345,9 @@ class Partition():
> """
> Prepare an empty btrfs partition.
> """
> + size = self.get_size()
> with open(rootfs, 'w') as sparse:
> - os.ftruncate(sparse.fileno(), self.size * 1024)
> + os.ftruncate(sparse.fileno(), size * 1024)
>
> label_str = ""
> if self.label:
> @@ -345,7 +362,7 @@ class Partition():
> """
> Prepare an empty vfat partition.
> """
> - blocks = self.size
> + blocks = self.get_size()
>
> label_str = "-n boot"
> if self.label:
> diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
> index 9e76487844eebfffc7227d053a65dc9fdab3678b..cfa5f5ce09b764c1c2a9b7a3f7bf7d677a6811c4 100644
> --- a/scripts/lib/wic/utils/partitionedfs.py
> +++ b/scripts/lib/wic/utils/partitionedfs.py
> @@ -209,7 +209,7 @@ class Image():
> msger.debug("Assigned %s to %s%d, sectors range %d-%d size %d "
> "sectors (%d bytes)." \
> % (part['mountpoint'], part['disk_name'], part['num'],
> - part['start'], part['start'] + part['size'] - 1,
> + part['start'], disk['offset'] - 1,
> part['size'], part['size'] * self.sector_size))
>
> # Once all the partitions have been layed out, we can calculate the
> --
> 2.5.0
>
--
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH 2/5] wic: use partition size when creating empty partition files
From: Ed Bartosh @ 2016-11-09 9:23 UTC (permalink / raw)
To: Maciej Borzecki; +Cc: Maciej Borzecki, openembedded-core
In-Reply-To: <927e5e94d6d20caf9b59e8e57895742f9ebebff8.1478619682.git.maciej.borzecki@rndity.com>
On Tue, Nov 08, 2016 at 04:56:08PM +0100, Maciej Borzecki wrote:
> It seems that prepare_empty_partition_ext() and
> prepare_empty_partition_btrfs() got broken in commit
> c8669749e37fe865c197c98d5671d9de176ff4dd, thus one could observe the
> following backtrace:
>
> Backtrace:
> File "<snip>/poky/scripts/lib/wic/plugins/imager/direct_plugin.py", line 93, in do_create
> creator.create()
> File "<snip>/poky/scripts/lib/wic/imager/baseimager.py", line 159, in create
> self._create()
> File "<snip>/poky/scripts/lib/wic/imager/direct.py", line 290, in _create
> self.bootimg_dir, self.kernel_dir, self.native_sysroot)
> File "<snip>/poky/scripts/lib/wic/partition.py", line 146, in prepare
> method(rootfs, oe_builddir, native_sysroot)
> File "<snip>/poky/scripts/lib/wic/partition.py", line 325, in prepare_empty_partition_ext
> os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> NameError: name 'rootfs_size' is not defined
>
> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
> ---
> scripts/lib/wic/partition.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index 4b8d769437120adadb5dba2f3919d4eb96141292..8adc698240c8e3bd9f4118663a5d7a167e0bb4a4 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -308,7 +308,7 @@ class Partition():
> Prepare an empty ext2/3/4 partition.
> """
> with open(rootfs, 'w') as sparse:
> - os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> + os.ftruncate(sparse.fileno(), self.size * 1024)
>
> extra_imagecmd = "-i 8192"
>
> @@ -326,7 +326,7 @@ class Partition():
> Prepare an empty btrfs partition.
> """
> with open(rootfs, 'w') as sparse:
> - os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> + os.ftruncate(sparse.fileno(), self.size * 1024)
>
> label_str = ""
> if self.label:
Thank you for the fix. Sorry for breaking this. I thought I
double-checked and all tests were passing :(
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH] mkefidisk.sh: add deprecation warning to the output
From: Ed Bartosh @ 2016-11-09 8:05 UTC (permalink / raw)
To: John Hawley; +Cc: openembedded-core
In-Reply-To: <77d63518-4bd4-0688-438b-07778f754733@intel.com>
On Tue, Nov 08, 2016 at 01:05:23PM -0800, John Hawley wrote:
> On 11/08/2016 12:44 PM, Randy Witt wrote:
> >>>> We should also document, the wic steps in wiki pages e.g.
> >>>> http://wiki.minnowboard.org/Yocto_Project
> >>> It's already documented in README.hardware:
> >>> https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/README.hardware
> >>>
> >>> And in Yocto manual:
> >>> http://www.yoctoproject.org/docs/2.2/mega-manual/mega-manual.html#building-an-image-for-hardware
> >>>
> >>
> >> Thanks, now can you also nudge the minnowboard.org to do the same ?
> >>
> >
> > Pinging you John. :)
>
> So two obvious questions in reading the documentation off the YP site:
>
> 1) Does WIC actually handle the EFI partition for booting off of UEFI
> systems? (guessing yes, but wanted to double check)
Yes, it does.
> 2) I assume it only creates MBR based images, seeing as the suggestion
> is to DD the image down, how does GPT based images work since you can't
> (exactly) DD a GPT image down and have it work "correctly"?
>
Please, elaborate on "correctly". Do you mean that kernel will complain
that backup GPT header is not at the end of disk? This is not handled by
wic obviously. However, even without this image is bootable and
functional.
> Sorry, I'm sure that's covered somewhere else, just want to double check
> this will be ok before I update the documentation on MB
--
Regards,
Ed
^ permalink raw reply
* [PATCH] classes/cpan-base: fix for PERLVERSION
From: jackie.huang @ 2016-11-09 5:51 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
Immediate expansion of get_perl_version() is too early for
PERLVERSION, it will result in 'None' before perl is built
and packages that rely on this veriable fail to work with
the incorrect version.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/classes/cpan-base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 55ac052..48d53cc 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -36,5 +36,5 @@ def is_target(d):
PERLLIBDIRS = "${libdir}/perl"
PERLLIBDIRS_class-native = "${libdir}/perl-native"
-PERLVERSION := "${@get_perl_version(d)}"
+PERLVERSION = "${@get_perl_version(d)}"
PERLVERSION[vardepvalue] = ""
--
2.8.3
^ permalink raw reply related
* Re: [PATCH] kernel.bbclass: Allow ${S} to be overridden
From: Bruce Ashfield @ 2016-11-09 2:23 UTC (permalink / raw)
To: Burton, Ross; +Cc: OpenEmbedded Core
In-Reply-To: <CAJTo0LbB0eGStoFbyinDYP0zzEJ27BL0eDyGKFkjdh=AaWBPVA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 846 bytes --]
On Tue, Nov 8, 2016 at 8:04 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 5 November 2016 at 10:14, Paul Barker <paul@paulbarker.me.uk> wrote:
>
>> Ping on this. Anyone had a chance to look at it?
>>
>
> I tend to want to let Bruce have a look at kernel patches, but this does
> seem sufficiently obvious that I've just merge it to my staging branch.
>
It managed to slip by me. Sorry about that.
I can ack this patch, since no defaults change .. there's no risk to
existing users.
Bruce
>
> Ross
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 2275 bytes --]
^ permalink raw reply
* Re: [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Gary Thomas @ 2016-11-09 2:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <CAJTo0Lb-xraoP7zCyWEw-06Q4BwjFjFMG+d5mbkgKRCyfzYbzg@mail.gmail.com>
On 2016-11-09 01:45, Burton, Ross wrote:
>
> On 9 November 2016 at 00:43, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
>
> > I'm guessing that it is using the host compiler instead of the cross compiler.
>
> isnt mkimage a host tool ? why are we building it for target ?
>
>
> If there's no chance that it will be ran on the target for in a SDK then patches welcome to force the recipe to native only.
>
> The recipe is using _append without adding whitespace, but fixing that doesn't fix the build.
I routinely build and use it on my targets, so no, it's not host only.
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply
* Re: [PATCH] kernel.bbclass: Allow ${S} to be overridden
From: Burton, Ross @ 2016-11-09 1:04 UTC (permalink / raw)
To: Paul Barker; +Cc: OpenEmbedded Core
In-Reply-To: <20161105101438.1ef1f627@nuc.betafive.co.uk>
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
On 5 November 2016 at 10:14, Paul Barker <paul@paulbarker.me.uk> wrote:
> Ping on this. Anyone had a chance to look at it?
>
I tend to want to let Bruce have a look at kernel patches, but this does
seem sufficiently obvious that I've just merge it to my staging branch.
Ross
[-- Attachment #2: Type: text/html, Size: 686 bytes --]
^ permalink raw reply
* Re: [Patch v2 12/14] ltp: Reduce duplication in MIPS variants.
From: Khem Raj @ 2016-11-09 0:46 UTC (permalink / raw)
To: Burton, Ross, Zubair Lutfullah Kakakhel; +Cc: OE-core
In-Reply-To: <CAJTo0LZTHPYsot=YkNGXh=p2AP37X89JqW2xMgdYjanftpDxxQ@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 467 bytes --]
On 11/8/16 4:13 PM, Burton, Ross wrote:
>
> On 8 November 2016 at 17:12, Zubair Lutfullah Kakakhel
> <Zubair.Kakakhel@imgtec.com <mailto:Zubair.Kakakhel@imgtec.com>> wrote:
>
> Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
> variable is defined
>
>
> I'm guessing that this is the cause of this error for qemumips64:
>
> http://errors.yoctoproject.org/Errors/Details/99744/
seems to be yes.
>
> Ross
>
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply
* Re: [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Burton, Ross @ 2016-11-09 0:45 UTC (permalink / raw)
To: Khem Raj; +Cc: Marek Vasut, OE-core
In-Reply-To: <03d91527-2e2f-0694-8339-22fe7158880e@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
On 9 November 2016 at 00:43, Khem Raj <raj.khem@gmail.com> wrote:
> > I'm guessing that it is using the host compiler instead of the cross
> compiler.
>
> isnt mkimage a host tool ? why are we building it for target ?
>
If there's no chance that it will be ran on the target for in a SDK then
patches welcome to force the recipe to native only.
The recipe is using _append without adding whitespace, but fixing that
doesn't fix the build.
Ross
[-- Attachment #2: Type: text/html, Size: 910 bytes --]
^ permalink raw reply
* Re: [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Khem Raj @ 2016-11-09 0:43 UTC (permalink / raw)
To: Burton, Ross, Marek Vasut; +Cc: OE-core
In-Reply-To: <CAJTo0LaSLN1eVRH1ju1w5Ba3PLh6d+E0ZwmRimxcN1DjKRk6iQ@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 1232 bytes --]
On 11/8/16 4:15 PM, Burton, Ross wrote:
>
> On 7 November 2016 at 18:20, Marek Vasut <marex@denx.de
> <mailto:marex@denx.de>> wrote:
>
> -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS}
> ${LDFLAGS}" STRIP=true V=1'
> +EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
> +EXTRA_OEMAKE_append_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}"
> CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
> +EXTRA_OEMAKE_append_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS}
> ${BUILD_LDFLAGS}" STRIP=true V=1'
> +EXTRA_OEMAKE_append_class-nativesdk = 'CC="${BUILD_CC} ${BUILD_CFLAGS}
> ${BUILD_LDFLAGS}" STRIP=true V=1'
>
>
> You're going to start hating u-boot...
>
> Fails on the autobuilder if you're building for a 32-bit x86 target on a
> 64-bit x86 host:
>
> ERROR: QA Issue: Architecture did not match (x86-64, expected x86) on
> /work/i586-poky-linux-musl/u-boot-mkimage/1_2016.09.01-r0/packages-split/u-boot-mkimage/usr/bin/uboot-mkimage
> [arch]
>
> I'm guessing that it is using the host compiler instead of the cross compiler.
isnt mkimage a host tool ? why are we building it for target ?
>
> Ross
>
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox