Date   

[RFC PATCH 6/6] config.json: add a target to test standalone X11 image

Alexander Kanavin
 

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
config.json | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/config.json b/config.json
index 75bf4e2..b9c493a 100644
--- a/config.json
+++ b/config.json
@@ -729,6 +729,11 @@
]
}
},
+ "only-x11" : {
+ "MACHINE" : "qemux86-64",
+ "BBTARGETS" : "core-image-sato core-image-sato:do_populate_sdk core-image-sato:do_populate_sdk_ext core-image-sato-sdk",
+ "SANITYTARGETS" : "core-image-sato:do_testimage core-image-sato:do_testsdk core-image-sato:do_testsdkext core-image-sato-sdk:do_testimage"
+ },
"musl-qemux86" : {
"MACHINE" : "qemux86",
"SDKMACHINE" : "x86_64",
--
2.29.2


[RFC PATCH 5/6] config.json: pam is required when weston starts under systemd

Alexander Kanavin
 

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
config.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index cf6165a..75bf4e2 100644
--- a/config.json
+++ b/config.json
@@ -937,7 +937,7 @@
"BBTARGETS" : "core-image-weston",
"SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
- "DISTRO_FEATURES_append = ' systemd'",
+ "DISTRO_FEATURES_append = ' pam systemd'",
"VIRTUAL-RUNTIME_init_manager = 'systemd'",
"TEST_SUITES_append = ' systemd'"
]
@@ -957,7 +957,7 @@
"SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"TEST_SUITES_append = ' systemd'",
- "DISTRO_FEATURES_append = ' systemd'",
+ "DISTRO_FEATURES_append = ' pam systemd'",
"VIRTUAL-RUNTIME_init_manager = 'systemd'",
"DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit'"
]
--
2.29.2


[RFC PATCH 4/6] config.json: replace core-image-sato with core-image-weston

Alexander Kanavin
 

I believe the time has come for YP to be defaulting to Wayland
and not X11.

X11 is effectively deprecated technology at this point with
only minimal maintenance; standalone X server will not be
developed any further, and all attention currently is towards
making X apps work well under Wayland.

Weston is built with x11 support enabled via xwayland, so
x11 bits continue do be built and exercised in tests and SDKs;
for testing core-image-sato as a whole a separate target will
be added next.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
config.json | 176 ++++++++++++++++++++++++++--------------------------
1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/config.json b/config.json
index b0fc363..cf6165a 100644
--- a/config.json
+++ b/config.json
@@ -62,13 +62,13 @@
"BUILDINFO" : true,
"BUILDHISTORY" : true,
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage core-image-weston:do_testsdk"
},
"step2" : {
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
- "SANITYTARGETS" : "core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
+ "BBTARGETS" : "core-image-weston:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-weston:do_populate_sdk_ext",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk core-image-minimal:do_testsdkext core-image-weston:do_testsdkext"
},
"step3" : {
"shortname" : "Machine oe-selftest",
@@ -82,8 +82,8 @@
"BUILDINFO" : true,
"BUILDHISTORY" : true,
"step1" : {
- "BBTARGETS" : "core-image-full-cmdline core-image-sato core-image-sato-sdk",
- "SANITYTARGETS" : "core-image-full-cmdline:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
+ "BBTARGETS" : "core-image-full-cmdline core-image-weston core-image-weston-sdk",
+ "SANITYTARGETS" : "core-image-full-cmdline:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage"
}
},
"ptest-qemu" : {
@@ -104,8 +104,8 @@
},
"ltp-qemu" : {
"BUILDINFO" : true,
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"IMAGE_INSTALL_append = ' ltp'",
"TEST_SUITES = 'ping ssh ltp ltp_compliance'",
@@ -117,16 +117,16 @@
"arch-hw" : {
"BUILDINFO" : true,
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-weston-ptest-all core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston-ptest-all core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk"
}
},
"arch-hw-qemu" : {
"BUILDINFO" : true,
"step1" : {
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-minimal core-image-sato core-image-sato-sdk core-image-sato:do_populate_sdk core-image-sato:do_populate_sdk_ext",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-sato:do_testsdkext"
+ "BBTARGETS" : "core-image-minimal core-image-weston core-image-weston-sdk core-image-weston:do_populate_sdk core-image-weston:do_populate_sdk_ext",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage core-image-weston:do_testsdk core-image-weston:do_testsdkext"
},
"step2" : {
"shortname" : "Machine oe-selftest",
@@ -138,7 +138,7 @@
"DISTRO" : "poky-altcfg",
"BUILDINFO" : true,
"step1" : {
- "BBTARGETS" : "core-image-full-cmdline core-image-sato core-image-sato-sdk"
+ "BBTARGETS" : "core-image-full-cmdline core-image-weston core-image-weston-sdk"
}
},
"buildperf" : {
@@ -224,17 +224,17 @@
"BB_SIGNATURE_HANDLER = 'OEEquivHash'"
],
"step1" : {
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage"
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage"
},
"step2" : {
- "BBTARGETS" : "core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk"
},
"step3" : {
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext",
- "SANITYTARGETS" : "core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston:do_populate_sdk core-image-minimal:do_populate_sdk_ext",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk"
}
},
"qemuarm" : {
@@ -246,8 +246,8 @@
"BUILDINFO" : true,
"step1" : {
"SDKMACHINE" : "aarch64",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-weston:do_populate_sdk_ext",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage core-image-weston:do_testsdk core-image-minimal:do_testsdkext core-image-weston:do_testsdkext"
}
},
"qemuarm-alt" : {
@@ -259,7 +259,7 @@
"TEMPLATE" : "arch-hw",
"step2" : {
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk"
+ "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext core-image-weston:do_populate_sdk"
}
},
"beaglebone-alt" : {
@@ -275,8 +275,8 @@
"BUILDINFO" : true,
"step1" : {
"SDKMACHINE" : "aarch64",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-weston:do_populate_sdk_ext",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage core-image-weston:do_testsdk core-image-minimal:do_testsdkext core-image-weston:do_testsdkext"
}
},
"qemuarm64-ptest" : {
@@ -300,13 +300,13 @@
],
"step1": {
"MACHINE": "n1sdp",
- "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-sato:do_testsdk"
+ "BBTARGETS": "core-image-minimal core-image-weston core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk"
},
"step2": {
"MACHINE": "juno",
- "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-sato:do_testsdk"
+ "BBTARGETS": "core-image-minimal core-image-weston core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk"
}
},
"bringup" : {
@@ -314,24 +314,24 @@
"SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"],
"MACHINE" : "qemuarm64",
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage core-image-weston:do_testsdk"
},
"step2" : {
"MACHINE" : "qemux86-64",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-weston-ptest-all core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston-ptest-all core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk"

},
"step3" : {
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
- "SANITYTARGETS" : "core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
+ "BBTARGETS" : "core-image-weston:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-weston:do_populate_sdk_ext",
+ "SANITYTARGETS" : "core-image-weston:do_testsdk core-image-minimal:do_testsdkext core-image-weston:do_testsdkext"
},
"step4" : {
"MACHINE" : "qemux86-64",
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk"
+ "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext core-image-weston:do_populate_sdk"
},
"step5" : {
"BUILDINFO" : false,
@@ -475,11 +475,11 @@
"baselib = \"${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}\""
],
"step1" : {
- "BBTARGETS" : "core-image-minimal core-image-sato",
+ "BBTARGETS" : "core-image-minimal core-image-weston",
"SANITYTARGETS" : "core-image-minimal:do_testimage"
},
"step2" : {
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"TEST_SUITES_append = ' x32lib'"
]
@@ -528,8 +528,8 @@
"step3" : {
"shortname" : "x86-64 lib32 rpm",
"description" : "qemux86-64 64bit image and 32 bit multilibs with rpm",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"TEST_SUITES_append = ' multilib'",
"require conf/multilib.conf",
@@ -543,8 +543,8 @@
"shortname" : "x86-64 lib32 ipk",
"description" : "qemux86-64 64bit image and 32 bit multilibs with ipk",
"PACKAGE_CLASSES" : "package_ipk",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"TEST_SUITES_append = ' multilib'",
"require conf/multilib.conf",
@@ -559,7 +559,7 @@
"description" : "x86 building 64bit multilib image",
"MACHINE" : "qemux86",
"SDKMACHINE" : "i686",
- "BBTARGETS" : "lib64-core-image-sato lib64-core-image-sato-sdk",
+ "BBTARGETS" : "lib64-core-image-weston lib64-core-image-weston-sdk",
"extravars" : [
"require conf/multilib.conf",
"MULTILIBS = 'multilib:lib64'",
@@ -584,26 +584,26 @@
"pkgman-rpm-non-rpm" : {
"MACHINE" : "qemux86",
"PACKAGE_CLASSES" : "package_rpm",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage"
},
"pkgman-deb-non-deb" : {
"MACHINE" : "qemux86",
"PACKAGE_CLASSES" : "package_deb",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev core-image-weston:do_populate_sdk",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage core-image-weston:do_testsdk"
},
"pkgman-non-rpm" : {
"MACHINE" : "qemux86",
"step1" : {
"PACKAGE_CLASSES" : "package_ipk",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage"
},
"step2" : {
"PACKAGE_CLASSES" : "package_deb",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
+ "BBTARGETS" : "core-image-weston core-image-weston-sdk core-image-minimal core-image-minimal-dev",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-weston:do_testimage core-image-weston-sdk:do_testimage"
}
},
"poky-tiny" : {
@@ -620,41 +620,41 @@
"step1" : {
"MACHINE" : "qemux86",
"shortname" : "qemux86 wic",
- "BBTARGETS" : "wic-tools core-image-sato",
+ "BBTARGETS" : "wic-tools core-image-weston",
"EXTRACMDS" : [
- "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/",
- "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/",
- "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/"
+ "wic create directdisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-weston/",
+ "wic create directdisk-gpt -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-weston/",
+ "wic create mkefidisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-weston/"
]
},
"step2" : {
"MACHINE" : "genericx86",
"shortname" : "genericx86 wic",
- "BBTARGETS" : "wic-tools core-image-sato",
+ "BBTARGETS" : "wic-tools core-image-weston",
"EXTRACMDS" : [
- "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/",
- "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/",
- "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/"
+ "wic create directdisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-weston/",
+ "wic create directdisk-gpt -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-weston/",
+ "wic create mkefidisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-weston/"
]
},
"step3" : {
"MACHINE" : "qemux86-64",
"shortname" : "qemux86-64 wic",
- "BBTARGETS" : "wic-tools core-image-sato",
+ "BBTARGETS" : "wic-tools core-image-weston",
"EXTRACMDS" : [
- "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/",
- "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/",
- "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/"
+ "wic create directdisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-weston/",
+ "wic create directdisk-gpt -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-weston/",
+ "wic create mkefidisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-weston/"
]
},
"step4" : {
"MACHINE" : "genericx86-64",
"shortname" : "genericx86-64 wic",
- "BBTARGETS" : "wic-tools core-image-sato",
+ "BBTARGETS" : "wic-tools core-image-weston",
"EXTRACMDS" : [
- "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-sato/",
- "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-sato/",
- "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-sato/"
+ "wic create directdisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-weston/",
+ "wic create directdisk-gpt -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-weston/",
+ "wic create mkefidisk -e core-image-weston -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-weston/"
]
}
},
@@ -732,8 +732,8 @@
"musl-qemux86" : {
"MACHINE" : "qemux86",
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-minimal core-image-full-cmdline core-image-sato-sdk world",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-full-cmdline:do_testimage core-image-sato-sdk:do_testimage",
+ "BBTARGETS" : "core-image-minimal core-image-full-cmdline core-image-weston-sdk world",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-full-cmdline:do_testimage core-image-weston-sdk:do_testimage",
"extravars" : [
"TCLIBC = 'musl'"
]
@@ -742,8 +742,8 @@
"MACHINE" : "qemux86-64",
"SDKMACHINE" : "x86_64",
"BUILDINFO" : true,
- "BBTARGETS" : "core-image-minimal core-image-full-cmdline core-image-sato-sdk world",
- "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-full-cmdline:do_testimage core-image-sato-sdk:do_testimage",
+ "BBTARGETS" : "core-image-minimal core-image-full-cmdline core-image-weston-sdk world",
+ "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-full-cmdline:do_testimage core-image-weston-sdk:do_testimage",
"extravars" : [
"TCLIBC = 'musl'"
]
@@ -877,18 +877,18 @@
"step4" : {
"shortname" : "Prep locked-sigs test",
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato core-image-sato:do_populate_sdk_ext"
+ "BBTARGETS" : "core-image-weston core-image-weston:do_populate_sdk_ext"
},
"step5" : {
"shortname" : "Prep #2 locked-sigs test",
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato -S none",
+ "BBTARGETS" : "core-image-weston -S none",
"EXTRACMDS" : ["${SCRIPTSDIR}/../janitor/clobberdir ${BUILDDIR}/../build/tmp"]
},
"step6" : {
"shortname" : "Test locked-sigs image",
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato",
+ "BBTARGETS" : "core-image-weston",
"extravars" : [
"TMPDIR = '${TOPDIR}/newtmp'",
"require ../locked-sigs.inc"
@@ -897,7 +897,7 @@
"step7" : {
"shortname" : "Test locked-sigs eSDK",
"SDKMACHINE" : "x86_64",
- "BBTARGETS" : "core-image-sato:do_populate_sdk_ext",
+ "BBTARGETS" : "core-image-weston:do_populate_sdk_ext",
"extravars" : [
"TMPDIR = '${TOPDIR}/sdktmp'"
]
@@ -907,16 +907,16 @@
"MACHINE" : "qemux86-64",
"step1" : {
"shortname" : "Test logrotate",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"IMAGE_INSTALL_append = ' logrotate'",
"TEST_SUITES_append = ' logrotate'"
]
},
"step2" : {
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"DISTRO_FEATURES_append = ' pam'",
"TEST_SUITES_append = ' pam'"
@@ -924,8 +924,8 @@
},
"step3" : {
"shortname" : "Test skeletoninit",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"IMAGE_INSTALL_append = ' service hello-mod'",
"TEST_SUITES_append = ' skeletoninit'"
@@ -934,8 +934,8 @@
},
"step4" : {
"shortname" : "Systemd with sysvinit compat",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"DISTRO_FEATURES_append = ' systemd'",
"VIRTUAL-RUNTIME_init_manager = 'systemd'",
@@ -944,8 +944,8 @@
},
"step5" : {
"shortname" : "Sysvinit with systemd",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"DISTRO_FEATURES_append = ' systemd'",
"VIRTUAL-RUNTIME_init_manager = 'sysvinit'"
@@ -953,8 +953,8 @@
},
"step6" : {
"shortname" : "Systemd",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"TEST_SUITES_append = ' systemd'",
"DISTRO_FEATURES_append = ' systemd'",
@@ -964,8 +964,8 @@
},
"step7" : {
"shortname" : "Mesa gallium-llvm",
- "BBTARGETS" : "core-image-sato",
- "SANITYTARGETS" : "core-image-sato:do_testimage",
+ "BBTARGETS" : "core-image-weston",
+ "SANITYTARGETS" : "core-image-weston:do_testimage",
"extravars" : [
"PACKAGECONFIG_append_x86-64_pn-mesa = ' gallium-llvm gallium r600'"
]
--
2.29.2


[RFC PATCH 3/6] config.json: transition ptests to weston-based images

Alexander Kanavin
 

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
config.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.json b/config.json
index 66b76ed..b0fc363 100644
--- a/config.json
+++ b/config.json
@@ -88,16 +88,16 @@
},
"ptest-qemu" : {
"BUILDINFO" : true,
- "BBTARGETS" : "core-image-sato-ptest",
- "SANITYTARGETS" : "core-image-sato-ptest:do_testimage",
+ "BBTARGETS" : "core-image-weston-ptest-all",
+ "SANITYTARGETS" : "core-image-weston-ptest-all:do_testimage",
"extravars" : [
"TEST_SUITES = 'ping ssh ptest'"
]
},
"ptest-qemu-fast" : {
"BUILDINFO" : true,
- "BBTARGETS" : "core-image-sato-ptest-fast",
- "SANITYTARGETS" : "core-image-sato-ptest-fast:do_testimage",
+ "BBTARGETS" : "core-image-weston-ptest-fast",
+ "SANITYTARGETS" : "core-image-weston-ptest-fast:do_testimage",
"extravars" : [
"TEST_SUITES = 'ping ssh ptest'"
]
@@ -117,7 +117,7 @@
"arch-hw" : {
"BUILDINFO" : true,
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-ptest core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-weston-ptest-all core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
}
},
@@ -319,7 +319,7 @@
},
"step2" : {
"MACHINE" : "qemux86-64",
- "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-sdk-ptest core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-weston-ptest-all core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"

},
--
2.29.2


[RFC PATCH 2/6] config.json: drop core-image-sato-dev from builds

Alexander Kanavin
 

core-image-sato-sdk is a superset, and a much more useful one.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
config.json | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config.json b/config.json
index d6e7df8..66b76ed 100644
--- a/config.json
+++ b/config.json
@@ -62,7 +62,7 @@
"BUILDINFO" : true,
"BUILDHISTORY" : true,
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk"
},
"step2" : {
@@ -117,7 +117,7 @@
"arch-hw" : {
"BUILDINFO" : true,
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-ptest core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-ptest core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
}
},
@@ -246,7 +246,7 @@
"BUILDINFO" : true,
"step1" : {
"SDKMACHINE" : "aarch64",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
}
},
@@ -275,7 +275,7 @@
"BUILDINFO" : true,
"step1" : {
"SDKMACHINE" : "aarch64",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
}
},
@@ -314,12 +314,12 @@
"SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"],
"MACHINE" : "qemuarm64",
"step1" : {
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk"
},
"step2" : {
"MACHINE" : "qemux86-64",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-sdk-ptest core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-sdk-ptest core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"

},
@@ -584,25 +584,25 @@
"pkgman-rpm-non-rpm" : {
"MACHINE" : "qemux86",
"PACKAGE_CLASSES" : "package_rpm",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
},
"pkgman-deb-non-deb" : {
"MACHINE" : "qemux86",
"PACKAGE_CLASSES" : "package_deb",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk"
},
"pkgman-non-rpm" : {
"MACHINE" : "qemux86",
"step1" : {
"PACKAGE_CLASSES" : "package_ipk",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
},
"step2" : {
"PACKAGE_CLASSES" : "package_deb",
- "BBTARGETS" : "core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev",
+ "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage"
}
},
--
2.29.2


