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>

diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh
index af82c09..034256c 100644 (file)
--- 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