diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2018-10-01 07:07:47 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-10-02 14:15:09 +0000 |
| commit | 7cb72acea1e4c8516a76835f51c2b97a03118267 (patch) | |
| tree | 3b0f4b3aa75cb9445fe9f034500777ad416d4a79 /templates/base/01_setup_pkg_revision.sh | |
| parent | aa13f0ad14708f93e8e0c9bd0e2e9872555917fb (diff) | |
Fix image build with PR timestamp
* If we using _append with PKGR the image creation failed.
The _append action is done twice and so corrupt the PKGR
value.
Change-Id: Ia549e83a33ed667cd246a24f9a83a89d9c3f97a9
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'templates/base/01_setup_pkg_revision.sh')
| -rw-r--r-- | templates/base/01_setup_pkg_revision.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh index af82c0988..034256c7d 100644 --- a/templates/base/01_setup_pkg_revision.sh +++ b/templates/base/01_setup_pkg_revision.sh @@ -34,7 +34,7 @@ EOF EOF echo "AGL_PR ?= \"${AGL_PR}\"" >> $LOCALCONF; cat <<'EOF' >> $LOCALCONF -PKGR_append = ".${AGL_PR}" +PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}" PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}" BB_HASHBASE_WHITELIST_append = " PKGR PKGV" EOF @@ -42,7 +42,7 @@ EOF value:*) echo "AGL_PR ?= \"${RPMREVISION#value:}\"" >> $LOCALCONF; cat <<'EOF' >> $LOCALCONF -PKGR_append = ".${AGL_PR}" +PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}" PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}" BB_HASHBASE_WHITELIST_append = " PKGR PKGV" EOF |