diff mbox series

[meta-oe] source-han-sans-*-fonts: rename downloaded files in SRC_URI

Message ID 20240523075052.8854-1-alexandre.truong@smile.fr
State New
Headers show
Series [meta-oe] source-han-sans-*-fonts: rename downloaded files in SRC_URI | expand

Commit Message

Alexandre Truong May 23, 2024, 7:50 a.m. UTC
In commit [0], we've switched away from SVN fetcher in SRC_URI.
The archives downloaded are named SourceHanSans*.zip
They are named this way regardless of the version 1.004 or 2.004.
So when the new archives checksums are tested, the fetcher will
look for the old archives with the same name in the DL_DIR.
From [1], there are checksum failures due to given checksums not
matching the ones in DL_DIR. Thus, downloaded archives are renamed
by adding ${PV} in archive name.

[0]: https://git.openembedded.org/meta-openembedded/commit/?id=36a1e36e1272ca50e5dba0c4cf25ee3ff8b8f1c9
[1]: https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/367/steps/16/logs/errors

Signed-off-by: Alexandre Truong <alexandre.truong@smile.fr>
Reviewed-by: Yoann Congal <yoann.congal@smile.fr>
---
 .../ttf-fonts/source-han-sans-cn-fonts_2.004.bb                 | 2 +-
 .../ttf-fonts/source-han-sans-jp-fonts_2.004.bb                 | 2 +-
 .../ttf-fonts/source-han-sans-kr-fonts_2.004.bb                 | 2 +-
 .../ttf-fonts/source-han-sans-tw-fonts_2.004.bb                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Martin Jansa May 23, 2024, 7:57 a.m. UTC | #1
I think you can use ${BP} for downloafilename.

On Thu, May 23, 2024 at 9:51 AM Alexandre Truong via
lists.openembedded.org
<alexandre.truong=smile.fr@lists.openembedded.org> wrote:
>
> In commit [0], we've switched away from SVN fetcher in SRC_URI.
> The archives downloaded are named SourceHanSans*.zip
> They are named this way regardless of the version 1.004 or 2.004.
> So when the new archives checksums are tested, the fetcher will
> look for the old archives with the same name in the DL_DIR.
> From [1], there are checksum failures due to given checksums not
> matching the ones in DL_DIR. Thus, downloaded archives are renamed
> by adding ${PV} in archive name.
>
> [0]: https://git.openembedded.org/meta-openembedded/commit/?id=36a1e36e1272ca50e5dba0c4cf25ee3ff8b8f1c9
> [1]: https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/367/steps/16/logs/errors
>
> Signed-off-by: Alexandre Truong <alexandre.truong@smile.fr>
> Reviewed-by: Yoann Congal <yoann.congal@smile.fr>
> ---
>  .../ttf-fonts/source-han-sans-cn-fonts_2.004.bb                 | 2 +-
>  .../ttf-fonts/source-han-sans-jp-fonts_2.004.bb                 | 2 +-
>  .../ttf-fonts/source-han-sans-kr-fonts_2.004.bb                 | 2 +-
>  .../ttf-fonts/source-han-sans-tw-fonts_2.004.bb                 | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> index 391d46557..f6e1a4c6d 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> @@ -11,7 +11,7 @@ inherit allarch fontcache
>  #EXCLUDE_FROM_WORLD = "1"
>
>  SRC_URI = " \
> -    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP} \
> +    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP};downloadfilename=source-han-sans-cn-fonts-${PV}.zip \
>      file://44-source-han-sans-cn.conf \
>  "
>  SRC_URI[sha256sum] = "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6"
> diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> index f940478a8..9e18921d6 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> @@ -11,7 +11,7 @@ inherit allarch fontcache
>  #EXCLUDE_FROM_WORLD = "1"
>
>  SRC_URI = " \
> -    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP} \
> +    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP};downloadfilename=source-han-sans-jp-fonts-${PV}.zip \
>      file://44-source-han-sans-jp.conf \
>  "
>  SRC_URI[sha256sum] = "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e"
> diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> index f536d1b61..2b79cd762 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> @@ -11,7 +11,7 @@ inherit allarch fontcache
>  #EXCLUDE_FROM_WORLD = "1"
>
>  SRC_URI = " \
> -    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP} \
> +    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP};downloadfilename=source-han-sans-kr-fonts-${PV}.zip \
>      file://44-source-han-sans-kr.conf \
>  "
>  SRC_URI[sha256sum] = "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe"
> diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
> index 0a4aff5e3..303edf3b6 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
> @@ -11,7 +11,7 @@ inherit allarch fontcache
>  #EXCLUDE_FROM_WORLD = "1"
>
>  SRC_URI = " \
> -    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansTW.zip;subdir=${BP} \
> +    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansTW.zip;subdir=${BP};downloadfilename=source-han-sans-tw-fonts-${PV}.zip \
>      file://44-source-han-sans-tw.conf \
>  "
>  SRC_URI[sha256sum] = "11d78c8fbc1a4bb04a453cdd65c99db8d41ec5cd6ba6d68c8638e6ba170de806"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110496): https://lists.openembedded.org/g/openembedded-devel/message/110496
> Mute This Topic: https://lists.openembedded.org/mt/106258754/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexandre Truong May 23, 2024, 8:15 a.m. UTC | #2
Yes, you are right ! I will make the changes in a v2
Thank you.

