Re: [oe] [meta-oe][PATCH v2] source-han-sans-*-fonts: rename downloaded files in SRC_URI
It works for me.
Reviewed-by: Alexandre Truong
Le jeu. 23 mai 2024 à 10:49, Martin Jansa a écrit :
> Thanks looks better, it can be simplified further, see:
>
> https://git.openembedded.org/meta-openembedded-contrib/commit/?h=jansa/master=80fdbf37b3252ed263091fafe6a156655f1a89fb
>
> Please review and if you agree with it, I'll test it and send it for
> master-next.
>
> Notice that there is inconsistent use of UNPACKDIR in these recipes
> (from master-next) so this will allow us to clean it up a bit in
> single .inc file.
>
> On Thu, May 23, 2024 at 10:31 AM Alexandre Truong via
> 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
> > following their package name and version.
> >
> > [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
> > Reviewed-by: Yoann Congal
> > ---
> > .../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..db4ff4269 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=${BP}.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..7ece51128 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=${BP}.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..0cbe438ef 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=${BP}.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..3b4eeb271 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 = " \
> > -
>
Re: [oe] [meta-oe][PATCH v2] source-han-sans-*-fonts: rename downloaded files in SRC_URI
Thanks looks better, it can be simplified further, see:
https://git.openembedded.org/meta-openembedded-contrib/commit/?h=jansa/master=80fdbf37b3252ed263091fafe6a156655f1a89fb
Please review and if you agree with it, I'll test it and send it for
master-next.
Notice that there is inconsistent use of UNPACKDIR in these recipes
(from master-next) so this will allow us to clean it up a bit in
single .inc file.
On Thu, May 23, 2024 at 10:31 AM Alexandre Truong via
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
> following their package name and version.
>
> [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
> Reviewed-by: Yoann Congal
> ---
> .../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..db4ff4269 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=${BP}.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..7ece51128 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=${BP}.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..0cbe438ef 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=${BP}.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..3b4eeb271 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=${BP}.zip
> \
> file://44-source-han-sans-tw.conf \
> "
> SRC_URI[sha256sum] =
>
[oe] [meta-oe][PATCH v2] source-han-sans-*-fonts: rename downloaded files in SRC_URI
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
following their package name and version.
[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
Reviewed-by: Yoann Congal
---
.../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..db4ff4269 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=${BP}.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..7ece51128 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=${BP}.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..0cbe438ef 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=${BP}.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..3b4eeb271 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=${BP}.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 (#110500):
https://lists.openembedded.org/g/openembedded-devel/message/110500
Mute This Topic: https://lists.openembedded.org/mt/106258987/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
