summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/poky-sota-systemd.conf2
-rw-r--r--conf/distro/poky-sota.conf2
-rw-r--r--conf/distro/sota.conf.inc25
-rw-r--r--conf/include/bblayers/sota_intel-corei7-64.inc (renamed from conf/include/bblayers/sota_minnowboard.inc)0
-rw-r--r--conf/include/bblayers/sota_raspberrypi2.inc (renamed from conf/include/bblayers/sota_raspberrypi.inc)0
-rw-r--r--conf/include/bblayers/sota_raspberrypi3.inc2
-rw-r--r--conf/include/local/sota_bleeding.inc1
-rw-r--r--conf/include/local/sota_minnowboard.inc9
-rw-r--r--conf/include/local/sota_minnowboard_uboot.inc10
-rw-r--r--conf/include/local/sota_porter.inc12
-rw-r--r--conf/include/local/sota_qemux86-64.inc11
-rw-r--r--conf/include/local/sota_raspberrypi.inc14
12 files changed, 4 insertions, 84 deletions
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 85744ea..e6f43f7 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -1,5 +1,4 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2require conf/distro/sota.conf.inc
3 2
4DISTRO = "poky-sota" 3DISTRO = "poky-sota"
5DISTRO_NAME = "OTA-enabled Linux" 4DISTRO_NAME = "OTA-enabled Linux"
@@ -9,4 +8,5 @@ DISTRO_CODENAME = "sota"
9DISTRO_FEATURES_append = " systemd" 8DISTRO_FEATURES_append = " systemd"
10VIRTUAL-RUNTIME_init_manager = "systemd" 9VIRTUAL-RUNTIME_init_manager = "systemd"
11 10
11INHERIT += " sota"
12IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" 12IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index 2bbc62b..6972a94 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -1,9 +1,9 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2require conf/distro/sota.conf.inc
3 2
4DISTRO = "poky-sota" 3DISTRO = "poky-sota"
5DISTRO_NAME = "OTA-enabled Linux" 4DISTRO_NAME = "OTA-enabled Linux"
6DISTRO_VERSION = "1.0" 5DISTRO_VERSION = "1.0"
7DISTRO_CODENAME = "sota" 6DISTRO_CODENAME = "sota"
8 7
8INHERIT += " sota"
9IMAGE_INSTALL_append = " connman connman-client" 9IMAGE_INSTALL_append = " connman connman-client"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
deleted file mode 100644
index 20946a6..0000000
--- a/conf/distro/sota.conf.inc
+++ /dev/null
@@ -1,25 +0,0 @@
1DISTRO_FEATURES_append = " sota"
2OVERRIDES .= ":sota"
3
4IMAGE_INSTALL_append = " ostree os-release"
5
6# live image for OSTree-enabled systems
7IMAGE_CLASSES += "image_types_ostree image_types_ota"
8IMAGE_FSTYPES += "ostreepush otaimg"
9
10# if don't build wic image unless IMAGE_BOOT_FILES is set. Prevents build from failing
11# on machines that don't support updater yet
12IMAGE_FSTYPES += "${@' wic' if (d.getVar("IMAGE_BOOT_FILES", True)) else ''}"
13WKS_FILE ?= "sdimage-sota.wks"
14do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
15
16EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native"
17
18# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
19OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
20OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
21OSTREE_OSNAME ?= "poky"
22OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
23
24# Prelinking increases the size of downloads and causes build errors
25USER_CLASSES_remove = "image-prelink"
diff --git a/conf/include/bblayers/sota_minnowboard.inc b/conf/include/bblayers/sota_intel-corei7-64.inc
index 1771e6c..1771e6c 100644
--- a/conf/include/bblayers/sota_minnowboard.inc
+++ b/conf/include/bblayers/sota_intel-corei7-64.inc
diff --git a/conf/include/bblayers/sota_raspberrypi.inc b/conf/include/bblayers/sota_raspberrypi2.inc
index 11ede20..11ede20 100644
--- a/conf/include/bblayers/sota_raspberrypi.inc
+++ b/conf/include/bblayers/sota_raspberrypi2.inc
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc
new file mode 100644
index 0000000..11ede20
--- /dev/null
+++ b/conf/include/bblayers/sota_raspberrypi3.inc
@@ -0,0 +1,2 @@
1
2BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi "
diff --git a/conf/include/local/sota_bleeding.inc b/conf/include/local/sota_bleeding.inc
deleted file mode 100644
index fc5947d..0000000
--- a/conf/include/local/sota_bleeding.inc
+++ /dev/null
@@ -1 +0,0 @@
1SRCREV_pn-aktualizr ?= "${AUTOREV}"
diff --git a/conf/include/local/sota_minnowboard.inc b/conf/include/local/sota_minnowboard.inc
deleted file mode 100644
index 36d1a17..0000000
--- a/conf/include/local/sota_minnowboard.inc
+++ /dev/null
@@ -1,9 +0,0 @@
1MACHINE = "intel-corei7-64"
2
3OSTREE_BOOTLOADER ?= "grub"
4EFI_PROVIDER = "grub-efi"
5
6WKS_FILE = "efiimage-sota.wks"
7IMAGE_BOOT_FILES = ""
8
9OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0"
diff --git a/conf/include/local/sota_minnowboard_uboot.inc b/conf/include/local/sota_minnowboard_uboot.inc
deleted file mode 100644
index e64f7eb..0000000
--- a/conf/include/local/sota_minnowboard_uboot.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1MACHINE = "intel-corei7-64"
2
3PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota"
4UBOOT_MACHINE = "minnowmax_defconfig"
5
6EXTRA_IMAGEDEPENDS_append = " minnowboard-bootfiles"
7IMAGE_BOOT_FILES = "minnowboard-bootfiles/*"
8
9OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda console=ttyS0,115200 console=tty0"
10
diff --git a/conf/include/local/sota_porter.inc b/conf/include/local/sota_porter.inc
deleted file mode 100644
index 9828248..0000000
--- a/conf/include/local/sota_porter.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1MACHINE = "porter"
2
3# Commit united image to OSTree, not just uImage
4OSTREE_KERNEL = "uImage+dtb"
5
6EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles"
7IMAGE_CLASSES_append_sota = " image_types_uboot "
8IMAGE_BOOT_FILES_sota += "porter-bootfiles/*"
9
10OSTREE_BOOTLOADER ?= "u-boot"
11UBOOT_MACHINE_sota = "porter_config"
12
diff --git a/conf/include/local/sota_qemux86-64.inc b/conf/include/local/sota_qemux86-64.inc
deleted file mode 100644
index b03631b..0000000
--- a/conf/include/local/sota_qemux86-64.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1MACHINE = "qemux86-64"
2
3# See https://advancedtelematic.atlassian.net/browse/PRO-2693
4PREFERRED_VERSION_linux-yocto_qemux86-64_sota = "4.4%"
5
6# U-Boot support for SOTA
7PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
8UBOOT_MACHINE_sota = "qemu-x86_defconfig"
9OSTREE_BOOTLOADER ?= "u-boot"
10
11OSTREE_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
deleted file mode 100644
index ae13b8e..0000000
--- a/conf/include/local/sota_raspberrypi.inc
+++ /dev/null
@@ -1,14 +0,0 @@
1MACHINE ?= "raspberrypi3"
2
3IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
4IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
5
6### both rpi-sdimg and rpi-sdimg-ota broken
7IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
8
9KERNEL_IMAGETYPE_sota = "uImage"
10PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"
11UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig"
12UBOOT_MACHINE_raspberrypi3_sota ?= "rpi_3_32b_defconfig"
13
14OSTREE_BOOTLOADER ?= "u-boot"