[PATCHv2,1/3] tzdata: Make it compatible with devtool modify

Message ID 20211217021618.30887-1-pkj@axis.com
State Accepted, archived
Commit 3c64d964089f2909d5dc7d94cd449ad068d04caf
Headers show
Series [PATCHv2,1/3] tzdata: Make it compatible with devtool modify | expand

Commit Message

Peter Kjellerstedt Dec. 17, 2021, 2:16 a.m. UTC
This avoids the following build error after having run `devtool modify
tzdata`:

  cp: cannot stat '.../qemux86-64/workspace/sources/tzdata//usr': No
  such file or directory

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

PATCHv2: No changes.

 meta/recipes-extended/timezone/tzdata.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb
index c2b019922a..09cb14a855 100644
--- a/meta/recipes-extended/timezone/tzdata.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -35,8 +35,8 @@  do_compile () {
 }
 
 do_install () {
-        install -d ${D}/$exec_prefix ${D}${datadir}/zoneinfo
-        cp -pPR ${S}/$exec_prefix ${D}/
+        install -d ${D}$exec_prefix ${D}${datadir}/zoneinfo
+        cp -pPR ${WORKDIR}$exec_prefix ${D}${base_prefix}
         # libc is removing zoneinfo files from package
         cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo
         cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo