[PATCH yocto-autobuilder-helper 3/4] config.json: pam is required when weston starts under systemd
Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@...>
--- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 8e0f0ac..6de85a4 100644 --- a/config.json +++ b/config.json @@ -976,7 +976,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'" ] @@ -996,7 +996,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.30.2
|
|
[PATCH yocto-autobuilder-helper 2/4] 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@...> --- config.json | 176 ++++++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/config.json b/config.json index a1893db..8e0f0ac 100644 --- a/config.json +++ b/config.json @@ -66,13 +66,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", @@ -86,8 +86,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" : { @@ -108,8 +108,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'", @@ -121,16 +121,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", @@ -142,7 +142,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" : { @@ -229,17 +229,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" : { @@ -251,8 +251,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" : { @@ -264,7 +264,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" : { @@ -280,8 +280,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" : { @@ -305,13 +305,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" } }, "meta-agl-core" : { @@ -336,24 +336,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, @@ -497,11 +497,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'" ] @@ -550,8 +550,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", @@ -565,8 +565,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", @@ -581,7 +581,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'", @@ -606,26 +606,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" : { @@ -642,41 +642,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/" ] } }, @@ -754,8 +754,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'" ] @@ -764,8 +764,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'" ] @@ -916,18 +916,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" @@ -936,7 +936,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'" ] @@ -946,16 +946,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'" @@ -963,8 +963,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'" @@ -973,8 +973,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'", @@ -983,8 +983,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'" @@ -992,8 +992,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'", @@ -1003,8 +1003,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.30.2
|
|
[PATCH yocto-autobuilder-helper 1/4] config.json: transition ptests to weston-based images
Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@...>
--- config.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config.json b/config.json index 8d8d1bf..a1893db 100644 --- a/config.json +++ b/config.json @@ -92,16 +92,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'" ] @@ -121,7 +121,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" } }, @@ -341,7 +341,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.30.2
|
|
Re: [meta-rockchip][PATCH v3 0/7] OP-TEE support for ARM and rk3399
Joshua Watt
On 4/23/21 11:58 AM, Yann Dirson wrote:
From: Yann Dirson <yann@...> Changes from v2: - turn the DISTRO_FEATURE idea into separate RFC patches so as to allow merging of basic support - remove optee-os patch that proved unnecessary Changes from v1: - fix last-minute typo in TFA_SPD setting, which led to optee not being started - use PACKAGECONFIG[optee] to simplify recipes as suggested on meta-arm ml Yann Dirson (7): trusted-firmware-a: include optee support when requested by DISTRO_FEATURE u-boot: include optee-os as BL32 when requested by DISTRO_FEATURE optee-os: enable rk3399 support, including serial console support RFC optee: new "optee" DISTRO_FEATURE to enable optee-os integration RFC: optee: only enable the recipes when "optee" is included in DISTRO_FEATURES WIP nanopi-m4: declare OP-TEE presence in devicetree WIP kernel config feature for OP-TEE activation In general, it seems like a lot of these changes should be in the
upstream recipes, not the meta-rockchip bbappends. Also, the things that do belong in this layer need proper
variable overrides to keep the layer (mostly) Yocto project
compliant. conf/machine/include/rk3399.inc | 2 + .../trusted-firmware-a_%.bbappend | 14 +++++ recipes-bsp/u-boot/u-boot%.bbappend | 9 ++++ .../0001-nanopi-declare-optee-presence.patch | 30 +++++++++++ recipes-kernel/linux/files/bsp/tee.cfg | 2 + recipes-kernel/linux/linux-yocto%.bbappend | 1 + ...399-enable-serial-console-by-default.patch | 52 +++++++++++++++++++ recipes-security/optee/optee%.bbappend | 4 ++ recipes-security/optee/optee-os_%.bbappend | 8 +++ 9 files changed, 122 insertions(+) create mode 100644 recipes-kernel/linux/files/0001-nanopi-declare-optee-presence.patch create mode 100644 recipes-kernel/linux/files/bsp/tee.cfg create mode 100644 recipes-security/optee/files/0001-rk3399-enable-serial-console-by-default.patch create mode 100644 recipes-security/optee/optee%.bbappend create mode 100644 recipes-security/optee/optee-os_%.bbappend
|
|
[meta-rockchip][PATCH v3 7/7] WIP kernel config feature for OP-TEE activation
Yann Dirson
From: Yann Dirson <yann@...>
FIXME: - provide an .scc with proper information - maybe bundle with dts overlay - select a more suitable path in config namespace --- recipes-kernel/linux/files/bsp/tee.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipes-kernel/linux/files/bsp/tee.cfg diff --git a/recipes-kernel/linux/files/bsp/tee.cfg b/recipes-kernel/linu= x/files/bsp/tee.cfg new file mode 100644 index 0000000..82213a5 --- /dev/null +++ b/recipes-kernel/linux/files/bsp/tee.cfg @@ -0,0 +1,2 @@ +CONFIG_TEE=3Dm +CONFIG_OPTEE=3Dm --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 6/7] WIP nanopi-m4: declare OP-TEE presence in devicetree
Yann Dirson
From: Yann Dirson <yann@...>
FIXME: - this is not specific to the board, and would indeed apply to any SoC supported by OP-TEE. - should rather be selected by "optee" in DISTRO_FEATURES, maybe using a dts overlay --- .../0001-nanopi-declare-optee-presence.patch | 30 +++++++++++++++++++ recipes-kernel/linux/linux-yocto%.bbappend | 1 + 2 files changed, 31 insertions(+) create mode 100644 recipes-kernel/linux/files/0001-nanopi-declare-optee-= presence.patch diff --git a/recipes-kernel/linux/files/0001-nanopi-declare-optee-presenc= e.patch b/recipes-kernel/linux/files/0001-nanopi-declare-optee-presence.p= atch new file mode 100644 index 0000000..aede781 --- /dev/null +++ b/recipes-kernel/linux/files/0001-nanopi-declare-optee-presence.patch @@ -0,0 +1,30 @@ +From 30cb714e717990276a5fabc50dc616c83b223ee7 Mon Sep 17 00:00:00 2001 +From: Yann Dirson <yann@...> +Date: Mon, 12 Apr 2021 15:50:26 +0200 +Subject: [PATCH] nanopi: declare optee presence + +--- + arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts b/arch/ar= m64/boot/dts/rockchip/rk3399-nanopi-m4.dts +index 60358ab8c7df..ef11639b03f6 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts +@@ -16,6 +16,13 @@ / { + model =3D "FriendlyElec NanoPi M4"; + compatible =3D "friendlyarm,nanopi-m4", "rockchip,rk3399"; +=20 ++ firmware { ++ optee { ++ compatible =3D "linaro,optee-tz"; ++ method =3D "smc"; ++ }; ++ }; ++ + vdd_5v: vdd-5v { + compatible =3D "regulator-fixed"; + regulator-name =3D "vdd_5v"; +--=20 +2.30.2 + diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/= linux/linux-yocto%.bbappend index 9658681..97b3238 100644 --- a/recipes-kernel/linux/linux-yocto%.bbappend +++ b/recipes-kernel/linux/linux-yocto%.bbappend @@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:" =20 SRC_URI_append =3D "\ file://bsp;type=3Dkmeta;subdir=3Dkernel-meta \ + file://0001-nanopi-declare-optee-presence.patch \ " =20 COMPATIBLE_MACHINE_marsboard-rk3066 =3D "marsboard-rk3066" --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 5/7] RFC: optee: only enable the recipes when "optee" is included in DISTRO_FEATURES
Yann Dirson
From: Yann Dirson <yann@...>
This is meant as a safeguard against having optee-os included without the required support in u-boot and trusted-firmware-a. Signed-off-by: Yann Dirson <yann@...> --- recipes-security/optee/optee%.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-security/optee/optee%.bbappend b/recipes-security/op= tee/optee%.bbappend index 9a156bb..ec11863 100644 --- a/recipes-security/optee/optee%.bbappend +++ b/recipes-security/optee/optee%.bbappend @@ -1 +1,4 @@ COMPATIBLE_MACHINE_rk3399 ?=3D "rk3399" + +inherit features_check +REQUIRED_DISTRO_FEATURES =3D "optee" --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 4/7] RFC optee: new "optee" DISTRO_FEATURE to enable optee-os integration
Yann Dirson
From: Yann Dirson <yann@...>
This sets up a central switch for OP-TEE operation, activating support in all dependent recipes at the same time: - u-boot - trusted-firmware-a - kernel (not part of this patch, has to be implemented separately) Signed-off-by: Yann Dirson <yann@...> --- recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 1 + recipes-bsp/u-boot/u-boot%.bbappend | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend= b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 638d53f..9887b6e 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -20,5 +20,6 @@ OPTEE_OEMAKE ?=3D " \ =20 EXTRA_OEMAKE_append =3D " ${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG[optee] =3D "${OPTEE_OEMAKE},,optee-os" +PACKAGECONFIG_append =3D " ${@bb.utils.filter('DISTRO_FEATURES', 'optee'= , d)}" =20 TFA_SPD =3D "${@bb.utils.contains('PACKAGECONFIG', 'optee', 'opteed', ''= , d)}" diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-b= oot%.bbappend index 767df5f..d947815 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -22,3 +22,4 @@ OPTEE_OEMAKE ?=3D " TEE=3D${DEPLOY_DIR_IMAGE}/optee/tee= .elf" =20 EXTRA_OEMAKE_append =3D " ${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG[optee] =3D "${OPTEE_OEMAKE},,optee-os" +PACKAGECONFIG_append =3D " ${@bb.utils.filter('DISTRO_FEATURES', 'optee'= , d)}" --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 3/7] optee-os: enable rk3399 support, including serial console support
Yann Dirson
From: Yann Dirson <yann@...>
As discussed in https://github.com/OP-TEE/optee_os/issues/4542, ASLR support currently has to be disabled for OP-TEE to boot. Signed-off-by: Yann Dirson <yann@...> --- conf/machine/include/rk3399.inc | 2 + ...399-enable-serial-console-by-default.patch | 52 +++++++++++++++++++ recipes-security/optee/optee%.bbappend | 1 + recipes-security/optee/optee-os_%.bbappend | 8 +++ 4 files changed, 63 insertions(+) create mode 100644 recipes-security/optee/files/0001-rk3399-enable-seria= l-console-by-default.patch create mode 100644 recipes-security/optee/optee%.bbappend create mode 100644 recipes-security/optee/optee-os_%.bbappend diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk339= 9.inc index f6b7826..9ac434e 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -13,6 +13,8 @@ KBUILD_DEFCONFIG ?=3D "defconfig" KERNEL_CLASSES =3D "kernel-fitimage" KERNEL_IMAGETYPE =3D "fitImage" =20 +OPTEEMACHINE =3D "rockchip-rk3399" + TFA_PLATFORM =3D "rk3399" TFA_BUILD_TARGET =3D "bl31" =20 diff --git a/recipes-security/optee/files/0001-rk3399-enable-serial-conso= le-by-default.patch b/recipes-security/optee/files/0001-rk3399-enable-ser= ial-console-by-default.patch new file mode 100644 index 0000000..c09cfae --- /dev/null +++ b/recipes-security/optee/files/0001-rk3399-enable-serial-console-by-d= efault.patch @@ -0,0 +1,52 @@ +From 96a614759ff5572b16929379d72376fa6c805a37 Mon Sep 17 00:00:00 2001 +From: Yann Dirson <yann@...> +Date: Mon, 12 Apr 2021 10:49:18 +0200 +Subject: [PATCH] rk3399: enable serial console by default +Upstream-Status: Backport + +The definition is the same as for rk322x. + +Signed-off-by: Yann Dirson <yann@...> +Acked-by: Jerome Forissier <jerome@...> +--- + core/arch/arm/plat-rockchip/conf.mk | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/core/arch/arm/plat-rockchip/conf.mk b/core/arch/arm/plat-ro= ckchip/conf.mk +index f6eef865..f180d63a 100644 +--- a/core/arch/arm/plat-rockchip/conf.mk ++++ b/core/arch/arm/plat-rockchip/conf.mk +@@ -26,8 +26,6 @@ CFG_EARLY_CONSOLE_BAUDRATE ?=3D 1500000 + CFG_EARLY_CONSOLE_CLK_IN_HZ ?=3D 24000000 + endif +=20 +-CFG_EARLY_CONSOLE ?=3D n +- + ifeq ($(PLATFORM_FLAVOR),rk3399) + include core/arch/arm/cpu/cortex-armv8-0.mk + $(call force,CFG_TEE_CORE_NB_CORE,6) +@@ -37,6 +35,12 @@ CFG_TZDRAM_START ?=3D 0x30000000 + CFG_TZDRAM_SIZE ?=3D 0x02000000 + CFG_SHMEM_START ?=3D 0x32000000 + CFG_SHMEM_SIZE ?=3D 0x00400000 ++ ++CFG_EARLY_CONSOLE ?=3D y ++CFG_EARLY_CONSOLE_BASE ?=3D UART2_BASE ++CFG_EARLY_CONSOLE_SIZE ?=3D UART2_SIZE ++CFG_EARLY_CONSOLE_BAUDRATE ?=3D 1500000 ++CFG_EARLY_CONSOLE_CLK_IN_HZ ?=3D 24000000 + endif +=20 + ifeq ($(PLATFORM_FLAVOR),px30) +@@ -47,6 +51,8 @@ CFG_TZDRAM_START ?=3D 0x30000000 + CFG_TZDRAM_SIZE ?=3D 0x02000000 + CFG_SHMEM_START ?=3D 0x32000000 + CFG_SHMEM_SIZE ?=3D 0x00400000 ++ ++CFG_EARLY_CONSOLE ?=3D n + endif +=20 + ifeq ($(platform-flavor-armv8),1) +--=20 +2.30.2 + diff --git a/recipes-security/optee/optee%.bbappend b/recipes-security/op= tee/optee%.bbappend new file mode 100644 index 0000000..9a156bb --- /dev/null +++ b/recipes-security/optee/optee%.bbappend @@ -0,0 +1 @@ +COMPATIBLE_MACHINE_rk3399 ?=3D "rk3399" diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-securit= y/optee/optee-os_%.bbappend new file mode 100644 index 0000000..a1b0c4f --- /dev/null +++ b/recipes-security/optee/optee-os_%.bbappend @@ -0,0 +1,8 @@ +EXTRA_OEMAKE_append_rk3399 =3D " \ + CFG_CORE_ASLR=3Dn \ +" + +FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:" +SRC_URI +=3D "\ + file://0001-rk3399-enable-serial-console-by-default.patch \ +" --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 2/7] u-boot: include optee-os as BL32 when requested by DISTRO_FEATURE
Yann Dirson
From: Yann Dirson <yann@...>
This causes OP-TEE to get included into the u-boot.itb fitImage so u-boot can load it for the trusted-firmware-a BL31 to run it. This has to be enabled through PACKAGECONFIG +=3D "optee". Signed-off-by: Yann Dirson <yann@...> --- recipes-bsp/u-boot/u-boot%.bbappend | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-b= oot%.bbappend index 95c019d..767df5f 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -5,6 +5,8 @@ do_compile_append_rock2-square () { fi } =20 +# TF-A, when supported + ATF_DEPENDS ??=3D "" =20 EXTRA_OEMAKE_append_rk3399 =3D " BL31=3D${DEPLOY_DIR_IMAGE}/bl31-rk3399.= elf" @@ -14,3 +16,9 @@ ATF_DEPENDS_rk3328 =3D " virtual/trusted-firmware-a:do_= deploy" =20 do_compile[depends] .=3D "${ATF_DEPENDS}" =20 +# OP-TEE, dependent on "optee" DISTRO_FEATURES + +OPTEE_OEMAKE ?=3D " TEE=3D${DEPLOY_DIR_IMAGE}/optee/tee.elf" + +EXTRA_OEMAKE_append =3D " ${PACKAGECONFIG_CONFARGS}" +PACKAGECONFIG[optee] =3D "${OPTEE_OEMAKE},,optee-os" --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 0/7] OP-TEE support for ARM and rk3399
Yann Dirson
From: Yann Dirson <yann@...>
Changes from v2: - turn the DISTRO_FEATURE idea into separate RFC patches so as to allow merging of basic support - remove optee-os patch that proved unnecessary Changes from v1: - fix last-minute typo in TFA_SPD setting, which led to optee not being = started - use PACKAGECONFIG[optee] to simplify recipes as suggested on meta-arm = ml Yann Dirson (7): trusted-firmware-a: include optee support when requested by DISTRO_FEATURE u-boot: include optee-os as BL32 when requested by DISTRO_FEATURE optee-os: enable rk3399 support, including serial console support RFC optee: new "optee" DISTRO_FEATURE to enable optee-os integration RFC: optee: only enable the recipes when "optee" is included in DISTRO_FEATURES WIP nanopi-m4: declare OP-TEE presence in devicetree WIP kernel config feature for OP-TEE activation conf/machine/include/rk3399.inc | 2 + .../trusted-firmware-a_%.bbappend | 14 +++++ recipes-bsp/u-boot/u-boot%.bbappend | 9 ++++ .../0001-nanopi-declare-optee-presence.patch | 30 +++++++++++ recipes-kernel/linux/files/bsp/tee.cfg | 2 + recipes-kernel/linux/linux-yocto%.bbappend | 1 + ...399-enable-serial-console-by-default.patch | 52 +++++++++++++++++++ recipes-security/optee/optee%.bbappend | 4 ++ recipes-security/optee/optee-os_%.bbappend | 8 +++ 9 files changed, 122 insertions(+) create mode 100644 recipes-kernel/linux/files/0001-nanopi-declare-optee-= presence.patch create mode 100644 recipes-kernel/linux/files/bsp/tee.cfg create mode 100644 recipes-security/optee/files/0001-rk3399-enable-seria= l-console-by-default.patch create mode 100644 recipes-security/optee/optee%.bbappend create mode 100644 recipes-security/optee/optee-os_%.bbappend --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 1/7] trusted-firmware-a: include optee support when requested by DISTRO_FEATURE
Yann Dirson
From: Yann Dirson <yann@...>
This instructs TF-A to: - load OP-TEE OS as BL32, but still relies on the actual image to be provided through other means, eg. in u-boot.itb - run opteed as Secure Payload Dispatcher This has to be enabled through PACKAGECONFIG +=3D "optee". Signed-off-by: Yann Dirson <yann@...> --- .../trusted-firmware-a_%.bbappend | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend= b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 1942c17..638d53f 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -9,3 +9,16 @@ FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:" SRC_URI +=3D "\ file://serial-console-baudrate.patch \ " + +# OP-TEE, dependent on "optee" DISTRO_FEATURES + +OPTEE_OEMAKE ?=3D " \ + BL32=3D${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/tee-head= er_v2.bin \ + BL32_EXTRA1=3D${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/t= ee-pager_v2.bin \ + BL32_EXTRA2=3D${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/t= ee-pageable_v2.bin \ + " + +EXTRA_OEMAKE_append =3D " ${PACKAGECONFIG_CONFARGS}" +PACKAGECONFIG[optee] =3D "${OPTEE_OEMAKE},,optee-os" + +TFA_SPD =3D "${@bb.utils.contains('PACKAGECONFIG', 'optee', 'opteed', ''= , d)}" --=20 2.30.2
|
|
The Yocto Project 2021 virtual Summit CFP reminder
Hello all,
This is a reminder that the 2021 Yocto Project Summit CFP window closes this Sunday at 11:59 PM PST. If anyone is interested, please visit: https://pretalx.com/yocto-project-summit-2021/cfp Kind regards, Armin sorry about the cross posting.
|
|
[meta-rockchip][PATCH v3 3/3] linux-yocto: add an initial NanoPi-M4 BSP
Yann Dirson
From: Yann Dirson <yann@...>
This patch provides "standard" and "tiny" BSP. There is still much work to be done in dispatching feature to individual scc files - the more boards we can support the better it will get. Not all SoC/board features are covered yet either (esp. Wifi/Bluetooth an= d audio jack), and properly-woking HDMI still needs patches. Tiny is not fully testable by itself, it can be minimally booted with serial console (though still missing CONFIG_MULTIUSER for serial getty, and CONFIG_INOTIFY_USER for proper udev operation) using: PREFERRED_PROVIDER_virtual/kernel =3D "linux-yocto-tiny" KERNEL_FEATURES_append =3D "\ ktypes/base/base.scc \ features/debug/printk.scc \ cfg/fs/ext4.scc \ cfg/8250.scc \ " Such a tiny build is still using mainline defconfig with lots of hardware features, and the kernel can be slimmed down even more by using: KBUILD_DEFCONFIG =3D "" Kernel weight using default configurations: - standard 11MB - tiny 5MB - tiny with no defconfig 2.5MB Signed-off-by: Yann Dirson <yann@...> --- .../linux/files/bsp/nanopi-m4-standard.scc | 7 ++ .../linux/files/bsp/nanopi-m4-tiny.scc | 7 ++ recipes-kernel/linux/files/bsp/nanopi-m4.cfg | 15 ++++ recipes-kernel/linux/files/bsp/nanopi-m4.scc | 5 ++ recipes-kernel/linux/files/bsp/rk3399.cfg | 71 +++++++++++++++++++ recipes-kernel/linux/files/bsp/rk3399.scc | 5 ++ recipes-kernel/linux/files/bsp/rockchip.cfg | 50 +++++++++++++ recipes-kernel/linux/files/bsp/rockchip.scc | 6 ++ recipes-kernel/linux/linux-yocto%.bbappend | 6 ++ 9 files changed, 172 insertions(+) create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4-standard.scc create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4-tiny.scc create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4.cfg create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4.scc create mode 100644 recipes-kernel/linux/files/bsp/rk3399.cfg create mode 100644 recipes-kernel/linux/files/bsp/rk3399.scc create mode 100644 recipes-kernel/linux/files/bsp/rockchip.cfg create mode 100644 recipes-kernel/linux/files/bsp/rockchip.scc diff --git a/recipes-kernel/linux/files/bsp/nanopi-m4-standard.scc b/reci= pes-kernel/linux/files/bsp/nanopi-m4-standard.scc new file mode 100644 index 0000000..5c74d6b --- /dev/null +++ b/recipes-kernel/linux/files/bsp/nanopi-m4-standard.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KMACHINE nanopi-m4 +define KTYPE standard +define KARCH arm + +include ktypes/standard/standard.scc +include nanopi-m4.scc diff --git a/recipes-kernel/linux/files/bsp/nanopi-m4-tiny.scc b/recipes-= kernel/linux/files/bsp/nanopi-m4-tiny.scc new file mode 100644 index 0000000..6e94d6a --- /dev/null +++ b/recipes-kernel/linux/files/bsp/nanopi-m4-tiny.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KMACHINE nanopi-m4 +define KTYPE tiny +define KARCH arm + +include ktypes/tiny/tiny.scc +include nanopi-m4.scc diff --git a/recipes-kernel/linux/files/bsp/nanopi-m4.cfg b/recipes-kerne= l/linux/files/bsp/nanopi-m4.cfg new file mode 100644 index 0000000..7802ab3 --- /dev/null +++ b/recipes-kernel/linux/files/bsp/nanopi-m4.cfg @@ -0,0 +1,15 @@ +CONFIG_MFD_RK808=3Dy +CONFIG_COMMON_CLK_RK808=3Dy + +CONFIG_REGULATOR_RK808=3Dy +CONFIG_REGULATOR_FAN53555=3Dy + +CONFIG_MMC_BLOCK=3Dy +CONFIG_PWRSEQ_SIMPLE=3Dy + +# RTL8211E +CONFIG_REALTEK_PHY=3Dm + +# AP6356S +CONFIG_BT_BCM=3Dm +CONFIG_BT_HCIUART_BCM=3Dy diff --git a/recipes-kernel/linux/files/bsp/nanopi-m4.scc b/recipes-kerne= l/linux/files/bsp/nanopi-m4.scc new file mode 100644 index 0000000..f4267aa --- /dev/null +++ b/recipes-kernel/linux/files/bsp/nanopi-m4.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT + +kconf hardware nanopi-m4.cfg + +include rk3399.scc diff --git a/recipes-kernel/linux/files/bsp/rk3399.cfg b/recipes-kernel/l= inux/files/bsp/rk3399.cfg new file mode 100644 index 0000000..f5f2909 --- /dev/null +++ b/recipes-kernel/linux/files/bsp/rk3399.cfg @@ -0,0 +1,71 @@ +# A72 errata, all past revisions +CONFIG_ARM64_ERRATUM_1319367=3Dy +# A53 errata, all patched on boot when needed +CONFIG_ARM64_ERRATUM_826319=3Dy +CONFIG_ARM64_ERRATUM_827319=3Dy +CONFIG_ARM64_ERRATUM_824069=3Dy +CONFIG_ARM64_ERRATUM_819472=3Dy + +# cru +CONFIG_CLK_RK3399=3Dy + +CONFIG_PL330_DMA=3Dy +CONFIG_I2C_RK3X=3Dy +CONFIG_SERIAL_8250_DW=3Dy + +# usb +CONFIG_PHY_ROCKCHIP_INNO_USB2=3Dy +CONFIG_PHY_ROCKCHIP_TYPEC=3Dy + +# ethernet +CONFIG_NET_VENDOR_STMICRO=3Dy +CONFIG_STMMAC_ETH=3Dm +CONFIG_STMMAC_PLATFORM=3Dm +CONFIG_DWMAC_ROCKCHIP=3Dm +CONFIG_PHYLIB=3Dm + +# display +CONFIG_ROCKCHIP_DW_HDMI=3Dy +CONFIG_ROCKCHIP_DW_MIPI_DSI=3Dy +CONFIG_ROCKCHIP_ANALOGIX_DP=3Dy +CONFIG_ROCKCHIP_CDN_DP=3Dy +CONFIG_PHY_ROCKCHIP_DP=3Dy +CONFIG_DRM_DW_HDMI=3Dm +CONFIG_DRM_DW_HDMI_I2S_AUDIO=3Dm +CONFIG_DRM_DW_HDMI_CEC=3Dm +CONFIG_DRM_DW_MIPI_DSI=3Dm +CONFIG_DRM_PANFROST=3Dm + +# HDMI audio +CONFIG_DRM_DW_HDMI_AHB_AUDIO=3Dm +CONFIG_SND_SOC_RK3288_HDMI_ANALOG=3Dm + +CONFIG_VIDEO_DEV=3Dm +CONFIG_V4L_MEM2MEM_DRIVERS=3Dy +CONFIG_VIDEO_ROCKCHIP_RGA=3Dm + +CONFIG_V4L2_H264=3Dm +CONFIG_MEDIA_CONTROLLER_REQUEST_API=3Dy +CONFIG_VIDEO_HANTRO=3Dm +CONFIG_VIDEO_HANTRO_ROCKCHIP=3Dy +CONFIG_VIDEO_ROCKCHIP_VDEC=3Dm + +# usb +CONFIG_USB_DWC2=3Dy +CONFIG_USB_DWC3=3Dy +CONFIG_USB_DWC3_DUAL_ROLE=3Dy + +# sd/mmc +CONFIG_MMC=3Dy +CONFIG_MMC_SDHCI=3Dy +CONFIG_MMC_SDHCI_PLTFM=3Dy +CONFIG_MMC_DW=3Dy +CONFIG_MMC_DW_ROCKCHIP=3Dy +CONFIG_MMC_SDHCI_OF_ARASAN=3Dy + +# temperature sensors +CONFIG_THERMAL=3Dy +CONFIG_THERMAL_OF=3Dy +CONFIG_ROCKCHIP_THERMAL=3Dm +CONFIG_IIO=3Dy +CONFIG_ROCKCHIP_SARADC=3Dm diff --git a/recipes-kernel/linux/files/bsp/rk3399.scc b/recipes-kernel/l= inux/files/bsp/rk3399.scc new file mode 100644 index 0000000..9b1a88e --- /dev/null +++ b/recipes-kernel/linux/files/bsp/rk3399.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT + +kconf hardware rk3399.cfg + +include rockchip.scc diff --git a/recipes-kernel/linux/files/bsp/rockchip.cfg b/recipes-kernel= /linux/files/bsp/rockchip.cfg new file mode 100644 index 0000000..05a397d --- /dev/null +++ b/recipes-kernel/linux/files/bsp/rockchip.cfg @@ -0,0 +1,50 @@ +CONFIG_CPU_ISOLATION=3Dy +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=3Dy +CONFIG_HZ_250=3Dy +CONFIG_CPU_IDLE=3Dy +CONFIG_ARM_CPUIDLE=3Dy + +CONFIG_ARCH_ROCKCHIP=3Dy +CONFIG_COMMON_CLK_ROCKCHIP=3Dy +CONFIG_REGULATOR=3Dy +CONFIG_REGULATOR_FIXED_VOLTAGE=3Dy +CONFIG_REGULATOR_PWM=3Dy +CONFIG_I2C=3Dy +CONFIG_FW_LOADER=3Dy +CONFIG_PHY_ROCKCHIP_EMMC=3Dy +CONFIG_PINCTRL=3Dy +CONFIG_PINCTRL_ROCKCHIP=3Dy +CONFIG_ROCKCHIP_IODOMAIN=3Dy +CONFIG_ROCKCHIP_PM_DOMAINS=3Dy + +CONFIG_SPI=3Dy +CONFIG_SPI_ROCKCHIP=3Dm + +CONFIG_PWM=3Dy +CONFIG_PWM_ROCKCHIP=3Dy + +CONFIG_DRM_KMS_HELPER=3Dm +CONFIG_DRM_FBDEV_EMULATION=3Dy +CONFIG_ROCKCHIP_IOMMU=3Dy +CONFIG_DRM_ROCKCHIP=3Dm +CONFIG_DRM_BRIDGE=3Dy + +CONFIG_SND=3Dy +CONFIG_SND_SOC=3Dy +CONFIG_SND_HDA_CODEC_HDMI=3Dm +CONFIG_SND_SOC_ROCKCHIP=3Dm +CONFIG_SND_SOC_ROCKCHIP_I2S=3Dm +CONFIG_SND_SOC_ROCKCHIP_SPDIF=3Dm + +CONFIG_NVMEM=3Dy +CONFIG_ROCKCHIP_EFUSE=3Dm + +CONFIG_CPU_FREQ=3Dy +CONFIG_CPU_FREQ_THERMAL=3Dy +CONFIG_HWMON=3Dy +CONFIG_THERMAL_HWMON=3Dy + +CONFIG_CRYPTO_HW=3Dy +CONFIG_CRYPTO_DEV_ROCKCHIP=3Dm + +CONFIG_MMC_BLOCK_MINORS=3D32 diff --git a/recipes-kernel/linux/files/bsp/rockchip.scc b/recipes-kernel= /linux/files/bsp/rockchip.scc new file mode 100644 index 0000000..800f105 --- /dev/null +++ b/recipes-kernel/linux/files/bsp/rockchip.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +kconf hardware rockchip.cfg + +include cfg/dmaengine.scc +include features/mmc/mmc-block.cfg diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/= linux/linux-yocto%.bbappend index 7702e3f..9658681 100644 --- a/recipes-kernel/linux/linux-yocto%.bbappend +++ b/recipes-kernel/linux/linux-yocto%.bbappend @@ -1,3 +1,9 @@ +FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:" + +SRC_URI_append =3D "\ + file://bsp;type=3Dkmeta;subdir=3Dkernel-meta \ +" + COMPATIBLE_MACHINE_marsboard-rk3066 =3D "marsboard-rk3066" COMPATIBLE_MACHINE_rock2-square =3D "rock2-square" COMPATIBLE_MACHINE_radxarock =3D "radxarock" --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 2/3] NanoPi-M4: declare "usbhost" in MACHINE_FEATURES
Yann Dirson
From: Yann Dirson <yann@...>
Lets USB tools be installed if the distro activates the feature. Signed-off-by: Yann Dirson <yann@...> --- conf/machine/include/nanopi-m4.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/na= nopi-m4.inc index 603160f..1a16eae 100644 --- a/conf/machine/include/nanopi-m4.inc +++ b/conf/machine/include/nanopi-m4.inc @@ -3,6 +3,8 @@ =20 require rk3399.inc =20 +MACHINE_FEATURES +=3D "usbhost" + KMACHINE =3D "nanopi-m4" KERNEL_DEVICETREE =3D "rockchip/rk3399-nanopi-m4.dtb" =20 --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 0/3] kmeta BSP for nanopi-m4
Yann Dirson
From: Yann Dirson <yann@...>
Changes from in v3: - relocate the bsp files into files/ so we don't have to add linux-yocto/ to FILESEXTRAPATHS for all other kernels - removed the "don't force KCONFIG_MODE to alldefconfig" (not needed fina= lly, and causing interferences in default setup) - add "usbhost" to MACHINE_FEATURES to enable lsusb and friends - better hardware coverage (though still no wifi/bt/audio, and buggy hdmi= ) The Wifi/BT support requires firmware, to be properly packaged; BT support itself is still buggy in mainline; audio jack requires a couple of patches; HDMI requires at the very least a DTS patch, and LibreELEC maintains a "latest and greatest" DRM patchset, but it can conflicts with some patches in default kmeta. Yann Dirson (3): rockchip-defaults: don't force KCONFIG_MODE to alldefconfig NanoPi-M4: let all variants use the same KMACHINE type linux-yocto: add a NanoPi-M4 BSP conf/machine/include/nanopi-m4.inc | 1 + conf/machine/include/rockchip-defaults.inc | 1 - .../linux/files/bsp/nanopi-m4-standard.scc | 7 +++ .../linux/files/bsp/nanopi-m4-tiny.scc | 7 +++ recipes-kernel/linux/files/bsp/nanopi-m4.cfg | 40 ++++++++++++++ recipes-kernel/linux/files/bsp/nanopi-m4.scc | 5 ++ recipes-kernel/linux/files/bsp/rk3399.cfg | 50 +++++++++++++++++ recipes-kernel/linux/files/bsp/rk3399.scc | 5 ++ recipes-kernel/linux/files/bsp/rockchip.cfg | 53 +++++++++++++++++++ recipes-kernel/linux/files/bsp/rockchip.scc | 6 +++ recipes-kernel/linux/linux-yocto%.bbappend | 6 +++ 11 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4-standard.scc create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4-tiny.scc create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4.cfg create mode 100644 recipes-kernel/linux/files/bsp/nanopi-m4.scc create mode 100644 recipes-kernel/linux/files/bsp/rk3399.cfg create mode 100644 recipes-kernel/linux/files/bsp/rk3399.scc create mode 100644 recipes-kernel/linux/files/bsp/rockchip.cfg create mode 100644 recipes-kernel/linux/files/bsp/rockchip.scc --=20 2.30.2
|
|
[meta-rockchip][PATCH v3 1/3] NanoPi-M4: let all variants use the same KMACHINE type
Yann Dirson
From: Yann Dirson <yann@...>
This will allow us to define a single set of kernel BSP for all variants of the board (which only need to differ in u-boot dts). Signed-off-by: Yann Dirson <yann@...> --- conf/machine/include/nanopi-m4.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/na= nopi-m4.inc index 74cdae8..603160f 100644 --- a/conf/machine/include/nanopi-m4.inc +++ b/conf/machine/include/nanopi-m4.inc @@ -3,6 +3,7 @@ =20 require rk3399.inc =20 +KMACHINE =3D "nanopi-m4" KERNEL_DEVICETREE =3D "rockchip/rk3399-nanopi-m4.dtb" =20 RK_BOOT_DEVICE =3D "mmcblk1" --=20 2.30.2
|
|
Monsees, Steven C (US)
Thanks you...
toggle quoted messageShow quoted text
-----Original Message-----
From: Khem Raj <raj.khem@...> Sent: Thursday, April 22, 2021 11:23 PM To: Monsees, Steven C (US) <steven.monsees@...> Cc: yocto@... Subject: Re: [yocto] #yocto #sdk #cmake External Email Alert This email has been sent from an account outside of the BAE Systems network. Please treat the email with caution, especially if you are requested to click on a link, decrypt/open an attachment, or enable macros. For further information on how to spot phishing, access "Cybersecurity OneSpace Page" and report phishing by clicking the button "Report Phishing" on the Outlook toolbar. take a look at https://github.com/kraj/meta-clang/blob/master/recipes-core/meta/clang-environment.inc#L11-L19 perhaps that can be something you might find useful On Thu, Apr 22, 2021 at 11:51 AM Monsees, Steven C (US) via lists.yoctoproject.org <steven.monsees=baesystems.com@...> wrote:
|
|
Re: #bitbake Can't use 'bitbake -g <image-name> -u taskdep
#bitbake
keydi <krzysztof.dudziak@...>
As for project here Poky operates on headless server. Developers use SSH to interact with Poky, to handle its input data, and to access build results. Must gtk3 be installed locally to Poky or will taskexp be able to connect to gtk3 operating on ssh client? As of time being Poky host has gtk not installed. Installation of gtk on Poky host will need approval of latter's administrator.
|
|
Re: Problems building hardknott for raspberri pi
On Thu, Apr 22, 2021 at 11:13 PM Morten Bruun <morten.bruun@...> wrote:
Then it should not be using Mesa-gl so it’s a bit confusing how you end up needing it
|
|