summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <p@beta16.co.uk>2017-04-11 14:40:07 +0200
committerGitHub <noreply@github.com>2017-04-11 14:40:07 +0200
commit21927f5acb9a4bce1d210507573949d2df4580ba (patch)
tree350c6128ae4d211102b06b60e8dcb9d32fbcb3ca
parent25199f1b47aeea15e56b17aced5c310bf1dd1208 (diff)
parente36a7821467fe3ae3f22e0ca67b91ebb3e65d2cb (diff)
downloadmeta-updater-21927f5acb9a4bce1d210507573949d2df4580ba.tar.gz
Merge pull request #45 from advancedtelematic/bugfix/aglcompat
Add tweaks for compatibility with AGL
-rw-r--r--conf/include/local/sota_minnowboard.inc9
-rw-r--r--conf/include/local/sota_porter.inc8
-rw-r--r--conf/include/local/sota_qemux86-64.inc6
-rw-r--r--conf/include/local/sota_raspberrypi.inc12
-rw-r--r--scripts/lib/wic/plugins/source/otaimage.py5
-rw-r--r--templates/README.md10
-rw-r--r--templates/feature/agl-sota/50_bblayers.conf.inc7
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc15
8 files changed, 17 insertions, 55 deletions
diff --git a/conf/include/local/sota_minnowboard.inc b/conf/include/local/sota_minnowboard.inc
index 0bd4210..5a5b3f4 100644
--- a/conf/include/local/sota_minnowboard.inc
+++ b/conf/include/local/sota_minnowboard.inc
@@ -1,8 +1,9 @@
1MACHINE = "intel-corei7-64" 1MACHINE = "intel-corei7-64"
2 2
3PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota" 3PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
4UBOOT_MACHINE = "minnowmax_defconfig" 4UBOOT_MACHINE_sota = "minnowmax_defconfig"
5 5
6EXTRA_IMAGEDEPENDS_append = " minnowboard-bootfiles" 6EXTRA_IMAGEDEPENDS_append_sota = " minnowboard-bootfiles"
7IMAGE_BOOT_FILES = "minnowboard-bootfiles/*" 7IMAGE_BOOT_FILES_sota += "minnowboard-bootfiles/*"
8 8
9OSTREE_BOOTLOADER ?= "u-boot"
diff --git a/conf/include/local/sota_porter.inc b/conf/include/local/sota_porter.inc
index fcda041..64923f9 100644
--- a/conf/include/local/sota_porter.inc
+++ b/conf/include/local/sota_porter.inc
@@ -3,10 +3,10 @@ MACHINE = "porter"
3# Commit united image to OSTree, not just uImage 3# Commit united image to OSTree, not just uImage
4OSTREE_KERNEL = "uImage+dtb" 4OSTREE_KERNEL = "uImage+dtb"
5 5
6EXTRA_IMAGEDEPENDS_append = " porter-bootfiles" 6EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles"
7IMAGE_CLASSES_append = " image_types_uboot " 7IMAGE_CLASSES_append_sota = " image_types_uboot "
8IMAGE_BOOT_FILES = "porter-bootfiles/*" 8IMAGE_BOOT_FILES_sota += "porter-bootfiles/*"
9 9
10OSTREE_BOOTLOADER ?= "u-boot" 10OSTREE_BOOTLOADER ?= "u-boot"
11UBOOT_MACHINE = "porter_vin_config" 11UBOOT_MACHINE_sota = "porter_vin_config"
12 12
diff --git a/conf/include/local/sota_qemux86-64.inc b/conf/include/local/sota_qemux86-64.inc
index b72c29d..5fa1521 100644
--- a/conf/include/local/sota_qemux86-64.inc
+++ b/conf/include/local/sota_qemux86-64.inc
@@ -1,12 +1,8 @@
1MACHINE = "qemux86-64" 1MACHINE = "qemux86-64"
2 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 3# U-Boot support for SOTA
8PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota" 4PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
9UBOOT_MACHINE = "qemu-x86_defconfig" 5UBOOT_MACHINE_sota = "qemu-x86_defconfig"
10OSTREE_BOOTLOADER ?= "u-boot" 6OSTREE_BOOTLOADER ?= "u-boot"
11 7
12OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" 8OSTREE_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
index 51919f0..ae13b8e 100644
--- a/conf/include/local/sota_raspberrypi.inc
+++ b/conf/include/local/sota_raspberrypi.inc
@@ -1,16 +1,14 @@
1MACHINE ?= "raspberrypi3" 1MACHINE ?= "raspberrypi3"
2 2
3# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota 3IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
4IMAGE_CLASSES += "image_types_uboot sdcard_image-rpi-ota" 4IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
5 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 6### both rpi-sdimg and rpi-sdimg-ota broken
9IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz" 7IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
10 8
11KERNEL_IMAGETYPE_sota = "uImage" 9KERNEL_IMAGETYPE_sota = "uImage"
12PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 10PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"
13UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig" 11UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig"
14UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig" 12UBOOT_MACHINE_raspberrypi3_sota ?= "rpi_3_32b_defconfig"
15 13
16OSTREE_BOOTLOADER ?= "u-boot" 14OSTREE_BOOTLOADER ?= "u-boot"
diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py
index 016c996..dc507a8 100644
--- a/scripts/lib/wic/plugins/source/otaimage.py
+++ b/scripts/lib/wic/plugins/source/otaimage.py
@@ -55,10 +55,9 @@ class OTAImagePlugin(SourcePlugin):
55 Called to do the actual content population for a partition i.e. it 55 Called to do the actual content population for a partition i.e. it
56 'prepares' the partition to be incorporated into the image. 56 'prepares' the partition to be incorporated into the image.
57 """ 57 """
58 bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
58 if not bootimg_dir: 59 if not bootimg_dir:
59 bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 60 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
60 if not bootimg_dir:
61 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
62 61
63 msger.debug('Bootimg dir: %s' % bootimg_dir) 62 msger.debug('Bootimg dir: %s' % bootimg_dir)
64 63
diff --git a/templates/README.md b/templates/README.md
deleted file mode 100644
index f43a67e..0000000
--- a/templates/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
1AGL templates
2=============
3
4This directory contains templates for integration with AGL's aglsetup.sh.
5To use meta-updater with AGL, 'agl-sota' to the list of features as in:
6
7 source meta-agl/scripts/aglsetup.sh -m raspberrypi3 agl-demo agl-netboot agl-appfw-smack agl-sota
8
9For more information see [AGL documentation](https://wiki.automotivelinux.org/subsystem/agl-sota/ostree)
10
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
deleted file mode 100644
index 0a5440b..0000000
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ /dev/null
@@ -1,7 +0,0 @@
1BBLAYERS =+ " \
2 ${METADIR}/meta-agl-extra/meta-sota \
3 ${METADIR}/meta-openembedded/meta-filesystems \
4 ${METADIR}/meta-openembedded/meta-ruby \
5 ${METADIR}/meta-rust \
6 "
7
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
deleted file mode 100644
index 8d21c17..0000000
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DISTRO_FEATURES_append = " agl-ota"
2OVERRIDES .= ":sota"
3
4IMAGE_INSTALL_append = " ostree"
5
6# live image for OSTree-enabled systems
7IMAGE_CLASSES += "image_types_ostree image_types_ota"
8IMAGE_FSTYPES += "ostreepush otaimg"
9
10# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
11OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
12OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
13OSTREE_OSNAME ?= "ota"
14OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
15