From 7cb72acea1e4c8516a76835f51c2b97a03118267 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 1 Oct 2018 07:07:47 +0000 Subject: 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 --- templates/base/01_setup_pkg_revision.sh | 4 ++-- 1 file 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 -- cgit 1.2.3-korg