Alexandre Truong


Le jeu. 23 mai 2024 à 09:58, Martin Jansa <martin.jansa@gmail.com> a écrit :

> I think you can use ${BP} for downloafilename.
>
> On Thu, May 23, 2024 at 9:51 AM Alexandre Truong via
> lists.openembedded.org
> <alexandre.truong=smile.fr@lists.openembedded.org> wrote:
> >
> > In commit [0], we've switched away from SVN fetcher in SRC_URI.
> > The archives downloaded are named SourceHanSans*.zip
> > They are named this way regardless of the version 1.004 or 2.004.
> > So when the new archives checksums are tested, the fetcher will
> > look for the old archives with the same name in the DL_DIR.
> > From [1], there are checksum failures due to given checksums not
> > matching the ones in DL_DIR. Thus, downloaded archives are renamed
> > by adding ${PV} in archive name.
> >
> > [0]:
> https://git.openembedded.org/meta-openembedded/commit/?id=36a1e36e1272ca50e5dba0c4cf25ee3ff8b8f1c9
> > [1]:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/367/steps/16/logs/errors
> >
> > Signed-off-by: Alexandre Truong <alexandre.truong@smile.fr>
> > Reviewed-by: Yoann Congal <yoann.congal@smile.fr>
> > ---
> >  .../ttf-fonts/source-han-sans-cn-fonts_2.004.bb                 | 2 +-
> >  .../ttf-fonts/source-han-sans-jp-fonts_2.004.bb                 | 2 +-
> >  .../ttf-fonts/source-han-sans-kr-fonts_2.004.bb                 | 2 +-
> >  .../ttf-fonts/source-han-sans-tw-fonts_2.004.bb                 | 2 +-
> >  4 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-cn-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-cn-fonts_2.004.bb
> > index 391d46557..f6e1a4c6d 100644
> > --- a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-cn-fonts_2.004.bb
> > +++ b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-cn-fonts_2.004.bb
> > @@ -11,7 +11,7 @@ inherit allarch fontcache
> >  #EXCLUDE_FROM_WORLD = "1"
> >
> >  SRC_URI = " \
> > -
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP}
> \
> > +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP};downloadfilename=source-han-sans-cn-fonts-${PV}.zip
> \
> >      file://44-source-han-sans-cn.conf \
> >  "
> >  SRC_URI[sha256sum] =
> "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6"
> > diff --git a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-jp-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-jp-fonts_2.004.bb
> > index f940478a8..9e18921d6 100644
> > --- a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-jp-fonts_2.004.bb
> > +++ b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-jp-fonts_2.004.bb
> > @@ -11,7 +11,7 @@ inherit allarch fontcache
> >  #EXCLUDE_FROM_WORLD = "1"
> >
> >  SRC_URI = " \
> > -
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP}
> \
> > +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP};downloadfilename=source-han-sans-jp-fonts-${PV}.zip
> \
> >      file://44-source-han-sans-jp.conf \
> >  "
> >  SRC_URI[sha256sum] =
> "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e"
> > diff --git a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-kr-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-kr-fonts_2.004.bb
> > index f536d1b61..2b79cd762 100644
> > --- a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-kr-fonts_2.004.bb
> > +++ b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-kr-fonts_2.004.bb
> > @@ -11,7 +11,7 @@ inherit allarch fontcache
> >  #EXCLUDE_FROM_WORLD = "1"
> >
> >  SRC_URI = " \
> > -
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP}
> \
> > +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP};downloadfilename=source-han-sans-kr-fonts-${PV}.zip
> \
> >      file://44-source-han-sans-kr.conf \
> >  "
> >  SRC_URI[sha256sum] =
> "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe"
> > diff --git a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-tw-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-tw-fonts_2.004.bb
> > index 0a4aff5e3..303edf3b6 100644
> > --- a/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-tw-fonts_2.004.bb
> > +++ b/meta-oe/recipes-graphics/ttf-fonts/
> source-han-sans-tw-fonts_2.004.bb
> > @@ -11,7 +11,7 @@ inherit allarch fontcache
> >  #EXCLUDE_FROM_WORLD = "1"
> >
> >  SRC_URI = " \
> > -
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansTW.zip;subdir=${BP}
> \
> > +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansTW.zip;subdir=${BP};downloadfilename=source-han-sans-tw-fonts-${PV}.zip
> \
> >      file://44-source-han-sans-tw.conf \
> >  "
> >  SRC_URI[sha256sum] =
> "11d78c8fbc1a4bb04a453cdd65c99db8d41ec5cd6ba6d68c8638e6ba170de806"
> > --
> > 2.34.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#110496):
> https://lists.openembedded.org/g/openembedded-devel/message/110496
> > Mute This Topic: https://lists.openembedded.org/mt/106258754/3617156
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> martin.jansa@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
index 391d46557..f6e1a4c6d 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
@@ -11,7 +11,7 @@  inherit allarch fontcache
 #EXCLUDE_FROM_WORLD = "1"
 
 SRC_URI = " \
-    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP} \
+    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP};downloadfilename=source-han-sans-cn-fonts-${PV}.zip \
     file://44-source-han-sans-cn.conf \
 "
 SRC_URI[sha256sum] = "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
