Replace TEMPLATECONF with agl-like config snippets

10 files changed, 62 insertions, 1 deletions

diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index c8b4388..55e9cac 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -1,7 +1,7 @@
 DISTRO_FEATURES_append = " sota"
 OVERRIDES .= ":sota"
 
-IMAGE_INSTALL_append = " ostree"
+IMAGE_INSTALL_append = " ostree os-release"
 
 # live image for OSTree-enabled systems
 IMAGE_CLASSES += "image_types_ostree image_types_ota"
@@ -13,6 +13,9 @@ do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
 IMAGE_FSTYPES_remove_raspberrypi3 = "wic"
 IMAGE_FSTYPES_remove_raspberrypi2 = "wic"
 
+# QEMU emulation uses plain otaimg, no wic needed
+IMAGE_FSTYPES_remove_qemux86-64 = "wic"
+
 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo
 OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
 OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
diff --git a/conf/include/bblayers/sota.inc b/conf/include/bblayers/sota.inc
new file mode 100644
index 0000000..97edecb
--- /dev/null
+++ b/conf/include/bblayers/sota.inc
@@ -0,0 +1,5 @@
+
+BBLAYERS += "${METADIR}/meta-updater"
+BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems"
+BBLAYERS += "${METADIR}/meta-openembedded/meta-oe"
+BBLAYERS += "${METADIR}/meta-rust"
diff --git a/conf/include/bblayers/sota_minnowboard.inc b/conf/include/bblayers/sota_minnowboard.inc
new file mode 100644
index 0000000..1771e6c
--- /dev/null
+++ b/conf/include/bblayers/sota_minnowboard.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-updater-minnowboard ${METADIR}/meta-intel "
diff --git a/conf/include/bblayers/sota_porter.inc b/conf/include/bblayers/sota_porter.inc
new file mode 100644
index 0000000..a0888d5
--- /dev/null
+++ b/conf/include/bblayers/sota_porter.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-updater-porter ${METADIR}/meta-renesas "
diff --git a/conf/include/bblayers/sota_qemux86-64.inc b/conf/include/bblayers/sota_qemux86-64.inc
new file mode 100644
index 0000000..22ace81
--- /dev/null
+++ b/conf/include/bblayers/sota_qemux86-64.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-updater-qemux86-64 " 
diff --git a/conf/include/bblayers/sota_raspberrypi.inc b/conf/include/bblayers/sota_raspberrypi.inc
new file mode 100644
index 0000000..11ede20
--- /dev/null
+++ b/conf/include/bblayers/sota_raspberrypi.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
diff --git a/conf/include/local/sota_minnowboard.inc b/conf/include/local/sota_minnowboard.inc
new file mode 100644
index 0000000..b3702a2
--- /dev/null
+++ b/conf/include/local/sota_minnowboard.inc
@@ -0,0 +1,6 @@
+MACHINE = "intel-corei7-64"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota"
+UBOOT_MACHINE = "minnowmax_defconfig"
+IMAGE_CLASSES_append = " sdcard_image-minnowboard-ota"
+IMAGE_FSTYPES += "minnowboard-sdimg-ota"
diff --git a/conf/include/local/sota_porter.inc b/conf/include/local/sota_porter.inc
new file mode 100644
index 0000000..e079e4d
--- /dev/null
+++ b/conf/include/local/sota_porter.inc
@@ -0,0 +1,11 @@
+MACHINE = "porter"
+
+# Commit united image to OSTree, not just uImage
+OSTREE_KERNEL = "uImage+dtb"
+
+IMAGE_CLASSES_append = " image_types_uboot "
+IMAGE_BOOT_FILES = "porter-bootfiles/*"
+
+OSTREE_BOOTLOADER ?= "u-boot"
+UBOOT_MACHINE = "porter_vin_config"
+
diff --git a/conf/include/local/sota_qemux86-64.inc b/conf/include/local/sota_qemux86-64.inc
new file mode 100644
index 0000000..b72c29d
--- /dev/null
+++ b/conf/include/local/sota_qemux86-64.inc
@@ -0,0 +1,12 @@
+MACHINE = "qemux86-64"
+
+PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "5.4%"
+PREFERRED_VERSION_libgcc ?= "5.4%"
+PREFERRED_VERSION_gcc-runtime ?= "5.4%"
+
+# U-Boot support for SOTA
+PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
+UBOOT_MACHINE = "qemu-x86_defconfig"
+OSTREE_BOOTLOADER ?= "u-boot"
+
+OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda"
diff --git a/conf/include/local/sota_raspberrypi.inc b/conf/include/local/sota_raspberrypi.inc
new file mode 100644
index 0000000..51919f0
--- /dev/null
+++ b/conf/include/local/sota_raspberrypi.inc
@@ -0,0 +1,16 @@
+MACHINE ?= "raspberrypi3"
+
+# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
+IMAGE_CLASSES += "image_types_uboot sdcard_image-rpi-ota"
+
+# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
+IMAGE_FSTYPES += "rpi-sdimg-ota"
+### both rpi-sdimg and rpi-sdimg-ota broken
+IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
+
+KERNEL_IMAGETYPE_sota = "uImage"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig"
+UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig"
+
+OSTREE_BOOTLOADER ?= "u-boot"