summaryrefslogtreecommitdiffstats
path: root/meta-sota
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-01-16 17:11:23 +0100
committerAnton Gerasimov <anton@advancedtelematic.com>2017-01-17 14:59:47 +0100
commit22a19e912214d2a35050e95832b88cf4a6116954 (patch)
treeb969eb5f669aeb82856e32522d29747dbea7d280 /meta-sota
parent684da7770b33f417f50f89889436d99c45c77525 (diff)
Image creation has changed a bit in morty, fix OSTree-related types
accordingly Bug-AGL: SPEC-413 Change-Id: If7dbf01eb277143e41b602a977b0ef6110a5664d Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'meta-sota')
-rw-r--r--meta-sota/classes/image_types_ostree.bbclass2
-rw-r--r--meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass3
-rw-r--r--meta-sota/classes/sdcard_image-porter-ota.bbclass3
-rw-r--r--meta-sota/classes/sdcard_image-rpi-ota.bbclass9
-rw-r--r--meta-sota/recipes-support/libgsystem/libgsystem_git.bb2
5 files changed, 15 insertions, 4 deletions
diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass
index 32ea98f..04aeae8 100644
--- a/meta-sota/classes/image_types_ostree.bbclass
+++ b/meta-sota/classes/image_types_ostree.bbclass
@@ -4,7 +4,7 @@ inherit image
IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \
virtual/kernel:do_deploy \
- ${OSTREE_INITRAMFS_IMAGE}:do_image_ext4"
+ ${OSTREE_INITRAMFS_IMAGE}:do_image_complete"
export OSTREE_REPO
export OSTREE_BRANCHNAME
diff --git a/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass b/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass
index f023649..179ed10 100644
--- a/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass
+++ b/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass
@@ -68,5 +68,8 @@ IMAGE_CMD_dra7xx-evm-sdimg-ota () {
xz -k "${SDIMG_OTA}"
;;
esac
+
+ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota
+ ln -s ${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota
}
diff --git a/meta-sota/classes/sdcard_image-porter-ota.bbclass b/meta-sota/classes/sdcard_image-porter-ota.bbclass
index 1b1de79..a9619dc 100644
--- a/meta-sota/classes/sdcard_image-porter-ota.bbclass
+++ b/meta-sota/classes/sdcard_image-porter-ota.bbclass
@@ -71,5 +71,8 @@ IMAGE_CMD_porter-sdimg-ota () {
xz -k "${SDIMG_OTA}"
;;
esac
+
+ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota
+ ln -s ${IMAGE_NAME}.rootfs.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota
}
diff --git a/meta-sota/classes/sdcard_image-rpi-ota.bbclass b/meta-sota/classes/sdcard_image-rpi-ota.bbclass
index 2fa03c4..deea8d1 100644
--- a/meta-sota/classes/sdcard_image-rpi-ota.bbclass
+++ b/meta-sota/classes/sdcard_image-rpi-ota.bbclass
@@ -125,8 +125,10 @@ IMAGE_CMD_rpi-sdimg-ota () {
# Copy device tree overlays to dedicated folder
mmd -i ${WORKDIR}/boot.img overlays
for DTB in ${DT_OVERLAYS}; do
- DTB_BASE_NAME=`basename ${DTB} .dtb`
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtbo
+ DTB_EXT=${DTB##*.}
+ DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
done
fi
@@ -174,6 +176,9 @@ IMAGE_CMD_rpi-sdimg-ota () {
xz -k "${SDIMG_OTA}"
;;
esac
+
+ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota
+ ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota
}
ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "
diff --git a/meta-sota/recipes-support/libgsystem/libgsystem_git.bb b/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
index 92ac386..2b93191 100644
--- a/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
+++ b/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/git"
inherit autotools-brokensep gobject-introspection
-DEPENDS += "attr glib-2.0 pkgconfig libcap gtk-doc-native"
+DEPENDS += "attr glib-2.0 pkgconfig libcap gtk-doc-native gpgme"
RDEPENDS_${PN} = "xz systemd"
RDEPENDS_${PN}_remove_class-native = "systemd-native"