| Message ID | 20240528170722.365546-1-yoann.congal@smile.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-multimedia,v2] sample-content: Set UNPACKDIR to S to avoid a QA warning | expand |
diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb index e5a8f085b..5eba4da20 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb @@ -9,6 +9,9 @@ SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c2 inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies install -m 0644 ${UNPACKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/ diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb index 37e519790..29e60cb0a 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb @@ -9,6 +9,9 @@ SRC_URI[sha256sum] = "40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db0 inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies install -m 0644 ${UNPACKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/ diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb index 2b233d3e1..50ea2e3c8 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb @@ -9,6 +9,9 @@ SRC_URI[sha256sum] = "b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06ed inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies install -m 0644 ${UNPACKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/ diff --git a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb index 34753fdb1..ed3ff75ac 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb @@ -8,6 +8,9 @@ SRC_URI[sha256sum] = "bd2b5bc6c16d4085034f47ef7e4b3938afe86b4eec4ac3cf2685367d3b inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies install -m 0644 ${UNPACKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/
Since recent UNPACKDIR work, default S directory is not created anymore. By setting UNPACKDIR to S, S in indirectly created in do_unpack. Also set S to a known static value to match OE-Core definition of UNPACKDIR/S[0]. Fixes these warnings: WARNING: bigbuckbunny-480p-1.0-r0 do_unpack: bigbuckbunny-480p: the directory ${WORKDIR}/${BP} (.../tmp/work/all-poky-linux/bigbuckbunny-480p/1.0/bigbuckbunny-480p-1.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to WARNING: bigbuckbunny-720p-1.0-r0 do_unpack: bigbuckbunny-720p: the directory ${WORKDIR}/${BP} (.../tmp/work/all-poky-linux/bigbuckbunny-720p/1.0/bigbuckbunny-720p-1.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to WARNING: bigbuckbunny-1080p-1.0-r0 do_unpack: bigbuckbunny-1080p: the directory ${WORKDIR}/${BP} (.../tmp/work/all-poky-linux/bigbuckbunny-1080p/1.0/bigbuckbunny-1080p-1.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to WARNING: tearsofsteel-1080p-1.0-r0 do_unpack: tearsofsteel-1080p: the directory ${WORKDIR}/${BP} (.../tmp/work/all-poky-linux/tearsofsteel-1080p/1.0/tearsofsteel-1080p-1.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to [0]: https://git.yoctoproject.org/poky/commit/?id=d6ae8d2004f8ac3aab4571e0077d406b2d19b542 Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Reviewed-by: Alexandre Truong <alexandre.truong@smile.fr> --- v1->v2: Add S affectation to be consistent with OE-Core UNPACKDIR/S definitions. --- .../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 3 +++ .../recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 3 +++ .../recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 3 +++ .../recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 3 +++ 4 files changed, 12 insertions(+)