[RFC PATCH 1/6] config.json: add a systemd no-x11 build

Alexander Kanavin
 

Particularly the weston image has now regressed twice under systemd,
so I think there should be a quality gate for it.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
config.json | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index 8025166..d6e7df8 100644
--- a/config.json
+++ b/config.json
@@ -715,8 +715,19 @@
"SANITYTARGETS" : "core-image-full-cmdline:do_testimage core-image-weston:do_testimage",
"extravars" : [
"DISTRO_FEATURES_remove = 'x11'"
- ]
-
+ ],
+ "step1" : {
+ "shortname" : "Sysvinit weston"
+ },
+ "step2" : {
+ "shortname" : "Systemd weston",
+ "extravars" : [
+ "TEST_SUITES_append = ' systemd'",
+ "DISTRO_FEATURES_append = ' pam systemd'",
+ "VIRTUAL-RUNTIME_init_manager = 'systemd'",
+ "DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit'"
+ ]
+ }
},
"musl-qemux86" : {
"MACHINE" : "qemux86",
--
2.29.2


Re: ttyS0 is not getting generated in my Raspberry-CM3 module.

Zoran
 

...I'm not getting /dev/ttyS0 even after giving
enable_uart=1 in config.txt file...
And what U R getting exactly? ls -al /dev | grep ttyS
And, also, could you do it for: ls -al /dev | grep ttyUSB (with
serial/USB cable plugged-in)?

Zee
_______

On Fri, Mar 12, 2021 at 6:57 AM <prashantsingh@dialtronics.com> wrote:

Dear Team,

I'm building linux-raspberry, in this I'm not getting getting /dev/ttyS0 even after giving enable_uart=1 in config.txt file.
I'm building two different kernels i.e. 4.14 and 5.4 using poky-dunell and poky-sumo for each different kernel. In both of them I'm not getting ttyS0 terminal in /dev directory.

I need to use this terminal for console purpose.

Please assist me with this issue.

Thanks and Regards.


ttyS0 is not getting generated in my Raspberry-CM3 module.

@prashant2314
 

Dear Team,

I'm building linux-raspberry, in this I'm not getting getting /dev/ttyS0 even after giving enable_uart=1 in config.txt file.
I'm building two different kernels i.e. 4.14 and 5.4 using poky-dunell and poky-sumo for each different kernel. In both of them I'm not getting ttyS0 terminal in /dev directory.

I need to use this terminal for console purpose.

Please assist me with this issue.

Thanks and Regards.


Re: Assign IP address at boot time

Chen Qi
 

Try adding the following line to the match section of the 80-wired.network file.
KernelCommandLine=!ip

Regards,
Chen Qi

On 03/12/2021 02:12 AM, jchludzinski via lists.yoctoproject.org wrote:
Can this be done using boot parameters?

Something like(?):

LABEL Arria10 SOCDK SDMMC
    KERNEL ../zImage
    FDT ../socfpga_arria10_phead.dtb
    APPEND root=/dev/mmcblk0p2 rw rootwait earlyprintk console=ttyS0,115200n8 ip=192.168.0.101:255.255.255.0:eth0






Re: [meta-security][dunfell][PATCH 0/9] Some IMA/EVM fixes to dunfell branch

Armin Kuster
 

merged.

thanks.

On 3/10/21 2:31 AM, Ming Liu wrote:
Hi, akuster808:

I saw this patch set has been merged to gatesgarth, may I ask, any
plan for dunfell? I am asking because dunfell is a LTS branch and many
users are building their products based on it. Thanks!

the best,
thank you

series in build testing

-armin

On 3/2/21 6:57 AM, liu.ming50@gmail.com
<mailto:liu.ming50@gmail.com> wrote:
> From: Ming Liu <ming.liu@toradex.com <mailto:ming.liu@toradex.com>>
>
> Cherry pick some IMA/EVM fixes to LTS dunfell branch, with these
> patches applied, I could run a ima enabled image with
sysvinit/systemd
> on qemuarm/qemuarm64 and some NXP machines.
>
> Ming Liu (9):
>   ima-evm-utils: set native REQUIRED_DISTRO_FEATURES to empty
>   initramfs-framework-ima: fix a wrong path
>   ima-evm-keys: add recipe
>   initramfs-framework-ima: RDEPENDS on ima-evm-keys
>   meta: refactor IMA/EVM sign rootfs
>   README.md: update according to the refactoring in
>     ima-evm-rootfs.bbclass
>   initramfs-framework-ima: let ima_enabled return 0
>   ima-evm-rootfs.bbclass: avoid generating /etc/fstab for wic
>   ima-policy-hashed: add CGROUP2_SUPER_MAGIC fsmagic
>
>  meta-integrity/README.md                      |  4 ++-
>  meta-integrity/classes/ima-evm-rootfs.bbclass | 33
+++++++++----------
>  .../initrdscripts/initramfs-framework-ima.bb
<http://initramfs-framework-ima.bb>  |  2 +-
>  .../initrdscripts/initramfs-framework-ima/ima |  3 +-
>  .../ima-evm-keys/ima-evm-keys_1.0.bb
<http://ima-evm-keys_1.0.bb>          | 16 +++++++++
>  .../ima-evm-utils/ima-evm-utils_git.bb
<http://ima-evm-utils_git.bb>        |  1 +
>  .../ima_policy_hashed/files/ima_policy_hashed |  3 ++
>  7 files changed, 41 insertions(+), 21 deletions(-)
>  create mode 100644
meta-integrity/recipes-security/ima-evm-keys/ima-evm-keys_1.0.bb
<http://ima-evm-keys_1.0.bb>
>


Re: Want to use nodejs 14 from nodejs 10 in yocto warrior bsp

Khem Raj
 

On Thu, Mar 11, 2021 at 3:45 AM darshak.raval via
lists.yoctoproject.org
<darshak.raval=volansys.com@lists.yoctoproject.org> wrote:

Hi,
I am currently using yocto warrior bsp as my build system.
In warrior, nodejs version 10 is running at sources/meta-openembedded/meta-oe/recipes-devtools
I want to use nodejs 14. I couldn't find yocto recipe for nodejs 14.
Is it possible to upgrade from nodejs 10 to nodejs 14 in yocto warrior ?
Thanks in advance.
you could backport nodejs 12.x from master as your own risk but I
don't think we have recipe for 14.x contributed yet.
Darshak




Re: Assign IP address at boot time

Rudolf J Streif
 


On 3/11/21 10:12 AM, jchludzinski wrote:
Can this be done using boot parameters?
Not that I know of. Why anyway?

Something like(?):

LABEL Arria10 SOCDK SDMMC
    KERNEL ../zImage
    FDT ../socfpga_arria10_phead.dtb
    APPEND root=/dev/mmcblk0p2 rw rootwait earlyprintk console=ttyS0,115200n8 ip=192.168.0.101:255.255.255.0:eth0
-- 
Rudolf J Streif
CEO/CTO ibeeto
+1.855.442.3386 x700


dunfell: regression linux-fimware installed in rootfs in actual dunfell master

Marek Belisko
 

Hi,

I've bumped from poky dunfell: dunfell-23.0.6 to actual dunfell branch
and I have an problem that all linux-firmware packages are installed
in my rootfs (even I have in IMAGE_INSTALL only
linux-firmware-bcm43430). Any ideas? In the commit log I saw that
linux-firmware package was bumped.

Thanks and BR,

marek

--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com


Re: Assign IP address at boot time

jchludzinski
 

Can this be done using boot parameters?

Something like(?):

LABEL Arria10 SOCDK SDMMC
    KERNEL ../zImage
    FDT ../socfpga_arria10_phead.dtb
    APPEND root=/dev/mmcblk0p2 rw rootwait earlyprintk console=ttyS0,115200n8 ip=192.168.0.101:255.255.255.0:eth0


Re: [PATCH] perf: reproducibility fixes for pmu-events.c

Bruce Ashfield
 

Ignore this.

I reused an old git-send-email and sent it to the wrong list. I've
re-send to oe-core :D

Bruce

On Thu, Mar 11, 2021 at 8:56 AM Bruce Ashfield via
lists.yoctoproject.org
<bruce.ashfield=gmail.com@lists.yoctoproject.org> wrote:


From: Bruce Ashfield <bruce.ashfield@gmail.com>

perf generates pmu-events.c as part of the build process. The
code that generates the events is doing tree walks and potentially
other non-determinstic things.

We'd rather not mess with that implementation, so we add a script
that knows how to read the pmu-events.c, sort the entries and then
copy it over the generated one.

With this, we should always have events in the same order, improving
reproducibility.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/perf/perf.bb | 16 ++++
.../perf/perf/sort-pmuevents.py | 93 +++++++++++++++++++
2 files changed, 109 insertions(+)
create mode 100755 meta/recipes-kernel/perf/perf/sort-pmuevents.py

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 2beb404c03..c7653e523c 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -250,6 +250,14 @@ do_configure_prepend () {
# all the calls have YFLAGS, which contains prefix mapping information.
sed -i -e 's,$(YACC),$(YACC) $(YFLAGS),g' ${S}/scripts/Makefile.host
fi
+ if [ -e "${S}/tools/perf/pmu-events/Build" ]; then
+ target='$(OUTPUT)pmu-events/pmu-events.c $(V)'
+ replacement1='$(OUTPUT)pmu-events/pmu-events.c $(V)\n'
+ replacement2='\t$(srctree)/sort-pmuevents.py $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/pmu-events.c.new\n'
+ replacement3='\tcp $(OUTPUT)pmu-events/pmu-events.c.new $(OUTPUT)pmu-events/pmu-events.c'
+ sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \
+ "${S}/tools/perf/pmu-events/Build"
+ fi
# end reproducibility substitutions

# We need to ensure the --sysroot option in CC is preserved
@@ -292,6 +300,14 @@ do_configure_prepend () {
# so we copy it from the sysroot unistd.h to the perf unistd.h
install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
+
+ # the fetcher is inhibited by the 'inherit kernelsrc', so we do a quick check and
+ # copy for a helper script we need
+ for p in $(echo ${FILESPATH} | tr ':' '\n'); do
+ if [ -e $p/sort-pmuevents.py ]; then
+ cp $p/sort-pmuevents.py ${S}
+ fi
+ done
}

python do_package_prepend() {
diff --git a/meta/recipes-kernel/perf/perf/sort-pmuevents.py b/meta/recipes-kernel/perf/perf/sort-pmuevents.py
new file mode 100755
index 0000000000..5ddf0f144f
--- /dev/null
+++ b/meta/recipes-kernel/perf/perf/sort-pmuevents.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+# perf pmu-events sorting tool
+#
+# Copyright (C) 2021 Bruce Ashfield
+#
+# SPDX-License-Identifier: MIT
+#
+
+import sys
+import os
+import re
+from collections import OrderedDict
+
+if len(sys.argv) < 2:
+ print( "[ERROR]: input and output pmu files missing" )
+ sys.exit(1)
+
+if len(sys.argv) < 3:
+ print( "[ERROR]: output pmu file missing" )
+ sys.exit(1)
+
+infile = sys.argv[1]
+outfile = sys.argv[2]
+
+if not os.path.exists(infile):
+ print( "ERROR. input file does not exist: %s" % infile )
+ sys.exit(1)
+
+if os.path.exists(outfile):
+ print( "WARNING. output file will be overwritten: %s" % infile )
+
+with open(infile, 'r') as file:
+ data = file.read()
+
+preamble_regex = re.compile( '^(.*?)^struct', re.MULTILINE | re.DOTALL )
+
+preamble = re.search( preamble_regex, data )
+struct_block_regex = re.compile( '^struct.*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL )
+field_regex = re.compile( '{.*?},', re.MULTILINE | re.DOTALL )
+cpuid_regex = re.compile( '\.cpuid = (.*?),', re.MULTILINE | re.DOTALL )
+name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL )
+
+# create a dictionary structure to store all the structs, their
+# types and then their fields.
+entry_dict = {}
+for struct in re.findall( struct_block_regex, data ):
+ # print( "struct: %s %s" % (struct[0],struct[1]) )
+ entry_dict[struct[1]] = {}
+ entry_dict[struct[1]]['type'] = struct[0]
+ entry_dict[struct[1]]['fields'] = {}
+ for entry in re.findall( field_regex, struct[2] ):
+ #print( " entry: %s" % entry )
+ cpuid = re.search( cpuid_regex, entry )
+ if cpuid:
+ #print( " cpuid found: %s" % cpuid.group(1) )
+ entry_dict[struct[1]]['fields'][cpuid.group(1)] = entry
+
+ name = re.search( name_regex, entry )
+ if name:
+ #print( " name found: %s" % name.group(1) )
+ entry_dict[struct[1]]['fields'][name.group(1)] = entry
+
+
+# created ordered dictionaries from the captured values. These are ordered by
+# a sorted() iteration of the keys. We don't care about the order we read
+# things, just the sorted order. Hency why we couldn't create these during
+# reading.
+#
+# yes, there's a more concise way to do this, but our nested dictionaries of
+# fields make it complex enough that it becomes unreadable.
+entry_dict_sorted = OrderedDict()
+for i in sorted(entry_dict.keys()):
+ entry_dict_sorted[i] = {}
+ entry_dict_sorted[i]['type'] = entry_dict[i]['type']
+ entry_dict_sorted[i]['fields'] = {}
+ for f in sorted(entry_dict[i]['fields'].keys()):
+ entry_dict_sorted[i]['fields'][f] = entry_dict[i]['fields'][f]
+
+# dump the sorted elements to the outfile
+outf = open( outfile, 'w' )
+
+print( preamble.group(1) )
+outf.write( preamble.group(1) )
+for d in entry_dict_sorted:
+ outf.write( "struct %s %s[] = {\n" % (entry_dict_sorted[d]['type'],d) )
+ for f in entry_dict_sorted[d]['fields']:
+ outf.write( entry_dict_sorted[d]['fields'][f] + '\n' )
+
+ outf.write( "};\n" )
+
+outf.close()
+
--
2.19.1



--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


[PATCH] perf: reproducibility fixes for pmu-events.c

Bruce Ashfield
 

From: Bruce Ashfield <bruce.ashfield@gmail.com>

perf generates pmu-events.c as part of the build process. The
code that generates the events is doing tree walks and potentially
other non-determinstic things.

We'd rather not mess with that implementation, so we add a script
that knows how to read the pmu-events.c, sort the entries and then
copy it over the generated one.

With this, we should always have events in the same order, improving
reproducibility.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/perf/perf.bb | 16 ++++
.../perf/perf/sort-pmuevents.py | 93 +++++++++++++++++++
2 files changed, 109 insertions(+)
create mode 100755 meta/recipes-kernel/perf/perf/sort-pmuevents.py

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 2beb404c03..c7653e523c 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -250,6 +250,14 @@ do_configure_prepend () {
# all the calls have YFLAGS, which contains prefix mapping information.
sed -i -e 's,$(YACC),$(YACC) $(YFLAGS),g' ${S}/scripts/Makefile.host
fi
+ if [ -e "${S}/tools/perf/pmu-events/Build" ]; then
+ target='$(OUTPUT)pmu-events/pmu-events.c $(V)'
+ replacement1='$(OUTPUT)pmu-events/pmu-events.c $(V)\n'
+ replacement2='\t$(srctree)/sort-pmuevents.py $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/pmu-events.c.new\n'
+ replacement3='\tcp $(OUTPUT)pmu-events/pmu-events.c.new $(OUTPUT)pmu-events/pmu-events.c'
+ sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \
+ "${S}/tools/perf/pmu-events/Build"
+ fi
# end reproducibility substitutions

# We need to ensure the --sysroot option in CC is preserved
@@ -292,6 +300,14 @@ do_configure_prepend () {
# so we copy it from the sysroot unistd.h to the perf unistd.h
install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
+
+ # the fetcher is inhibited by the 'inherit kernelsrc', so we do a quick check and
+ # copy for a helper script we need
+ for p in $(echo ${FILESPATH} | tr ':' '\n'); do
+ if [ -e $p/sort-pmuevents.py ]; then
+ cp $p/sort-pmuevents.py ${S}
+ fi
+ done
}

python do_package_prepend() {
diff --git a/meta/recipes-kernel/perf/perf/sort-pmuevents.py b/meta/recipes-kernel/perf/perf/sort-pmuevents.py
new file mode 100755
index 0000000000..5ddf0f144f
--- /dev/null
+++ b/meta/recipes-kernel/perf/perf/sort-pmuevents.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+# perf pmu-events sorting tool
+#
+# Copyright (C) 2021 Bruce Ashfield
+#
+# SPDX-License-Identifier: MIT
+#
+
+import sys
+import os
+import re
+from collections import OrderedDict
+
+if len(sys.argv) < 2:
+ print( "[ERROR]: input and output pmu files missing" )
+ sys.exit(1)
+
+if len(sys.argv) < 3:
+ print( "[ERROR]: output pmu file missing" )
+ sys.exit(1)
+
+infile = sys.argv[1]
+outfile = sys.argv[2]
+
+if not os.path.exists(infile):
+ print( "ERROR. input file does not exist: %s" % infile )
+ sys.exit(1)
+
+if os.path.exists(outfile):
+ print( "WARNING. output file will be overwritten: %s" % infile )
+
+with open(infile, 'r') as file:
+ data = file.read()
+
+preamble_regex = re.compile( '^(.*?)^struct', re.MULTILINE | re.DOTALL )
+
+preamble = re.search( preamble_regex, data )
+struct_block_regex = re.compile( '^struct.*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL )
+field_regex = re.compile( '{.*?},', re.MULTILINE | re.DOTALL )
+cpuid_regex = re.compile( '\.cpuid = (.*?),', re.MULTILINE | re.DOTALL )
+name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL )
+
+# create a dictionary structure to store all the structs, their
+# types and then their fields.
+entry_dict = {}
+for struct in re.findall( struct_block_regex, data ):
+ # print( "struct: %s %s" % (struct[0],struct[1]) )
+ entry_dict[struct[1]] = {}
+ entry_dict[struct[1]]['type'] = struct[0]
+ entry_dict[struct[1]]['fields'] = {}
+ for entry in re.findall( field_regex, struct[2] ):
+ #print( " entry: %s" % entry )
+ cpuid = re.search( cpuid_regex, entry )
+ if cpuid:
+ #print( " cpuid found: %s" % cpuid.group(1) )
+ entry_dict[struct[1]]['fields'][cpuid.group(1)] = entry
+
+ name = re.search( name_regex, entry )
+ if name:
+ #print( " name found: %s" % name.group(1) )
+ entry_dict[struct[1]]['fields'][name.group(1)] = entry
+
+
+# created ordered dictionaries from the captured values. These are ordered by
+# a sorted() iteration of the keys. We don't care about the order we read
+# things, just the sorted order. Hency why we couldn't create these during
+# reading.
+#
+# yes, there's a more concise way to do this, but our nested dictionaries of
+# fields make it complex enough that it becomes unreadable.
+entry_dict_sorted = OrderedDict()
+for i in sorted(entry_dict.keys()):
+ entry_dict_sorted[i] = {}
+ entry_dict_sorted[i]['type'] = entry_dict[i]['type']
+ entry_dict_sorted[i]['fields'] = {}
+ for f in sorted(entry_dict[i]['fields'].keys()):
+ entry_dict_sorted[i]['fields'][f] = entry_dict[i]['fields'][f]
+
+# dump the sorted elements to the outfile
+outf = open( outfile, 'w' )
+
+print( preamble.group(1) )
+outf.write( preamble.group(1) )
+for d in entry_dict_sorted:
+ outf.write( "struct %s %s[] = {\n" % (entry_dict_sorted[d]['type'],d) )
+ for f in entry_dict_sorted[d]['fields']:
+ outf.write( entry_dict_sorted[d]['fields'][f] + '\n' )
+
+ outf.write( "};\n" )
+
+outf.close()
+
--
2.19.1


Want to use nodejs 14 from nodejs 10 in yocto warrior bsp

darshak.raval@...
 

Hi,
I am currently using yocto warrior bsp as my build system.
In warrior, nodejs version 10 is running at sources/meta-openembedded/meta-oe/recipes-devtools
I want to use nodejs 14. I couldn't find yocto recipe for nodejs 14.
Is it possible to upgrade from nodejs 10 to nodejs 14 in yocto warrior ?
Thanks in advance.
Darshak


Failing to patch u-boot .dts

Jonas Vautherin
 

Hello!

I am using u-boot on a pocketbeagle which, according to "Default Device Tree for DT control" in `bitbake -c menuconfig u-boot`, uses am335x-evm, which I understand is the file in ./build/tmp/work/pocketbeagle-poky-linux-gnueabi/u-boot/1_2020.07-r0/git/arch/arm/dts/am335x-evm.dts. 

My issue is that this file ends up setting usb1 as `dr_mode = "host"` and usb0 as `dr_mode = "otg"`. I would like to use fastboot on my pocketbeagle, and therefore set them to `dr_mode = "peripheral"`.

In order to do that, I wrote a .bbappend that does the following:

```
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

SRC_URI += "file://am335x-evm.dts.patch"
SRC_URI += "file://logging.cfg"
```

The patch sets both usb0 and usb1 to `dr_mode = "peripheral"`, while the cfg enables logging in u-boot. Because logging is effectively enabled, I get that my .bbappend is used. And I can confirm that ./build/tmp/work/pocketbeagle-poky-linux-gnueabi/u-boot/1_2020.07-r0/git/arch/arm/dts/am335x-evm.dts is patched indeed.

However, whatever I do, I can't seem to get that modification in my u-boot device tree at runtime, as usb0 always ends up as "otg" and usb1 as "host". I have even tried a full clean build where I removed build/tmp and cache_sstate.

I cannot really tell if my patched file is actually used or not. For instance, if I `bitbake -c cleansstate u-boot`, then `bitbake -c do_patch u-boot`, then `rm -rf ./build/tmp/work/pocketbeagle-poky-linux-gnueabi/u-boot/1_2020.07-r0/git/arch/arm/dts` and finally `bitbake u-boot`, it does not complain at all about a missing dts file.

What am I missing, and how could I make sure that my patched am335x-evm.dts is the device tree being used by my u-boot install?

Best Regards,
Jonas


Re: how often would one use "VAR_someoverride_append = ..."?

Quentin Schulz
 

Hi Robert,

On Thu, Mar 11, 2021 at 04:27:46AM -0500, Robert P. J. Day wrote:
On Wed, 10 Mar 2021, Quentin Schulz wrote:
... snip ...

https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/linux/linux-yocto_5.10.bb#n12
for example.

This is an example of a "valid" use case (not that there are invalid
ones) for VAR_foo.

Would probably a better example:
https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/linux/linux-yocto_5.10.bb#n50

So, you might decide that a machine is so much different than others
that KERNEL_FEATURES should be overridden for said machine.

Then in a bbappend, one might want to add another feature for this
machine, they'll therefore need to use KERNEL_FEATURES_foo_append.

I do not have examples at hand of VAR_foo_append except the ones
Leon sent in another mail. Which should show how rare it is :)
i will ramble for just a bit as i think i settled on a way to
perhaps explain the difference here to some students.

in the overwhelmingly common case, we normally see overrides at the
end of either assignments or appends:

VAR = "snafu"
VAR_qemux86 = "more snafu"
VAR_append_qemux86 = "qemux86_specific_fubar"

it seems that the proper way to interpret the above is that, in the
end, all you would be after is the *final* value of the single
variable VAR, and all the appending and overriding is leading you in
that direction -- whatever "VAR" contains after it's all over is all
you care about.
For that particular example, I'm not entirely sure what the actual value
for VAR would be.

Also not sure what:
VAR = "snafu"
VAR_append = " more"
VAR_qemux86 = "qemu"

would mean for VAR. I don't know exactly when _append is applied to
VAR... after or before the override is applied?

Gut feeling would say before, in which case for non-qemux86 one would
have VAR set to "snafu more" and for qemux86 it'd be "qemu".

I'd anyway use bitbake -e trick to check that, which IMO should really
be given in that section of the docs, to explain how one can debug the
assignment of the variable thanks to the history of the variable :)

on the other hand, with the example from the kernel recipe:

KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs"
KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64"
KBRANCH_qemumips ?= "v5.10/standard/mti-malta32"
KBRANCH_qemuppc ?= "v5.10/standard/qemuppc"
KBRANCH_qemuriscv64 ?= "v5.10/standard/base"
KBRANCH_qemux86 ?= "v5.10/standard/base"
KBRANCH_qemux86-64 ?= "v5.10/standard/base"
KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"

it seems that the right way to interpret the above is that you are,
simultaneously, creating *multiple* versions of the variable KBRANCH,
so that if you subsequently see, for example:

KBRANCH_qemux86_append = " whatever"

you're appending to the variable KBRANCH_qemux86 because the ultimate
result you're after is the *set* of KBRANCH-related variables, perhaps
because you will actually need them all at once.

and given that most situations don't require access to all of those
variations of that variable, that's why the first approach is by far
the most common.

that might be an over-simplification, but it seems to at least give
an idea of why that second approach would be used in very particular
situations.

thoughts?
I like to think that:

KBRANCH_qemux86

is for OVERRIDING, while

VAR_append_qemux86

is for CONDITIONAL appending.

In which case,

KBRANCH_qemux86_append

is UNCONDITIONALLY APPENDING to OVERRIDDEN KBRANCH for qemux86 override.

Only _append and _prepend would be a case of CONDITIONAL
appending/prepending. All others are OVERRIDING.

It's a topic I've long been interested in describing with simple words
but couldn't come with anything yet.

Because you kind of need to explain also the difference between:
KBRANCH_qemux86_class-native
and
KBRANCH_class-native_qemux86

which are completely different.

You also have many, many, many different kinds of overrides, from
pn-recipe, to class-target, virtclass-lib32, task-compile, ${PN},
remove, poky, _X.Y.Z when BBVERSIONS is set, etc...

If you omit _append and _prepend, it's simpler to explain that the
overrides happen from right to left. But once you have _append and
_prepend in the mix, it's a bit confusing and hard to explain.

IMO it would warrant some kind of drawings/schemes to explain step by
step what's happening, couldn't think of a proper one though. Thought of
using multiple FIFOs but couldn't come up with something less confusing
that what it already is :/

I'd be very happy to find a way to explain those (IMO) difficult
notions and make it part of the docs.

Quentin


[meta-security][PATCH v2] samhain: fix compile error on powerpc

kai
 

From: Kai Kang <kai.kang@windriver.com>

It fails to comile samhain for powerpc(qemuppc):

| x_sh_dbIO.c: In function 'swap_short':
| x_sh_dbIO.c:229:36: error: initializer element is not constant
| 229 | static unsigned short ooop = *iptr;
| | ^

Assign after initialization of the static variable to avoid the failure.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
...-initializer-element-is-not-constant.patch | 28 +++++++++++++++++++
recipes-ids/samhain/samhain.inc | 1 +
2 files changed, 29 insertions(+)
create mode 100644 recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch

diff --git a/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch b/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch
new file mode 100644
index 0000000..72cb880
--- /dev/null
+++ b/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch
@@ -0,0 +1,28 @@
+Fix error when compile for powerpc:
+
+| x_sh_dbIO.c: In function 'swap_short':
+| x_sh_dbIO.c:229:36: error: initializer element is not constant
+| 229 | static unsigned short ooop = *iptr;
+| | ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ src/sh_dbIO.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/sh_dbIO.c b/src/sh_dbIO.c
+index b547ac5..23a9621 100644
+--- a/src/sh_dbIO.c
++++ b/src/sh_dbIO.c
+@@ -226,7 +226,8 @@ static unsigned short * swap_short (unsigned short * iptr)
+ else
+ {
+ /* alignment problem */
+- static unsigned short ooop = *iptr;
++ static unsigned short ooop;
++ ooop = *iptr;
+ unsigned short hi = (ooop & 0xff00);
+ unsigned short lo = (ooop & 0xff);
+ ooop = (lo << 8) | (hi >> 8);
diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index 6a2eb08..0148e46 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -18,6 +18,7 @@ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
file://samhain-avoid-searching-host-for-postgresql.patch \
file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \
file://fix-build-with-new-version-attr.patch \
+ file://samhain-fix-initializer-element-is-not-constant.patch \
"

SRC_URI[sha256sum] = "3e57574036d5055e9557ec5095818b419ea6c4365370fc2ccce1e9f87f9fad08"
--
2.17.1

2421 - 2440 of 55069