devtool: correctly handle non-standard source tree locations in upgrades
PATCH 1/21 devtool: correctly handle non-standard source tree locations in upgrades
When S is set to a sub-directory of upstream source, the license checks and the bbappend writing (specifically, setting EXTERNALSRC) need to operate on that sub-directory.
'devtool modify' already has similar logic, and it was copied from there and adjusted.
--- scripts/lib/devtool/upgrade.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
scripts/lib/devtool/upgrade.py +12 -3
@@ -521,6 +521,15 @@ def upgrade(args, config, basepath, workspace): else: srctree = standard.get_default_srctree(config, pn) + # Check that recipe isn't using a shared workdir + s = os.path.abspath(rd.getVar('S')) + workdir = os.path.abspath(rd.getVar('WORKDIR')) + srctree_s = srctree + if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir: + # Handle if S is set to a subdirectory of the source + srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] + srctree_s = os.path.join(srctree, srcsubdir) + # try to automatically discover latest version and revision if not provided on command line if not args.version and not args.srcrev: version_info = oe.recipeutils.get_recipe_upstream_version(rd)
@@ -550,12 +559,12 @@ def upgrade(args, config, basepath, workspace): try: logger.info('Extracting current version source...') rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides) - old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or "")) + old_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or "")) logger.info('Extracting upgraded version source...') rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch, args.srcrev, args.srcbranch, args.branch, args.keep_temp, tinfoil, rd) - new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or "")) + new_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or "")) license_diff = _generate_license_diff(old_licenses, new_licenses) rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure) except bb.process.CmdError as e:
@@ -564,7 +573,7 @@ def upgrade(args, config, basepath, workspace): _upgrade_error(e, rf, srctree, args.keep_failure) standard._add_md5(config, pn, os.path.dirname(rf)) - af = _write_append(rf, srctree, args.same_dir, args.no_same_dir, rev2, + af = _write_append(rf, srctree_s, args.same_dir, args.no_same_dir, rev2, copied, config.workspace_path, rd) standard._add_md5(config, pn, af)
Signature · 1 line
2.31.1
PATCH 2/21 tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
oe-core has not been providing multiple versions for any of these items for a long time, it's not likely to change anytime soon, and it makes automated (or semi-automated) versions updates with devtool impossible, as PREFERRED_VERSION masks the updated recipe in devtool workspace.
Specifically, this was prompted by investigating why automated llvm update doesn't work; it does now.
--- meta/conf/distro/include/tcmode-default.inc | 57 --------------------- 1 file changed, 57 deletions(-)
meta/conf/distro/include/tcmode-default.inc +0 -57
@@ -16,68 +16,11 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" # Default libc config PREFERRED_PROVIDER_virtual/gettext ??= "gettext" -GCCVERSION ?= "11.%" -SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.36%" -GDBVERSION ?= "10.%" -GLIBCVERSION ?= "2.33" -LINUXLIBCVERSION ?= "5.13%" -QEMUVERSION ?= "6.0%" -GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "12.0.0" -PREFERRED_VERSION_gcc ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" -PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" -PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_binutils ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_gdb ?= "${GDBVERSION}" -PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}" -PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}" - -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" -PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" - -PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" -PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" -PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" - # Bootstrap Go using a binary release from golang.org. If you want to bootstrap # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use # go-native. PREFERRED_PROVIDER_go-native ?= "go-binary-native" -PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go ?= "${GOVERSION}" -PREFERRED_VERSION_go-native ?= "${GOVERSION}" -PREFERRED_VERSION_go-runtime ?= "${GOVERSION}" -PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}" -PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}" - -PREFERRED_VERSION_llvm = "${LLVMVERSION}" -PREFERRED_VERSION_llvm-native = "${LLVMVERSION}" -PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}"
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
Quoted 91 lines · Alexander Kanavin
oe-core has not been providing multiple versions for any of these items for a long time, it's not likely to change anytime soon, and it makes automated (or semi-automated) versions updates with devtool impossible, as
PREFERRED_VERSIONmasks the updated recipe in devtool workspace.Specifically, this was prompted by investigating why automated llvm update doesn't work; it does now.
Signed-off-by Alexander Kanavin <[email protected]>---
meta/conf/distro/include/tcmode-default.inc | 57 ---------------------1 file changed, 57 deletions(-)meta/conf/distro/include/tcmode-default.inc +0
-0@@ -16,68 +16,11 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" # Default libc configPREFERRED_PROVIDER_virtual/gettext ??= "gettext"
meta/conf/distro/include/tcmode-default.inc +0
-8-GCCVERSION ?= "11.%" -SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.36%" -GDBVERSION ?= "10.%" -GLIBCVERSION ?= "2.33" -LINUXLIBCVERSION ?= "5.13%" -QEMUVERSION ?= "6.0%" -GOVERSION ?= "1.16%"# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "12.0.0"meta/conf/distro/include/tcmode-default.inc +0
-36-PREFERRED_VERSION_gcc ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" -PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" -PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_binutils ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_gdb ?= "${GDBVERSION}" -PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}" -PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}" - -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" -PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" - -PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" -PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" -PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" -# Bootstrap Go using a binary release from golang.org. If you want to bootstrap
# from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use # go-native. PREFERRED_PROVIDER_go-native ?= "go-binary-native"meta/conf/distro/include/tcmode-default.inc +0
-4-PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}"
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
Quoted 10 lines
meta/conf/distro/include/tcmode-default.inc +0
-10-PREFERRED_VERSION_go ?= "${GOVERSION}" -PREFERRED_VERSION_go-native ?= "${GOVERSION}" -PREFERRED_VERSION_go-runtime ?= "${GOVERSION}" -PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}" -PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}" - -PREFERRED_VERSION_llvm = "${LLVMVERSION}" -PREFERRED_VERSION_llvm-native = "${LLVMVERSION}" -PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}" -
At the very least the GCC variable is well used in other layers as it is hard to remember all the different bits of gcc that are listed here so I think that should stay. Some of these can probably be removed but I'm not sure how far we could/should go. glibc's list of recipes isn't trivial either...
Cheers,
Richard
Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
Quoted 7 lines · Richard Purdie
At the very least the GCC variable is well used in other layers as it is hard to
remember all the different bits of gcc that are listed here so I think that
should stay. Some of these can probably be removed but I'm not sure how far we could/should go. glibc's list of recipes isn't trivial either...
I used layerindex to check. Alternative gcc versions are provided by multiple layers (mostly arm-related), but an alternative older glibc is only in meta-debian and that is using neither PREFERRED_VERSION directly nor the *LIBCVERSION convenience (so not sure how it's meant to be used). I will send a v2 with gcc added back.
Anyone else should probably just copy the PREFERRED_VERSION lines for what they want to adjust into the layers directly. But let's see what Khem says
- I do think getting help from AUH/devtool in doing the updates fully, or at least using 'devtool upgrade' locally to prepare the git trees for manual patch rebasing is valuable.
Alex
Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
Quoted 11 lines · Alexander Kanavin
Quoted 7 lines · Richard Purdie
At the very least the GCC variable is well used in other layers as it is hard to
remember all the different bits of gcc that are listed here so I think that
should stay. Some of these can probably be removed but I'm not sure how far we could/should go. glibc's list of recipes isn't trivial either...
Quoted 5 lines
I used layerindex to check. Alternative gcc versions are provided by multiple layers (mostly arm-related), but an alternative older glibc is only in meta-debian and that is using neither
PREFERRED_VERSIONdirectly nor the *LIBCVERSION convenience (so not sure how it's meant to be used). I will send a v2 with gcc added back.
Reusing those variables is common in layers dealing with multiple toolchains, such as external binary toolchains and such. Might be good to keep them in OE-Core for consistency:
GCCVERSION ?= "9.%"
SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.34%"
GDBVERSION ?= "9.%"
GLIBCVERSION ?= "2.31%"
LINUXLIBCVERSION ?= "5.4%"
Quoted 7 lines
Anyone else should probably just copy the
PREFERRED_VERSIONlines for what they want to adjust into the layers directly. But let's see what Khem says
- I do think getting help from AUH/devtool in doing the updates fully, or at least using 'devtool upgrade' locally to prepare the git trees for manual patch rebasing is valuable.Alex
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
In reply to Alexander KanavinQuoted 19 lines · Alexander Kanavin
oe-core has not been providing multiple versions for any of these items for a long time, it's not likely to change anytime soon, and it makes automated (or semi-automated) versions updates with devtool impossible, as
PREFERRED_VERSIONmasks the updated recipe in devtool workspace.Specifically, this was prompted by investigating why automated llvm update doesn't work; it does now.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/tcmode-default.inc | 57 --------------------- 1 file changed, 57 deletions(-)meta/conf/distro/include/tcmode-default.inc +0
-0
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" · line 24
Quoted 9 lines
meta/conf/distro/include/tcmode-default.inc +0
-6@@ -16,68 +16,11 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" # Default libc config PREFERRED_PROVIDER_virtual/gettext ??= "gettext" -GCCVERSION ?= "11.%" -SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.36%" -GDBVERSION ?= "10.%" -GLIBCVERSION ?= "2.33" -LINUXLIBCVERSION ?= "5.13%"
I'd prefer that libcheaders stays explicitly set.
Bumping libc-headers is something we do carefully, and should not be a common devtool
operation, and is not something that we want automated at all. Having that extra variable
to set is a good thing for the headers, it helps reenforce that you really should know what
you are doing.
Bruce
Quoted 65 lines
meta/conf/distro/include/tcmode-default.inc +0
-52-QEMUVERSION ?= "6.0%" -GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "12.0.0" -PREFERRED_VERSION_gcc ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" -PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" -PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_binutils ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_gdb ?= "${GDBVERSION}" -PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}" -PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}" - -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" -PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" - -PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" -PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" -PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" - # Bootstrap Go using a binary release from golang.org. If you want to bootstrap # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use # go-native. PREFERRED_PROVIDER_go-native ?= "go-binary-native" -PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}" -PREFERRED_VERSION_go ?= "${GOVERSION}" -PREFERRED_VERSION_go-native ?= "${GOVERSION}" -PREFERRED_VERSION_go-runtime ?= "${GOVERSION}" -PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}" -PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}" - -PREFERRED_VERSION_llvm = "${LLVMVERSION}" -PREFERRED_VERSION_llvm-native = "${LLVMVERSION}" -PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}" --2.31.1
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
Quoted 11 lines · Bruce Ashfield
I'd prefer that libcheaders stays explicitly set.
Bumping libc-headers is something we do carefully, and should not be a common devtool
operation, and is not something that we want automated at all. Having that extra variable
to set is a good thing for the headers, it helps reenforce that you really should know what
you are doing.
Right, I'll respin the patch once more.
Alex
Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items
Quoted 14 lines · Alexander Kanavin
On Wed, 14 Jul 2021 at 16:02, Bruce Ashfield <[email protected] <mailto:[email protected]>> wrote:
I'd prefer that libcheaders stays explicitly set.
Bumping libc-headers is something we do carefully, and should not be a common devtool
operation, and is not something that we want automated at all. Having that extra variable
to set is a good thing for the headers, it helps reenforce that you really should know what
you are doing.
Quoted 1 line
Right, I'll respin the patch once more.
if this is not fixing anything besides cleanup then, its not worth doing it, there are layers which may not be public which use these variables to choose toolchain from external layers which may not be in layer index
Quoted 6 lines
Alex
PATCH 3/21 llvm: make upgradable via devtool
In reply to Alexander KanavinAssembling PV from bits is too clever for devtool; but it can be done in the opposite direction.
--- meta/recipes-devtools/llvm/llvm_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
meta/recipes-devtools/llvm/llvm_git.bb +3 -5
@@ -19,11 +19,9 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -MAJOR_VERSION = "12" -MINOR_VERSION = "0" -PATCH_VERSION = "0" +PV = "12.0.0" -PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" +MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}"
@@ -178,7 +176,7 @@ FILES_${PN}-llvmhello = "\ FILES_${PN}-dev += " \ ${libdir}/${LLVM_DIR}/llvm-config \ ${libdir}/${LLVM_DIR}/libRemarks.so \ - ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ + ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ " FILES_${PN}-staticdev += "\
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 03/21] llvm: make upgradable via devtool
Quoted 13 lines · Alexander Kanavin
Assembling PV from bits is too clever for devtool; but it can be done in the opposite direction.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/llvm/llvm_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)meta/recipes-devtools/llvm/llvm_git.bb +0
-0
meta/recipes-devtools/llvm/llvm_git.bb inherit cmake pkgconfig · line 22
Quoted 7 lines
meta/recipes-devtools/llvm/llvm_git.bb +1
-3@@ -19,11 +19,9 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -MAJOR_VERSION = "12" -MINOR_VERSION = "0" -PATCH_VERSION = "0" +PV = "12.0.0"
may be rename the recipe to have PV instead of _git as well, while here
Quoted 20 lines
meta/recipes-devtools/llvm/llvm_git.bb +2
-2-PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" +MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}"@@ -178,7 +176,7 @@ FILES_${PN}-llvmhello = "\ FILES_${PN}-dev += " \ ${libdir}/${LLVM_DIR}/llvm-config \ ${libdir}/${LLVM_DIR}/libRemarks.so \ - ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ + ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ " FILES_${PN}-staticdev += "\
PATCH 4/21 llvm: update 12.0.0 -> 12.0.1
In reply to Alexander KanavinOther than the tcmode tweak, this was done by devtool \0/
--- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "12.0.0" +LLVMVERSION ?= "12.0.1" # Bootstrap Go using a binary release from golang.org. If you want to bootstrap # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use
meta/recipes-devtools/llvm/llvm_git.bb +2 -2
@@ -19,7 +19,7 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "12.0.0" +PV = "12.0.1" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
@@ -27,7 +27,7 @@ LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "fa0971b87fb2c9d14d1bba2551e61f02f18f329b" +SRCREV = "fed41342a82f5a3a9201819a82bf7a48313e296b" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
Signature · 1 line
2.31.1
PATCH 5/21 systemd: update 248.3 -> 249
In reply to Alexander Kanavinjinja is now required:
https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
---
...temd-boot_248.3.bb => systemd-boot_249.bb} | 2 +-
meta/recipes-core/systemd/systemd.inc | 4 +-
...tall-dependency-links-at-install-tim.patch | 38 +++++++++----------
.../{systemd_248.3.bb => systemd_249.bb} | 6 +--
4 files changed, 25 insertions(+), 25 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.bb} (98%)
rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb} (99%)meta/recipes-core/systemd/systemd-boot_249.bb renamed from meta/recipes-core/systemd/systemd-boot_248.3.bb +1 -1
@@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" require conf/image-uefi.conf -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native" inherit meson pkgconfig gettext inherit deploy
meta/recipes-core/systemd/systemd.inc +2 -2
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" -SRCBRANCH = "v248-stable" +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5" +SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ "
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +19 -19
@@ -1,4 +1,4 @@ -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for
@@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <[email protected]> units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build -@@ -55,8 +55,7 @@ units = [ +diff --git a/units/meson.build b/units/meson.build +index 17e9ead9c1..e5502be620 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -59,8 +59,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],
@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], -@@ -166,8 +165,7 @@ in_units = [ - ['rc-local.service', 'HAVE_SYSV_COMPAT'], +@@ -178,8 +177,7 @@ in_units = [ ['rescue.service', ''], + ['[email protected]', ''], ['[email protected]', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'],
@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['[email protected]', 'ENABLE_COREDUMP'], -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 172c8757ab..f65d8930c6 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index fdafce7ff7..4efc05e495 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no
@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target @@ -30,3 +31,6 @@ RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-binfmt - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s + +[Install]
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +3 -3
@@ -4,7 +4,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "intltool-native gperf-native libcap util-linux" +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell"
@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu # that we don't build both udev and systemd in world builds. REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI += " \ - file://touchscreen.rules \ +SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \
@@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ ${rootlibexecdir}/udev/rules.d/README \ ${sysconfdir}/udev \
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 05/21] systemd: update 248.3 -> 249
Hello Alex,
This patch does apply on master but the patch introduced by "systemd:
Fix libseccomp testcase involving __NR_ppoll" needs to be refreshed, can you do that?
Quoted 166 lines · Alexander Kanavin
jinja is now required:
https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704Signed-off-by Alexander Kanavin <[email protected]>--- ...temd-boot_248.3.bb => systemd-boot_249.bb} | 2 +- meta/recipes-core/systemd/systemd.inc | 4 +- ...tall-dependency-links-at-install-tim.patch | 38 +++++++++---------- .../{systemd_248.3.bb => systemd_249.bb} | 6 +-- 4 files changed, 25 insertions(+), 25 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.bb} (98%) rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb} (99%)meta/recipes-core/systemd/systemd-boot_249.bb renamed from meta/recipes-core/systemd/systemd-boot_248.3.bb +1
-1@@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" require conf/image-uefi.conf -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native" inherit meson pkgconfig gettext inherit deploymeta/recipes-core/systemd/systemd.inc +2
-2@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" -SRCBRANCH = "v248-stable" +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5" +SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ "meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +19
-19@@ -1,4 +1,4 @@ -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for@@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <[email protected]> units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build -@@ -55,8 +55,7 @@ units = [ +diff --git a/units/meson.build b/units/meson.build +index 17e9ead9c1..e5502be620 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -59,8 +59,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], -@@ -166,8 +165,7 @@ in_units = [ - ['rc-local.service', 'HAVE_SYSV_COMPAT'], +@@ -178,8 +177,7 @@ in_units = [ ['rescue.service', ''], + ['[email protected]', ''], ['[email protected]', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'],@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['[email protected]', 'ENABLE_COREDUMP'], -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 172c8757ab..f65d8930c6 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index fdafce7ff7..4efc05e495 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target @@ -30,3 +31,6 @@ RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-binfmt - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s + +[Install]meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +3
-3@@ -4,7 +4,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "intltool-native gperf-native libcap util-linux" +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell"@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu # that we don't build both udev and systemd in world builds. REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI += " \ - file://touchscreen.rules \ +SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \@@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ ${rootlibexecdir}/udev/rules.d/README \ ${sysconfdir}/udev \Signature · 1 line
2.31.1
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH 05/21] systemd: update 248.3 -> 249
Quoted 6 lines · Alexandre Belloni
Hello Alex,
This patch does apply on master but the patch introduced by "systemd:
Fix libseccomp testcase involving__NR_ppoll" needs to be refreshed, can you do that?
this patch is already upstream in 249 so you can drop it when upgrading to 249+
Quoted 177 lines · Alexander Kanavin
Quoted 160 lines
jinja is now required:
https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704Signed-off-by Alexander Kanavin <[email protected]>--- ...temd-boot_248.3.bb => systemd-boot_249.bb} | 2 +- meta/recipes-core/systemd/systemd.inc | 4 +- ...tall-dependency-links-at-install-tim.patch | 38 +++++++++---------- .../{systemd_248.3.bb => systemd_249.bb} | 6 +-- 4 files changed, 25 insertions(+), 25 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.bb} (98%) rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb} (99%)meta/recipes-core/systemd/systemd-boot_249.bb renamed from meta/recipes-core/systemd/systemd-boot_248.3.bb +1
-1@@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" require conf/image-uefi.conf -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native" inherit meson pkgconfig gettext inherit deploymeta/recipes-core/systemd/systemd.inc +2
-2@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" -SRCBRANCH = "v248-stable" +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5" +SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ "meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +19
-19@@ -1,4 +1,4 @@ -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for@@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <[email protected]> units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build -@@ -55,8 +55,7 @@ units = [ +diff --git a/units/meson.build b/units/meson.build +index 17e9ead9c1..e5502be620 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -59,8 +59,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], -@@ -166,8 +165,7 @@ in_units = [ - ['rc-local.service', 'HAVE_SYSV_COMPAT'], +@@ -178,8 +177,7 @@ in_units = [ ['rescue.service', ''], + ['[email protected]', ''], ['[email protected]', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'],@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['[email protected]', 'ENABLE_COREDUMP'], -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 172c8757ab..f65d8930c6 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index fdafce7ff7..4efc05e495 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target @@ -30,3 +31,6 @@ RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-binfmt - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s + +[Install]meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +3
-4@@ -4,7 +4,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "intltool-native gperf-native libcap util-linux" +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell"@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu # that we don't build both udev and systemd in world builds. REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI += " \ - file://touchscreen.rules \ +SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \@@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ ${rootlibexecdir}/udev/rules.d/README \ ${sysconfdir}/udev \ --Quoted 6 lines
2.31.1
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [OE-core] [PATCH 05/21] systemd: update 248.3 -> 249
I amended my commit, and will resend with the next upgrade batch.
Alex
Quoted 223 lines · Khem Raj
Quoted 6 lines · Alexandre Belloni
Hello Alex,
This patch does apply on master but the patch introduced by "systemd:
Fix libseccomp testcase involving__NR_ppoll" needs to be refreshed, can you do that?this patch is already upstream in 249 so you can drop it when upgrading to 249+
Quoted 4 lines · Alexander Kanavin
Quoted 2 lines
jinja is now required:
https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
Quoted 9 lines
Quoted 9 lines
Signed-off-by Alexander Kanavin <[email protected]>--- ...temd-boot_248.3.bb => systemd-boot_249.bb} | 2 +- meta/recipes-core/systemd/systemd.inc | 4 +- ...tall-dependency-links-at-install-tim.patch | 38 +++++++++---------- .../{systemd_248.3.bb => systemd_249.bb} | 6 +-- 4 files changed, 25 insertions(+), 25 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_248.3.bb =>systemd-boot_249.bb} (98%)
Quoted 1 line
Quoted 1 line
rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb}(99%)
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/recipes-core/systemd/systemd-boot_249.bb
Quoted 8 lines
Quoted 8 lines
similarity index 98%
rename from meta/recipes-core/systemd/systemd-boot_248.3.bb rename to meta/recipes-core/systemd/systemd-boot_249.bb index249e620f4e..2c0bec4eda100644meta/recipes-core/systemd/systemd-boot_249.bb renamed from meta/recipes-core/systemd/systemd-boot_248.3.bb +0
-0@@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"Quoted 4 lines
meta/recipes-core/systemd/systemd-boot_249.bb FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
Quoted 4 lines
meta/recipes-core/systemd/systemd-boot_249.bb renamed from meta/recipes-core/systemd/systemd-boot_248.3.bb +1
-1require conf/image-uefi.conf -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-nativepython3-jinja2-native"
Quoted 4 lines
Review
Quoted 4 lines
meta/recipes-core/systemd/systemd-boot_249.bb renamed from meta/recipes-core/systemd/systemd-boot_248.3.bb +0
-0inherit meson pkgconfig gettext inherit deploy(quoted diff) +0
-0b/meta/recipes-core/systemd/systemd.inc
Quoted 5 lines
meta/recipes-core/systemd/systemd.inc LICENSE = "GPLv2 & LGPLv2.1" · line 14
Quoted 5 lines
index
0524a25008..79fb15f8fe100644meta/recipes-core/systemd/systemd.inc +0
-0@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM ="file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
Quoted 1 line
Quoted 1 line
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc LICENSE = "GPLv2 & LGPLv2.1"
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +2
-2-SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" -SRCBRANCH = "v248-stable" +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5" +SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}
<http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D>
\Quoted 3 lines
Quoted 3 lines
"
diff --git
a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patchb/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patchQuoted 2 lines
Quoted 2 lines
index
8dd22eeb7b..d3af734e06100644
---
a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patchQuoted 1 line
Quoted 1 line
+++
b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patchQuoted 6 lines
meta/recipes-core/systemd/systemd.inc line 4
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +1
-1@@ -1,4 +1,4 @@ -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at installtime for
Quoted 1 line
meta/recipes-core/systemd/systemd.inc Signed-off-by: Scott Murray <
Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0
-0@@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <Quoted 12 lines
Quoted 12 lines
meta/recipes-core/systemd/systemd.inc +4
-5units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build -@@ -55,8 +55,7 @@ units = [ +diff --git a/units/meson.build b/units/meson.build +index 17e9ead9c1..e5502be620 100644 +--- a/units/meson.build ++++ b/units/meson.buildQuoted 8 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 41
Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1
-0+@@ -59,8 +59,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? 'runlevel6.target' : '')],
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 45
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +2
-2-@@ -166,8 +165,7 @@ in_units = [ - ['rc-local.service', 'HAVE_SYSV_COMPAT'], +@@ -178,8 +177,7 @@ in_units = [ ['rescue.service', ''], + ['[email protected]', ''], ['[email protected]','
ENABLE_BACKLIGHT'],Quoted 4 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 49
Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0
-0- ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'],@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI
HAVE_BLKID'],Quoted 8 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 52
Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1
-5['systemd-boot-check-no-failures.service', ''], ['[email protected]', 'ENABLE_COREDUMP'], -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ +diff --git a/units/proc-sys-fs-binfmt_misc.automountb/units/proc-sys-fs-binfmt_misc.automount
Quoted 5 lines
Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +4
-0+index 172c8757ab..f65d8930c6 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/Quoted 10 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 63
Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +1
-4[Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
Quoted 4 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 67
Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +3
-0+index fdafce7ff7..4efc05e495 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
Quoted 1 line
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/meson.build · line 68
Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0
-0Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
Quoted 2 lines
meta/recipes-core/systemd/systemd.inc Index: systemd-stable/units/
Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0
-0DefaultDependencies=no@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in
Quoted 11 lines
Review
Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +2
-2After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target @@ -30,3 +31,6 @@ RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-binfmt - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s + +[Install](quoted diff) +0
-0b/meta/recipes-core/systemd/systemd_249.bb
Quoted 8 lines
Quoted 8 lines
similarity index 99%
rename from meta/recipes-core/systemd/systemd_248.3.bb rename to meta/recipes-core/systemd/systemd_249.bb index37607708f7..9bfb12249c100644meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +0
-0@@ -4,7 +4,7 @@ PROVIDES = "udev"Quoted 4 lines
meta/recipes-core/systemd/systemd_249.bb PROVIDES = "udev"
Quoted 4 lines
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +1
-1PE = "1" -DEPENDS = "intltool-native gperf-native libcap util-linux" +DEPENDS = "intltool-native gperf-native libcap util-linuxpython3-jinja2-native"
Quoted 4 lines
meta/recipes-core/systemd/systemd_249.bb inherit useradd pkgconfig meson perlnative
Quoted 4 lines
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +0
-0SECTION = "base/shell"@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnativeupdate-rc.d update-alternatives qemu
Quoted 8 lines
meta/recipes-core/systemd/systemd_249.bb inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu
Quoted 8 lines
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +1
-2# that we don't build both udev and systemd in world builds. REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI += " \ - file://touchscreen.rules \ +SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ ${@bb.utils.contains('PACKAGECONFIG','
polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \Quoted 1 line
meta/recipes-core/systemd/systemd_249.bb inherit useradd pkgconfig meson perlnative · line 20
Quoted 1 line
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +0
-0${@bb.utils.contains('PACKAGECONFIG','
polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \Quoted 4 lines
meta/recipes-core/systemd/systemd_249.bb FILES_udev += "${base_sbindir}/udevd \ · line 687
Quoted 4 lines
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +0
-0@@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules\
Quoted 20 lines
Quoted 11 lines
meta/recipes-core/systemd/systemd_249.bb renamed from meta/recipes-core/systemd/systemd_248.3.bb +1
-1+ ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ ${rootlibexecdir}/udev/rules.d/README \ ${sysconfdir}/udev \ --2.31.1
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
PATCH 6/21 xserver-xorg: update 1.20.11 -> 1.20.12
In reply to Alexander Kanavin---
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
.../{xserver-xorg_1.20.11.bb => xserver-xorg_1.20.12.bb} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.11.bb => xserver-xorg_1.20.12.bb} (93%)meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1
@@ -15,7 +15,7 @@ PROVIDES += "virtual/xserver" PE = "2" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz" UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar"
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " -SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49" +SRC_URI[sha256sum] = "336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades.
Signature · 1 line
2.31.1
PATCH 7/21 libmodulemd: update 2.12.1 -> 2.13.0
In reply to Alexander KanavinDelete patch, as the issue is fixed upstream.
Disable python bindings as they're not used anywhere, and require functional gobject introspection.
--- ...e-the-manpage-only-if-the-feature-is.patch | 28 ------------------- .../libmodulemd/libmodulemd_git.bb | 16 ++++------- 2 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch
meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 31 Mar 2020 16:06:39 +0200 -Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - modulemd/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modulemd/meson.build b/modulemd/meson.build -index 9ef1902..9f71e72 100644 ---- a/modulemd/meson.build -+++ b/modulemd/meson.build -@@ -494,6 +494,7 @@ if with_docs - ) - endif - -+if with_manpages == 'enabled' - help2man_opts = [ - '--no-info', - '--section=1', -@@ -506,3 +507,4 @@ custom_target( - ], - install: true, - install_dir: join_paths(get_option('mandir'), 'man1')) -+endif
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +6 -10
@@ -4,25 +4,21 @@ DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" -SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main \ - file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ - " +SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main" -PV = "2.12.1" -SRCREV = "c0897fa0e9d7d1305fd4813b1010c1d4cca42346" +PV = "2.13.0" +SRCREV = "1a032da198333ee77bdbe4be65e60eb4115ea73f" S = "${WORKDIR}/git" -inherit meson gobject-introspection python3-dir +inherit meson gobject-introspection -EXTRA_OEMESON = "-Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" +EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" -DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" +DEPENDS += "glib-2.0 libyaml glib-2.0-native" BBCLASSEXTEND = "native nativesdk" GIR_MESON_OPTION = 'skip_introspection' GIR_MESON_ENABLE_FLAG = 'false' GIR_MESON_DISABLE_FLAG = 'true' - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/*"
Signature · 1 line
2.31.1
PATCH 8/21 bluez5: upgrade 5.59 -> 5.60
In reply to Alexander Kanavin---
.../bluez5/{bluez5_5.59.bb => bluez5_5.60.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bluez5/{bluez5_5.59.bb => bluez5_5.60.bb} (95%)meta/recipes-connectivity/bluez5/bluez5_5.60.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.59.bb +1 -1
@@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "046b95b386d0bfb2a16311fe799d517ee7735045512d89902c4ed701db477316" +SRC_URI[sha256sum] = "710999580d01ee59ec585e5e7c07fd94eddedc001aa26fe7464c546f9d945304" # These issues have kernel fixes rather than bluez fixes so exclude here CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490"
Signature · 1 line
2.31.1
PATCH 9/21 createrepo-c: upgrade 0.17.3 -> 0.17.4
In reply to Alexander Kanavin---
.../{createrepo-c_0.17.3.bb => createrepo-c_0.17.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.17.3.bb => createrepo-c_0.17.4.bb} (96%)meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "8196982f0974c268898a5550d61b374bd58103e2" +SRCREV = "cb74969736bdea86465e85feeceb895ff7a42610" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 10/21 ethtool: upgrade 5.12 -> 5.13
In reply to Alexander Kanavin---
.../ethtool/ethtool/avoid_parallel_tests.patch | 6 +++---
.../ethtool/{ethtool_5.12.bb => ethtool_5.13.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-extended/ethtool/{ethtool_5.12.bb => ethtool_5.13.bb} (93%)meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +3 -3
@@ -1,4 +1,4 @@ -From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001 +From e652ccd8965895087887c270fc0d380b61f96b11 Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 13c2bc0..0b6ca1d 100644 +index 6b620bf..ff62b2a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.12, [email protected]) + AC_INIT(ethtool, 5.13, [email protected]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects])
meta/recipes-extended/ethtool/ethtool_5.13.bb renamed from meta/recipes-extended/ethtool/ethtool_5.12.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "7ca623cc1dd25ba66531573da6a11f1ecde9b62b00742d9ba54f9ba983439bfa" +SRC_URI[sha256sum] = "e66ab0d74d2a888fd64a0053290dbea66ddc9b75b3d21d117b7edd9576b9db60" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
Signature · 1 line
2.31.1
PATCH 11/21 gtk+3: upgrade 3.24.29 -> 3.24.30
In reply to Alexander Kanavincloudprint support removed upstream:
https://gitlab.gnome.org/GNOME/gtk/-/commit/c77ea5101e55b8690127beed14b26dd3520889b5
---
meta/recipes-gnome/gtk+/gtk+3.inc | 1 -
...-Add-disable-opengl-configure-option.patch | 44 +++++++++----------
.../{gtk+3_3.24.29.bb => gtk+3_3.24.30.bb} | 2 +-
3 files changed, 23 insertions(+), 24 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.24.29.bb => gtk+3_3.24.30.bb} (89%)meta/recipes-gnome/gtk+/gtk+3.inc +0 -1
@@ -63,7 +63,6 @@ PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib" PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" prepare_gtk_scripts() {
meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +22 -22
155 lines not on this page · raw message
meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa" +SRC_URI[sha256sum] = "ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.31.1
PATCH 12/21 harfbuzz: upgrade 2.8.1 -> 2.8.2
In reply to Alexander KanavinLicense-Update: copyright years
---
...ariable-supp_size-from-plan_subset_e.patch | 44 -------------------
.../{harfbuzz_2.8.1.bb => harfbuzz_2.8.2.bb} | 11 +++--
2 files changed, 5 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.8.1.bb => harfbuzz_2.8.2.bb} (84%)meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch deleted +0 -44
@@ -1,44 +0,0 @@ -From f96b2b653c605679b83a820b38f49a0a0f4baf42 Mon Sep 17 00:00:00 2001 -From: Andi-Bogdan Postelnicu <[email protected]> -Date: Wed, 2 Jun 2021 14:08:11 +0300 -Subject: [PATCH] Removed unused variable `supp_size` from - plan_subset_encoding(...). - -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/243d056ff1c2af583ceb67e5dfbfaac51dc96e63] -Signed-off-by: Khem Raj <[email protected]> ---- - src/hb-subset-cff1.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc -index df322f8..35dae7b 100644 ---- a/src/hb-subset-cff1.cc -+++ b/src/hb-subset-cff1.cc -@@ -402,7 +402,7 @@ struct cff_subset_plan { - void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan) - { - const Encoding *encoding = acc.encoding; -- unsigned int size0, size1, supp_size; -+ unsigned int size0, size1; - hb_codepoint_t code, last_code = CFF_UNDEF_CODE; - hb_vector_t<hb_codepoint_t> supp_codes; - -@@ -412,7 +412,6 @@ struct cff_subset_plan { - return; - } - -- supp_size = 0; - supp_codes.init (); - - subset_enc_num_codes = plan->num_output_glyphs () - 1; -@@ -448,7 +447,6 @@ struct cff_subset_plan { - code_pair_t pair = { supp_codes[i], sid }; - subset_enc_supp_codes.push (pair); - } -- supp_size += SuppEncoding::static_size * supp_codes.length; - } - } - supp_codes.fini (); --- -2.31.1 -
meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb +5 -6
@@ -4,16 +4,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \ - file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ + file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ + " UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch \ - " -SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7" inherit meson pkgconfig lib_package gtk-doc gobject-introspection
Signature · 1 line
2.31.1
PATCH 13/21 iproute2: upgrade 5.12.0 -> 5.13.0
In reply to Alexander Kanavin---
.../iproute2/{iproute2_5.12.0.bb => iproute2_5.13.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/iproute2/{iproute2_5.12.0.bb => iproute2_5.13.0.bb} (75%)meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.12.0.bb +1 -1
@@ -4,7 +4,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[sha256sum] = "9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f" +SRC_URI[sha256sum] = "72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36" # CFLAGS are computed in Makefile and reference CCOPTS #
Signature · 1 line
2.31.1
PATCH 14/21 libgit2: upgrade 1.1.0 -> 1.1.1
In reply to Alexander Kanavin---
.../libgit2/{libgit2_1.1.0.bb => libgit2_1.1.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/libgit2/{libgit2_1.1.0.bb => libgit2_1.1.1.bb} (91%)meta/recipes-support/libgit2/libgit2_1.1.1.bb renamed from meta/recipes-support/libgit2/libgit2_1.1.0.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1" -SRCREV = "7f4fa178629d559c037a1f72f79f79af9c1ef8ce" +SRCREV = "8a0dc6783c340e61a44c179c48f832165ad2053c" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 15/21 mpg123: upgrade 1.28.0 -> 1.28.2
In reply to Alexander Kanavin---
.../mpg123/{mpg123_1.28.0.bb => mpg123_1.28.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/mpg123/{mpg123_1.28.0.bb => mpg123_1.28.2.bb} (96%)meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb +1 -1
@@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5" +SRC_URI[sha256sum] = "7eefd4b68fdac7e138d04c37efe12155a8ebf25a5bccf0fb7e775af22d21db00" UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.31.1
PATCH 16/21 mtools: upgrade 4.0.31 -> 4.0.32
In reply to Alexander Kanavin---
.../mtools/mtools/disable-hardcoded-configs.patch | 6 +++---
.../mtools/{mtools_4.0.31.bb => mtools_4.0.32.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/mtools/{mtools_4.0.31.bb => mtools_4.0.32.bb} (93%)meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +3 -3
@@ -1,4 +1,4 @@ -From 589a05f9377e3899082ced46c1736f90c0a4dc9b Mon Sep 17 00:00:00 2001 +From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 From: Ed Bartosh <[email protected]> Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs.
@@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <[email protected]> 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index f91004b..b72f8ea 100644 +index bb13682..9186c77 100644 --- a/config.c +++ b/config.c -@@ -827,14 +827,6 @@ void read_config(void) +@@ -836,14 +836,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device));
meta/recipes-devtools/mtools/mtools_4.0.32.bb renamed from meta/recipes-devtools/mtools/mtools_4.0.31.bb +1 -1
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "538999277f8f2fa901f3898855d1b0ccb184666457fefddb70001cac612dd586" +SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \
Signature · 1 line
2.31.1
PATCH 17/21 ruby: upgrade 3.0.1 -> 3.0.2
In reply to Alexander Kanavin---
meta/recipes-devtools/ruby/{ruby_3.0.1.bb => ruby_3.0.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/ruby/{ruby_3.0.1.bb => ruby_3.0.2.bb} (97%)meta/recipes-devtools/ruby/ruby_3.0.2.bb renamed from meta/recipes-devtools/ruby/ruby_3.0.1.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI += " \ file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ " -SRC_URI[sha256sum] = "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" +SRC_URI[sha256sum] = "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
Signature · 1 line
2.31.1
PATCH 18/21 stress-ng: upgrade 0.12.11 -> 0.12.12
In reply to Alexander Kanavin---
.../stress-ng/{stress-ng_0.12.11.bb => stress-ng_0.12.12.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.12.11.bb => stress-ng_0.12.12.bb} (90%)meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.12.11.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "971393075321c24c3d5769acfabb705911d1f411ced5937b7cfea58528c1b4e6" +SRC_URI[sha256sum] = "f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499" DEPENDS = "coreutils-native"
Signature · 1 line
2.31.1
PATCH 19/21 webkitgtk: upgrade 2.32.1 -> 2.32.2
In reply to Alexander Kanavin---
.../webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 6 +++---
.../webkit/{webkitgtk_2.32.1.bb => webkitgtk_2.32.2.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-sato/webkit/{webkitgtk_2.32.1.bb => webkitgtk_2.32.2.bb} (98%)meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +3 -3
@@ -1,4 +1,4 @@ -From af90ae1f128626e8d57a8bcbc432596bfc2987af Mon Sep 17 00:00:00 2001 +From 1a7becde0e508d7fac488bae6c08c1a4a0ac6b73 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 3 Feb 2020 17:06:27 -0800 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 2 insertions(+) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index af6c0fac..f393d741 100644 +index 1f500299..0771af9c 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() - SET_PROJECT_VERSION(2 32 1) + SET_PROJECT_VERSION(2 32 2) set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") +set(THREADS_PREFER_PTHREAD_FLAG ON)
meta/recipes-sato/webkit/webkitgtk_2.32.2.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.32.1.bb +1 -1
@@ -22,7 +22,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \ " -SRC_URI[sha256sum] = "136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917" +SRC_URI[sha256sum] = "1790f86975bdef957ba9a12fc09202de8f55c885ee38467afc50d2bdb7a6c5cd" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.31.1
PATCH 20/21 xwayland: upgrade 21.1.1 -> 21.1.2
In reply to Alexander Kanavin---
.../xwayland/{xwayland_21.1.1.bb => xwayland_21.1.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/xwayland/{xwayland_21.1.1.bb => xwayland_21.1.2.bb} (95%)meta/recipes-graphics/xwayland/xwayland_21.1.2.bb renamed from meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +1 -1
@@ -10,7 +10,7 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "31f261ce51bbee76a6ca3ec02aa367ffa2b5efa2b98412df57ccefd7a19003ce" +SRC_URI[sha256sum] = "b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08bebd18b" UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
Signature · 1 line
2.31.1
PATCH 21/21 tcl: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/tcltk/tcl_8.6.11.bb +2 -0
@@ -29,6 +29,8 @@ SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469 SRC_URI_class-native = "${BASE_SRC_URI}" +UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src" + S = "${WORKDIR}/${BPN}${PV}" VER = "${PV}"
Signature · 1 line
2.31.1