diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-04-06 15:34:02 +0100 |
|---|---|---|
| committer | Joshua Lock <joshua.g.lock@intel.com> | 2016-04-06 22:08:04 +0100 |
| commit | 4b80c4d78318954600351add4997e4584edb157a (patch) | |
| tree | 90ef64b94f21f088ab0ddc3b961ad176acc3e3f0 | |
| parent | 69e5703e54fbcf19b0dfdae62cb5eefa181b685c (diff) | |
| download | meta-swupd-4b80c4d78318954600351add4997e4584edb157a.tar.gz meta-swupd-4b80c4d78318954600351add4997e4584edb157a.tar.bz2 meta-swupd-4b80c4d78318954600351add4997e4584edb157a.zip | |
swupd-image: make the swupd format number a variable
The format version isn't static, and indeed will be bumped in the
next swupd release.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
| -rw-r--r-- | classes/swupd-image.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/swupd-image.bbclass b/classes/swupd-image.bbclass index 5729875..783c22b 100644 --- a/classes/swupd-image.bbclass +++ b/classes/swupd-image.bbclass @@ -409,6 +409,7 @@ fakeroot python do_prune_bundle () { } addtask prune_bundle after do_copy_bundle_contents before do_swupd_update +SWUPD_FORMAT = "3" fakeroot do_swupd_update () { if [ -z "${BUNDLE_NAME}" ] || [ ! -z "${PN_BASE}" ] ; then bbwarn 'We only generate swupd updates for the base image, skipping ${PN}:do_swupd_update' @@ -470,7 +471,7 @@ END done ${SWUPD_LOG_FN} "Generating update from $PREVREL to ${OS_VERSION}" - ${STAGING_BINDIR_NATIVE}/swupd_create_update -S ${DEPLOY_DIR_SWUPD} --osversion ${OS_VERSION} + ${STAGING_BINDIR_NATIVE}/swupd_create_update -S ${DEPLOY_DIR_SWUPD} --osversion ${OS_VERSION} --format ${SWUPD_FORMAT} ${SWUPD_LOG_FN} "Generating fullfiles for ${OS_VERSION}" ${STAGING_BINDIR_NATIVE}/swupd_make_fullfiles -S ${DEPLOY_DIR_SWUPD} ${OS_VERSION} @@ -497,10 +498,10 @@ END done fi - # Write version to www/version/format3/latest and image/latest.version + # Write version to www/version/format${SWUPD_FORMAT}/latest and image/latest.version bbdebug 2 "Writing latest file" - mkdir -p ${DEPLOY_DIR_SWUPD}/www/version/format3 - echo ${OS_VERSION} > ${DEPLOY_DIR_SWUPD}/www/version/format3/latest + mkdir -p ${DEPLOY_DIR_SWUPD}/www/version/format${SWUPD_FORMAT} + echo ${OS_VERSION} > ${DEPLOY_DIR_SWUPD}/www/version/format${SWUPD_FORMAT}/latest echo ${OS_VERSION} > ${DEPLOY_DIR_SWUPD}/image/latest.version } |