Merge pull request #815 from YoeDistro/kraj/master

Move projects to toplevel conf directory

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

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

sources/meta-yoe/conf/projects/beaglebone/config.conf → 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 <image>
 #TEST_TARGET_IP = "10.0.0.34"
 #TEST_SERVER_IP = "10.0.0.13"

conf/projects/qemuarm/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemuarm"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemuarm/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

conf/projects/qemuarm64/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemuarm64"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemuarm64/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

conf/projects/qemumips/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemumips"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemumips/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

conf/projects/qemuppc/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemuppc"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemuppc/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

conf/projects/qemuppc64/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemuppc64"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemuppc64/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

conf/projects/qemuriscv32/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemuriscv32"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemuriscv64/config.conf

@@ -0,0 +1,2 @@
+MACHINE = "qemuriscv64"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemux86-64/config.conf

@@ -0,0 +1,3 @@
+MACHINE = "qemux86-64"
+TESTIMAGE_AUTO = "1"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemux86-64/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

conf/projects/qemux86/config.conf

@@ -0,0 +1,3 @@
+MACHINE = "qemux86"
+TESTIMAGE_AUTO = "1"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf

conf/projects/qemux86/layers.conf

@@ -0,0 +1 @@
+../qemucommon/layers.conf

sources/meta-yoe/conf/projects/rpi4-64/config.conf → 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"
@@ -27,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 <image>
 TEST_TARGET_IP = "10.0.0.47"
 TEST_SERVER_IP = "10.0.0.13"

sources/meta-yoe/conf/projects/var-som-mx8m-nano/config.conf → conf/projects/var-som-mx8m-nano/config.conf

@@ -1,3 +1,4 @@
+MACHINE = "imx8mn-var-som"
 DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
 YOE_PROFILE = "yoe-glibc-systemd-wayland"

sources/meta-yoe/conf/projects/var-som-mx8x/config.conf → conf/projects/var-som-mx8x/config.conf

@@ -1,3 +1,4 @@
+MACHINE = "imx8qxp-var-som"
 DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
 YOE_PROFILE = "yoe-glibc-systemd-wayland"

conf/projects/visionfive/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 \
+"

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"

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
@@ -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 = \"<name>\" in conf/projects/$PROJECT/config.conf"
+  unset PROJECT
+  unset MACHINE
+  return 1
+fi
+
 export MACHINE
 echo "Setting MACHINE=$MACHINE"
 
@@ -481,7 +463,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 +477,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

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"
 
@@ -166,12 +162,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"
 
@@ -193,13 +183,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"
-
-# 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"