summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-04-03 12:08:39 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2017-04-04 12:01:58 +0200
commit82a3c13a0b0c9979fa0812143d619748aa89c85d (patch)
treebd18751638ce99904dcd68ad2eba6e6db7851f41
parentb49c2631b6bc48ead4d352e2bd00cdfbca7af5e8 (diff)
downloadmeta-updater-82a3c13a0b0c9979fa0812143d619748aa89c85d.tar.gz
Replace TEMPLATECONF with agl-like config snippets
-rw-r--r--conf/distro/sota.conf.inc5
-rw-r--r--conf/include/bblayers/sota.inc5
-rw-r--r--conf/include/bblayers/sota_minnowboard.inc2
-rw-r--r--conf/include/bblayers/sota_porter.inc2
-rw-r--r--conf/include/bblayers/sota_qemux86-64.inc2
-rw-r--r--conf/include/bblayers/sota_raspberrypi.inc2
-rw-r--r--conf/include/local/sota_minnowboard.inc6
-rw-r--r--conf/include/local/sota_porter.inc11
-rw-r--r--conf/include/local/sota_qemux86-64.inc12
-rw-r--r--conf/include/local/sota_raspberrypi.inc16
-rwxr-xr-xscripts/envsetup.sh53
11 files changed, 115 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 @@
1DISTRO_FEATURES_append = " sota" 1DISTRO_FEATURES_append = " sota"
2OVERRIDES .= ":sota" 2OVERRIDES .= ":sota"
3 3
4IMAGE_INSTALL_append = " ostree" 4IMAGE_INSTALL_append = " ostree os-release"
5 5
6# live image for OSTree-enabled systems 6# live image for OSTree-enabled systems
7IMAGE_CLASSES += "image_types_ostree image_types_ota" 7IMAGE_CLASSES += "image_types_ostree image_types_ota"
@@ -13,6 +13,9 @@ do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
13IMAGE_FSTYPES_remove_raspberrypi3 = "wic" 13IMAGE_FSTYPES_remove_raspberrypi3 = "wic"
14IMAGE_FSTYPES_remove_raspberrypi2 = "wic" 14IMAGE_FSTYPES_remove_raspberrypi2 = "wic"
15 15
16# QEMU emulation uses plain otaimg, no wic needed
17IMAGE_FSTYPES_remove_qemux86-64 = "wic"
18
16# Please redefine OSTREE_REPO in order to have a persistent OSTree repo 19# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
17OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" 20OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
18OSTREE_BRANCHNAME ?= "ota-${MACHINE}" 21OSTREE_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 @@
1
2BBLAYERS += "${METADIR}/meta-updater"
3BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems"
4BBLAYERS += "${METADIR}/meta-openembedded/meta-oe"
5BBLAYERS += "${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 @@
1
2BBLAYERS += " ${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 @@
1
2BBLAYERS += " ${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 @@
1
2BBLAYERS += " ${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 @@
1
2BBLAYERS += " ${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 @@
1MACHINE = "intel-corei7-64"
2
3PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota"
4UBOOT_MACHINE = "minnowmax_defconfig"
5IMAGE_CLASSES_append = " sdcard_image-minnowboard-ota"
6IMAGE_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 @@
1MACHINE = "porter"
2
3# Commit united image to OSTree, not just uImage
4OSTREE_KERNEL = "uImage+dtb"
5
6IMAGE_CLASSES_append = " image_types_uboot "
7IMAGE_BOOT_FILES = "porter-bootfiles/*"
8
9OSTREE_BOOTLOADER ?= "u-boot"
10UBOOT_MACHINE = "porter_vin_config"
11
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 @@
1MACHINE = "qemux86-64"
2
3PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "5.4%"
4PREFERRED_VERSION_libgcc ?= "5.4%"
5PREFERRED_VERSION_gcc-runtime ?= "5.4%"
6
7# U-Boot support for SOTA
8PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
9UBOOT_MACHINE = "qemu-x86_defconfig"
10OSTREE_BOOTLOADER ?= "u-boot"
11
12OSTREE_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 @@
1MACHINE ?= "raspberrypi3"
2
3# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
4IMAGE_CLASSES += "image_types_uboot sdcard_image-rpi-ota"
5
6# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
7IMAGE_FSTYPES += "rpi-sdimg-ota"
8### both rpi-sdimg and rpi-sdimg-ota broken
9IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
10
11KERNEL_IMAGETYPE_sota = "uImage"
12PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
13UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig"
14UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig"
15
16OSTREE_BOOTLOADER ?= "u-boot"
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
new file mode 100755
index 0000000..316a782
--- /dev/null
+++ b/scripts/envsetup.sh
@@ -0,0 +1,53 @@
1#!/bin/sh
2
3SCRIPT="envsetup.sh"
4
5MACHINE=$1
6
7if [ "$#" -lt 1 ]; then
8 echo "Usage: ${SCRIPT} <machine> [builddir]"
9 return -1
10elif [ "$#" -eq 2 ]; then
11 BUILDDIR=$2
12else
13 BUILDDIR=build
14fi
15BULDDIR=$2
16
17# detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594
18SOURCED=0
19if [ -n "$ZSH_EVAL_CONTEXT" ]; then
20 [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); }
21elif [ -n "$KSH_VERSION" ]; then
22 [[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); }
23elif [ -n "$BASH_VERSION" ]; then
24 [[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); }
25fi
26
27if [ $SOURCED -ne 1 ]; then
28 unset SOURCED
29 unset SOURCEDIR
30 echo "Error: this script needs to be sourced in a supported shell" >&2
31 echo "Please check that the current shell is bash, zsh or ksh and run this script as '. $0 <args>'" >&2
32 exit -1
33fi
34
35SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P)
36METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)
37
38if ! [[ -e ${SCRIPTDIR}/../conf/include/local/sota_${MACHINE}.inc && -e ${SCRIPTDIR}/../conf/include/bblayers/sota_${MACHINE}.inc ]]; then
39 echo "Error: invalid machine: ${MACHINE}" >&2
40 return -1
41fi
42
43if [ -e ${BUILDDIR}/conf/local.conf ]; then
44 source $METADIR/poky/oe-init-build-env ${BUILDDIR}
45else
46 source $METADIR/poky/oe-init-build-env ${BUILDDIR}
47 echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
48 cat ${METADIR}/meta-updater/conf/include/bblayers/sota.inc >> conf/bblayers.conf
49 cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf
50 echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf
51 echo "include conf/distro/sota.conf.inc" >> conf/local.conf
52fi
53