-
Notifications
You must be signed in to change notification settings - Fork 55
OE-core master update + Yocto Compatible 2.0 enhancements #184
Conversation
70c234e
to
9ea203f
Compare
test this please I had not caught all _refkit -> _df-refkit renames. |
test this please |
retest this please Seems like an unrelated problem (race?):
|
9ea203f
to
685d575
Compare
The util-linux 2.30 upgrade from OE-core master-next was broken. Trying again without it. retest this please test this please |
retest this please test this please |
OE-core test branch hadn't been pushed. retest this please |
test this please |
685d575
to
715bd5a
Compare
6e2cc0f
to
5b68993
Compare
5b68993
to
e014adf
Compare
9b39234
to
02bb422
Compare
Rebased onto current master, fixed ovmf (in OE-core), fixed upm (in refkit). |
0bfc25e
to
7ec73b2
Compare
@mythi: do we really want packagegroup-sensors in refkit-image-common? It drags in mraa, upm, nodejs, and the latter is what currently fails in the "test_common_poky_config" test, because it builds refkit-image-common with the Poky distro config and thus gcc7, which is known to fail for nodejs. We run an increasing number of tests (installer test, soon my system update tests) with refkit-image-common. Reducing the content of that image would speed up testing and local development. |
On Fri, Jun 16, 2017 at 11:32 PM, Patrick Ohly wrote:
@mythi <https://github.com/mythi>: do we really want packagegroup-sensors
in refkit-image-common? It drags in mraa, upm, nodejs, and the latter is
what currently fails in the "test_common_poky_config" test, because it
builds refkit-image-common with the Poky distro config and thus gcc7, which
is known to fail for nodejs.
I'm pretty sure I dropped some time ago (moved it to gateway only). If
that's not the case, please remove.
|
On Sat, Jun 17, 2017 at 8:02 AM, Ylinen, Mikko <mikko.ylinen@intel.com>
wrote:
On Fri, Jun 16, 2017 at 11:32 PM, Patrick Ohly wrote:
> @mythi <https://github.com/mythi>: do we really want
> packagegroup-sensors in refkit-image-common? It drags in mraa, upm, nodejs,
> and the latter is what currently fails in the "test_common_poky_config"
> test, because it builds refkit-image-common with the Poky distro config and
> thus gcc7, which is known to fail for nodejs.
>
>
>
I'm pretty sure I dropped some time ago (moved it to gateway only). If
that's not the case, please remove.
Ah, it was iotivity. Let's move sensors in gateway.
|
The new "bbappends" hierarchy can be used to provide .bbappends for recipes in layers which may or may not be present. This relies on the BBFILES_DYNAMIC support in bitbake master. The complete hierarchy for all layers that are currently used by the refkit distro is set up in advance with empty directories where .bbappends need to go, to make it easier for developers to add .bbappends correctly. .bbappends outside of the "bbappends" hierarchy are ignored. While technically not required because OE-core is a hard dependency, also hosting the .bbappends that modified OE-core under the new "bbappends" hierarchy makes more sense (all modifications to other layers in one place). Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
7ec73b2
to
2f70ecf
Compare
Rebased (again). Instead of reducing the content of meta-refkit-common, I restricted the test_common_poky_config to OE-core + meta-refkit-core. That's the part that should work. Additional layers will only work when using our distro config, because that's where we enabled workarounds for known problems. Reducing meta-refkit-common can and should still be done separately. The upm + gcc7 incompatibility gets resolved via backporting a fix (problem still occurs while sensors are in meta-refkit-common). Someone more familiar with upm should do a major version upgrade. |
@ipuustin can you please review and merge, if it passes? Note that I have not done any manual checking whether I resolved conflicts with you recent firewall changes correctly. Extra care is needed to ensure that I moved them correctly into stand-alone .bbappends. |
Several config changes were in refkit-config.inc merely because we couldn't use .bbappends for layers other than OE-core. Now we can make the changes in optional .bbappends. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
We had to use "inherit" to include optional changes. Now "require" is also supported without parameter, so we can use that instead of abusing the class inheritance mechanism. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Cooperation of ConnMan and systemd is getting enhanced in OE-core "systemd: enable resolved and networkd" by introducing additional symlinks. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Several components are known to have problems (for example, upm = eclipse-upm/upm#573 and nodejs) with gcc7. We have to continue using gcc 6.x until those problems have been sorted out. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
We cannot guarantee that all layers actually work with OE-core master and its Poky distro. For example, when OE-core switched to gcc7, nodejs and upm failed to build. Therefore we now limit testing in that build configuration to OE-core and meta-refkit-core, without any of the additional layers. As an additional benefit, the test now ensures that meta-refkit-core is actually usable for image building and booting when just using OE-core. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
gcc7 correctly errors out because the if check does not make sense (using enums in boolean context). An upm version update might also make sense; for now the goal is to get the code ready for OE-core master with gcc7 with minimal changes. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
The new OE-core master has its own distrooverrides.bbclass with a slightly different API (different variable for listing overrides, all overrides have a df- for "distro feature" prefix). * openembedded-core b51383e...1d9a88f (28): > ovmf: fix secureboot PACKAGECONFIG + OpenSSL update > package_ipk: Clean up Source entry in ipk packages > mtools-native: fix Upstream-Status > package_manager: flush installed_pkgs file before oe-pkgdata-util uses it > distrooverrides.bbclass: DISTRO_FEATURES as overrides > Revert "bitbake.conf: DISTRO_FEATURES as overrides" > python-3.5: Move bz2.py, lzma.py and _compression.py from python3-misc to python3-compression > attr: Fix build failure when image includes man-pages pkg > externalsrc: verify that EXTERNALSRC/EXTERNALSRC_BUILD are absolute paths > adwaita-icon-theme: add a patch to speed up the do_install() task > runqemu: change terminal settings for valid tty's > grub: switch from ftp to https > libid3tag: switch from ftp to http > libglu: switch from ftp to https > mesa: switch from ftp to https > mesa-demos: switch from ftp to https > dhcp: switch from ftp to http > libpcre: switch from ftp to https > image.bbclass: fix setting of vardeps flag > image.bbclass: improve setup of flags > image.bbclass: cleanup: add new variable "task" > staging.bbclass: fix typo > connman: correct the systemd boot in read only rootfs > systemd: enable resolved and networkd > selftest/sstatetests: Fix potential failure on uniprocessor machines > gcc_7.1.bb: disable thumb on armv5t > gcc: Add recipes for gcc-7 > ovmf: Update to latest Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
The helper function makes the intention of the code more explicit. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
The docstring is only special when it appears directly at the start of the method body. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
It is useful to run signature checks separately from the slower image build tests. "bitbake -r refkit_poky" still runs both, as before, but now refkit_poky.TestRefkitPokySignatures and refkit_poky.TestRefkitPokyBuilds can be used to run those subsets of the tests. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
2f70ecf
to
bdfa882
Compare
@@ -0,0 +1,4 @@ | |||
# Temporary workaround (needs to be fixed in meta-security once the | |||
# necessary patch "net-tools: enable native and nativesdk variant" | |||
# is in OE-core): swtpm_setup.sh needs netstat command. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Appears to be in oe-core (openembedded/openembedded-core@508163b). Can this be removed?
On Mon, 2017-06-19 at 01:22 -0700, Ismo Puustinen wrote:
@ipuustin commented on this pull request.
______________________________________________________________________
In
meta-refkit-core/bbappends/meta-security/recipes-tpm/swtpm/swtpm-wrappers-native.bbappend:
> @@ -0,0 +1,4 @@
+# Temporary workaround (needs to be fixed in meta-security once the
+# necessary patch "net-tools: enable native and nativesdk variant"
+# is in OE-core): swtpm_setup.sh needs netstat command.
Appears to be in oe-core ***@***.***). Can
this be removed?
meta-security also needs to be fixed first. I haven't gotten around to
sending a patch for that.
|
layers[layer] = path | ||
# meta-poky should not be active. We expect it next to the meta-refkit layer. | ||
if not 'meta-poky' in layers: | ||
layers['meta-poky'] = os.path.join(os.path.dirname(layers['meta-refkit']), 'meta-yocto', 'meta-poky') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should you check if the layer was actually there?
On Mon, 2017-06-19 at 02:30 -0700, Ismo Puustinen wrote:
@ipuustin commented on this pull request.
______________________________________________________________________
In meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py:
> @@ -31,6 +31,24 @@
from oeqa.selftest.case import OESelftestTestCase
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu
+def find_layers():
+ layers = {}
+ result = runCmd('bitbake-layers show-layers')
+ for layer, path, pri in re.findall(r'^(\S+) +([^\n]*?) +(\d+)$', result.output, re.MULTILINE):
+ layers[layer] = path
+ # meta-poky should not be active. We expect it next to the meta-refkit layer.
+ if not 'meta-poky' in layers:
+ layers['meta-poky'] = os.path.join(os.path.dirname(layers['meta-refkit']), 'meta-yocto', 'meta-poky')
Should you check if the layer was actually there?
I don't think it is worth checking. We know it's there because we put it
there, and (re)moving it will cause test failures.
|
Imports and adapts to latest OE-core master, plus uses all the Yocto Compatible 2.0 support that recently landed in OE-core + bitbake master:
Also split up the Yocto Compatible 2.0 selftest, to make it easier to run just the signature checks.