summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatti Vacek <pattivacek@gmail.com>2021-07-01 07:24:43 +0200
committerGitHub <noreply@github.com>2021-07-01 07:24:43 +0200
commitca03912d6d0047705c9ac30bbdbc1777457f4f7c (patch)
treed219817f9fdfdeabd83941a40dad8b3a242f33ab
parent05e0075ffe155c6177ac5402e8b05ec5e7cb556d (diff)
parent6e24e397347b0d14652793fea3dcf95438442ed8 (diff)
downloadmeta-updater-ca03912d6d0047705c9ac30bbdbc1777457f4f7c.tar.gz
Merge pull request #811 from liuming50/support-readonly-sysroot
meta: support readonly sysroot
-rw-r--r--classes/image_types_ota.bbclass4
-rw-r--r--classes/sota.bbclass1
2 files changed, 5 insertions, 0 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 283b50e..2a20660 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -45,6 +45,10 @@ IMAGE_CMD_ota () {
45 ostree --repo=${OTA_SYSROOT}/ostree/repo refs --create=${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} ${ostree_target_hash} 45 ostree --repo=${OTA_SYSROOT}/ostree/repo refs --create=${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} ${ostree_target_hash}
46 ostree admin --sysroot=${OTA_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} 46 ostree admin --sysroot=${OTA_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME}
47 47
48 if [ ${@ oe.types.boolean('${OSTREE_SYSROOT_READONLY}')} = True ]; then
49 ostree config --repo=${OTA_SYSROOT}/ostree/repo set sysroot.readonly true
50 fi
51
48 cp -a ${IMAGE_ROOTFS}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true 52 cp -a ${IMAGE_ROOTFS}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
49 # Create /var/sota if it doesn't exist yet 53 # Create /var/sota if it doesn't exist yet
50 mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota 54 mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 8f3f5d7..a331fa4 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -32,6 +32,7 @@ OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
32OSTREE_DEPLOY_DEVICETREE ??= "0" 32OSTREE_DEPLOY_DEVICETREE ??= "0"
33OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}" 33OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}"
34OSTREE_MULTI_DEVICETREE_SUPPORT ??= "0" 34OSTREE_MULTI_DEVICETREE_SUPPORT ??= "0"
35OSTREE_SYSROOT_READONLY ??= "0"
35 36
36INITRAMFS_IMAGE ?= "initramfs-ostree-image" 37INITRAMFS_IMAGE ?= "initramfs-ostree-image"
37 38