From 493f435ee9f1729bb16b63b659cf3a4d6109b963 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 18:14:21 -0700 Subject: [PATCH 1/9] projects: Move to toplevel conf/ dir from under meta-yoe Signed-off-by: Khem Raj --- conf/bblayers.conf | 2 +- .../meta-yoe/conf => conf}/projects/beaglebone/config.conf | 0 .../meta-yoe/conf => conf}/projects/beaglebone/layers.conf | 0 .../conf => conf}/projects/imx8mm-ddr4-evk/config.conf | 0 .../conf => conf}/projects/imx8mm-ddr4-evk/layers.conf | 0 .../meta-yoe/conf => conf}/projects/nezha-d1/config.conf | 0 .../meta-yoe/conf => conf}/projects/nezha-d1/layers.conf | 0 .../meta-yoe/conf => conf}/projects/odroid-c4/config.conf | 0 .../meta-yoe/conf => conf}/projects/odroid-c4/layers.conf | 0 {sources/meta-yoe/conf => conf}/projects/qemuarm | 0 {sources/meta-yoe/conf => conf}/projects/qemuarm64 | 0 .../meta-yoe/conf => conf}/projects/qemucommon/config.conf | 0 .../meta-yoe/conf => conf}/projects/qemucommon/layers.conf | 0 {sources/meta-yoe/conf => conf}/projects/qemumips | 0 {sources/meta-yoe/conf => conf}/projects/qemumips64 | 0 {sources/meta-yoe/conf => conf}/projects/qemuppc | 0 {sources/meta-yoe/conf => conf}/projects/qemuppc64 | 0 {sources/meta-yoe/conf => conf}/projects/qemuriscv32 | 0 .../meta-yoe/conf => conf}/projects/qemuriscv64/config.conf | 0 .../meta-yoe/conf => conf}/projects/qemuriscv64/layers.conf | 0 {sources/meta-yoe/conf => conf}/projects/qemux86 | 0 {sources/meta-yoe/conf => conf}/projects/qemux86-64 | 0 .../meta-yoe/conf => conf}/projects/rockpi-4b/config.conf | 0 .../meta-yoe/conf => conf}/projects/rockpi-4b/layers.conf | 0 .../meta-yoe/conf => conf}/projects/rpi4-64/config.conf | 0 .../meta-yoe/conf => conf}/projects/rpi4-64/layers.conf | 0 .../meta-yoe/conf => conf}/projects/unleashed/config.conf | 0 .../meta-yoe/conf => conf}/projects/unleashed/layers.conf | 0 .../meta-yoe/conf => conf}/projects/unmatched/config.conf | 0 .../meta-yoe/conf => conf}/projects/unmatched/layers.conf | 0 .../conf => conf}/projects/var-dart-imx6ul/config.conf | 0 .../conf => conf}/projects/var-dart-imx6ul/layers.conf | 0 .../meta-yoe/conf => conf}/projects/var-som-mx8/config.conf | 0 .../meta-yoe/conf => conf}/projects/var-som-mx8/layers.conf | 0 .../conf => conf}/projects/var-som-mx8m-nano/config.conf | 0 .../conf => conf}/projects/var-som-mx8m-nano/layers.conf | 0 .../conf => conf}/projects/var-som-mx8x/config.conf | 0 .../conf => conf}/projects/var-som-mx8x/layers.conf | 0 .../meta-yoe/conf => conf}/projects/visionfive/config.conf | 0 .../meta-yoe/conf => conf}/projects/visionfive/layers.conf | 0 .../meta-yoe/conf => conf}/projects/visionfive2/config.conf | 0 .../meta-yoe/conf => conf}/projects/visionfive2/layers.conf | 0 conf/site.conf | 2 +- envsetup.sh | 6 +++--- 44 files changed, 5 insertions(+), 5 deletions(-) rename {sources/meta-yoe/conf => conf}/projects/beaglebone/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/beaglebone/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/imx8mm-ddr4-evk/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/imx8mm-ddr4-evk/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/nezha-d1/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/nezha-d1/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/odroid-c4/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/odroid-c4/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuarm (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuarm64 (100%) rename {sources/meta-yoe/conf => conf}/projects/qemucommon/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/qemucommon/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/qemumips (100%) rename {sources/meta-yoe/conf => conf}/projects/qemumips64 (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuppc (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuppc64 (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuriscv32 (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuriscv64/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/qemuriscv64/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/qemux86 (100%) rename {sources/meta-yoe/conf => conf}/projects/qemux86-64 (100%) rename {sources/meta-yoe/conf => conf}/projects/rockpi-4b/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/rockpi-4b/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/rpi4-64/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/rpi4-64/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/unleashed/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/unleashed/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/unmatched/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/unmatched/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-dart-imx6ul/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-dart-imx6ul/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-som-mx8/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-som-mx8/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-som-mx8m-nano/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-som-mx8m-nano/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-som-mx8x/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/var-som-mx8x/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/visionfive/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/visionfive/layers.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/visionfive2/config.conf (100%) rename {sources/meta-yoe/conf => conf}/projects/visionfive2/layers.conf (100%) diff --git a/conf/bblayers.conf b/conf/bblayers.conf index 6239843fa..63505ab23 100644 --- a/conf/bblayers.conf +++ b/conf/bblayers.conf @@ -3,7 +3,7 @@ LCONF_VERSION = "7" #TOPDIR := "${@os.path.dirname(os.path.dirname(d.getVar('FILE', True)))}" -require ${TOPDIR}/sources/meta-yoe/conf/projects/${PROJECT}/layers.conf +require ${TOPDIR}/conf/projects/${PROJECT}/layers.conf # Placeholder for devtool adding layers as it does not understand above # location for finding BBLAYERS diff --git a/sources/meta-yoe/conf/projects/beaglebone/config.conf b/conf/projects/beaglebone/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/beaglebone/config.conf rename to conf/projects/beaglebone/config.conf diff --git a/sources/meta-yoe/conf/projects/beaglebone/layers.conf b/conf/projects/beaglebone/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/beaglebone/layers.conf rename to conf/projects/beaglebone/layers.conf diff --git a/sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/config.conf b/conf/projects/imx8mm-ddr4-evk/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/config.conf rename to conf/projects/imx8mm-ddr4-evk/config.conf diff --git a/sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/layers.conf b/conf/projects/imx8mm-ddr4-evk/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/layers.conf rename to conf/projects/imx8mm-ddr4-evk/layers.conf diff --git a/sources/meta-yoe/conf/projects/nezha-d1/config.conf b/conf/projects/nezha-d1/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/nezha-d1/config.conf rename to conf/projects/nezha-d1/config.conf diff --git a/sources/meta-yoe/conf/projects/nezha-d1/layers.conf b/conf/projects/nezha-d1/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/nezha-d1/layers.conf rename to conf/projects/nezha-d1/layers.conf diff --git a/sources/meta-yoe/conf/projects/odroid-c4/config.conf b/conf/projects/odroid-c4/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/odroid-c4/config.conf rename to conf/projects/odroid-c4/config.conf diff --git a/sources/meta-yoe/conf/projects/odroid-c4/layers.conf b/conf/projects/odroid-c4/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/odroid-c4/layers.conf rename to conf/projects/odroid-c4/layers.conf diff --git a/sources/meta-yoe/conf/projects/qemuarm b/conf/projects/qemuarm similarity index 100% rename from sources/meta-yoe/conf/projects/qemuarm rename to conf/projects/qemuarm diff --git a/sources/meta-yoe/conf/projects/qemuarm64 b/conf/projects/qemuarm64 similarity index 100% rename from sources/meta-yoe/conf/projects/qemuarm64 rename to conf/projects/qemuarm64 diff --git a/sources/meta-yoe/conf/projects/qemucommon/config.conf b/conf/projects/qemucommon/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/qemucommon/config.conf rename to conf/projects/qemucommon/config.conf diff --git a/sources/meta-yoe/conf/projects/qemucommon/layers.conf b/conf/projects/qemucommon/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/qemucommon/layers.conf rename to conf/projects/qemucommon/layers.conf diff --git a/sources/meta-yoe/conf/projects/qemumips b/conf/projects/qemumips similarity index 100% rename from sources/meta-yoe/conf/projects/qemumips rename to conf/projects/qemumips diff --git a/sources/meta-yoe/conf/projects/qemumips64 b/conf/projects/qemumips64 similarity index 100% rename from sources/meta-yoe/conf/projects/qemumips64 rename to conf/projects/qemumips64 diff --git a/sources/meta-yoe/conf/projects/qemuppc b/conf/projects/qemuppc similarity index 100% rename from sources/meta-yoe/conf/projects/qemuppc rename to conf/projects/qemuppc diff --git a/sources/meta-yoe/conf/projects/qemuppc64 b/conf/projects/qemuppc64 similarity index 100% rename from sources/meta-yoe/conf/projects/qemuppc64 rename to conf/projects/qemuppc64 diff --git a/sources/meta-yoe/conf/projects/qemuriscv32 b/conf/projects/qemuriscv32 similarity index 100% rename from sources/meta-yoe/conf/projects/qemuriscv32 rename to conf/projects/qemuriscv32 diff --git a/sources/meta-yoe/conf/projects/qemuriscv64/config.conf b/conf/projects/qemuriscv64/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/qemuriscv64/config.conf rename to conf/projects/qemuriscv64/config.conf diff --git a/sources/meta-yoe/conf/projects/qemuriscv64/layers.conf b/conf/projects/qemuriscv64/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/qemuriscv64/layers.conf rename to conf/projects/qemuriscv64/layers.conf diff --git a/sources/meta-yoe/conf/projects/qemux86 b/conf/projects/qemux86 similarity index 100% rename from sources/meta-yoe/conf/projects/qemux86 rename to conf/projects/qemux86 diff --git a/sources/meta-yoe/conf/projects/qemux86-64 b/conf/projects/qemux86-64 similarity index 100% rename from sources/meta-yoe/conf/projects/qemux86-64 rename to conf/projects/qemux86-64 diff --git a/sources/meta-yoe/conf/projects/rockpi-4b/config.conf b/conf/projects/rockpi-4b/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/rockpi-4b/config.conf rename to conf/projects/rockpi-4b/config.conf diff --git a/sources/meta-yoe/conf/projects/rockpi-4b/layers.conf b/conf/projects/rockpi-4b/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/rockpi-4b/layers.conf rename to conf/projects/rockpi-4b/layers.conf diff --git a/sources/meta-yoe/conf/projects/rpi4-64/config.conf b/conf/projects/rpi4-64/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/rpi4-64/config.conf rename to conf/projects/rpi4-64/config.conf diff --git a/sources/meta-yoe/conf/projects/rpi4-64/layers.conf b/conf/projects/rpi4-64/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/rpi4-64/layers.conf rename to conf/projects/rpi4-64/layers.conf diff --git a/sources/meta-yoe/conf/projects/unleashed/config.conf b/conf/projects/unleashed/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/unleashed/config.conf rename to conf/projects/unleashed/config.conf diff --git a/sources/meta-yoe/conf/projects/unleashed/layers.conf b/conf/projects/unleashed/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/unleashed/layers.conf rename to conf/projects/unleashed/layers.conf diff --git a/sources/meta-yoe/conf/projects/unmatched/config.conf b/conf/projects/unmatched/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/unmatched/config.conf rename to conf/projects/unmatched/config.conf diff --git a/sources/meta-yoe/conf/projects/unmatched/layers.conf b/conf/projects/unmatched/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/unmatched/layers.conf rename to conf/projects/unmatched/layers.conf diff --git a/sources/meta-yoe/conf/projects/var-dart-imx6ul/config.conf b/conf/projects/var-dart-imx6ul/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-dart-imx6ul/config.conf rename to conf/projects/var-dart-imx6ul/config.conf diff --git a/sources/meta-yoe/conf/projects/var-dart-imx6ul/layers.conf b/conf/projects/var-dart-imx6ul/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-dart-imx6ul/layers.conf rename to conf/projects/var-dart-imx6ul/layers.conf diff --git a/sources/meta-yoe/conf/projects/var-som-mx8/config.conf b/conf/projects/var-som-mx8/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-som-mx8/config.conf rename to conf/projects/var-som-mx8/config.conf diff --git a/sources/meta-yoe/conf/projects/var-som-mx8/layers.conf b/conf/projects/var-som-mx8/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-som-mx8/layers.conf rename to conf/projects/var-som-mx8/layers.conf diff --git a/sources/meta-yoe/conf/projects/var-som-mx8m-nano/config.conf b/conf/projects/var-som-mx8m-nano/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-som-mx8m-nano/config.conf rename to conf/projects/var-som-mx8m-nano/config.conf diff --git a/sources/meta-yoe/conf/projects/var-som-mx8m-nano/layers.conf b/conf/projects/var-som-mx8m-nano/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-som-mx8m-nano/layers.conf rename to conf/projects/var-som-mx8m-nano/layers.conf diff --git a/sources/meta-yoe/conf/projects/var-som-mx8x/config.conf b/conf/projects/var-som-mx8x/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-som-mx8x/config.conf rename to conf/projects/var-som-mx8x/config.conf diff --git a/sources/meta-yoe/conf/projects/var-som-mx8x/layers.conf b/conf/projects/var-som-mx8x/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/var-som-mx8x/layers.conf rename to conf/projects/var-som-mx8x/layers.conf diff --git a/sources/meta-yoe/conf/projects/visionfive/config.conf b/conf/projects/visionfive/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/visionfive/config.conf rename to conf/projects/visionfive/config.conf diff --git a/sources/meta-yoe/conf/projects/visionfive/layers.conf b/conf/projects/visionfive/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/visionfive/layers.conf rename to conf/projects/visionfive/layers.conf diff --git a/sources/meta-yoe/conf/projects/visionfive2/config.conf b/conf/projects/visionfive2/config.conf similarity index 100% rename from sources/meta-yoe/conf/projects/visionfive2/config.conf rename to conf/projects/visionfive2/config.conf diff --git a/sources/meta-yoe/conf/projects/visionfive2/layers.conf b/conf/projects/visionfive2/layers.conf similarity index 100% rename from sources/meta-yoe/conf/projects/visionfive2/layers.conf rename to conf/projects/visionfive2/layers.conf diff --git a/conf/site.conf b/conf/site.conf index 28103a386..a1e5b2c71 100644 --- a/conf/site.conf +++ b/conf/site.conf @@ -5,7 +5,7 @@ # SCONF_VERSION is increased each time build/conf/ changes incompatibly SCONF_VERSION = "1" -require ${TOPDIR}/sources/meta-yoe/conf/projects/${PROJECT}/config.conf +require ${TOPDIR}/conf/projects/${PROJECT}/config.conf # Override default distro profile if needed #YOE_PROFILE = "yoe-musl-systemd-wayland" diff --git a/envsetup.sh b/envsetup.sh index 2d41d33b0..76bbce115 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -9,7 +9,7 @@ echoerr() { # List supported projects yoe_get_projects() { ( - cd $OE_BASE/sources/meta-yoe/conf/projects + cd $OE_BASE/conf/projects for f in *; do if [ -e $f/config.conf ]; then echo $f @@ -481,7 +481,7 @@ yoe_add_layer() { fi git submodule add -b $br -f $1 sources/$n git submodule init sources/$n - echo "Add it from project layers.conf files in sources/meta-yoe/conf/projects" + echo "Add it from project layers.conf files in conf/projects" echo "please commit with - git commit -s -m'Add module $n'" } @@ -495,7 +495,7 @@ yoe_remove_layer() { bitbake-layers remove-layer $1 git submodule deinit -f $m git rm -r -f $m - echo "Remove it from project layers.conf files in sources/meta-yoe/conf/projects" + echo "Remove it from project layers.conf files in conf/projects" echo "please commit with - git commit -s -m'Remove module $n'" rm -rf .git/modules/$m #rm -rf $m From 90639d7a06d506f72b0b7f84453c7cc6f3054e9b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 20:43:10 -0700 Subject: [PATCH 2/9] envsetup: Deduce machine from project/config.conf file This makes envsetup.sh get rid of static case statement which needs to be touched everytime a project is added. Signed-off-by: Khem Raj --- envsetup.sh | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 76bbce115..572b043dd 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -119,37 +119,19 @@ fi export PROJECT echo "Setting PROJECT=$PROJECT" -case "$PROJECT" in - "rpi4-64") - MACHINE=raspberrypi4-64 - ;; - "odroid-c4") - MACHINE=odroid-c4-hardkernel - ;; - "rockpi-4b") - MACHINE=rockpi-4-b - ;; - "var-som-mx8") - MACHINE=imx8qm-var-som - ;; - "var-som-mx8x") - MACHINE=imx8qxp-var-som - ;; - "var-som-mx8m-nano") - MACHINE=imx8mn-var-som - ;; - "nezha-d1") - MACHINE=nezha-allwinner-d1 - ;; - "unleashed") - MACHINE=freedom-u540 - ;; - "var-dart-imx6ul") - MACHINE=imx6ul-var-dart - ;; - *) - MACHINE=$PROJECT -esac +MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d '"' -f 2` + +if [ -z "$MACHINE" ]; then + MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d "'" -f 2` +fi + +if [ -z "$MACHINE" ]; then + echo "Please define MACHINE = \"\" in conf/projects/$PROJECT/config.conf" + unset PROJECT + unset MACHINE + return 1 +fi + export MACHINE echo "Setting MACHINE=$MACHINE" From 41a0803485a3d16c4e06daa445e3b48ead181b76 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 21:27:24 -0700 Subject: [PATCH 3/9] projects: Add missing MACHINE variable and redefine qemu machines Signed-off-by: Khem Raj --- conf/projects/qemuarm | 1 - conf/projects/qemuarm/config.conf | 2 + conf/projects/qemuarm/layers.conf | 1 + conf/projects/qemuarm64 | 1 - conf/projects/qemuarm64/config.conf | 2 + conf/projects/qemuarm64/layers.conf | 1 + conf/projects/qemumips | 1 - conf/projects/qemumips/config.conf | 2 + conf/projects/qemumips/layers.conf | 1 + conf/projects/qemumips64 | 1 - conf/projects/qemuppc | 1 - conf/projects/qemuppc/config.conf | 2 + conf/projects/qemuppc/layers.conf | 1 + conf/projects/qemuppc64 | 1 - conf/projects/qemuppc64/config.conf | 2 + conf/projects/qemuppc64/layers.conf | 1 + conf/projects/qemuriscv32 | 1 - conf/projects/qemuriscv32/config.conf | 2 + conf/projects/qemuriscv32/layers.conf | 25 +++++++++ conf/projects/qemuriscv64/config.conf | 56 +-------------------- conf/projects/qemux86 | 1 - conf/projects/qemux86-64 | 1 - conf/projects/qemux86-64/config.conf | 2 + conf/projects/qemux86-64/layers.conf | 1 + conf/projects/qemux86/config.conf | 2 + conf/projects/qemux86/layers.conf | 1 + conf/projects/var-som-mx8m-nano/config.conf | 1 + conf/projects/var-som-mx8x/config.conf | 1 + 28 files changed, 52 insertions(+), 63 deletions(-) delete mode 120000 conf/projects/qemuarm create mode 100644 conf/projects/qemuarm/config.conf create mode 120000 conf/projects/qemuarm/layers.conf delete mode 120000 conf/projects/qemuarm64 create mode 100644 conf/projects/qemuarm64/config.conf create mode 120000 conf/projects/qemuarm64/layers.conf delete mode 120000 conf/projects/qemumips create mode 100644 conf/projects/qemumips/config.conf create mode 120000 conf/projects/qemumips/layers.conf delete mode 120000 conf/projects/qemumips64 delete mode 120000 conf/projects/qemuppc create mode 100644 conf/projects/qemuppc/config.conf create mode 120000 conf/projects/qemuppc/layers.conf delete mode 120000 conf/projects/qemuppc64 create mode 100644 conf/projects/qemuppc64/config.conf create mode 120000 conf/projects/qemuppc64/layers.conf delete mode 120000 conf/projects/qemuriscv32 create mode 100644 conf/projects/qemuriscv32/config.conf create mode 100644 conf/projects/qemuriscv32/layers.conf delete mode 120000 conf/projects/qemux86 delete mode 120000 conf/projects/qemux86-64 create mode 100644 conf/projects/qemux86-64/config.conf create mode 120000 conf/projects/qemux86-64/layers.conf create mode 100644 conf/projects/qemux86/config.conf create mode 120000 conf/projects/qemux86/layers.conf diff --git a/conf/projects/qemuarm b/conf/projects/qemuarm deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemuarm +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemuarm/config.conf b/conf/projects/qemuarm/config.conf new file mode 100644 index 000000000..6ead55bef --- /dev/null +++ b/conf/projects/qemuarm/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemuarm" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemuarm/layers.conf b/conf/projects/qemuarm/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemuarm/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/qemuarm64 b/conf/projects/qemuarm64 deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemuarm64 +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemuarm64/config.conf b/conf/projects/qemuarm64/config.conf new file mode 100644 index 000000000..bb12cc721 --- /dev/null +++ b/conf/projects/qemuarm64/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemuarm64" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemuarm64/layers.conf b/conf/projects/qemuarm64/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemuarm64/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/qemumips b/conf/projects/qemumips deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemumips +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemumips/config.conf b/conf/projects/qemumips/config.conf new file mode 100644 index 000000000..6e3562f37 --- /dev/null +++ b/conf/projects/qemumips/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemumips" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemumips/layers.conf b/conf/projects/qemumips/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemumips/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/qemumips64 b/conf/projects/qemumips64 deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemumips64 +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemuppc b/conf/projects/qemuppc deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemuppc +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemuppc/config.conf b/conf/projects/qemuppc/config.conf new file mode 100644 index 000000000..883dcd130 --- /dev/null +++ b/conf/projects/qemuppc/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemuppc" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemuppc/layers.conf b/conf/projects/qemuppc/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemuppc/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/qemuppc64 b/conf/projects/qemuppc64 deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemuppc64 +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemuppc64/config.conf b/conf/projects/qemuppc64/config.conf new file mode 100644 index 000000000..4934de647 --- /dev/null +++ b/conf/projects/qemuppc64/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemuppc64" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemuppc64/layers.conf b/conf/projects/qemuppc64/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemuppc64/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/qemuriscv32 b/conf/projects/qemuriscv32 deleted file mode 120000 index 14d63fd96..000000000 --- a/conf/projects/qemuriscv32 +++ /dev/null @@ -1 +0,0 @@ -qemuriscv64 \ No newline at end of file diff --git a/conf/projects/qemuriscv32/config.conf b/conf/projects/qemuriscv32/config.conf new file mode 100644 index 000000000..37cc5c969 --- /dev/null +++ b/conf/projects/qemuriscv32/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemuriscv32" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemuriscv32/layers.conf b/conf/projects/qemuriscv32/layers.conf new file mode 100644 index 000000000..7caf048f9 --- /dev/null +++ b/conf/projects/qemuriscv32/layers.conf @@ -0,0 +1,25 @@ +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS = "\ + ${TOPDIR}/sources/meta-yoe \ + \ + ${TOPDIR}/sources/meta-riscv \ + \ + ${TOPDIR}/sources/meta-clang \ + ${TOPDIR}/sources/meta-elm-binary \ + ${TOPDIR}/sources/meta-qt5 \ + \ + ${TOPDIR}/sources/meta-openembedded/meta-filesystems \ + ${TOPDIR}/sources/meta-openembedded/meta-gnome \ + ${TOPDIR}/sources/meta-openembedded/meta-initramfs \ + ${TOPDIR}/sources/meta-openembedded/meta-multimedia \ + ${TOPDIR}/sources/meta-openembedded/meta-networking \ + ${TOPDIR}/sources/meta-openembedded/meta-oe \ + ${TOPDIR}/sources/meta-openembedded/meta-perl \ + ${TOPDIR}/sources/meta-openembedded/meta-python \ + ${TOPDIR}/sources/meta-openembedded/meta-webserver \ + ${TOPDIR}/sources/meta-openembedded/meta-xfce \ + \ + ${TOPDIR}/sources/poky/meta \ +" diff --git a/conf/projects/qemuriscv64/config.conf b/conf/projects/qemuriscv64/config.conf index 2097b4c58..f1138cd33 100644 --- a/conf/projects/qemuriscv64/config.conf +++ b/conf/projects/qemuriscv64/config.conf @@ -1,54 +1,2 @@ -DISTRO = "yoe" -# "yoe---" -YOE_PROFILE = "yoe-glibc-systemd-wayland" -# usually not changed often -# Add 4G space to QEMU image -#IMAGE_ROOTFS_EXTRA_SPACE:append = " + 4000000" -# common -#TEST_SERVER_IP = "10.0.0.13" -# QEMU -#TEST_TARGET_IP = "192.168.7.2" -#TEST_QEMUBOOT_TIMEOUT = "100" -#TEST_TARGET = "qemu" -#TEST_TARGET = "simpleremote" -#TFTP_SERVER_IP = "10.0.0.13" - -#INHERIT += "scan-build" -SCAN_BUILD ?= "" -SCAN_BUILD:pn-openssl = "1" - -IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz" -IMAGE_FSTYPES:remove = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap" -# use kvm with x86/x86_64 qemu -QEMU_USE_KVM = "1" -# Launch vnc backend during testing -# TEST_RUNQEMUPARAMS = "publicvnc" -# needed for running ptests automatically -PACKAGE_FEED_URIS ?= "" - -IMG_VERSION = "0.0.1" -##################################################################### -# add project specific configuration below this line -##################################################################### -#require conf/distro/include/lto.inc -#DISTRO_FEATURES:append = " lto" -# set max loadavg equal to nr of cpus, same at 1.0 on 1 cpu machine -#PARALLEL_MAKE:append = " \ -#-l ${@int(os.sysconf(os.sysconf_names['SC_NPROCESSORS_ONLN'])) * 150/100} \ -#" - -# Setting a user/password in system -#INHERIT += "extrausers" -#EXTRA_USERS_PARAMS += "\ -# useradd admin; \ -# usermod -p '$(openssl passwd -6 myrootpassword)' admin; \ -# usermod -a -G adm admin; \ -# usermod -a -G video admin; \ -# usermod -a -G audio admin; \ -# usermod -a -G systemd-journal admin; \ -#" -#EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" - -# For running oe-selftest uncomment below lines -#USER_CLASSES:remove = "buildhistory" -#PRSERV_HOST = "" +MACHINE = "qemuriscv64" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemux86 b/conf/projects/qemux86 deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemux86 +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemux86-64 b/conf/projects/qemux86-64 deleted file mode 120000 index 7e3009df6..000000000 --- a/conf/projects/qemux86-64 +++ /dev/null @@ -1 +0,0 @@ -qemucommon \ No newline at end of file diff --git a/conf/projects/qemux86-64/config.conf b/conf/projects/qemux86-64/config.conf new file mode 100644 index 000000000..cf67ed5d4 --- /dev/null +++ b/conf/projects/qemux86-64/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemux86-64" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemux86-64/layers.conf b/conf/projects/qemux86-64/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemux86-64/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/qemux86/config.conf b/conf/projects/qemux86/config.conf new file mode 100644 index 000000000..fb074a3a3 --- /dev/null +++ b/conf/projects/qemux86/config.conf @@ -0,0 +1,2 @@ +MACHINE = "qemux86" +require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemux86/layers.conf b/conf/projects/qemux86/layers.conf new file mode 120000 index 000000000..489683f8c --- /dev/null +++ b/conf/projects/qemux86/layers.conf @@ -0,0 +1 @@ +../qemucommon/layers.conf \ No newline at end of file diff --git a/conf/projects/var-som-mx8m-nano/config.conf b/conf/projects/var-som-mx8m-nano/config.conf index 32b239481..2bafb0572 100644 --- a/conf/projects/var-som-mx8m-nano/config.conf +++ b/conf/projects/var-som-mx8m-nano/config.conf @@ -1,3 +1,4 @@ +MACHINE = "imx8mn-var-som" DISTRO = "yoe" # "yoe---" YOE_PROFILE = "yoe-glibc-systemd-wayland" diff --git a/conf/projects/var-som-mx8x/config.conf b/conf/projects/var-som-mx8x/config.conf index f03a35437..1030cc503 100644 --- a/conf/projects/var-som-mx8x/config.conf +++ b/conf/projects/var-som-mx8x/config.conf @@ -1,3 +1,4 @@ +MACHINE = "imx8qxp-var-som" DISTRO = "yoe" # "yoe---" YOE_PROFILE = "yoe-glibc-systemd-wayland" From 7069a5ecb5b07587a733fa3450a89ca1d74ff19a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 21:30:32 -0700 Subject: [PATCH 4/9] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2463f993f..ec1bd8029 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2023.08] - 2023-XX-XX + +### Changed + +- Move projects to toplevel conf directory +- Implement new project detection logic in envsetup + +### Added + ## [2023.07] - 2023-07-31 ### Changed From 0b0dac73b15555fac3435eb512816855fe0bb8d3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 21:40:53 -0700 Subject: [PATCH 5/9] qemux86-64,qemux86: Enable auto testing images These are kvm enabled therefore running images automatically is fast, therefore enable it Signed-off-by: Khem Raj --- conf/projects/qemux86-64/config.conf | 1 + conf/projects/qemux86/config.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/projects/qemux86-64/config.conf b/conf/projects/qemux86-64/config.conf index cf67ed5d4..b755867d9 100644 --- a/conf/projects/qemux86-64/config.conf +++ b/conf/projects/qemux86-64/config.conf @@ -1,2 +1,3 @@ MACHINE = "qemux86-64" +TESTIMAGE_AUTO = "1" require ${TOPDIR}/conf/projects/qemucommon/config.conf diff --git a/conf/projects/qemux86/config.conf b/conf/projects/qemux86/config.conf index fb074a3a3..745ef161e 100644 --- a/conf/projects/qemux86/config.conf +++ b/conf/projects/qemux86/config.conf @@ -1,2 +1,3 @@ MACHINE = "qemux86" +TESTIMAGE_AUTO = "1" require ${TOPDIR}/conf/projects/qemucommon/config.conf From b5b73bfd49c124516836822183da3f190a4399e3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 23:06:52 -0700 Subject: [PATCH 6/9] rpi: Disable rpi rainbow at boot Move this from generic distro config to project config Signed-off-by: Khem Raj --- conf/projects/rpi4-64/config.conf | 4 ++++ sources/meta-yoe/conf/distro/yoe.inc | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conf/projects/rpi4-64/config.conf b/conf/projects/rpi4-64/config.conf index 0001171c6..a5f4ca38b 100644 --- a/conf/projects/rpi4-64/config.conf +++ b/conf/projects/rpi4-64/config.conf @@ -12,6 +12,10 @@ LICENSE_FLAGS_ACCEPTED += "\ " # Enable serial console on Raspberry PI systems ENABLE_UART = "1" + +# Disable rpi raimbow screen +DISABLE_SPLASH = "1" + IMAGE_FSTYPES:append = " wic.xz wic.bmap ext4.xz" # Yoe Updater Supported Machines ( RPI, beaglebone, C4, SAMA5D27 for now ) INITRAMFS_IMAGE_BUNDLE = "1" diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc index 567c6c826..14bbae15c 100644 --- a/sources/meta-yoe/conf/distro/yoe.inc +++ b/sources/meta-yoe/conf/distro/yoe.inc @@ -166,12 +166,6 @@ PREFERRED_VERSION_nativesdk-swig = "4%" # other BSP layers fail bitbake parsing (ti). MACHINE_KERNEL_PR = "0" -# Enable u-boot for RPI -#RPI_USE_U_BOOT = "1" - -# Disable rpi raimbow screen -DISABLE_SPLASH = "1" - # swupdate initramfs init system SWUPDATE_INIT = "tiny" From 164206d1f6823b046ddf9570ccbd9bb2379a9836 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 23:08:43 -0700 Subject: [PATCH 7/9] yoe: move rpi and bbb specific options to project config Signed-off-by: Khem Raj --- conf/projects/beaglebone/config.conf | 3 +++ conf/projects/rpi4-64/config.conf | 3 +++ sources/meta-yoe/conf/distro/yoe.inc | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/projects/beaglebone/config.conf b/conf/projects/beaglebone/config.conf index ef8b92b13..9c1fa6e8e 100644 --- a/conf/projects/beaglebone/config.conf +++ b/conf/projects/beaglebone/config.conf @@ -29,6 +29,9 @@ SIMPLECLIENTS:ti-soc = "damage,im,egl,shm,touch,dmabuf-v4l,dmabuf-egl" # Do not need it if PREFERRED_PROVIDER_virtual/kernel is not "linux-bb.org" OLDEST_KERNEL = "5.10" +# Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table +OBJCOPY:pn-linux-ti-staging:toolchain-clang = "${HOST_PREFIX}objcopy" + # Needed for Running bitbake -ctestimage #TEST_TARGET_IP = "10.0.0.34" #TEST_SERVER_IP = "10.0.0.13" diff --git a/conf/projects/rpi4-64/config.conf b/conf/projects/rpi4-64/config.conf index a5f4ca38b..d3092c148 100644 --- a/conf/projects/rpi4-64/config.conf +++ b/conf/projects/rpi4-64/config.conf @@ -31,6 +31,9 @@ IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}" IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}" IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${SDIMG_KERNELIMAGE}" +# Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table +OBJCOPY:pn-linux-raspberrypi:toolchain-clang = "${HOST_PREFIX}objcopy" + # Needed for Running bitbake -ctestimage TEST_TARGET_IP = "10.0.0.47" TEST_SERVER_IP = "10.0.0.13" diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc index 14bbae15c..2ae9c5f44 100644 --- a/sources/meta-yoe/conf/distro/yoe.inc +++ b/sources/meta-yoe/conf/distro/yoe.inc @@ -190,10 +190,6 @@ VOLATILE_LOG_DIR = "no" # Use gcc for perf temporarily, until oe-core gets it TOOLCHAIN:pn-perf = "gcc" -# Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table -OBJCOPY:pn-linux-raspberrypi:toolchain-clang = "${HOST_PREFIX}objcopy" -OBJCOPY:pn-linux-ti-staging:toolchain-clang = "${HOST_PREFIX}objcopy" - SKIP_RECIPE[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/" SKIP_RECIPE[smartrefrigerator] = "Needs porting to QT > 5.6" SKIP_RECIPE[qmlbrowser] = "Needs porting to QT > 5.6" From 24e59255c16b8c905898c3b0d2fb9760f5081fb4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 23:12:04 -0700 Subject: [PATCH 8/9] Revert "perf: Use gcc instead of clang" This reverts commit 7976dbfdda50c86aa7b5f3b89aa1cb1c9d2339a6. --- sources/meta-yoe/conf/distro/yoe.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc index 2ae9c5f44..4219a4cef 100644 --- a/sources/meta-yoe/conf/distro/yoe.inc +++ b/sources/meta-yoe/conf/distro/yoe.inc @@ -187,9 +187,6 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" # Enable persistent logs across reboots VOLATILE_LOG_DIR = "no" -# Use gcc for perf temporarily, until oe-core gets it -TOOLCHAIN:pn-perf = "gcc" - SKIP_RECIPE[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/" SKIP_RECIPE[smartrefrigerator] = "Needs porting to QT > 5.6" SKIP_RECIPE[qmlbrowser] = "Needs porting to QT > 5.6" From 3694b984402a0a4f8943d988015f2b38dc60153a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 23:15:24 -0700 Subject: [PATCH 9/9] yoe: Remove duplicate definition of MACHINE_KERNEL_PR Signed-off-by: Khem Raj --- sources/meta-yoe/conf/distro/yoe.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc index 4219a4cef..8166cebd8 100644 --- a/sources/meta-yoe/conf/distro/yoe.inc +++ b/sources/meta-yoe/conf/distro/yoe.inc @@ -64,10 +64,6 @@ BUILDHISTORY_COMMIT ?= "1" # e.g. qtwebkit from 163M down to < 1M CMAKE_VERBOSE ?= "" -# the following is required because some BSP layers (fsl) don't set this, and then -# other BSP layers fail bitbake parsing (ti). -MACHINE_KERNEL_PR ??= "0" - # account for some layers which have bbappends for layers we dont include BB_DANGLINGAPPENDS_WARNONLY = "1"