[oe] [scarthgap][meta-filesystems][PATCH V2] fuse3: remove sysv init script and install fuse kernel module explictly
From: Changqing Li For systemd, there is not a fuse.service since systemd provides sys-fs-fuse-connections.mount to mount the fuse control filesystem, so instead, only fuse3.conf is added to modules-load.d to load the required fuse kernel module. Signed-off-by: Changqing Li --- .../recipes-support/fuse/fuse3/fuse3.conf | 1 + .../recipes-support/fuse/fuse3_3.16.2.bb | 15 +++ 2 files changed, 16 insertions(+) create mode 100644 meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf diff --git a/meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf b/meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf new file mode 100644 index 0..a517c488f --- /dev/null +++ b/meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf @@ -0,0 +1 @@ +fuse diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb index 2b0797a6f..b946b63ee 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \ " SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz \ + file://fuse3.conf \ " SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" @@ -79,6 +80,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}" DEBIAN_NOAUTONAME:fuse3-utils = "1" DEBIAN_NOAUTONAME:${PN}-dbg = "1" +SYSTEMD_SERVICE:${PN} = "" + do_install:append() { rm -rf ${D}${base_prefix}/dev + +# systemd class remove the sysv_initddir only if systemd_system_unitdir +# contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES +if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then +rm -rf ${D}${sysconfdir}/init.d/ +fi + +# Install systemd related configuration file +if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then +install -d ${D}${sysconfdir}/modules-load.d +install -m 0644 ${WORKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d +fi } -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110506): https://lists.openembedded.org/g/openembedded-devel/message/110506 Mute This Topic: https://lists.openembedded.org/mt/106274955/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][master-next][PATCH] source-han-sans-*-fonts: move common part to .inc file
* only SUMMARY, ZIPNAME and SRC_URI checksums are different * rename the .conf file to match BPN to simplify even more Signed-off-by: Martin Jansa --- conf => 44-source-han-sans-cn-fonts.conf} | 0 .../source-han-sans-cn-fonts_2.004.bb | 29 ++ .../ttf-fonts/source-han-sans-fonts.inc | 26 conf => 44-source-han-sans-jp-fonts.conf} | 0 .../source-han-sans-jp-fonts_2.004.bb | 29 ++ conf => 44-source-han-sans-kr-fonts.conf} | 0 .../source-han-sans-kr-fonts_2.004.bb | 30 ++- conf => 44-source-han-sans-tw-fonts.conf} | 0 .../source-han-sans-tw-fonts_2.004.bb | 30 ++- 9 files changed, 34 insertions(+), 110 deletions(-) rename meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/{44-source-han-sans-cn.conf => 44-source-han-sans-cn-fonts.conf} (100%) create mode 100644 meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc rename meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/{44-source-han-sans-jp.conf => 44-source-han-sans-jp-fonts.conf} (100%) rename meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/{44-source-han-sans-kr.conf => 44-source-han-sans-kr-fonts.conf} (100%) rename meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/{44-source-han-sans-tw.conf => 44-source-han-sans-tw-fonts.conf} (100%) diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf similarity index 100% rename from meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf rename to meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf 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 0eeae9c2ee..c46952cce0 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 @@ -1,31 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans"; -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" +ZIPNAME = "SourceHanSansCN" -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - 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" - -do_install() { -install -d ${D}${sysconfdir}/fonts/conf.d/ -install -m 0644 ${UNPACKDIR}/44-source-han-sans-cn.conf ${D}${sysconfdir}/fonts/conf.d/ - -install -d ${D}${datadir}/fonts/truetype/ -find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ -${sysconfdir}/fonts \ -${datadir}/fonts \ -" - diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc new file mode 100644 index 00..03ca4c0902 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc @@ -0,0 +1,26 @@ +require ttf.inc + +HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans"; +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" + +inherit allarch fontcache + +SRC_URI = " \ + https://github.com/adobe-fonts/source-han-sans/releases/download/${PV}R/${ZIPNAME}.zip;subdir=${BP};downloadfilename=${BP}.zip \ +file://44-${BPN}.conf \ +" + +do_install() { +install -d ${D}${sysconfdir}/fonts/conf.d/ +install -m 0644 ${UNPACKDIR}/44-${BPN}.conf ${D}${sysconfdir}/fonts/conf.d/ + +install -d ${D}${datadir}/fonts/truetype/ +find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; +} + +FILES:${PN} = " \ +${sysconfdir}/fonts \ +${datadir}/fonts \ +" + diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf similarity index 100% rename from meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf rename to meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf 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 d75de154cd..40128f97d3 100644 --- a/meta-oe
[oe] [meta-oe][PATCH 2/2] uim: Upgrade to 1.8.9
Drop upstreamed patch and second patch is no longer needed Signed-off-by: Khem Raj --- ...it-path-from-configure-option-proper.patch | 29 --- .../uim/uim/JMP_BUF_GC_jmp_buf.patch | 15 -- .../uim/{uim_1.8.8.bb => uim_1.8.9.bb}| 8 ++--- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch delete mode 100644 meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch rename meta-oe/recipes-support/uim/{uim_1.8.8.bb => uim_1.8.9.bb} (94%) diff --git a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch deleted file mode 100644 index 34a1ea0fa2..00 --- a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001 -From: OBATA Akio -Date: Fri, 10 Aug 2018 18:38:18 +0900 -Subject: [PATCH] Fix to set libedit path from configure option properly - -Upstream-Status: Backport [https://github.com/uim/uim/pull/134] -Signed-off-by: Khem Raj - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 00d1b02..9c0a5ec 100644 a/configure.ac -+++ b/configure.ac -@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then - if test "x$with_libedit" = xyes; then - libedit_path=/usr - else --with_libedit=yes - libedit_path="$with_libedit" -+with_libedit=yes - fi - - saved_CPPFLAGS=$CPPFLAGS --- -2.23.0 - diff --git a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch b/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch deleted file mode 100644 index adb9c4b06b..00 --- a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix error pointed out by gcc10 - -Upstream-Status: Pending -Signed-off-by: Khem Raj a/sigscheme/libgcroots/include/private/gc_priv.h -+++ b/sigscheme/libgcroots/include/private/gc_priv.h -@@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s); - - # if defined(NEED_FIND_LIMIT) || \ - defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS) --JMP_BUF GC_jmp_buf; -+extern JMP_BUF GC_jmp_buf; - - /* Set up a handler for address faults which will longjmp to */ - /* GC_jmp_buf;*/ diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb similarity index 94% rename from meta-oe/recipes-support/uim/uim_1.8.8.bb rename to meta-oe/recipes-support/uim/uim_1.8.9.bb index e0d9d05dce..f78c82f18a 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb @@ -4,15 +4,11 @@ LICENSE = "BSD-3-Clause & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" -SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ -file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ -file://JMP_BUF_GC_jmp_buf.patch \ -" +SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2"; SRC_URI:append:class-target = "\ file://uim-module-manager.patch \ " -SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" -SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" +SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"; -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110504): https://lists.openembedded.org/g/openembedded-devel/message/110504 Mute This Topic: https://lists.openembedded.org/mt/106263513/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-multimedia][PATCH 1/2] oscam: Upgrade to 1.20
Switch SRC_URI away from svn and use git fetcher streamboard.tv svn server seems to be not accessible all the time reliably Signed-off-by: Khem Raj --- .../recipes-dvb/oscam/{oscam_svn.bb => oscam_1.20.bb} | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta-multimedia/recipes-dvb/oscam/{oscam_svn.bb => oscam_1.20.bb} (74%) diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb similarity index 74% rename from meta-multimedia/recipes-dvb/oscam/oscam_svn.bb rename to meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb index 0a9a7499ac..e20358955a 100644 --- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb @@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libusb1 openssl pcsc-lite" -SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ - " -SRCREV = "11718" -PV = "1.10+" +SRCREV = "190d6dee96ca70f8b614932b1498332b1504632b" +SRC_URI = "git://repo.or.cz/oscam.git;protocol=https;nobranch=1" -S = "${UNPACKDIR}/trunk" +S = "${UNPACKDIR}/git" inherit cmake -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110503): https://lists.openembedded.org/g/openembedded-devel/message/110503 Mute This Topic: https://lists.openembedded.org/mt/106263511/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
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&id=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;subd
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&id=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] = > "11d78c8fbc1a4bb0
[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] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] libgpiod: update to v2.1.2
Please pick this to scarthgap, too. Thanks, Peter -Original Message- From: openembedded-devel@lists.openembedded.org On Behalf Of Bartosz Golaszewski via lists.openembedded.org Sent: Monday, May 13, 2024 11:48 To: Khem Raj ; Bruce Ashfield ; openembedded-devel@lists.openembedded.org Cc: Bartosz Golaszewski Subject: [oe] [meta-oe][PATCH] libgpiod: update to v2.1.2 > From: Bartosz Golaszewski > > This is a small bugfix release that fixes a build issue with slibtool (not > relevant to meta-oe ATM), makes the licensing of C++ bindings less > restrictive and preemptively fixes an issue that will be triggered with linux > v6.9 when running gpio-tools ptest suite. > > Signed-off-by: Bartosz Golaszewski > --- > .../libgpiod/{libgpiod_2.1.1.bb => libgpiod_2.1.2.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) rename > meta-oe/recipes-support/libgpiod/{libgpiod_2.1.1.bb => libgpiod_2.1.2.bb} > (93%) > > diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb > b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb > similarity index 93% > rename from meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb > rename to meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb > index 4c13d67eb..6e4fbd2a3 100644 > --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb > +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb > @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ > > FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" > > -SRC_URI[sha256sum] = > "b21913f469d3135680d5516f00fdf9f81d5e564e19ffb690927ea7f1d7e312cb" > +SRC_URI[sha256sum] = > "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" > > # Enable all project features for ptest PACKAGECONFIG[tests] = > "--enable-tests --enable-tools --enable-bindings-cxx > --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 > libedit" > -- > 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110499): https://lists.openembedded.org/g/openembedded-devel/message/110499 Mute This Topic: https://lists.openembedded.org/mt/106069394/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] source-han-sans-*-fonts: rename downloaded files in SRC_URI
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 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 > 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 > > 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..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] = > "11d78c8fbc1a4bb04a4
Re: [oe] [meta-oe][PATCH] source-han-sans-*-fonts: rename downloaded files in SRC_URI
I think you can use ${BP} for downloafilename. On Thu, May 23, 2024 at 9:51 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 > 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 > 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..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 (#110497): https://lists.openembedded.org/g/openembedded-devel/message/110497 Mute This Topic: https://list
[oe] [meta-oe][PATCH] 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 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 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..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/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-