index f940478a8..9e18921d6 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
@@ -11,7 +11,7 @@  inherit allarch fontcache
 #EXCLUDE_FROM_WORLD = "1"
 
 SRC_URI = " \
-    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP} \
+    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP};downloadfilename=source-han-sans-jp-fonts-${PV}.zip \
     file://44-source-han-sans-jp.conf \
 "
 SRC_URI[sha256sum] = "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
index f536d1b61..2b79cd762 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
@@ -11,7 +11,7 @@  inherit allarch fontcache
 #EXCLUDE_FROM_WORLD = "1"
 
 SRC_URI = " \
-    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP} \
+    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP};downloadfilename=source-han-sans-kr-fonts-${PV}.zip \
     file://44-source-han-sans-kr.conf \
 "
 SRC_URI[sha256sum] = "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
index 0a4aff5e3..303edf3b6 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
@@ -11,7 +11,7 @@  inherit allarch fontcache
 #EXCLUDE_FROM_WORLD = "1"
 
 SRC_URI = " \
-    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansTW.zip;subdir=${BP} \
+    https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansTW.zip;subdir=${BP};downloadfilename=source-han-sans-tw-fonts-${PV}.zip \
     file://44-source-han-sans-tw.conf \
 "
 SRC_URI[sha256sum] = "11d78c8fbc1a4bb04a453cdd65c99db8d41ec5cd6ba6d68c8638e6ba170de806"