diff options
Diffstat (limited to 'meta')
367 files changed, 5434 insertions, 4074 deletions
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 0999b42daa..066f3848f7 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass | |||
@@ -153,7 +153,7 @@ python base_do_fetch() { | |||
153 | } | 153 | } |
154 | 154 | ||
155 | addtask unpack after do_fetch | 155 | addtask unpack after do_fetch |
156 | do_unpack[dirs] = "${WORKDIR}" | 156 | do_unpack[dirs] = "${UNPACKDIR}" |
157 | 157 | ||
158 | do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}" | 158 | do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}" |
159 | 159 | ||
@@ -164,7 +164,7 @@ python base_do_unpack() { | |||
164 | 164 | ||
165 | try: | 165 | try: |
166 | fetcher = bb.fetch2.Fetch(src_uri, d) | 166 | fetcher = bb.fetch2.Fetch(src_uri, d) |
167 | fetcher.unpack(d.getVar('WORKDIR')) | 167 | fetcher.unpack(d.getVar('UNPACKDIR')) |
168 | except bb.fetch2.BBFetchException as e: | 168 | except bb.fetch2.BBFetchException as e: |
169 | bb.fatal("Bitbake Fetcher Error: " + repr(e)) | 169 | bb.fatal("Bitbake Fetcher Error: " + repr(e)) |
170 | } | 170 | } |
diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index e963001d09..03ac06b102 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass | |||
@@ -298,7 +298,7 @@ def package_qa_check_libdir(d): | |||
298 | try: | 298 | try: |
299 | elf.open() | 299 | elf.open() |
300 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) | 300 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) |
301 | except (oe.qa.NotELFFileError): | 301 | except (oe.qa.NotELFFileError, FileNotFoundError): |
302 | pass | 302 | pass |
303 | if exec_re.match(rel_path): | 303 | if exec_re.match(rel_path): |
304 | if libdir not in rel_path and libexecdir not in rel_path: | 304 | if libdir not in rel_path and libexecdir not in rel_path: |
@@ -307,7 +307,7 @@ def package_qa_check_libdir(d): | |||
307 | try: | 307 | try: |
308 | elf.open() | 308 | elf.open() |
309 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) | 309 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) |
310 | except (oe.qa.NotELFFileError): | 310 | except (oe.qa.NotELFFileError, FileNotFoundError): |
311 | pass | 311 | pass |
312 | 312 | ||
313 | if messages: | 313 | if messages: |
@@ -1399,7 +1399,7 @@ python do_qa_patch() { | |||
1399 | oe.qa.handle_error("unimplemented-ptest", "%s: autotools-based tests detected" % d.getVar('PN'), d) | 1399 | oe.qa.handle_error("unimplemented-ptest", "%s: autotools-based tests detected" % d.getVar('PN'), d) |
1400 | 1400 | ||
1401 | # Last resort, detect a test directory in sources | 1401 | # Last resort, detect a test directory in sources |
1402 | elif any(filename.lower() in ["test", "tests"] for filename in os.listdir(srcdir)): | 1402 | elif os.path.exists(srcdir) and any(filename.lower() in ["test", "tests"] for filename in os.listdir(srcdir)): |
1403 | oe.qa.handle_error("unimplemented-ptest", "%s: test subdirectory detected" % d.getVar('PN'), d) | 1403 | oe.qa.handle_error("unimplemented-ptest", "%s: test subdirectory detected" % d.getVar('PN'), d) |
1404 | 1404 | ||
1405 | oe.qa.exit_if_errors(d) | 1405 | oe.qa.exit_if_errors(d) |
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 2e3e4e8c79..790ccbfaf0 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass | |||
@@ -191,7 +191,7 @@ python write_specfile () { | |||
191 | if not len(depends_dict[dep]): | 191 | if not len(depends_dict[dep]): |
192 | array.append("%s: %s" % (tag, dep)) | 192 | array.append("%s: %s" % (tag, dep)) |
193 | 193 | ||
194 | def walk_files(walkpath, target, conffiles, dirfiles): | 194 | def walk_files(walkpath, target, conffiles): |
195 | # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories | 195 | # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories |
196 | # when packaging. We just ignore these files which are created in | 196 | # when packaging. We just ignore these files which are created in |
197 | # packages-split/ and not package/ | 197 | # packages-split/ and not package/ |
@@ -233,22 +233,12 @@ python write_specfile () { | |||
233 | return False | 233 | return False |
234 | dirs[:] = [dir for dir in dirs if not move_to_files(dir)] | 234 | dirs[:] = [dir for dir in dirs if not move_to_files(dir)] |
235 | 235 | ||
236 | # Directory handling can happen in two ways, either DIRFILES is not set at all | 236 | for dir in dirs: |
237 | # in which case we fall back to the older behaviour of packages owning all their | 237 | if dir == "CONTROL" or dir == "DEBIAN": |
238 | # directories | 238 | continue |
239 | if dirfiles is None: | 239 | p = path + '/' + dir |
240 | for dir in dirs: | 240 | # All packages own the directories their files are in... |
241 | if dir == "CONTROL" or dir == "DEBIAN": | 241 | target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"') |
242 | continue | ||
243 | p = path + '/' + dir | ||
244 | # All packages own the directories their files are in... | ||
245 | target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"') | ||
246 | elif path: | ||
247 | # packages own only empty directories or explict directory. | ||
248 | # This will prevent the overlapping of security permission. | ||
249 | attr = get_attr(path) | ||
250 | if (not files and not dirs) or path in dirfiles: | ||
251 | target.append(attr + '%dir "' + escape_chars(path) + '"') | ||
252 | 242 | ||
253 | for file in files: | 243 | for file in files: |
254 | if file == "CONTROL" or file == "DEBIAN": | 244 | if file == "CONTROL" or file == "DEBIAN": |
@@ -363,9 +353,6 @@ python write_specfile () { | |||
363 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) | 353 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) |
364 | 354 | ||
365 | conffiles = oe.package.get_conffiles(pkg, d) | 355 | conffiles = oe.package.get_conffiles(pkg, d) |
366 | dirfiles = localdata.getVar('DIRFILES') | ||
367 | if dirfiles is not None: | ||
368 | dirfiles = dirfiles.split() | ||
369 | 356 | ||
370 | splitname = pkgname | 357 | splitname = pkgname |
371 | 358 | ||
@@ -430,7 +417,7 @@ python write_specfile () { | |||
430 | srcrpostrm = splitrpostrm | 417 | srcrpostrm = splitrpostrm |
431 | 418 | ||
432 | file_list = [] | 419 | file_list = [] |
433 | walk_files(root, file_list, conffiles, dirfiles) | 420 | walk_files(root, file_list, conffiles) |
434 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": | 421 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": |
435 | bb.note("Not creating empty RPM package for %s" % splitname) | 422 | bb.note("Not creating empty RPM package for %s" % splitname) |
436 | else: | 423 | else: |
@@ -522,7 +509,7 @@ python write_specfile () { | |||
522 | 509 | ||
523 | # Now process files | 510 | # Now process files |
524 | file_list = [] | 511 | file_list = [] |
525 | walk_files(root, file_list, conffiles, dirfiles) | 512 | walk_files(root, file_list, conffiles) |
526 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": | 513 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": |
527 | bb.note("Not creating empty RPM package for %s" % splitname) | 514 | bb.note("Not creating empty RPM package for %s" % splitname) |
528 | else: | 515 | else: |
diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 04539bbb99..76a7b59636 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass | |||
@@ -1115,7 +1115,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, | |||
1115 | bb.parse.siggen.checkhashes(sq_data, missed, found, d) | 1115 | bb.parse.siggen.checkhashes(sq_data, missed, found, d) |
1116 | 1116 | ||
1117 | return found | 1117 | return found |
1118 | setscene_depvalid[vardepsexclude] = "SSTATE_EXCLUDEDEPS_SYSROOT" | 1118 | setscene_depvalid[vardepsexclude] = "SSTATE_EXCLUDEDEPS_SYSROOT _SSTATE_EXCLUDEDEPS_SYSROOT" |
1119 | 1119 | ||
1120 | BB_SETSCENE_DEPVALID = "setscene_depvalid" | 1120 | BB_SETSCENE_DEPVALID = "setscene_depvalid" |
1121 | 1121 | ||
diff --git a/meta/classes-recipe/cmake.bbclass b/meta/classes-recipe/cmake.bbclass index 3d3781ef33..e1c3d7ddb5 100644 --- a/meta/classes-recipe/cmake.bbclass +++ b/meta/classes-recipe/cmake.bbclass | |||
@@ -124,7 +124,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE STRING "LDFLAGS" ) | |||
124 | 124 | ||
125 | # only search in the paths provided so cmake doesnt pick | 125 | # only search in the paths provided so cmake doesnt pick |
126 | # up libraries and tools from the native build machine | 126 | # up libraries and tools from the native build machine |
127 | set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} ${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR}) | 127 | set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} ${EXTERNAL_TOOLCHAIN} ${COREBASE}/scripts ${HOSTTOOLS_DIR} ) |
128 | set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) | 128 | set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) |
129 | set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} ) | 129 | set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} ) |
130 | set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) | 130 | set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) |
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index cc3564c36a..d32509aa6d 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass | |||
@@ -48,8 +48,6 @@ GO_RPATH:class-native = "${@'-r ${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE | |||
48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" | 48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" |
49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" | 49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" |
50 | GO_LINKMODE ?= "" | 50 | GO_LINKMODE ?= "" |
51 | GO_LINKMODE:class-nativesdk = "--linkmode=external" | ||
52 | GO_LINKMODE:class-native = "--linkmode=external" | ||
53 | GO_EXTRA_LDFLAGS ?= "" | 51 | GO_EXTRA_LDFLAGS ?= "" |
54 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" | 52 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" |
55 | # Use system loader. If uninative is used, the uninative loader will be patched automatically | 53 | # Use system loader. If uninative is used, the uninative loader will be patched automatically |
diff --git a/meta/classes-recipe/goarch.bbclass b/meta/classes-recipe/goarch.bbclass index 6899ec28e4..1ebe03864f 100644 --- a/meta/classes-recipe/goarch.bbclass +++ b/meta/classes-recipe/goarch.bbclass | |||
@@ -38,13 +38,13 @@ BASE_GOARM:armv5 = '5' | |||
38 | # Go supports dynamic linking on a limited set of architectures. | 38 | # Go supports dynamic linking on a limited set of architectures. |
39 | # See the supportsDynlink function in go/src/cmd/compile/internal/gc/main.go | 39 | # See the supportsDynlink function in go/src/cmd/compile/internal/gc/main.go |
40 | GO_DYNLINK = "" | 40 | GO_DYNLINK = "" |
41 | GO_DYNLINK:arm = "" | 41 | GO_DYNLINK:arm ?= "1" |
42 | GO_DYNLINK:aarch64 = "" | 42 | GO_DYNLINK:aarch64 ?= "1" |
43 | GO_DYNLINK:x86 = "" | 43 | GO_DYNLINK:x86 ?= "1" |
44 | GO_DYNLINK:x86-64 = "" | 44 | GO_DYNLINK:x86-64 ?= "1" |
45 | GO_DYNLINK:powerpc64 = "" | 45 | GO_DYNLINK:powerpc64 ?= "1" |
46 | GO_DYNLINK:powerpc64le = "" | 46 | GO_DYNLINK:powerpc64le ?= "1" |
47 | GO_DYNLINK:class-native = "" | 47 | GO_DYNLINK:class-native ?= "" |
48 | GO_DYNLINK:class-nativesdk = "" | 48 | GO_DYNLINK:class-nativesdk = "" |
49 | 49 | ||
50 | # define here because everybody inherits this class | 50 | # define here because everybody inherits this class |
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 913cb8788c..b4a83ae284 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass | |||
@@ -112,18 +112,22 @@ IMAGE_CMD:btrfs () { | |||
112 | } | 112 | } |
113 | 113 | ||
114 | oe_mksquashfs () { | 114 | oe_mksquashfs () { |
115 | local comp=$1 | 115 | local comp=$1; shift |
116 | local suffix=$2 | 116 | local extra_imagecmd=$@ |
117 | |||
118 | if [ "$comp" = "zstd" ]; then | ||
119 | suffix="zst" | ||
120 | fi | ||
117 | 121 | ||
118 | # Use the bitbake reproducible timestamp instead of the hardcoded squashfs one | 122 | # Use the bitbake reproducible timestamp instead of the hardcoded squashfs one |
119 | export SOURCE_DATE_EPOCH=$(stat -c '%Y' ${IMAGE_ROOTFS}) | 123 | export SOURCE_DATE_EPOCH=$(stat -c '%Y' ${IMAGE_ROOTFS}) |
120 | mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}.squashfs${comp:+-}${suffix:-$comp} ${EXTRA_IMAGECMD} -noappend ${comp:+-comp }$comp | 124 | mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}.squashfs${comp:+-}${suffix:-$comp} -noappend ${comp:+-comp }$comp $extra_imagecmd |
121 | } | 125 | } |
122 | IMAGE_CMD:squashfs = "oe_mksquashfs" | 126 | IMAGE_CMD:squashfs = "oe_mksquashfs '' ${EXTRA_IMAGECMD}" |
123 | IMAGE_CMD:squashfs-xz = "oe_mksquashfs xz" | 127 | IMAGE_CMD:squashfs-xz = "oe_mksquashfs xz ${EXTRA_IMAGECMD}" |
124 | IMAGE_CMD:squashfs-lzo = "oe_mksquashfs lzo" | 128 | IMAGE_CMD:squashfs-lzo = "oe_mksquashfs lzo ${EXTRA_IMAGECMD}" |
125 | IMAGE_CMD:squashfs-lz4 = "oe_mksquashfs lz4" | 129 | IMAGE_CMD:squashfs-lz4 = "oe_mksquashfs lz4 ${EXTRA_IMAGECMD}" |
126 | IMAGE_CMD:squashfs-zst = "oe_mksquashfs zstd zst" | 130 | IMAGE_CMD:squashfs-zst = "oe_mksquashfs zstd ${EXTRA_IMAGECMD}" |
127 | 131 | ||
128 | IMAGE_CMD:erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs ${IMAGE_ROOTFS}" | 132 | IMAGE_CMD:erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs ${IMAGE_ROOTFS}" |
129 | IMAGE_CMD:erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs-lz4 ${IMAGE_ROOTFS}" | 133 | IMAGE_CMD:erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs-lz4 ${IMAGE_ROOTFS}" |
diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index 9a86616dad..6468e8aa90 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass | |||
@@ -63,7 +63,7 @@ def find_sccs(d): | |||
63 | return sources_list | 63 | return sources_list |
64 | 64 | ||
65 | # check the SRC_URI for "kmeta" type'd git repositories. Return the name of | 65 | # check the SRC_URI for "kmeta" type'd git repositories. Return the name of |
66 | # the repository as it will be found in WORKDIR | 66 | # the repository as it will be found in UNPACKDIR |
67 | def find_kernel_feature_dirs(d): | 67 | def find_kernel_feature_dirs(d): |
68 | feature_dirs=[] | 68 | feature_dirs=[] |
69 | fetch = bb.fetch2.Fetch([], d) | 69 | fetch = bb.fetch2.Fetch([], d) |
@@ -147,24 +147,24 @@ do_kernel_metadata() { | |||
147 | # from the source tree, into a common location and normalized "defconfig" name, | 147 | # from the source tree, into a common location and normalized "defconfig" name, |
148 | # where the rest of the process will include and incoroporate it into the build | 148 | # where the rest of the process will include and incoroporate it into the build |
149 | # | 149 | # |
150 | # If the fetcher has already placed a defconfig in WORKDIR (from the SRC_URI), | 150 | # If the fetcher has already placed a defconfig in UNPACKDIR (from the SRC_URI), |
151 | # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take | 151 | # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take |
152 | # precendence. | 152 | # precendence. |
153 | # | 153 | # |
154 | if [ -n "${KBUILD_DEFCONFIG}" ]; then | 154 | if [ -n "${KBUILD_DEFCONFIG}" ]; then |
155 | if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then | 155 | if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then |
156 | if [ -f "${WORKDIR}/defconfig" ]; then | 156 | if [ -f "${UNPACKDIR}/defconfig" ]; then |
157 | # If the two defconfig's are different, warn that we overwrote the | 157 | # If the two defconfig's are different, warn that we overwrote the |
158 | # one already placed in WORKDIR | 158 | # one already placed in UNPACKDIR |
159 | cmp "${WORKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" | 159 | cmp "${UNPACKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" |
160 | if [ $? -ne 0 ]; then | 160 | if [ $? -ne 0 ]; then |
161 | bbdebug 1 "detected SRC_URI or unpatched defconfig in WORKDIR. ${KBUILD_DEFCONFIG} copied over it" | 161 | bbdebug 1 "detected SRC_URI or unpatched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it" |
162 | fi | 162 | fi |
163 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig | 163 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig |
164 | else | 164 | else |
165 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig | 165 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig |
166 | fi | 166 | fi |
167 | in_tree_defconfig="${WORKDIR}/defconfig" | 167 | in_tree_defconfig="${UNPACKDIR}/defconfig" |
168 | else | 168 | else |
169 | bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)" | 169 | bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)" |
170 | fi | 170 | fi |
@@ -178,7 +178,7 @@ do_kernel_metadata() { | |||
178 | patches="${@" ".join(find_patches(d,'kernel-meta'))}" | 178 | patches="${@" ".join(find_patches(d,'kernel-meta'))}" |
179 | if [ -n "$patches" ]; then | 179 | if [ -n "$patches" ]; then |
180 | ( | 180 | ( |
181 | cd ${WORKDIR}/kernel-meta | 181 | cd ${UNPACKDIR}/kernel-meta |
182 | 182 | ||
183 | # take the SRC_URI patches, and create a series file | 183 | # take the SRC_URI patches, and create a series file |
184 | # this is required to support some better processing | 184 | # this is required to support some better processing |
@@ -193,11 +193,11 @@ do_kernel_metadata() { | |||
193 | # handling the rest of the kernel. This allows us | 193 | # handling the rest of the kernel. This allows us |
194 | # more flexibility for handling failures or advanced | 194 | # more flexibility for handling failures or advanced |
195 | # mergeing functinoality | 195 | # mergeing functinoality |
196 | message=$(kgit-s2q --gen -v --patches ${WORKDIR}/kernel-meta 2>&1) | 196 | message=$(kgit-s2q --gen -v --patches ${UNPACKDIR}/kernel-meta 2>&1) |
197 | if [ $? -ne 0 ]; then | 197 | if [ $? -ne 0 ]; then |
198 | # setup to try the patch again | 198 | # setup to try the patch again |
199 | kgit-s2q --prev | 199 | kgit-s2q --prev |
200 | bberror "Problem applying patches to: ${WORKDIR}/kernel-meta" | 200 | bberror "Problem applying patches to: ${UNPACKDIR}/kernel-meta" |
201 | bbfatal_log "\n($message)" | 201 | bbfatal_log "\n($message)" |
202 | fi | 202 | fi |
203 | ) | 203 | ) |
@@ -232,12 +232,12 @@ do_kernel_metadata() { | |||
232 | # SRC_URI. If they were supplied, we convert them into include directives | 232 | # SRC_URI. If they were supplied, we convert them into include directives |
233 | # for the update part of the process | 233 | # for the update part of the process |
234 | for f in ${feat_dirs}; do | 234 | for f in ${feat_dirs}; do |
235 | if [ -d "${WORKDIR}/$f/kernel-meta" ]; then | 235 | if [ -d "${UNPACKDIR}/$f/kernel-meta" ]; then |
236 | includes="$includes -I${WORKDIR}/$f/kernel-meta" | 236 | includes="$includes -I${UNPACKDIR}/$f/kernel-meta" |
237 | elif [ -d "${WORKDIR}/../oe-local-files/$f" ]; then | 237 | elif [ -d "${UNPACKDIR}/../oe-local-files/$f" ]; then |
238 | includes="$includes -I${WORKDIR}/../oe-local-files/$f" | 238 | includes="$includes -I${UNPACKDIR}/../oe-local-files/$f" |
239 | elif [ -d "${WORKDIR}/$f" ]; then | 239 | elif [ -d "${UNPACKDIR}/$f" ]; then |
240 | includes="$includes -I${WORKDIR}/$f" | 240 | includes="$includes -I${UNPACKDIR}/$f" |
241 | fi | 241 | fi |
242 | done | 242 | done |
243 | for s in ${sccs} ${patches}; do | 243 | for s in ${sccs} ${patches}; do |
@@ -460,7 +460,7 @@ do_kernel_configme() { | |||
460 | config_flags="" | 460 | config_flags="" |
461 | ;; | 461 | ;; |
462 | *) | 462 | *) |
463 | if [ -f ${WORKDIR}/defconfig ]; then | 463 | if [ -f ${UNPACKDIR}/defconfig ]; then |
464 | config_flags="-n" | 464 | config_flags="-n" |
465 | fi | 465 | fi |
466 | ;; | 466 | ;; |
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index b084d6d69d..d6eedf942c 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass | |||
@@ -463,7 +463,7 @@ kernel_do_install() { | |||
463 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" | 463 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" |
464 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" | 464 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" |
465 | # Remove empty module directories to prevent QA issues | 465 | # Remove empty module directories to prevent QA issues |
466 | find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete | 466 | [ -d "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" ] && find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete |
467 | else | 467 | else |
468 | bbnote "no modules to install" | 468 | bbnote "no modules to install" |
469 | fi | 469 | fi |
@@ -679,8 +679,8 @@ kernel_do_configure() { | |||
679 | 679 | ||
680 | # Copy defconfig to .config if .config does not exist. This allows | 680 | # Copy defconfig to .config if .config does not exist. This allows |
681 | # recipes to manage the .config themselves in do_configure:prepend(). | 681 | # recipes to manage the .config themselves in do_configure:prepend(). |
682 | if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then | 682 | if [ -f "${UNPACKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then |
683 | cp "${WORKDIR}/defconfig" "${B}/.config" | 683 | cp "${UNPACKDIR}/defconfig" "${B}/.config" |
684 | fi | 684 | fi |
685 | 685 | ||
686 | ${KERNEL_CONFIG_COMMAND} | 686 | ${KERNEL_CONFIG_COMMAND} |
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index f5687e5899..09d5e2aeb6 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass | |||
@@ -276,6 +276,8 @@ def write_bblayers_conf(d, baseoutpath, sdkbblayers): | |||
276 | def copy_uninative(d, baseoutpath): | 276 | def copy_uninative(d, baseoutpath): |
277 | import shutil | 277 | import shutil |
278 | 278 | ||
279 | uninative_checksum = None | ||
280 | |||
279 | # Copy uninative tarball | 281 | # Copy uninative tarball |
280 | # For now this is where uninative.bbclass expects the tarball | 282 | # For now this is where uninative.bbclass expects the tarball |
281 | if bb.data.inherits_class('uninative', d): | 283 | if bb.data.inherits_class('uninative', d): |
diff --git a/meta/classes-recipe/ptest.bbclass b/meta/classes-recipe/ptest.bbclass index 348d729aef..0941572f8f 100644 --- a/meta/classes-recipe/ptest.bbclass +++ b/meta/classes-recipe/ptest.bbclass | |||
@@ -53,8 +53,8 @@ do_install_ptest() { | |||
53 | } | 53 | } |
54 | 54 | ||
55 | do_install_ptest_base() { | 55 | do_install_ptest_base() { |
56 | if [ -f ${WORKDIR}/run-ptest ]; then | 56 | if [ -f ${UNPACKDIR}/run-ptest ]; then |
57 | install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest | 57 | install -D ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest |
58 | fi | 58 | fi |
59 | 59 | ||
60 | grep -q install-ptest: Makefile 2>/dev/null && oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest | 60 | grep -q install-ptest: Makefile 2>/dev/null && oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest |
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index e81b69a239..920da94ba2 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass | |||
@@ -206,7 +206,9 @@ read_only_rootfs_hook () { | |||
206 | # Also tweak the key location for dropbear in the same way. | 206 | # Also tweak the key location for dropbear in the same way. |
207 | if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then | 207 | if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then |
208 | if [ ! -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ]; then | 208 | if [ ! -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ]; then |
209 | echo "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear | 209 | if ! grep -q "^DROPBEAR_RSAKEY_DIR=" ${IMAGE_ROOTFS}/etc/default/dropbear ; then |
210 | echo "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear | ||
211 | fi | ||
210 | fi | 212 | fi |
211 | fi | 213 | fi |
212 | fi | 214 | fi |
diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 926b0630b1..330ad8a3f5 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass | |||
@@ -21,6 +21,9 @@ def llvm_features_from_tune(d): | |||
21 | 21 | ||
22 | if 'vfpv4' in feat: | 22 | if 'vfpv4' in feat: |
23 | f.append("+vfp4") | 23 | f.append("+vfp4") |
24 | elif 'vfpv4d16' in feat: | ||
25 | f.append("+vfp4") | ||
26 | f.append("-d32") | ||
24 | elif 'vfpv3' in feat: | 27 | elif 'vfpv3' in feat: |
25 | f.append("+vfp3") | 28 | f.append("+vfp3") |
26 | elif 'vfpv3d16' in feat: | 29 | elif 'vfpv3d16' in feat: |
diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index 7a0b8047e4..c8e097f2f2 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass | |||
@@ -367,7 +367,7 @@ do_uboot_assemble_fitimage() { | |||
367 | done | 367 | done |
368 | 368 | ||
369 | for binary in ${UBOOT_BINARIES}; do | 369 | for binary in ${UBOOT_BINARIES}; do |
370 | k=$(expr $j + 1); | 370 | k=$(expr $k + 1); |
371 | if [ $k -eq $i ]; then | 371 | if [ $k -eq $i ]; then |
372 | break; | 372 | break; |
373 | fi | 373 | fi |
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 486efadba9..7c8a0b8b0f 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass | |||
@@ -28,7 +28,7 @@ SPDX_ARCHIVE_SOURCES ??= "0" | |||
28 | SPDX_ARCHIVE_PACKAGED ??= "0" | 28 | SPDX_ARCHIVE_PACKAGED ??= "0" |
29 | 29 | ||
30 | SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" | 30 | SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" |
31 | SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdoc" | 31 | SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdocs" |
32 | SPDX_PRETTY ??= "0" | 32 | SPDX_PRETTY ??= "0" |
33 | 33 | ||
34 | SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json" | 34 | SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json" |
@@ -357,7 +357,13 @@ def collect_dep_recipes(d, doc, spdx_recipe): | |||
357 | with spdx_deps_file.open("r") as f: | 357 | with spdx_deps_file.open("r") as f: |
358 | deps = json.load(f) | 358 | deps = json.load(f) |
359 | 359 | ||
360 | for dep_pn, dep_hashfn in deps: | 360 | for dep_pn, dep_hashfn, in_taskhash in deps: |
361 | # If this dependency is not calculated in the taskhash skip it. | ||
362 | # Otherwise, it can result in broken links since this task won't | ||
363 | # rebuild and see the new SPDX ID if the dependency changes | ||
364 | if not in_taskhash: | ||
365 | continue | ||
366 | |||
361 | dep_recipe_path = oe.sbom.doc_find_by_hashfn(deploy_dir_spdx, package_archs, "recipe-" + dep_pn, dep_hashfn) | 367 | dep_recipe_path = oe.sbom.doc_find_by_hashfn(deploy_dir_spdx, package_archs, "recipe-" + dep_pn, dep_hashfn) |
362 | if not dep_recipe_path: | 368 | if not dep_recipe_path: |
363 | bb.fatal("Cannot find any SPDX file for recipe %s, %s" % (dep_pn, dep_hashfn)) | 369 | bb.fatal("Cannot find any SPDX file for recipe %s, %s" % (dep_pn, dep_hashfn)) |
@@ -478,7 +484,7 @@ def collect_direct_deps(d, dep_task): | |||
478 | for dep_name in this_dep[3]: | 484 | for dep_name in this_dep[3]: |
479 | dep_data = taskdepdata[dep_name] | 485 | dep_data = taskdepdata[dep_name] |
480 | if dep_data[1] == dep_task and dep_data[0] != pn: | 486 | if dep_data[1] == dep_task and dep_data[0] != pn: |
481 | deps.add((dep_data[0], dep_data[7])) | 487 | deps.add((dep_data[0], dep_data[7], dep_name in this_dep[8])) |
482 | 488 | ||
483 | return sorted(deps) | 489 | return sorted(deps) |
484 | 490 | ||
@@ -721,9 +727,9 @@ def collect_package_providers(d): | |||
721 | providers = {} | 727 | providers = {} |
722 | 728 | ||
723 | deps = collect_direct_deps(d, "do_create_spdx") | 729 | deps = collect_direct_deps(d, "do_create_spdx") |
724 | deps.append((d.getVar("PN"), d.getVar("BB_HASHFILENAME"))) | 730 | deps.append((d.getVar("PN"), d.getVar("BB_HASHFILENAME"), True)) |
725 | 731 | ||
726 | for dep_pn, dep_hashfn in deps: | 732 | for dep_pn, dep_hashfn, _ in deps: |
727 | localdata = d | 733 | localdata = d |
728 | recipe_data = oe.packagedata.read_pkgdata(dep_pn, localdata) | 734 | recipe_data = oe.packagedata.read_pkgdata(dep_pn, localdata) |
729 | if not recipe_data: | 735 | if not recipe_data: |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index ba8bd5f975..b2c500d873 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -405,6 +405,7 @@ STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" | |||
405 | STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" | 405 | STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" |
406 | BASE_WORKDIR ?= "${TMPDIR}/work" | 406 | BASE_WORKDIR ?= "${TMPDIR}/work" |
407 | WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" | 407 | WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" |
408 | UNPACKDIR ??= "${WORKDIR}" | ||
408 | T = "${WORKDIR}/temp" | 409 | T = "${WORKDIR}/temp" |
409 | D = "${WORKDIR}/image" | 410 | D = "${WORKDIR}/image" |
410 | S = "${WORKDIR}/${BP}" | 411 | S = "${WORKDIR}/${BP}" |
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e6131c815a..2b579339b2 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -123,7 +123,6 @@ DISTRO_PN_ALIAS:pn-keymaps = "OE-Core" | |||
123 | DISTRO_PN_ALIAS:pn-kf = "OSPDT" | 123 | DISTRO_PN_ALIAS:pn-kf = "OSPDT" |
124 | DISTRO_PN_ALIAS:pn-lame = "Debian=lame Ubuntu=lame" | 124 | DISTRO_PN_ALIAS:pn-lame = "Debian=lame Ubuntu=lame" |
125 | DISTRO_PN_ALIAS:pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" | 125 | DISTRO_PN_ALIAS:pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" |
126 | DISTRO_PN_ALIAS:pn-liba52 = "Mandriva=a52dec Debian=a52dec" | ||
127 | DISTRO_PN_ALIAS:pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi" | 126 | DISTRO_PN_ALIAS:pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi" |
128 | DISTRO_PN_ALIAS:pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ubuntu=libatomic-ops OpenSuSE=libatomic-ops Mandriva=libatomic-ops" | 127 | DISTRO_PN_ALIAS:pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ubuntu=libatomic-ops OpenSuSE=libatomic-ops Mandriva=libatomic-ops" |
129 | DISTRO_PN_ALIAS:pn-libcgroup = "Ubuntu=libcgroup1 Debian=libcgroup1" | 128 | DISTRO_PN_ALIAS:pn-libcgroup = "Ubuntu=libcgroup1 Debian=libcgroup1" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 20eb3a0446..014cf32e40 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -205,6 +205,7 @@ RECIPE_MAINTAINER:pn-gi-docgen = "Alexander Kanavin <alex.kanavin@gmail.com>" | |||
205 | RECIPE_MAINTAINER:pn-git = "Robert Yang <liezhi.yang@windriver.com>" | 205 | RECIPE_MAINTAINER:pn-git = "Robert Yang <liezhi.yang@windriver.com>" |
206 | RECIPE_MAINTAINER:pn-glew = "Anuj Mittal <anuj.mittal@intel.com>" | 206 | RECIPE_MAINTAINER:pn-glew = "Anuj Mittal <anuj.mittal@intel.com>" |
207 | RECIPE_MAINTAINER:pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>" | 207 | RECIPE_MAINTAINER:pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>" |
208 | RECIPE_MAINTAINER:pn-glib-2.0-initial = "Anuj Mittal <anuj.mittal@intel.com>" | ||
208 | RECIPE_MAINTAINER:pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>" | 209 | RECIPE_MAINTAINER:pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>" |
209 | RECIPE_MAINTAINER:pn-glibc = "Khem Raj <raj.khem@gmail.com>" | 210 | RECIPE_MAINTAINER:pn-glibc = "Khem Raj <raj.khem@gmail.com>" |
210 | RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" | 211 | RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" |
@@ -305,7 +306,6 @@ RECIPE_MAINTAINER:pn-l3afpad = "Anuj Mittal <anuj.mittal@intel.com>" | |||
305 | RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker <michael.opdenacker@bootlin.com>" | 306 | RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker <michael.opdenacker@bootlin.com>" |
306 | RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" | 307 | RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" |
307 | RECIPE_MAINTAINER:pn-less = "Yi Zhao <yi.zhao@windriver.com>" | 308 | RECIPE_MAINTAINER:pn-less = "Yi Zhao <yi.zhao@windriver.com>" |
308 | RECIPE_MAINTAINER:pn-liba52 = "Unassigned <unassigned@yoctoproject.org>" | ||
309 | RECIPE_MAINTAINER:pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" | 309 | RECIPE_MAINTAINER:pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" |
310 | RECIPE_MAINTAINER:pn-libadwaita = "Alexander Kanavin <alex.kanavin@gmail.com>" | 310 | RECIPE_MAINTAINER:pn-libadwaita = "Alexander Kanavin <alex.kanavin@gmail.com>" |
311 | RECIPE_MAINTAINER:pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" | 311 | RECIPE_MAINTAINER:pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" |
@@ -524,7 +524,6 @@ RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>" | |||
524 | RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>" | 524 | RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>" |
525 | RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" | 525 | RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" |
526 | RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" | 526 | RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" |
527 | RECIPE_MAINTAINER:pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>" | ||
528 | RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>" | 527 | RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>" |
529 | RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" | 528 | RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" |
530 | RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>" | 529 | RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>" |
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index d2f56a3fb0..02775970ae 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | # See sanity.bbclass | 3 | # See sanity.bbclass |
4 | # | 4 | # |
5 | # Expert users can confirm their sanity with "touch conf/sanity.conf" | 5 | # Expert users can confirm their sanity with "touch conf/sanity.conf" |
6 | BB_MIN_VERSION = "2.7.3" | 6 | BB_MIN_VERSION = "2.9.1" |
7 | 7 | ||
8 | SANITY_ABIFILE = "${TMPDIR}/abi_version" | 8 | SANITY_ABIFILE = "${TMPDIR}/abi_version" |
9 | 9 | ||
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4386b985bb..89d30005fd 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh | |||
@@ -164,7 +164,9 @@ else | |||
164 | fi | 164 | fi |
165 | 165 | ||
166 | # limit the length for target_sdk_dir, ensure the relocation behaviour in relocate_sdk.py has right result. | 166 | # limit the length for target_sdk_dir, ensure the relocation behaviour in relocate_sdk.py has right result. |
167 | if [ ${#target_sdk_dir} -gt 2048 ]; then | 167 | # This is due to ELF interpreter being set to 'a'*1024 in |
168 | # meta/recipes-core/meta/uninative-tarball.bb | ||
169 | if [ ${#target_sdk_dir} -gt 1024 ]; then | ||
168 | echo "Error: The target directory path is too long!!!" | 170 | echo "Error: The target directory path is too long!!!" |
169 | exit 1 | 171 | exit 1 |
170 | fi | 172 | fi |
diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index 6774cdb794..d3b2317894 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py | |||
@@ -449,7 +449,7 @@ class PackageManager(object, metaclass=ABCMeta): | |||
449 | return res | 449 | return res |
450 | return _append(uris, base_paths) | 450 | return _append(uris, base_paths) |
451 | 451 | ||
452 | def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencies): | 452 | def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencies, include_self=False): |
453 | """ | 453 | """ |
454 | Go through our do_package_write_X dependencies and hardlink the packages we depend | 454 | Go through our do_package_write_X dependencies and hardlink the packages we depend |
455 | upon into the repo directory. This prevents us seeing other packages that may | 455 | upon into the repo directory. This prevents us seeing other packages that may |
@@ -486,14 +486,17 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie | |||
486 | bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?") | 486 | bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?") |
487 | pkgdeps = set() | 487 | pkgdeps = set() |
488 | start = [start] | 488 | start = [start] |
489 | seen = set(start) | 489 | if include_self: |
490 | seen = set() | ||
491 | else: | ||
492 | seen = set(start) | ||
490 | # Support direct dependencies (do_rootfs -> do_package_write_X) | 493 | # Support direct dependencies (do_rootfs -> do_package_write_X) |
491 | # or indirect dependencies within PN (do_populate_sdk_ext -> do_rootfs -> do_package_write_X) | 494 | # or indirect dependencies within PN (do_populate_sdk_ext -> do_rootfs -> do_package_write_X) |
492 | while start: | 495 | while start: |
493 | next = [] | 496 | next = [] |
494 | for dep2 in start: | 497 | for dep2 in start: |
495 | for dep in taskdepdata[dep2][3]: | 498 | for dep in taskdepdata[dep2][3]: |
496 | if taskdepdata[dep][0] != pn: | 499 | if include_self or taskdepdata[dep][0] != pn: |
497 | if "do_" + taskname in dep: | 500 | if "do_" + taskname in dep: |
498 | pkgdeps.add(dep) | 501 | pkgdeps.add(dep) |
499 | elif dep not in seen: | 502 | elif dep not in seen: |
diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 8cc9953a02..0f0038d00d 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py | |||
@@ -4,6 +4,7 @@ | |||
4 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
5 | # | 5 | # |
6 | 6 | ||
7 | import glob | ||
7 | import re | 8 | import re |
8 | import shutil | 9 | import shutil |
9 | import subprocess | 10 | import subprocess |
@@ -134,11 +135,16 @@ class OpkgDpkgPM(PackageManager): | |||
134 | tmp_dir = tempfile.mkdtemp() | 135 | tmp_dir = tempfile.mkdtemp() |
135 | current_dir = os.getcwd() | 136 | current_dir = os.getcwd() |
136 | os.chdir(tmp_dir) | 137 | os.chdir(tmp_dir) |
137 | data_tar = 'data.tar.zst' | ||
138 | 138 | ||
139 | try: | 139 | try: |
140 | cmd = [ar_cmd, 'x', pkg_path] | 140 | cmd = [ar_cmd, 'x', pkg_path] |
141 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) | 141 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) |
142 | data_tar = glob.glob("data.tar.*") | ||
143 | if len(data_tar) != 1: | ||
144 | bb.fatal("Unable to extract %s package. Failed to identify " | ||
145 | "data tarball (found tarballs '%s').", | ||
146 | pkg_path, data_tar) | ||
147 | data_tar = data_tar[0] | ||
142 | cmd = [tar_cmd, 'xf', data_tar] | 148 | cmd = [tar_cmd, 'xf', data_tar] |
143 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) | 149 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) |
144 | except subprocess.CalledProcessError as e: | 150 | except subprocess.CalledProcessError as e: |
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 60a0cc8291..58c6e34fe8 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -882,7 +882,7 @@ class UserResolver(Resolver): | |||
882 | os.chdir(olddir) | 882 | os.chdir(olddir) |
883 | 883 | ||
884 | 884 | ||
885 | def patch_path(url, fetch, workdir, expand=True): | 885 | def patch_path(url, fetch, unpackdir, expand=True): |
886 | """Return the local path of a patch, or return nothing if this isn't a patch""" | 886 | """Return the local path of a patch, or return nothing if this isn't a patch""" |
887 | 887 | ||
888 | local = fetch.localpath(url) | 888 | local = fetch.localpath(url) |
@@ -891,7 +891,7 @@ def patch_path(url, fetch, workdir, expand=True): | |||
891 | base, ext = os.path.splitext(os.path.basename(local)) | 891 | base, ext = os.path.splitext(os.path.basename(local)) |
892 | if ext in ('.gz', '.bz2', '.xz', '.Z'): | 892 | if ext in ('.gz', '.bz2', '.xz', '.Z'): |
893 | if expand: | 893 | if expand: |
894 | local = os.path.join(workdir, base) | 894 | local = os.path.join(unpackdir, base) |
895 | ext = os.path.splitext(base)[1] | 895 | ext = os.path.splitext(base)[1] |
896 | 896 | ||
897 | urldata = fetch.ud[url] | 897 | urldata = fetch.ud[url] |
@@ -905,12 +905,12 @@ def patch_path(url, fetch, workdir, expand=True): | |||
905 | return local | 905 | return local |
906 | 906 | ||
907 | def src_patches(d, all=False, expand=True): | 907 | def src_patches(d, all=False, expand=True): |
908 | workdir = d.getVar('WORKDIR') | 908 | unpackdir = d.getVar('UNPACKDIR') |
909 | fetch = bb.fetch2.Fetch([], d) | 909 | fetch = bb.fetch2.Fetch([], d) |
910 | patches = [] | 910 | patches = [] |
911 | sources = [] | 911 | sources = [] |
912 | for url in fetch.urls: | 912 | for url in fetch.urls: |
913 | local = patch_path(url, fetch, workdir, expand) | 913 | local = patch_path(url, fetch, unpackdir, expand) |
914 | if not local: | 914 | if not local: |
915 | if all: | 915 | if all: |
916 | local = fetch.localpath(url) | 916 | local = fetch.localpath(url) |
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py index 448befce33..a9f717159e 100644 --- a/meta/lib/oe/reproducible.py +++ b/meta/lib/oe/reproducible.py | |||
@@ -120,7 +120,7 @@ def get_source_date_epoch_from_git(d, sourcedir): | |||
120 | return int(p.stdout.decode('utf-8')) | 120 | return int(p.stdout.decode('utf-8')) |
121 | 121 | ||
122 | def get_source_date_epoch_from_youngest_file(d, sourcedir): | 122 | def get_source_date_epoch_from_youngest_file(d, sourcedir): |
123 | if sourcedir == d.getVar('WORKDIR'): | 123 | if sourcedir == d.getVar('UNPACKDIR'): |
124 | # These sources are almost certainly not from a tarball | 124 | # These sources are almost certainly not from a tarball |
125 | return None | 125 | return None |
126 | 126 | ||
diff --git a/meta/lib/oeqa/selftest/cases/debuginfod.py b/meta/lib/oeqa/selftest/cases/debuginfod.py index 505b4be837..46c0cd87bb 100644 --- a/meta/lib/oeqa/selftest/cases/debuginfod.py +++ b/meta/lib/oeqa/selftest/cases/debuginfod.py | |||
@@ -62,7 +62,7 @@ class Debuginfod(OESelftestTestCase): | |||
62 | 62 | ||
63 | raise TimeoutError("Cannot connect debuginfod, still %d scan jobs running" % latest) | 63 | raise TimeoutError("Cannot connect debuginfod, still %d scan jobs running" % latest) |
64 | 64 | ||
65 | def start_debuginfod(self): | 65 | def start_debuginfod(self, feed_dir): |
66 | # We assume that the caller has already bitbake'd elfutils-native:do_addto_recipe_sysroot | 66 | # We assume that the caller has already bitbake'd elfutils-native:do_addto_recipe_sysroot |
67 | 67 | ||
68 | # Save some useful paths for later | 68 | # Save some useful paths for later |
@@ -82,7 +82,7 @@ class Debuginfod(OESelftestTestCase): | |||
82 | # Disable rescanning, this is a one-shot test | 82 | # Disable rescanning, this is a one-shot test |
83 | "--rescan-time=0", | 83 | "--rescan-time=0", |
84 | "--groom-time=0", | 84 | "--groom-time=0", |
85 | get_bb_var("DEPLOY_DIR"), | 85 | feed_dir, |
86 | ] | 86 | ] |
87 | 87 | ||
88 | format = get_bb_var("PACKAGE_CLASSES").split()[0] | 88 | format = get_bb_var("PACKAGE_CLASSES").split()[0] |
@@ -114,11 +114,12 @@ class Debuginfod(OESelftestTestCase): | |||
114 | self.write_config(""" | 114 | self.write_config(""" |
115 | TMPDIR = "${TOPDIR}/tmp-debuginfod" | 115 | TMPDIR = "${TOPDIR}/tmp-debuginfod" |
116 | DISTRO_FEATURES:append = " debuginfod" | 116 | DISTRO_FEATURES:append = " debuginfod" |
117 | INHERIT += "localpkgfeed" | ||
117 | """) | 118 | """) |
118 | bitbake("elfutils-native:do_addto_recipe_sysroot xz xz:do_package") | 119 | bitbake("elfutils-native:do_addto_recipe_sysroot xz xz:do_package xz:do_localpkgfeed") |
119 | 120 | ||
120 | try: | 121 | try: |
121 | self.start_debuginfod() | 122 | self.start_debuginfod(get_bb_var("LOCALPKGFEED_DIR", "xz")) |
122 | 123 | ||
123 | env = os.environ.copy() | 124 | env = os.environ.copy() |
124 | env["DEBUGINFOD_URLS"] = "http://localhost:%d/" % self.port | 125 | env["DEBUGINFOD_URLS"] = "http://localhost:%d/" % self.port |
@@ -141,12 +142,13 @@ DISTRO_FEATURES:append = " debuginfod" | |||
141 | self.write_config(""" | 142 | self.write_config(""" |
142 | TMPDIR = "${TOPDIR}/tmp-debuginfod" | 143 | TMPDIR = "${TOPDIR}/tmp-debuginfod" |
143 | DISTRO_FEATURES:append = " debuginfod" | 144 | DISTRO_FEATURES:append = " debuginfod" |
145 | INHERIT += "localpkgfeed" | ||
144 | CORE_IMAGE_EXTRA_INSTALL += "elfutils xz" | 146 | CORE_IMAGE_EXTRA_INSTALL += "elfutils xz" |
145 | """) | 147 | """) |
146 | bitbake("core-image-minimal elfutils-native:do_addto_recipe_sysroot") | 148 | bitbake("core-image-minimal elfutils-native:do_addto_recipe_sysroot xz:do_localpkgfeed") |
147 | 149 | ||
148 | try: | 150 | try: |
149 | self.start_debuginfod() | 151 | self.start_debuginfod(get_bb_var("LOCALPKGFEED_DIR", "xz")) |
150 | 152 | ||
151 | with runqemu("core-image-minimal", runqemuparams="nographic") as qemu: | 153 | with runqemu("core-image-minimal", runqemuparams="nographic") as qemu: |
152 | cmd = "DEBUGINFOD_URLS=http://%s:%d/ debuginfod-find debuginfo /usr/bin/xz" % (qemu.server_ip, self.port) | 154 | cmd = "DEBUGINFOD_URLS=http://%s:%d/ debuginfod-find debuginfo /usr/bin/xz" % (qemu.server_ip, self.port) |
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index bc1e40ef83..882225dde3 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -286,10 +286,13 @@ class DevtoolTestCase(OESelftestTestCase): | |||
286 | else: | 286 | else: |
287 | self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') | 287 | self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') |
288 | 288 | ||
289 | def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri): | 289 | def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri, srcrev=None): |
290 | self.track_for_cleanup(self.workspacedir) | 290 | self.track_for_cleanup(self.workspacedir) |
291 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') | 291 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') |
292 | result = runCmd('devtool add --version %s %s %s' % (version, pn, git_url)) | 292 | command = 'devtool add --version %s %s %s' % (version, pn, git_url) |
293 | if srcrev : | ||
294 | command += ' --srcrev %s' %srcrev | ||
295 | result = runCmd(command) | ||
293 | self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') | 296 | self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') |
294 | # Check the recipe name is correct | 297 | # Check the recipe name is correct |
295 | recipefile = get_bb_var('FILE', pn) | 298 | recipefile = get_bb_var('FILE', pn) |
@@ -479,11 +482,12 @@ class DevtoolAddTests(DevtoolBase): | |||
479 | 482 | ||
480 | def test_devtool_add_git_style2(self): | 483 | def test_devtool_add_git_style2(self): |
481 | version = 'v3.1.0' | 484 | version = 'v3.1.0' |
485 | srcrev = 'v3.1.0' | ||
482 | pn = 'mbedtls' | 486 | pn = 'mbedtls' |
483 | # this will trigger reformat_git_uri with branch parameter in url | 487 | # this will trigger reformat_git_uri with branch parameter in url |
484 | git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" | 488 | git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" |
485 | resulting_src_uri = "gitsm://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" | 489 | resulting_src_uri = "git://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" |
486 | self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri) | 490 | self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri, srcrev) |
487 | 491 | ||
488 | def test_devtool_add_library(self): | 492 | def test_devtool_add_library(self): |
489 | # Fetch source | 493 | # Fetch source |
@@ -1405,14 +1409,30 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1405 | runCmd('echo "Bar" > new-file', cwd=tempdir) | 1409 | runCmd('echo "Bar" > new-file', cwd=tempdir) |
1406 | runCmd('git add new-file', cwd=tempdir) | 1410 | runCmd('git add new-file', cwd=tempdir) |
1407 | runCmd('git commit -m "Add new file"', cwd=tempdir) | 1411 | runCmd('git commit -m "Add new file"', cwd=tempdir) |
1408 | self.add_command_to_tearDown('cd %s; git clean -fd .; git checkout .' % | ||
1409 | os.path.dirname(recipefile)) | ||
1410 | runCmd('devtool update-recipe %s' % testrecipe) | 1412 | runCmd('devtool update-recipe %s' % testrecipe) |
1411 | expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), | 1413 | expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), |
1412 | (' M', '.*/makedevs/makedevs.c$'), | 1414 | (' M', '.*/makedevs/makedevs.c$'), |
1413 | ('??', '.*/makedevs/new-local$'), | 1415 | ('??', '.*/makedevs/new-local$'), |
1414 | ('??', '.*/makedevs/0001-Add-new-file.patch$')] | 1416 | ('??', '.*/makedevs/0001-Add-new-file.patch$')] |
1415 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 1417 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
1418 | # Now try to update recipe in another layer, so first, clean it | ||
1419 | runCmd('cd %s; git clean -fd .; git checkout .' % os.path.dirname(recipefile)) | ||
1420 | # Create a temporary layer and add it to bblayers.conf | ||
1421 | self._create_temp_layer(templayerdir, True, 'templayer') | ||
1422 | # Update recipe in templayer | ||
1423 | result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir)) | ||
1424 | self.assertNotIn('WARNING:', result.output) | ||
1425 | # Check recipe is still clean | ||
1426 | self._check_repo_status(os.path.dirname(recipefile), []) | ||
1427 | splitpath = os.path.dirname(recipefile).split(os.sep) | ||
1428 | appenddir = os.path.join(templayerdir, splitpath[-2], splitpath[-1]) | ||
1429 | bbappendfile = self._check_bbappend(testrecipe, recipefile, appenddir) | ||
1430 | patchfile = os.path.join(appenddir, testrecipe, '0001-Add-new-file.patch') | ||
1431 | new_local_file = os.path.join(appenddir, testrecipe, 'new_local') | ||
1432 | local_file = os.path.join(appenddir, testrecipe, 'makedevs.c') | ||
1433 | self.assertExists(patchfile, 'Patch file 0001-Add-new-file.patch not created') | ||
1434 | self.assertExists(local_file, 'File makedevs.c not created') | ||
1435 | self.assertExists(patchfile, 'File new_local not created') | ||
1416 | 1436 | ||
1417 | def test_devtool_update_recipe_local_files_2(self): | 1437 | def test_devtool_update_recipe_local_files_2(self): |
1418 | """Check local source files support when oe-local-files is in Git""" | 1438 | """Check local source files support when oe-local-files is in Git""" |
@@ -1753,6 +1773,8 @@ class DevtoolExtractTests(DevtoolBase): | |||
1753 | # Definitions | 1773 | # Definitions |
1754 | testrecipe = 'mdadm' | 1774 | testrecipe = 'mdadm' |
1755 | testfile = '/sbin/mdadm' | 1775 | testfile = '/sbin/mdadm' |
1776 | if "usrmerge" in get_bb_var('DISTRO_FEATURES'): | ||
1777 | testfile = '/usr/sbin/mdadm' | ||
1756 | testimage = 'oe-selftest-image' | 1778 | testimage = 'oe-selftest-image' |
1757 | testcommand = '/sbin/mdadm --help' | 1779 | testcommand = '/sbin/mdadm --help' |
1758 | # Build an image to run | 1780 | # Build an image to run |
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index aebea42502..126906df50 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py | |||
@@ -120,9 +120,15 @@ class RecipetoolAppendTests(RecipetoolBase): | |||
120 | self._try_recipetool_appendfile_fail('/dev/console', self.testfile, ['ERROR: /dev/console cannot be handled by this tool']) | 120 | self._try_recipetool_appendfile_fail('/dev/console', self.testfile, ['ERROR: /dev/console cannot be handled by this tool']) |
121 | 121 | ||
122 | def test_recipetool_appendfile_alternatives(self): | 122 | def test_recipetool_appendfile_alternatives(self): |
123 | lspath = '/bin/ls' | ||
124 | dirname = "base_bindir" | ||
125 | if "usrmerge" in get_bb_var('DISTRO_FEATURES'): | ||
126 | lspath = '/usr/bin/ls' | ||
127 | dirname = "bindir" | ||
128 | |||
123 | # Now try with a file we know should be an alternative | 129 | # Now try with a file we know should be an alternative |
124 | # (this is very much a fake example, but one we know is reliably an alternative) | 130 | # (this is very much a fake example, but one we know is reliably an alternative) |
125 | self._try_recipetool_appendfile_fail('/bin/ls', self.testfile, ['ERROR: File /bin/ls is an alternative possibly provided by the following recipes:', 'coreutils', 'busybox']) | 131 | self._try_recipetool_appendfile_fail(lspath, self.testfile, ['ERROR: File %s is an alternative possibly provided by the following recipes:' % lspath, 'coreutils', 'busybox']) |
126 | # Need a test file - should be executable | 132 | # Need a test file - should be executable |
127 | testfile2 = os.path.join(self.corebase, 'oe-init-build-env') | 133 | testfile2 = os.path.join(self.corebase, 'oe-init-build-env') |
128 | testfile2name = os.path.basename(testfile2) | 134 | testfile2name = os.path.basename(testfile2) |
@@ -131,12 +137,12 @@ class RecipetoolAppendTests(RecipetoolBase): | |||
131 | 'SRC_URI += "file://%s"\n' % testfile2name, | 137 | 'SRC_URI += "file://%s"\n' % testfile2name, |
132 | '\n', | 138 | '\n', |
133 | 'do_install:append() {\n', | 139 | 'do_install:append() {\n', |
134 | ' install -d ${D}${base_bindir}\n', | 140 | ' install -d ${D}${%s}\n' % dirname, |
135 | ' install -m 0755 ${WORKDIR}/%s ${D}${base_bindir}/ls\n' % testfile2name, | 141 | ' install -m 0755 ${WORKDIR}/%s ${D}${%s}/ls\n' % (testfile2name, dirname), |
136 | '}\n'] | 142 | '}\n'] |
137 | self._try_recipetool_appendfile('coreutils', '/bin/ls', testfile2, '-r coreutils', expectedlines, [testfile2name]) | 143 | self._try_recipetool_appendfile('coreutils', lspath, testfile2, '-r coreutils', expectedlines, [testfile2name]) |
138 | # Now try bbappending the same file again, contents should not change | 144 | # Now try bbappending the same file again, contents should not change |
139 | bbappendfile, _ = self._try_recipetool_appendfile('coreutils', '/bin/ls', self.testfile, '-r coreutils', expectedlines, [testfile2name]) | 145 | bbappendfile, _ = self._try_recipetool_appendfile('coreutils', lspath, self.testfile, '-r coreutils', expectedlines, [testfile2name]) |
140 | # But file should have | 146 | # But file should have |
141 | copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name) | 147 | copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name) |
142 | result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) | 148 | result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) |
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 12000aac16..13aa5f16c9 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -273,7 +273,7 @@ TEST_RUNQEMUPARAMS += " slirp" | |||
273 | import subprocess, os | 273 | import subprocess, os |
274 | 274 | ||
275 | distro = oe.lsb.distro_identifier() | 275 | distro = oe.lsb.distro_identifier() |
276 | if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or | 276 | if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'centos-9', 'ubuntu-16.04', 'ubuntu-18.04'] or |
277 | distro.startswith('almalinux') or distro.startswith('rocky')): | 277 | distro.startswith('almalinux') or distro.startswith('rocky')): |
278 | self.skipTest('virgl headless cannot be tested with %s' %(distro)) | 278 | self.skipTest('virgl headless cannot be tested with %s' %(distro)) |
279 | 279 | ||
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 57844b289a..99186175e5 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py | |||
@@ -194,8 +194,23 @@ class OESelftestTestContextExecutor(OETestContextExecutor): | |||
194 | parser.add_argument('-R', '--skip-tests', required=False, action='store', | 194 | parser.add_argument('-R', '--skip-tests', required=False, action='store', |
195 | nargs='+', dest="skips", default=None, | 195 | nargs='+', dest="skips", default=None, |
196 | help='Skip the tests specified. Format should be <module>[.<class>[.<test_method>]]') | 196 | help='Skip the tests specified. Format should be <module>[.<class>[.<test_method>]]') |
197 | |||
198 | def check_parallel_support(parameter): | ||
199 | if not parameter.isdigit(): | ||
200 | import argparse | ||
201 | raise argparse.ArgumentTypeError("argument -j/--num-processes: invalid int value: '%s' " % str(parameter)) | ||
202 | |||
203 | processes = int(parameter) | ||
204 | if processes: | ||
205 | try: | ||
206 | import testtools, subunit | ||
207 | except ImportError: | ||
208 | print("Failed to import testtools or subunit, the testcases will run serially") | ||
209 | processes = None | ||
210 | return processes | ||
211 | |||
197 | parser.add_argument('-j', '--num-processes', dest='processes', action='store', | 212 | parser.add_argument('-j', '--num-processes', dest='processes', action='store', |
198 | type=int, help="number of processes to execute in parallel with") | 213 | type=check_parallel_support, help="number of processes to execute in parallel with") |
199 | 214 | ||
200 | parser.add_argument('-t', '--select-tag', dest="select_tags", | 215 | parser.add_argument('-t', '--select-tag', dest="select_tags", |
201 | action='append', default=None, | 216 | action='append', default=None, |
diff --git a/meta/lib/oeqa/utils/postactions.py b/meta/lib/oeqa/utils/postactions.py index 8104400ac2..ecdddd2d40 100644 --- a/meta/lib/oeqa/utils/postactions.py +++ b/meta/lib/oeqa/utils/postactions.py | |||
@@ -25,7 +25,7 @@ def create_artifacts_directory(d, tc): | |||
25 | def get_target_disk_usage(d, tc): | 25 | def get_target_disk_usage(d, tc): |
26 | output_file = os.path.join(get_json_result_dir(d), "artifacts", "target_disk_usage.txt") | 26 | output_file = os.path.join(get_json_result_dir(d), "artifacts", "target_disk_usage.txt") |
27 | try: | 27 | try: |
28 | (status, output) = tc.target.run('df -hl') | 28 | (status, output) = tc.target.run('df -h') |
29 | with open(output_file, 'w') as f: | 29 | with open(output_file, 'w') as f: |
30 | f.write(output) | 30 | f.write(output) |
31 | f.write("\n") | 31 | f.write("\n") |
diff --git a/meta/lib/patchtest/repo.py b/meta/lib/patchtest/repo.py index d3788f466d..5f361ac500 100644 --- a/meta/lib/patchtest/repo.py +++ b/meta/lib/patchtest/repo.py | |||
@@ -11,6 +11,7 @@ | |||
11 | import os | 11 | import os |
12 | import utils | 12 | import utils |
13 | import logging | 13 | import logging |
14 | import git | ||
14 | from patch import PatchTestPatch | 15 | from patch import PatchTestPatch |
15 | 16 | ||
16 | logger = logging.getLogger('patchtest') | 17 | logger = logging.getLogger('patchtest') |
@@ -21,15 +22,17 @@ class PatchTestRepo(object): | |||
21 | # prefixes used for temporal branches/stashes | 22 | # prefixes used for temporal branches/stashes |
22 | prefix = 'patchtest' | 23 | prefix = 'patchtest' |
23 | 24 | ||
25 | |||
24 | def __init__(self, patch, repodir, commit=None, branch=None): | 26 | def __init__(self, patch, repodir, commit=None, branch=None): |
25 | self._repodir = repodir | 27 | self._repodir = repodir |
28 | self._repo = git.Repo.init(repodir) | ||
26 | self._patch = PatchTestPatch(patch) | 29 | self._patch = PatchTestPatch(patch) |
27 | self._current_branch = self._get_current_branch() | 30 | self._current_branch = self._repo.active_branch.name |
28 | 31 | ||
29 | # targeted branch defined on the patch may be invalid, so make sure there | 32 | # targeted branch defined on the patch may be invalid, so make sure there |
30 | # is a corresponding remote branch | 33 | # is a corresponding remote branch |
31 | valid_patch_branch = None | 34 | valid_patch_branch = None |
32 | if self._patch.branch in self.upstream_branches(): | 35 | if self._patch.branch in self._repo.branches: |
33 | valid_patch_branch = self._patch.branch | 36 | valid_patch_branch = self._patch.branch |
34 | 37 | ||
35 | # Target Branch | 38 | # Target Branch |
@@ -52,22 +55,19 @@ class PatchTestRepo(object): | |||
52 | 55 | ||
53 | self._workingbranch = "%s_%s" % (PatchTestRepo.prefix, os.getpid()) | 56 | self._workingbranch = "%s_%s" % (PatchTestRepo.prefix, os.getpid()) |
54 | 57 | ||
55 | # create working branch | 58 | # create working branch. Use the '-B' flag so that we just |
56 | self._exec({'cmd': ['git', 'checkout', '-b', self._workingbranch, self._commit]}) | 59 | # check out the existing one if it's there |
60 | self._repo.git.execute(['git', 'checkout', '-B', self._workingbranch, self._commit]) | ||
57 | 61 | ||
58 | self._patchmerged = False | 62 | self._patchmerged = False |
59 | 63 | ||
60 | # Check if patch can be merged using git-am | 64 | # Check if patch can be merged using git-am |
61 | self._patchcanbemerged = True | 65 | self._patchcanbemerged = True |
62 | try: | 66 | try: |
63 | self._exec({'cmd': ['git', 'am', '--keep-cr'], 'input': self._patch.contents}) | 67 | # Make sure to get the absolute path of the file |
64 | except utils.CmdException as ce: | 68 | self._repo.git.execute(['git', 'apply', '--check', os.path.abspath(self._patch.path)], with_exceptions=True) |
65 | self._exec({'cmd': ['git', 'am', '--abort']}) | 69 | except git.exc.GitCommandError as ce: |
66 | self._patchcanbemerged = False | 70 | self._patchcanbemerged = False |
67 | finally: | ||
68 | # if patch was applied, remove it | ||
69 | if self._patchcanbemerged: | ||
70 | self._exec({'cmd':['git', 'reset', '--hard', self._commit]}) | ||
71 | 71 | ||
72 | # for debugging purposes, print all repo parameters | 72 | # for debugging purposes, print all repo parameters |
73 | logger.debug("Parameters") | 73 | logger.debug("Parameters") |
@@ -97,78 +97,24 @@ class PatchTestRepo(object): | |||
97 | def canbemerged(self): | 97 | def canbemerged(self): |
98 | return self._patchcanbemerged | 98 | return self._patchcanbemerged |
99 | 99 | ||
100 | def _exec(self, cmds): | ||
101 | _cmds = [] | ||
102 | if isinstance(cmds, dict): | ||
103 | _cmds.append(cmds) | ||
104 | elif isinstance(cmds, list): | ||
105 | _cmds = cmds | ||
106 | else: | ||
107 | raise utils.CmdException({'cmd':str(cmds)}) | ||
108 | |||
109 | results = [] | ||
110 | cmdfailure = False | ||
111 | try: | ||
112 | results = utils.exec_cmds(_cmds, self._repodir) | ||
113 | except utils.CmdException as ce: | ||
114 | cmdfailure = True | ||
115 | raise ce | ||
116 | finally: | ||
117 | if cmdfailure: | ||
118 | for cmd in _cmds: | ||
119 | logger.debug("CMD: %s" % ' '.join(cmd['cmd'])) | ||
120 | else: | ||
121 | for result in results: | ||
122 | cmd, rc, stdout, stderr = ' '.join(result['cmd']), result['returncode'], result['stdout'], result['stderr'] | ||
123 | logger.debug("CMD: %s RCODE: %s STDOUT: %s STDERR: %s" % (cmd, rc, stdout, stderr)) | ||
124 | |||
125 | return results | ||
126 | |||
127 | def _get_current_branch(self, commit='HEAD'): | ||
128 | cmd = {'cmd':['git', 'rev-parse', '--abbrev-ref', commit]} | ||
129 | cb = self._exec(cmd)[0]['stdout'] | ||
130 | if cb == commit: | ||
131 | logger.warning('You may be detached so patchtest will checkout to master after execution') | ||
132 | cb = 'master' | ||
133 | return cb | ||
134 | |||
135 | def _get_commitid(self, commit): | 100 | def _get_commitid(self, commit): |
136 | 101 | ||
137 | if not commit: | 102 | if not commit: |
138 | return None | 103 | return None |
139 | 104 | ||
140 | try: | 105 | try: |
141 | cmd = {'cmd':['git', 'rev-parse', '--short', commit]} | 106 | return self._repo.rev_parse(commit).hexsha |
142 | return self._exec(cmd)[0]['stdout'] | 107 | except Exception as e: |
143 | except utils.CmdException as ce: | 108 | print(f"Couldn't find commit {commit} in repo") |
144 | # try getting the commit under any remotes | ||
145 | cmd = {'cmd':['git', 'remote']} | ||
146 | remotes = self._exec(cmd)[0]['stdout'] | ||
147 | for remote in remotes.splitlines(): | ||
148 | cmd = {'cmd':['git', 'rev-parse', '--short', '%s/%s' % (remote, commit)]} | ||
149 | try: | ||
150 | return self._exec(cmd)[0]['stdout'] | ||
151 | except utils.CmdException: | ||
152 | pass | ||
153 | 109 | ||
154 | return None | 110 | return None |
155 | 111 | ||
156 | def upstream_branches(self): | ||
157 | cmd = {'cmd':['git', 'branch', '--remotes']} | ||
158 | remote_branches = self._exec(cmd)[0]['stdout'] | ||
159 | |||
160 | # just get the names, without the remote name | ||
161 | branches = set(branch.split('/')[-1] for branch in remote_branches.splitlines()) | ||
162 | return branches | ||
163 | |||
164 | def merge(self): | 112 | def merge(self): |
165 | if self._patchcanbemerged: | 113 | if self._patchcanbemerged: |
166 | self._exec({'cmd': ['git', 'am', '--keep-cr'], | 114 | self._repo.git.execute(['git', 'am', '--keep-cr', os.path.abspath(self._patch.path)]) |
167 | 'input': self._patch.contents, | ||
168 | 'updateenv': {'PTRESOURCE':self._patch.path}}) | ||
169 | self._patchmerged = True | 115 | self._patchmerged = True |
170 | 116 | ||
171 | def clean(self): | 117 | def clean(self): |
172 | self._exec({'cmd':['git', 'checkout', '%s' % self._current_branch]}) | 118 | self._repo.git.execute(['git', 'checkout', self._current_branch]) |
173 | self._exec({'cmd':['git', 'branch', '-D', self._workingbranch]}) | 119 | self._repo.git.execute(['git', 'branch', '-D', self._workingbranch]) |
174 | self._patchmerged = False | 120 | self._patchmerged = False |
diff --git a/meta/lib/patchtest/requirements.txt b/meta/lib/patchtest/requirements.txt index ba55ff905e..4247b91f09 100644 --- a/meta/lib/patchtest/requirements.txt +++ b/meta/lib/patchtest/requirements.txt | |||
@@ -1,5 +1,6 @@ | |||
1 | boto3 | 1 | boto3 |
2 | git-pw>=2.5.0 | 2 | git-pw>=2.5.0 |
3 | GitPython | ||
3 | jinja2 | 4 | jinja2 |
4 | pylint | 5 | pylint |
5 | pyparsing>=3.0.9 | 6 | pyparsing>=3.0.9 |
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail index 80f409e952..854d7eb8c7 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail | |||
@@ -1,25 +1,26 @@ | |||
1 | From fdfd605e565d874502522c4b70b786c8c5aa0bad Mon Sep 17 00:00:00 2001 | 1 | From f06e14633723c1e78bc7a4b0fd0d3b79d09f0c68 Mon Sep 17 00:00:00 2001 |
2 | From: name@somedomain.com <email@address.com> | 2 | From: name@somedomain.com <email@address.com> |
3 | Date: Fri, 17 Feb 2017 16:29:21 -0600 | 3 | Date: Thu, 2 May 2024 10:21:45 -0400 |
4 | Subject: [PATCH] README: adds 'foo' to the header | 4 | Subject: [PATCH] README.OE-Core.md: Add foo to header |
5 | 5 | ||
6 | This test patch adds 'foo' to the header | 6 | This test patch adds 'foo' to the header of README.OE-Core.md |
7 | 7 | ||
8 | [YOCTO 1234] | 8 | [YOCTO 1234] |
9 | 9 | ||
10 | Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
11 | --- | 11 | --- |
12 | README | 1 + | 12 | README.OE-Core.md | 1 + |
13 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
14 | 14 | ||
15 | diff --git a/README b/README | 15 | diff --git a/README.OE-Core.md b/README.OE-Core.md |
16 | index 521916cd4f..cdf29dcea3 100644 | 16 | index 687c58e410c..9d863891134 100644 |
17 | --- a/README | 17 | --- a/README.OE-Core.md |
18 | +++ b/README | 18 | +++ b/README.OE-Core.md |
19 | @@ -1,3 +1,4 @@ | 19 | @@ -1,3 +1,4 @@ |
20 | +**** FOO **** | 20 | +**** FOO **** |
21 | OpenEmbedded-Core | 21 | OpenEmbedded-Core |
22 | ================= | 22 | ================= |
23 | |||
24 | -- | ||
25 | 2.44.0 | ||
23 | 26 | ||
24 | -- | ||
25 | 2.11.0 | ||
diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index be609dbd04..f5dbcf01ed 100644 --- a/meta/lib/patchtest/tests/test_metadata.py +++ b/meta/lib/patchtest/tests/test_metadata.py | |||
@@ -18,12 +18,12 @@ class TestMetadata(base.Metadata): | |||
18 | lictag_re = pyparsing.AtLineStart("License-Update:") | 18 | lictag_re = pyparsing.AtLineStart("License-Update:") |
19 | lic_chksum_added = pyparsing.AtLineStart("+" + metadata_chksum) | 19 | lic_chksum_added = pyparsing.AtLineStart("+" + metadata_chksum) |
20 | lic_chksum_removed = pyparsing.AtLineStart("-" + metadata_chksum) | 20 | lic_chksum_removed = pyparsing.AtLineStart("-" + metadata_chksum) |
21 | add_mark = pyparsing.Regex('\+ ') | 21 | add_mark = pyparsing.Regex('\\+ ') |
22 | max_length = 200 | 22 | max_length = 200 |
23 | metadata_src_uri = 'SRC_URI' | 23 | metadata_src_uri = 'SRC_URI' |
24 | md5sum = 'md5sum' | 24 | md5sum = 'md5sum' |
25 | sha256sum = 'sha256sum' | 25 | sha256sum = 'sha256sum' |
26 | git_regex = pyparsing.Regex('^git\:\/\/.*') | 26 | git_regex = pyparsing.Regex('^git\\:\\/\\/.*') |
27 | metadata_summary = 'SUMMARY' | 27 | metadata_summary = 'SUMMARY' |
28 | cve_check_ignore_var = 'CVE_CHECK_IGNORE' | 28 | cve_check_ignore_var = 'CVE_CHECK_IGNORE' |
29 | cve_status_var = 'CVE_STATUS' | 29 | cve_status_var = 'CVE_STATUS' |
diff --git a/meta/lib/patchtest/utils.py b/meta/lib/patchtest/utils.py index dd0abc22d9..8eddf3e85f 100644 --- a/meta/lib/patchtest/utils.py +++ b/meta/lib/patchtest/utils.py | |||
@@ -14,109 +14,6 @@ import logging | |||
14 | import re | 14 | import re |
15 | import mailbox | 15 | import mailbox |
16 | 16 | ||
17 | class CmdException(Exception): | ||
18 | """ Simple exception class where its attributes are the ones passed when instantiated """ | ||
19 | def __init__(self, cmd): | ||
20 | self._cmd = cmd | ||
21 | def __getattr__(self, name): | ||
22 | value = None | ||
23 | if self._cmd.has_key(name): | ||
24 | value = self._cmd[name] | ||
25 | return value | ||
26 | |||
27 | def exec_cmd(cmd, cwd, ignore_error=False, input=None, strip=True, updateenv={}): | ||
28 | """ | ||
29 | Input: | ||
30 | |||
31 | cmd: dict containing the following keys: | ||
32 | |||
33 | cmd : the command itself as an array of strings | ||
34 | ignore_error: if False, no exception is raised | ||
35 | strip: indicates if strip is done on the output (stdout and stderr) | ||
36 | input: input data to the command (stdin) | ||
37 | updateenv: environment variables to be appended to the current | ||
38 | process environment variables | ||
39 | |||
40 | NOTE: keys 'ignore_error' and 'input' are optional; if not included, | ||
41 | the defaults are the ones specify in the arguments | ||
42 | cwd: directory where commands are executed | ||
43 | ignore_error: raise CmdException if command fails to execute and | ||
44 | this value is False | ||
45 | input: input data (stdin) for the command | ||
46 | |||
47 | Output: dict containing the following keys: | ||
48 | |||
49 | cmd: the same as input | ||
50 | ignore_error: the same as input | ||
51 | strip: the same as input | ||
52 | input: the same as input | ||
53 | stdout: Standard output after command's execution | ||
54 | stderr: Standard error after command's execution | ||
55 | returncode: Return code after command's execution | ||
56 | |||
57 | """ | ||
58 | cmddefaults = { | ||
59 | 'cmd':'', | ||
60 | 'ignore_error':ignore_error, | ||
61 | 'strip':strip, | ||
62 | 'input':input, | ||
63 | 'updateenv':updateenv, | ||
64 | } | ||
65 | |||
66 | # update input values if necessary | ||
67 | cmddefaults.update(cmd) | ||
68 | |||
69 | _cmd = cmddefaults | ||
70 | |||
71 | if not _cmd['cmd']: | ||
72 | raise CmdException({'cmd':None, 'stderr':'no command given'}) | ||
73 | |||
74 | # update the environment | ||
75 | env = os.environ | ||
76 | env.update(_cmd['updateenv']) | ||
77 | |||
78 | _command = [e for e in _cmd['cmd']] | ||
79 | p = subprocess.Popen(_command, | ||
80 | stdin=subprocess.PIPE, | ||
81 | stdout=subprocess.PIPE, | ||
82 | stderr=subprocess.PIPE, | ||
83 | universal_newlines=True, | ||
84 | cwd=cwd, | ||
85 | env=env) | ||
86 | |||
87 | # execute the command and strip output | ||
88 | (_stdout, _stderr) = p.communicate(_cmd['input']) | ||
89 | if _cmd['strip']: | ||
90 | _stdout, _stderr = map(str.strip, [_stdout, _stderr]) | ||
91 | |||
92 | # generate the result | ||
93 | result = _cmd | ||
94 | result.update({'cmd':_command,'stdout':_stdout,'stderr':_stderr,'returncode':p.returncode}) | ||
95 | |||
96 | # launch exception if necessary | ||
97 | if not _cmd['ignore_error'] and p.returncode: | ||
98 | raise CmdException(result) | ||
99 | |||
100 | return result | ||
101 | |||
102 | def exec_cmds(cmds, cwd): | ||
103 | """ Executes commands | ||
104 | |||
105 | Input: | ||
106 | cmds: Array of commands | ||
107 | cwd: directory where commands are executed | ||
108 | |||
109 | Output: Array of output commands | ||
110 | """ | ||
111 | results = [] | ||
112 | _cmds = cmds | ||
113 | |||
114 | for cmd in _cmds: | ||
115 | result = exec_cmd(cmd, cwd) | ||
116 | results.append(result) | ||
117 | |||
118 | return results | ||
119 | |||
120 | def logger_create(name): | 17 | def logger_create(name): |
121 | logger = logging.getLogger(name) | 18 | logger = logging.getLogger(name) |
122 | loggerhandler = logging.StreamHandler() | 19 | loggerhandler = logging.StreamHandler() |
@@ -125,20 +22,6 @@ def logger_create(name): | |||
125 | logger.setLevel(logging.INFO) | 22 | logger.setLevel(logging.INFO) |
126 | return logger | 23 | return logger |
127 | 24 | ||
128 | def get_subject_prefix(path): | ||
129 | prefix = "" | ||
130 | mbox = mailbox.mbox(path) | ||
131 | |||
132 | if len(mbox): | ||
133 | subject = mbox[0]['subject'] | ||
134 | if subject: | ||
135 | pattern = re.compile(r"(\[.*\])", re.DOTALL) | ||
136 | match = pattern.search(subject) | ||
137 | if match: | ||
138 | prefix = match.group(1) | ||
139 | |||
140 | return prefix | ||
141 | |||
142 | def valid_branch(branch): | 25 | def valid_branch(branch): |
143 | """ Check if branch is valid name """ | 26 | """ Check if branch is valid name """ |
144 | lbranch = branch.lower() | 27 | lbranch = branch.lower() |
@@ -153,7 +36,17 @@ def valid_branch(branch): | |||
153 | 36 | ||
154 | def get_branch(path): | 37 | def get_branch(path): |
155 | """ Get the branch name from mbox """ | 38 | """ Get the branch name from mbox """ |
156 | fullprefix = get_subject_prefix(path) | 39 | fullprefix = "" |
40 | mbox = mailbox.mbox(path) | ||
41 | |||
42 | if len(mbox): | ||
43 | subject = mbox[0]['subject'] | ||
44 | if subject: | ||
45 | pattern = re.compile(r"(\[.*\])", re.DOTALL) | ||
46 | match = pattern.search(subject) | ||
47 | if match: | ||
48 | fullprefix = match.group(1) | ||
49 | |||
157 | branch, branches, valid_branches = None, [], [] | 50 | branch, branches, valid_branches = None, [], [] |
158 | 51 | ||
159 | if fullprefix: | 52 | if fullprefix: |
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc index 7b2f1c71c5..3d6f75f90f 100644 --- a/meta/recipes-bsp/acpid/acpid.inc +++ b/meta/recipes-bsp/acpid/acpid.inc | |||
@@ -27,13 +27,13 @@ SYSTEMD_SERVICE:${PN} = "acpid.service" | |||
27 | 27 | ||
28 | do_install:append () { | 28 | do_install:append () { |
29 | install -d ${D}${sysconfdir}/init.d | 29 | install -d ${D}${sysconfdir}/init.d |
30 | sed -e 's,/usr/sbin,${sbindir},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/acpid | 30 | sed -e 's,/usr/sbin,${sbindir},g' ${UNPACKDIR}/init > ${D}${sysconfdir}/init.d/acpid |
31 | chmod 755 ${D}${sysconfdir}/init.d/acpid | 31 | chmod 755 ${D}${sysconfdir}/init.d/acpid |
32 | 32 | ||
33 | install -d ${D}${sysconfdir}/acpi | 33 | install -d ${D}${sysconfdir}/acpi |
34 | install -d ${D}${sysconfdir}/acpi/events | 34 | install -d ${D}${sysconfdir}/acpi/events |
35 | 35 | ||
36 | install -d ${D}${systemd_system_unitdir} | 36 | install -d ${D}${systemd_system_unitdir} |
37 | install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_system_unitdir} | 37 | install -m 0644 ${UNPACKDIR}/acpid.service ${D}${systemd_system_unitdir} |
38 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/acpid.service | 38 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/acpid.service |
39 | } | 39 | } |
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index bd7f610f46..83384f2daf 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb | |||
@@ -38,15 +38,15 @@ INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." | |||
38 | do_install() { | 38 | do_install() { |
39 | # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. | 39 | # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. |
40 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 40 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
41 | sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state-init | 41 | sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${S}/alsa-state-init |
42 | install -d ${D}${sysconfdir}/init.d | 42 | install -d ${D}${sysconfdir}/init.d |
43 | install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state | 43 | install -m 0755 ${S}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state |
44 | fi | 44 | fi |
45 | 45 | ||
46 | install -d ${D}/${localstatedir}/lib/alsa | 46 | install -d ${D}/${localstatedir}/lib/alsa |
47 | install -d ${D}${sysconfdir} | 47 | install -d ${D}${sysconfdir} |
48 | install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} | 48 | install -m 0644 ${S}/asound.conf ${D}${sysconfdir} |
49 | install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa | 49 | install -m 0644 ${S}/*.state ${D}${localstatedir}/lib/alsa |
50 | } | 50 | } |
51 | 51 | ||
52 | PACKAGES += "alsa-states" | 52 | PACKAGES += "alsa-states" |
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 3d5d127820..e30dd9dca2 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb | |||
@@ -31,7 +31,7 @@ do_install () { | |||
31 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service | 31 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service |
32 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 32 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
33 | install -d ${D}${sysconfdir}/init.d/ | 33 | install -d ${D}${sysconfdir}/init.d/ |
34 | install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/ | 34 | install -m 0755 ${S}/keymap.sh ${D}${sysconfdir}/init.d/ |
35 | fi | 35 | fi |
36 | } | 36 | } |
37 | 37 | ||
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb index 63edcbd864..3024ddcaf0 100644 --- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | |||
@@ -46,3 +46,9 @@ ALTERNATIVE_TARGET[rb] = "${bindir}/lrz" | |||
46 | ALTERNATIVE_TARGET[sz] = "${bindir}/lsz" | 46 | ALTERNATIVE_TARGET[sz] = "${bindir}/lsz" |
47 | ALTERNATIVE_TARGET[sx] = "${bindir}/lsz" | 47 | ALTERNATIVE_TARGET[sx] = "${bindir}/lsz" |
48 | ALTERNATIVE_TARGET[sb] = "${bindir}/lsz" | 48 | ALTERNATIVE_TARGET[sb] = "${bindir}/lsz" |
49 | |||
50 | # http://errors.yoctoproject.org/Errors/Details/766929/ | ||
51 | # lrzsz-0.12.20/src/tcp.c:75:56: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] | ||
52 | # lrzsz-0.12.20/src/tcp.c:83:52: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] | ||
53 | # lrzsz-0.12.20/src/tcp.c:103:51: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] | ||
54 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f5b43f6e36..3a7afb81c8 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -157,9 +157,9 @@ do_install () { | |||
157 | fi | 157 | fi |
158 | fi | 158 | fi |
159 | 159 | ||
160 | if [ -e ${WORKDIR}/fw_env.config ] ; then | 160 | if [ -e ${UNPACKDIR}/fw_env.config ] ; then |
161 | install -d ${D}${sysconfdir} | 161 | install -d ${D}${sysconfdir} |
162 | install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config | 162 | install -m 644 ${UNPACKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config |
163 | fi | 163 | fi |
164 | 164 | ||
165 | if [ -n "${SPL_BINARY}" ] | 165 | if [ -n "${SPL_BINARY}" ] |
diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb index 3a50b835c2..b80191bddc 100644 --- a/meta/recipes-bsp/usbinit/usbinit.bb +++ b/meta/recipes-bsp/usbinit/usbinit.bb | |||
@@ -5,7 +5,7 @@ same wire, at higher speeds than most Wifi connections." | |||
5 | HOMEPAGE = "http://linux-sunxi.org/USB_Gadget/Ethernet" | 5 | HOMEPAGE = "http://linux-sunxi.org/USB_Gadget/Ethernet" |
6 | 6 | ||
7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
8 | LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" | 8 | LIC_FILES_CHKSUM = "file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" |
9 | 9 | ||
10 | 10 | ||
11 | SRC_URI = "file://usb-gether \ | 11 | SRC_URI = "file://usb-gether \ |
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index 1f18d4491d..a78e776a18 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb | |||
@@ -184,8 +184,8 @@ SYSTEMD_SERVICE:${PN}-dnsconfd = "avahi-dnsconfd.service" | |||
184 | 184 | ||
185 | do_install:append() { | 185 | do_install:append() { |
186 | install -d ${D}${sysconfdir}/udhcpc.d | 186 | install -d ${D}${sysconfdir}/udhcpc.d |
187 | install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d | 187 | install ${UNPACKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d |
188 | install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d | 188 | install ${UNPACKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d |
189 | } | 189 | } |
190 | 190 | ||
191 | # At the time the postinst runs, dbus might not be setup so only restart if running | 191 | # At the time the postinst runs, dbus might not be setup so only restart if running |
diff --git a/meta/recipes-connectivity/bind/bind_9.18.25.bb b/meta/recipes-connectivity/bind/bind_9.18.26.bb index cc35604aba..b99f92537c 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.25.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.26.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ | |||
20 | file://0001-avoid-start-failure-with-bind-user.patch \ | 20 | file://0001-avoid-start-failure-with-bind-user.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "5a4a70432a33d009f0e6e9dbb328aae7a5e27507e98e28bf3c0c6b250ccb2ab3" | 23 | SRC_URI[sha256sum] = "75ffee52731e9604c849b658df29e927f1c4f01d5a71ea3ebcbeb63702cb6651" |
24 | 24 | ||
25 | UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" | 25 | UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" |
26 | # follow the ESV versions divisible by 2 | 26 | # follow the ESV versions divisible by 2 |
@@ -68,15 +68,15 @@ do_install:append() { | |||
68 | 68 | ||
69 | # Install systemd related files | 69 | # Install systemd related files |
70 | install -d ${D}${sbindir} | 70 | install -d ${D}${sbindir} |
71 | install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} | 71 | install -m 755 ${UNPACKDIR}/generate-rndc-key.sh ${D}${sbindir} |
72 | install -d ${D}${systemd_system_unitdir} | 72 | install -d ${D}${systemd_system_unitdir} |
73 | install -m 0644 ${WORKDIR}/named.service ${D}${systemd_system_unitdir} | 73 | install -m 0644 ${UNPACKDIR}/named.service ${D}${systemd_system_unitdir} |
74 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 74 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
75 | -e 's,@SBINDIR@,${sbindir},g' \ | 75 | -e 's,@SBINDIR@,${sbindir},g' \ |
76 | ${D}${systemd_system_unitdir}/named.service | 76 | ${D}${systemd_system_unitdir}/named.service |
77 | 77 | ||
78 | install -d ${D}${sysconfdir}/default | 78 | install -d ${D}${sysconfdir}/default |
79 | install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default | 79 | install -m 0644 ${UNPACKDIR}/bind9 ${D}${sysconfdir}/default |
80 | 80 | ||
81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
82 | install -d ${D}${sysconfdir}/tmpfiles.d | 82 | install -d ${D}${sysconfdir}/tmpfiles.d |
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index a31d7076ba..a1ffdeef8c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
@@ -85,7 +85,7 @@ NOINST_TOOLS = " \ | |||
85 | 85 | ||
86 | do_install:append() { | 86 | do_install:append() { |
87 | install -d ${D}${INIT_D_DIR} | 87 | install -d ${D}${INIT_D_DIR} |
88 | install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth | 88 | install -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/bluetooth |
89 | 89 | ||
90 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then | 90 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then |
91 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth | 91 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth |
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index fcd154b4b0..46b3f854c5 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
@@ -26,5 +26,9 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
26 | RDEPENDS:${PN} = "connman" | 26 | RDEPENDS:${PN} = "connman" |
27 | 27 | ||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -m 0644 ${WORKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ | 29 | install -m 0644 ${UNPACKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ |
30 | } | 30 | } |
31 | |||
32 | # http://errors.yoctoproject.org/Errors/Details/766926/ | ||
33 | # connman-client.c:200:15: error: assignment to 'GtkTreeModel *' {aka 'struct _GtkTreeModel *'} from incompatible pointer type 'GtkTreeStore *' {aka 'struct _GtkTreeStore *'} [-Wincompatible-pointer-types] | ||
34 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 7487ca0d0c..073061eeda 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -86,7 +86,7 @@ ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','sy | |||
86 | do_install:append() { | 86 | do_install:append() { |
87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
88 | install -d ${D}${sysconfdir}/init.d | 88 | install -d ${D}${sysconfdir}/init.d |
89 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | 89 | install -m 0755 ${UNPACKDIR}/connman ${D}${sysconfdir}/init.d/connman |
90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman | 90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman |
91 | fi | 91 | fi |
92 | 92 | ||
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch index aefdd3aa06..9e2cc34995 100644 --- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch +++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch | |||
@@ -1,75 +1,88 @@ | |||
1 | From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001 | 1 | From 60783f0d885c9a0db8b6f1d528786321e53f1512 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 | 3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 |
4 | Subject: [PATCH] resolve: musl does not implement res_ninit | 4 | Subject: [PATCH] gweb/gresolv.c: make use of res_ninit optional and subject to |
5 | __RES | ||
5 | 6 | ||
6 | ported from | 7 | Not all libc implementation have those functions, and the way to determine |
8 | if they do is to check __RES which is explained in resolv.h thusly: | ||
9 | |||
10 | /* | ||
11 | * Revision information. This is the release date in YYYYMMDD format. | ||
12 | * It can change every day so the right thing to do with it is use it | ||
13 | * in preprocessor commands such as "#if (__RES > 19931104)". Do not | ||
14 | * compare for equality; rather, use it to determine whether your resolver | ||
15 | * is new enough to contain a certain feature. | ||
16 | */ | ||
17 | |||
18 | Indeed, it needs to be at least 19991006. | ||
19 | |||
20 | The portion of the patch that implements a fallback is ported from | ||
21 | Alpine Linux: | ||
7 | http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch | 22 | http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch |
8 | 23 | ||
9 | Upstream-Status: Pending | 24 | Upstream-Status: Submitted [to connman@lists.linux.dev,marcel@holtmann.org] |
10 | 25 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 26 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
13 | --- | 27 | --- |
14 | gweb/gresolv.c | 34 +++++++++++++--------------------- | 28 | gweb/gresolv.c | 21 +++++++++++++++++++++ |
15 | 1 file changed, 13 insertions(+), 21 deletions(-) | 29 | 1 file changed, 21 insertions(+) |
16 | 30 | ||
17 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c | 31 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c |
18 | index 954e7cf..2a9bc51 100644 | 32 | index 8101d71..9f1477c 100644 |
19 | --- a/gweb/gresolv.c | 33 | --- a/gweb/gresolv.c |
20 | +++ b/gweb/gresolv.c | 34 | +++ b/gweb/gresolv.c |
21 | @@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index) | 35 | @@ -879,7 +879,9 @@ GResolv *g_resolv_new(int index) |
22 | resolv->index = index; | 36 | resolv->index = index; |
23 | resolv->nameserver_list = NULL; | 37 | resolv->nameserver_list = NULL; |
24 | 38 | ||
25 | - res_ninit(&resolv->res); | 39 | +#if (__RES >= 19991006) |
26 | - | 40 | res_ninit(&resolv->res); |
41 | +#endif | ||
42 | |||
27 | return resolv; | 43 | return resolv; |
28 | } | 44 | } |
29 | 45 | @@ -920,7 +922,9 @@ void g_resolv_unref(GResolv *resolv) | |
30 | @@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv) | ||
31 | 46 | ||
32 | flush_nameservers(resolv); | 47 | flush_nameservers(resolv); |
33 | 48 | ||
34 | - res_nclose(&resolv->res); | 49 | +#if (__RES >= 19991006) |
35 | - | 50 | res_nclose(&resolv->res); |
51 | +#endif | ||
52 | |||
36 | g_free(resolv); | 53 | g_free(resolv); |
37 | } | 54 | } |
38 | 55 | @@ -1024,6 +1028,7 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, | |
39 | @@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, | ||
40 | debug(resolv, "hostname %s", hostname); | 56 | debug(resolv, "hostname %s", hostname); |
41 | 57 | ||
42 | if (!resolv->nameserver_list) { | 58 | if (!resolv->nameserver_list) { |
43 | - int i; | 59 | +#if (__RES >= 19991006) |
44 | - | 60 | int i; |
45 | - for (i = 0; i < resolv->res.nscount; i++) { | 61 | |
46 | - char buf[100]; | 62 | for (i = 0; i < resolv->res.nscount; i++) { |
47 | - int family = resolv->res.nsaddr_list[i].sin_family; | 63 | @@ -1043,6 +1048,22 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, |
48 | - void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr; | 64 | if (inet_ntop(family, sa_addr, buf, sizeof(buf))) |
49 | - | 65 | g_resolv_add_nameserver(resolv, buf, 53, 0); |
50 | - if (family != AF_INET && | ||
51 | - resolv->res._u._ext.nsaddrs[i]) { | ||
52 | - family = AF_INET6; | ||
53 | - sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr; | ||
54 | + FILE *f = fopen("/etc/resolv.conf", "r"); | ||
55 | + if (f) { | ||
56 | + char line[256], *s; | ||
57 | + int i; | ||
58 | + while (fgets(line, sizeof(line), f)) { | ||
59 | + if (strncmp(line, "nameserver", 10) || !isspace(line[10])) | ||
60 | + continue; | ||
61 | + for (s = &line[11]; isspace(s[0]); s++); | ||
62 | + for (i = 0; s[i] && !isspace(s[i]); i++); | ||
63 | + s[i] = 0; | ||
64 | + g_resolv_add_nameserver(resolv, s, 53, 0); | ||
65 | } | ||
66 | - | ||
67 | - if (family != AF_INET && family != AF_INET6) | ||
68 | - continue; | ||
69 | - | ||
70 | - if (inet_ntop(family, sa_addr, buf, sizeof(buf))) | ||
71 | - g_resolv_add_nameserver(resolv, buf, 53, 0); | ||
72 | + fclose(f); | ||
73 | } | 66 | } |
67 | +#else | ||
68 | + FILE *f = fopen("/etc/resolv.conf", "r"); | ||
69 | + if (f) { | ||
70 | + char line[256], *s; | ||
71 | + int i; | ||
72 | + while (fgets(line, sizeof(line), f)) { | ||
73 | + if (strncmp(line, "nameserver", 10) || !isspace(line[10])) | ||
74 | + continue; | ||
75 | + for (s = &line[11]; isspace(s[0]); s++); | ||
76 | + for (i = 0; s[i] && !isspace(s[i]); i++); | ||
77 | + s[i] = 0; | ||
78 | + g_resolv_add_nameserver(resolv, s, 53, 0); | ||
79 | + } | ||
80 | + fclose(f); | ||
81 | + } | ||
82 | +#endif | ||
74 | 83 | ||
75 | if (!resolv->nameserver_list) | 84 | if (!resolv->nameserver_list) |
85 | g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0); | ||
86 | -- | ||
87 | 2.39.2 | ||
88 | |||
diff --git a/meta/recipes-connectivity/connman/connman_1.42.bb b/meta/recipes-connectivity/connman/connman_1.42.bb index 91ab9895ac..5c60b9cb83 100644 --- a/meta/recipes-connectivity/connman/connman_1.42.bb +++ b/meta/recipes-connectivity/connman/connman_1.42.bb | |||
@@ -7,9 +7,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | |||
7 | file://no-version-scripts.patch \ | 7 | file://no-version-scripts.patch \ |
8 | file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \ | 8 | file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \ |
9 | file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \ | 9 | file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \ |
10 | file://0002-resolve-musl-does-not-implement-res_ninit.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" | ||
13 | 13 | ||
14 | SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa" | 14 | SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa" |
15 | 15 | ||
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb index 6bde9b1f51..fd193b2cff 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb | |||
@@ -52,7 +52,7 @@ USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" | |||
52 | do_install:append () { | 52 | do_install:append () { |
53 | # install systemd unit files | 53 | # install systemd unit files |
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} | 55 | install -m 0644 ${UNPACKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} |
56 | 56 | ||
57 | chmod 700 ${D}${DBDIR} | 57 | chmod 700 ${D}${DBDIR} |
58 | chown dhcpcd:dhcpcd ${D}${DBDIR} | 58 | chown dhcpcd:dhcpcd ${D}${DBDIR} |
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb index 0f1a0736bd..afb0462c61 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb | |||
@@ -80,23 +80,23 @@ do_install:append () { | |||
80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd | 80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd |
81 | if [ -e ${D}${libexecdir}/rexecd ]; then | 81 | if [ -e ${D}${libexecdir}/rexecd ]; then |
82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd | 82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd |
83 | cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec | 83 | cp ${UNPACKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec |
84 | fi | 84 | fi |
85 | if [ -e ${D}${libexecdir}/rlogind ]; then | 85 | if [ -e ${D}${libexecdir}/rlogind ]; then |
86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind | 86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind |
87 | cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin | 87 | cp ${UNPACKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin |
88 | fi | 88 | fi |
89 | if [ -e ${D}${libexecdir}/rshd ]; then | 89 | if [ -e ${D}${libexecdir}/rshd ]; then |
90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd | 90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd |
91 | cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh | 91 | cp ${UNPACKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh |
92 | fi | 92 | fi |
93 | if [ -e ${D}${libexecdir}/talkd ]; then | 93 | if [ -e ${D}${libexecdir}/talkd ]; then |
94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd | 94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd |
95 | fi | 95 | fi |
96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd | 96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd |
97 | mv ${D}${libexecdir}/* ${D}${bindir}/ | 97 | mv ${D}${libexecdir}/* ${D}${bindir}/ |
98 | cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet | 98 | cp ${UNPACKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet |
99 | cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd | 99 | cp ${UNPACKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd |
100 | 100 | ||
101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* | 101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* |
102 | if [ -e ${D}${libdir}/charset.alias ]; then | 102 | if [ -e ${D}${libdir}/charset.alias ]; then |
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch deleted file mode 100644 index 74e3de1ce9..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001 | ||
2 | From: Baruch Siach <baruch@tkos.co.il> | ||
3 | Date: Thu, 22 Dec 2016 15:26:30 +0200 | ||
4 | Subject: [PATCH] libc-compat.h: add musl workaround | ||
5 | |||
6 | The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and | ||
7 | __USE_MISC) to solve conflicts with libc provided headers. This patch makes | ||
8 | libc-compat.h work for musl libc as well. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Taken From: | ||
13 | https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch | ||
14 | |||
15 | Signed-off-by: Baruch Siach <baruch@tkos.co.il> | ||
16 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
17 | |||
18 | --- | ||
19 | include/uapi/linux/libc-compat.h | 4 +++- | ||
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h | ||
23 | index a159991..22198fa 100644 | ||
24 | --- a/include/uapi/linux/libc-compat.h | ||
25 | +++ b/include/uapi/linux/libc-compat.h | ||
26 | @@ -50,10 +50,12 @@ | ||
27 | #define _LIBC_COMPAT_H | ||
28 | |||
29 | /* We have included glibc headers... */ | ||
30 | -#if defined(__GLIBC__) | ||
31 | +#if 1 | ||
32 | +#define __USE_MISC | ||
33 | |||
34 | /* Coordinate with glibc net/if.h header. */ | ||
35 | #if defined(_NET_IF_H) && defined(__USE_MISC) | ||
36 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
37 | |||
38 | /* GLIBC headers included first so don't define anything | ||
39 | * that would already be defined. */ | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb index 8c460adf73..24539e3d99 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb | |||
@@ -11,11 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | |||
11 | 11 | ||
12 | DEPENDS = "flex-native bison-native iptables libcap" | 12 | DEPENDS = "flex-native bison-native iptables libcap" |
13 | 13 | ||
14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz" |
15 | file://0001-libc-compat.h-add-musl-workaround.patch \ | ||
16 | " | ||
17 | 15 | ||
18 | SRC_URI[sha256sum] = "ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d" | 16 | SRC_URI[sha256sum] = "03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce" |
19 | 17 | ||
20 | inherit update-alternatives bash-completion pkgconfig | 18 | inherit update-alternatives bash-completion pkgconfig |
21 | 19 | ||
@@ -28,6 +26,8 @@ PACKAGECONFIG[selinux] = ",,libselinux" | |||
28 | 26 | ||
29 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" | 27 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" |
30 | 28 | ||
29 | # This is needed with GCC-14 and musl | ||
30 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
31 | # CFLAGS are computed in Makefile and reference CCOPTS | 31 | # CFLAGS are computed in Makefile and reference CCOPTS |
32 | # | 32 | # |
33 | EXTRA_OEMAKE = "\ | 33 | EXTRA_OEMAKE = "\ |
@@ -53,6 +53,9 @@ do_install () { | |||
53 | install -d ${D}${datadir} | 53 | install -d ${D}${datadir} |
54 | mv ${D}/share/* ${D}${datadir}/ || true | 54 | mv ${D}/share/* ${D}${datadir}/ || true |
55 | rm ${D}/share -rf || true | 55 | rm ${D}/share -rf || true |
56 | |||
57 | # Remove support fot ipt and xt in tc. So tc library directory is not needed. | ||
58 | rm ${D}${libdir}/tc -rf | ||
56 | } | 59 | } |
57 | 60 | ||
58 | # The .so files in iproute2-tc are modules, not traditional libraries | 61 | # The .so files in iproute2-tc are modules, not traditional libraries |
diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch deleted file mode 100644 index 8a5bd00302..0000000000 --- a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | ||
3 | Date: Tue, 8 Aug 2023 19:03:13 +0100 | ||
4 | Subject: [PATCH] kea: fix reproducible build failure | ||
5 | |||
6 | New version of Kea has started using path of build-dir instead of | ||
7 | src-dir which results in reproducible builds failure. | ||
8 | Use src-dir as is used in v2.2.0 | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | https://gitlab.isc.org/isc-projects/kea/-/issues/3007 | ||
12 | |||
13 | Upstream has confirmed the patch will not be accepted but discussions | ||
14 | with upstream is still going on, we might have a proper solution later. | ||
15 | |||
16 | Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | ||
17 | --- | ||
18 | src/bin/admin/kea-admin.in | 8 ++++---- | ||
19 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in | ||
22 | index 034a0ee..8ab11ab 100644 | ||
23 | --- a/src/bin/admin/kea-admin.in | ||
24 | +++ b/src/bin/admin/kea-admin.in | ||
25 | @@ -51,14 +51,14 @@ dump_qry="" | ||
26 | if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then | ||
27 | . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" | ||
28 | else | ||
29 | - . "@abs_top_builddir@/src/bin/admin/admin-utils.sh" | ||
30 | + . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" | ||
31 | fi | ||
32 | |||
33 | # Find the installed kea-lfc if available. Fallback to sources otherwise. | ||
34 | if test -x "@sbindir@/kea-lfc"; then | ||
35 | kea_lfc="@sbindir@/kea-lfc" | ||
36 | else | ||
37 | - kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" | ||
38 | + kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" | ||
39 | fi | ||
40 | |||
41 | # Prints out usage version. | ||
42 | @@ -355,7 +355,7 @@ mysql_upgrade() { | ||
43 | # Check if there are any files in it | ||
44 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) | ||
45 | if [ "$num_files" -eq 0 ]; then | ||
46 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql | ||
47 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql | ||
48 | |||
49 | # Check if the scripts directory exists at all. | ||
50 | if [ ! -d ${upgrade_scripts_dir} ]; then | ||
51 | @@ -405,7 +405,7 @@ pgsql_upgrade() { | ||
52 | # Check if there are any files in it | ||
53 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) | ||
54 | if [ "$num_files" -eq 0 ]; then | ||
55 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql | ||
56 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql | ||
57 | |||
58 | # Check if the scripts directory exists at all. | ||
59 | if [ ! -d ${upgrade_scripts_dir} ]; then | ||
60 | -- | ||
61 | 2.39.2 | ||
62 | |||
diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb index c3aa4dc8f0..19309ce314 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb | |||
@@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | |||
17 | file://fix-multilib-conflict.patch \ | 17 | file://fix-multilib-conflict.patch \ |
18 | file://fix_pid_keactrl.patch \ | 18 | file://fix_pid_keactrl.patch \ |
19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ | 19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ |
20 | file://0001-kea-fix-reproducible-build-failure.patch \ | ||
21 | " | 20 | " |
22 | SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" | 21 | SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" |
23 | 22 | ||
@@ -39,6 +38,7 @@ DEBUG_OPTIMIZATION:append:mipsel = " -O" | |||
39 | BUILD_OPTIMIZATION:remove:mipsel = " -Og" | 38 | BUILD_OPTIMIZATION:remove:mipsel = " -Og" |
40 | BUILD_OPTIMIZATION:append:mipsel = " -O" | 39 | BUILD_OPTIMIZATION:append:mipsel = " -O" |
41 | 40 | ||
41 | CXXFLAGS:remove = "-fvisibility-inlines-hidden" | ||
42 | EXTRA_OECONF = "--with-boost-libs=-lboost_system \ | 42 | EXTRA_OECONF = "--with-boost-libs=-lboost_system \ |
43 | --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ | 43 | --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ |
44 | --with-openssl=${STAGING_DIR_TARGET}${prefix}" | 44 | --with-openssl=${STAGING_DIR_TARGET}${prefix}" |
@@ -47,7 +47,7 @@ do_configure:prepend() { | |||
47 | # replace abs_top_builddir to avoid introducing the build path | 47 | # replace abs_top_builddir to avoid introducing the build path |
48 | # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target | 48 | # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target |
49 | find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" | 49 | find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" |
50 | sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in | 50 | sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in |
51 | } | 51 | } |
52 | 52 | ||
53 | # patch out build host paths for reproducibility | 53 | # patch out build host paths for reproducibility |
@@ -59,8 +59,8 @@ do_install:append() { | |||
59 | install -d ${D}${sysconfdir}/init.d | 59 | install -d ${D}${sysconfdir}/init.d |
60 | install -d ${D}${systemd_system_unitdir} | 60 | install -d ${D}${systemd_system_unitdir} |
61 | 61 | ||
62 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} | 62 | install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} |
63 | install -m 0755 ${WORKDIR}/kea-*-server ${D}${sysconfdir}/init.d | 63 | install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d |
64 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 64 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
65 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 65 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
66 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl | 66 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl |
diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.19.bb index a98f436b98..94df1ac3d6 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.19.bb | |||
@@ -31,7 +31,7 @@ EXTRA_OECONF += "--enable-tools" | |||
31 | do_install:append() { | 31 | do_install:append() { |
32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
33 | install -d ${D}${sysconfdir}/init.d/ | 33 | install -d ${D}${sysconfdir}/init.d/ |
34 | sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ | 34 | sed "s:@installpath@:${libexecdir}/nfc:" ${UNPACKDIR}/neard.in \ |
35 | > ${D}${sysconfdir}/init.d/neard | 35 | > ${D}${sysconfdir}/init.d/neard |
36 | chmod 0755 ${D}${sysconfdir}/init.d/neard | 36 | chmod 0755 ${D}${sysconfdir}/init.d/neard |
37 | fi | 37 | fi |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 2f2644f9a8..af7a74a5fb 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb | |||
@@ -122,22 +122,22 @@ HIGH_RLIMIT_NOFILE ??= "4096" | |||
122 | 122 | ||
123 | do_install:append () { | 123 | do_install:append () { |
124 | install -d ${D}${sysconfdir}/init.d | 124 | install -d ${D}${sysconfdir}/init.d |
125 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver | 125 | install -m 0755 ${UNPACKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver |
126 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon | 126 | install -m 0755 ${UNPACKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon |
127 | 127 | ||
128 | install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir} | 128 | install -m 0755 ${UNPACKDIR}/nfs-utils.conf ${D}${sysconfdir} |
129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} | 129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} |
130 | 130 | ||
131 | install -d ${D}${systemd_system_unitdir} | 131 | install -d ${D}${systemd_system_unitdir} |
132 | install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ | 132 | install -m 0644 ${UNPACKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ |
133 | install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ | 133 | install -m 0644 ${UNPACKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ |
134 | install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ | 134 | install -m 0644 ${UNPACKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ |
135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ | 137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ |
138 | ${D}${systemd_system_unitdir}/*.service | 138 | ${D}${systemd_system_unitdir}/*.service |
139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
140 | install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ | 140 | install -m 0644 ${UNPACKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ |
141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ | 141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ |
142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount | 142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount |
143 | fi | 143 | fi |
diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.4.bb index dae5cc3c25..5e1e5f3b6a 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.4.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.4.bb | |||
@@ -37,7 +37,7 @@ do_configure:prepend() { | |||
37 | 37 | ||
38 | do_install:append() { | 38 | do_install:append() { |
39 | install -d ${D}${sysconfdir}/init.d/ | 39 | install -d ${D}${sysconfdir}/init.d/ |
40 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 40 | install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono |
41 | } | 41 | } |
42 | 42 | ||
43 | PACKAGES =+ "${PN}-tests" | 43 | PACKAGES =+ "${PN}-tests" |
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service b/meta/recipes-connectivity/openssh/openssh/sshd.service index 2a997b656a..3e570ab1e5 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd.service +++ b/meta/recipes-connectivity/openssh/openssh/sshd.service | |||
@@ -2,6 +2,7 @@ | |||
2 | Description=OpenSSH server daemon | 2 | Description=OpenSSH server daemon |
3 | Wants=sshdgenkeys.service | 3 | Wants=sshdgenkeys.service |
4 | After=sshdgenkeys.service | 4 | After=sshdgenkeys.service |
5 | After=nss-user-lookup.target | ||
5 | 6 | ||
6 | [Service] | 7 | [Service] |
7 | Environment="SSHD_OPTS=" | 8 | Environment="SSHD_OPTS=" |
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.socket b/meta/recipes-connectivity/openssh/openssh/sshd.socket index 8d76d62309..7dd2ed0626 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd.socket +++ b/meta/recipes-connectivity/openssh/openssh/sshd.socket | |||
@@ -1,6 +1,7 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Conflicts=sshd.service | 2 | Conflicts=sshd.service |
3 | Wants=sshdgenkeys.service | 3 | Wants=sshdgenkeys.service |
4 | After=nss-user-lookup.target | ||
4 | 5 | ||
5 | [Socket] | 6 | [Socket] |
6 | ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd | 7 | ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd |
diff --git a/meta/recipes-connectivity/openssh/openssh_9.7p1.bb b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb index d1468c59fc..36ffa49398 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.7p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb | |||
@@ -102,8 +102,8 @@ CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" | |||
102 | 102 | ||
103 | do_configure:prepend () { | 103 | do_configure:prepend () { |
104 | export LD="${CC}" | 104 | export LD="${CC}" |
105 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | 105 | install -m 0644 ${UNPACKDIR}/sshd_config ${B}/ |
106 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | 106 | install -m 0644 ${UNPACKDIR}/ssh_config ${B}/ |
107 | } | 107 | } |
108 | 108 | ||
109 | do_compile_ptest() { | 109 | do_compile_ptest() { |
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch deleted file mode 100644 index 8772f716d5..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch +++ /dev/null | |||
@@ -1,120 +0,0 @@ | |||
1 | From e9d7083e241670332e0443da0f0d4ffb52829f08 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Caswell <matt@openssl.org> | ||
3 | Date: Tue, 5 Mar 2024 15:43:53 +0000 | ||
4 | Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3 | ||
5 | |||
6 | In TLSv1.3 we create a new session object for each ticket that we send. | ||
7 | We do this by duplicating the original session. If SSL_OP_NO_TICKET is in | ||
8 | use then the new session will be added to the session cache. However, if | ||
9 | early data is not in use (and therefore anti-replay protection is being | ||
10 | used), then multiple threads could be resuming from the same session | ||
11 | simultaneously. If this happens and a problem occurs on one of the threads, | ||
12 | then the original session object could be marked as not_resumable. When we | ||
13 | duplicate the session object this not_resumable status gets copied into the | ||
14 | new session object. The new session object is then added to the session | ||
15 | cache even though it is not_resumable. | ||
16 | |||
17 | Subsequently, another bug means that the session_id_length is set to 0 for | ||
18 | sessions that are marked as not_resumable - even though that session is | ||
19 | still in the cache. Once this happens the session can never be removed from | ||
20 | the cache. When that object gets to be the session cache tail object the | ||
21 | cache never shrinks again and grows indefinitely. | ||
22 | |||
23 | CVE-2024-2511 | ||
24 | |||
25 | Reviewed-by: Neil Horman <nhorman@openssl.org> | ||
26 | Reviewed-by: Tomas Mraz <tomas@openssl.org> | ||
27 | (Merged from https://github.com/openssl/openssl/pull/24043) | ||
28 | |||
29 | CVE: CVE-2024-2511 | ||
30 | Upstream-Status: Backport [https://github.com/openssl/openssl/commit/e9d7083e241670332e0443da0f0d4ffb52829f08] | ||
31 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
32 | --- | ||
33 | ssl/ssl_lib.c | 5 +++-- | ||
34 | ssl/ssl_sess.c | 28 ++++++++++++++++++++++------ | ||
35 | ssl/statem/statem_srvr.c | 5 ++--- | ||
36 | 3 files changed, 27 insertions(+), 11 deletions(-) | ||
37 | |||
38 | diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c | ||
39 | index 4afb43bc86e54..c51529ddab5bb 100644 | ||
40 | --- a/ssl/ssl_lib.c | ||
41 | +++ b/ssl/ssl_lib.c | ||
42 | @@ -4457,9 +4457,10 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode) | ||
43 | |||
44 | /* | ||
45 | * If the session_id_length is 0, we are not supposed to cache it, and it | ||
46 | - * would be rather hard to do anyway :-) | ||
47 | + * would be rather hard to do anyway :-). Also if the session has already | ||
48 | + * been marked as not_resumable we should not cache it for later reuse. | ||
49 | */ | ||
50 | - if (s->session->session_id_length == 0) | ||
51 | + if (s->session->session_id_length == 0 || s->session->not_resumable) | ||
52 | return; | ||
53 | |||
54 | /* | ||
55 | diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c | ||
56 | index 3dcc4d81e5bc6..1fa6d17c46863 100644 | ||
57 | --- a/ssl/ssl_sess.c | ||
58 | +++ b/ssl/ssl_sess.c | ||
59 | @@ -127,16 +127,11 @@ SSL_SESSION *SSL_SESSION_new(void) | ||
60 | return ss; | ||
61 | } | ||
62 | |||
63 | -SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) | ||
64 | -{ | ||
65 | - return ssl_session_dup(src, 1); | ||
66 | -} | ||
67 | - | ||
68 | /* | ||
69 | * Create a new SSL_SESSION and duplicate the contents of |src| into it. If | ||
70 | * ticket == 0 then no ticket information is duplicated, otherwise it is. | ||
71 | */ | ||
72 | -SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) | ||
73 | +static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket) | ||
74 | { | ||
75 | SSL_SESSION *dest; | ||
76 | |||
77 | @@ -265,6 +260,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) | ||
78 | return NULL; | ||
79 | } | ||
80 | |||
81 | +SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) | ||
82 | +{ | ||
83 | + return ssl_session_dup_intern(src, 1); | ||
84 | +} | ||
85 | + | ||
86 | +/* | ||
87 | + * Used internally when duplicating a session which might be already shared. | ||
88 | + * We will have resumed the original session. Subsequently we might have marked | ||
89 | + * it as non-resumable (e.g. in another thread) - but this copy should be ok to | ||
90 | + * resume from. | ||
91 | + */ | ||
92 | +SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) | ||
93 | +{ | ||
94 | + SSL_SESSION *sess = ssl_session_dup_intern(src, ticket); | ||
95 | + | ||
96 | + if (sess != NULL) | ||
97 | + sess->not_resumable = 0; | ||
98 | + | ||
99 | + return sess; | ||
100 | +} | ||
101 | + | ||
102 | const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) | ||
103 | { | ||
104 | if (len) | ||
105 | diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c | ||
106 | index 853af8c0aa9f9..d5f0ab091dacc 100644 | ||
107 | --- a/ssl/statem/statem_srvr.c | ||
108 | +++ b/ssl/statem/statem_srvr.c | ||
109 | @@ -2445,9 +2445,8 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt) | ||
110 | * so the following won't overwrite an ID that we're supposed | ||
111 | * to send back. | ||
112 | */ | ||
113 | - if (s->session->not_resumable || | ||
114 | - (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER) | ||
115 | - && !s->hit)) | ||
116 | + if (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER) | ||
117 | + && !s->hit) | ||
118 | s->session->session_id_length = 0; | ||
119 | |||
120 | if (usetls13) { | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb index d37b68abbb..113ed4bf95 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb | |||
@@ -13,14 +13,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ | 14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ |
15 | file://bti.patch \ | 15 | file://bti.patch \ |
16 | file://CVE-2024-2511.patch \ | ||
17 | " | 16 | " |
18 | 17 | ||
19 | SRC_URI:append:class-nativesdk = " \ | 18 | SRC_URI:append:class-nativesdk = " \ |
20 | file://environment.d-openssl.sh \ | 19 | file://environment.d-openssl.sh \ |
21 | " | 20 | " |
22 | 21 | ||
23 | SRC_URI[sha256sum] = "83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39" | 22 | SRC_URI[sha256sum] = "53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02" |
24 | 23 | ||
25 | inherit lib_package multilib_header multilib_script ptest perlnative manpages | 24 | inherit lib_package multilib_header multilib_script ptest perlnative manpages |
26 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 25 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |
@@ -137,16 +136,12 @@ do_configure () { | |||
137 | ;; | 136 | ;; |
138 | esac | 137 | esac |
139 | 138 | ||
140 | useprefix=${prefix} | ||
141 | if [ "x$useprefix" = "x" ]; then | ||
142 | useprefix=/ | ||
143 | fi | ||
144 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the | 139 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the |
145 | # environment variables set by bitbake. Adjust the environment variables instead. | 140 | # environment variables set by bitbake. Adjust the environment variables instead. |
146 | PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" | 141 | PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" |
147 | test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" | 142 | test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" |
148 | HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ | 143 | HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ |
149 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target | 144 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=${prefix} --openssldir=${libdir}/ssl-3 --libdir=${baselib} $target |
150 | perl ${B}/configdata.pm --dump | 145 | perl ${B}/configdata.pm --dump |
151 | } | 146 | } |
152 | 147 | ||
@@ -182,7 +177,7 @@ do_install:append:class-native () { | |||
182 | 177 | ||
183 | do_install:append:class-nativesdk () { | 178 | do_install:append:class-nativesdk () { |
184 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 179 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
185 | install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 180 | install -m 644 ${UNPACKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
186 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 181 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
187 | } | 182 | } |
188 | 183 | ||
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index 099c58bfc7..0c3085d3a8 100644 --- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | |||
@@ -15,10 +15,10 @@ S = "${WORKDIR}" | |||
15 | 15 | ||
16 | do_install() { | 16 | do_install() { |
17 | install -d ${D}${sysconfdir}/ppp/peers | 17 | install -d ${D}${sysconfdir}/ppp/peers |
18 | install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host | 18 | install -m 0644 ${S}/host-peer ${D}${sysconfdir}/ppp/peers/host |
19 | 19 | ||
20 | install -d ${D}${sbindir} | 20 | install -d ${D}${sbindir} |
21 | install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir} | 21 | install -m 0755 ${S}/ppp-dialin ${D}${sbindir} |
22 | } | 22 | } |
23 | 23 | ||
24 | USERADD_PACKAGES = "${PN}" | 24 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb index 4b052f8ed9..36e2585de4 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb | |||
@@ -5,7 +5,7 @@ SECTION = "console/network" | |||
5 | HOMEPAGE = "http://samba.org/ppp/" | 5 | HOMEPAGE = "http://samba.org/ppp/" |
6 | BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" | 6 | BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" |
7 | DEPENDS = "libpcap openssl virtual/crypt" | 7 | DEPENDS = "libpcap openssl virtual/crypt" |
8 | LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD" | 8 | LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD" |
9 | LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ | 9 | LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ |
10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ | 10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ |
11 | file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ | 11 | file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ |
@@ -35,20 +35,20 @@ do_install:append () { | |||
35 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d | 35 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d |
36 | mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ | 36 | mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ |
37 | mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ | 37 | mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ |
38 | install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon | 38 | install -m 0755 ${UNPACKDIR}/pon ${D}${bindir}/pon |
39 | install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff | 39 | install -m 0755 ${UNPACKDIR}/poff ${D}${bindir}/poff |
40 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp | 40 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/ppp |
41 | install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ | 41 | install -m 0755 ${UNPACKDIR}/ip-up ${D}${sysconfdir}/ppp/ |
42 | install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ | 42 | install -m 0755 ${UNPACKDIR}/ip-down ${D}${sysconfdir}/ppp/ |
43 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ | 43 | install -m 0755 ${UNPACKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ |
44 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ | 44 | install -m 0755 ${UNPACKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ |
45 | mkdir -p ${D}${sysconfdir}/chatscripts | 45 | mkdir -p ${D}${sysconfdir}/chatscripts |
46 | mkdir -p ${D}${sysconfdir}/ppp/peers | 46 | mkdir -p ${D}${sysconfdir}/ppp/peers |
47 | install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts | 47 | install -m 0755 ${UNPACKDIR}/pap ${D}${sysconfdir}/chatscripts |
48 | install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot | 48 | install -m 0755 ${UNPACKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot |
49 | install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider | 49 | install -m 0755 ${UNPACKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider |
50 | install -d ${D}${systemd_system_unitdir} | 50 | install -d ${D}${systemd_system_unitdir} |
51 | install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_system_unitdir} | 51 | install -m 0644 ${UNPACKDIR}/ppp@.service ${D}${systemd_system_unitdir} |
52 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 52 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
53 | ${D}${systemd_system_unitdir}/ppp@.service | 53 | ${D}${systemd_system_unitdir}/ppp@.service |
54 | } | 54 | } |
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb index 226cb7ee77..c3ce5bc22e 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb | |||
@@ -29,7 +29,7 @@ do_compile () { | |||
29 | 29 | ||
30 | do_install () { | 30 | do_install () { |
31 | install -d ${D}${sysconfdir}/default/volatiles | 31 | install -d ${D}${sysconfdir}/default/volatiles |
32 | install -m 0644 ${WORKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles | 32 | install -m 0644 ${UNPACKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles |
33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
34 | install -d ${D}${sysconfdir}/tmpfiles.d | 34 | install -d ${D}${sysconfdir}/tmpfiles.d |
35 | echo "d /run/${BPN}/interface - - - -" \ | 35 | echo "d /run/${BPN}/interface - - - -" \ |
diff --git a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb index ddd10e6eeb..4a62ddacd5 100644 --- a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb +++ b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb | |||
@@ -8,12 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
8 | 8 | ||
9 | INHIBIT_DEFAULT_DEPS = "1" | 9 | INHIBIT_DEFAULT_DEPS = "1" |
10 | 10 | ||
11 | COMPATIBLE_MACHINE = "^qemu.*$" | ||
12 | |||
11 | do_install () { | 13 | do_install () { |
12 | install -d ${D}${sysconfdir}/dropbear | 14 | install -d ${D}${sysconfdir}/dropbear |
13 | install ${WORKDIR}/dropbear_rsa_host_key -m 0600 ${D}${sysconfdir}/dropbear/ | 15 | install ${UNPACKDIR}/dropbear_rsa_host_key -m 0600 ${D}${sysconfdir}/dropbear/ |
14 | 16 | ||
15 | install -d ${D}${sysconfdir}/ssh | 17 | install -d ${D}${sysconfdir}/ssh |
16 | install ${WORKDIR}/openssh/* ${D}${sysconfdir}/ssh/ | 18 | install ${UNPACKDIR}/openssh/* ${D}${sysconfdir}/ssh/ |
17 | chmod 0600 ${D}${sysconfdir}/ssh/* | 19 | chmod 0600 ${D}${sysconfdir}/ssh/* |
18 | chmod 0644 ${D}${sysconfdir}/ssh/*.pub | 20 | chmod 0644 ${D}${sysconfdir}/ssh/*.pub |
19 | } \ No newline at end of file | 21 | } |
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 22028ce957..8113bcab09 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | |||
@@ -62,15 +62,15 @@ do_install () { | |||
62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install | 62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install |
63 | 63 | ||
64 | install -d ${D}${docdir}/wpa_supplicant | 64 | install -d ${D}${docdir}/wpa_supplicant |
65 | install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant | 65 | install -m 644 wpa_supplicant/README ${UNPACKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant |
66 | 66 | ||
67 | install -d ${D}${sysconfdir} | 67 | install -d ${D}${sysconfdir} |
68 | install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf | 68 | install -m 600 ${UNPACKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf |
69 | 69 | ||
70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ | 70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ |
71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ | 71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ |
72 | install -d ${D}${sysconfdir}/network/if-down.d/ | 72 | install -d ${D}${sysconfdir}/network/if-down.d/ |
73 | install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant | 73 | install -m 755 ${UNPACKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant |
74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant | 74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant |
75 | 75 | ||
76 | install -d ${D}/${sysconfdir}/dbus-1/system.d | 76 | install -d ${D}/${sysconfdir}/dbus-1/system.d |
@@ -84,7 +84,7 @@ do_install () { | |||
84 | fi | 84 | fi |
85 | 85 | ||
86 | install -d ${D}/etc/default/volatiles | 86 | install -d ${D}/etc/default/volatiles |
87 | install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles | 87 | install -m 0644 ${UNPACKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles |
88 | 88 | ||
89 | install -d ${D}${includedir} | 89 | install -d ${D}${includedir} |
90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} | 90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} |
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 9fab53ce63..42a8026e63 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -113,23 +113,23 @@ do_install () { | |||
113 | ln -snf ../run ${D}${localstatedir}/run | 113 | ln -snf ../run ${D}${localstatedir}/run |
114 | ln -snf ../run/lock ${D}${localstatedir}/lock | 114 | ln -snf ../run/lock ${D}${localstatedir}/lock |
115 | 115 | ||
116 | install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts | 116 | install -m 0644 ${S}/hosts ${D}${sysconfdir}/hosts |
117 | ${BASEFILESISSUEINSTALL} | 117 | ${BASEFILESISSUEINSTALL} |
118 | 118 | ||
119 | rotation=`cat ${WORKDIR}/rotation` | 119 | rotation=`cat ${S}/rotation` |
120 | if [ "$rotation" != "0" ]; then | 120 | if [ "$rotation" != "0" ]; then |
121 | install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation | 121 | install -m 0644 ${S}/rotation ${D}${sysconfdir}/rotation |
122 | fi | 122 | fi |
123 | 123 | ||
124 | install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab | 124 | install -m 0644 ${S}/fstab ${D}${sysconfdir}/fstab |
125 | install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile | 125 | install -m 0644 ${S}/profile ${D}${sysconfdir}/profile |
126 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile | 126 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile |
127 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile | 127 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile |
128 | install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells | 128 | install -m 0644 ${S}/shells ${D}${sysconfdir}/shells |
129 | install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile | 129 | install -m 0755 ${S}/share/dot.profile ${D}${sysconfdir}/skel/.profile |
130 | install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc | 130 | install -m 0755 ${S}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc |
131 | install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf | 131 | install -m 0644 ${S}/host.conf ${D}${sysconfdir}/host.conf |
132 | install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd | 132 | install -m 0644 ${S}/motd ${D}${sysconfdir}/motd |
133 | 133 | ||
134 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab | 134 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab |
135 | 135 | ||
@@ -145,12 +145,12 @@ do_install () { | |||
145 | } | 145 | } |
146 | 146 | ||
147 | do_install:append:libc-glibc () { | 147 | do_install:append:libc-glibc () { |
148 | install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf | 148 | install -m 0644 ${S}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf |
149 | } | 149 | } |
150 | 150 | ||
151 | DISTRO_VERSION[vardepsexclude] += "DATE" | 151 | DISTRO_VERSION[vardepsexclude] += "DATE" |
152 | do_install_basefilesissue () { | 152 | do_install_basefilesissue () { |
153 | install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} | 153 | install -m 644 ${S}/issue* ${D}${sysconfdir} |
154 | if [ -n "${DISTRO_NAME}" ]; then | 154 | if [ -n "${DISTRO_NAME}" ]; then |
155 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue | 155 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue |
156 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net | 156 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net |
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb b/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb index 6904a91930..1f179d8560 100644 --- a/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb +++ b/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb | |||
@@ -14,7 +14,7 @@ do_compile() { | |||
14 | 14 | ||
15 | do_install() { | 15 | do_install() { |
16 | install -d ${D}${sysconfdir} | 16 | install -d ${D}${sysconfdir} |
17 | install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab | 17 | install -D -m 0644 ${S}/inittab ${D}${sysconfdir}/inittab |
18 | 18 | ||
19 | CONSOLES="${SERIAL_CONSOLES}" | 19 | CONSOLES="${SERIAL_CONSOLES}" |
20 | for s in $CONSOLES | 20 | for s in $CONSOLES |
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index f5d7c3f9c8..67a9111e5b 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -114,7 +114,7 @@ do_prepare_config () { | |||
114 | export KCONFIG_NOTIMESTAMP=1 | 114 | export KCONFIG_NOTIMESTAMP=1 |
115 | 115 | ||
116 | sed -e '/CONFIG_STATIC/d' \ | 116 | sed -e '/CONFIG_STATIC/d' \ |
117 | < ${WORKDIR}/defconfig > ${S}/.config | 117 | < ${UNPACKDIR}/defconfig > ${S}/.config |
118 | echo "# CONFIG_STATIC is not set" >> .config | 118 | echo "# CONFIG_STATIC is not set" >> .config |
119 | for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ | 119 | for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ |
120 | ${S}/.config | 120 | ${S}/.config |
@@ -280,67 +280,67 @@ do_install () { | |||
280 | fi | 280 | fi |
281 | 281 | ||
282 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then | 282 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then |
283 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog | 283 | install -m 0755 ${UNPACKDIR}/syslog ${D}${sysconfdir}/init.d/syslog |
284 | install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf | 284 | install -m 644 ${UNPACKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf |
285 | install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf | 285 | install -m 644 ${UNPACKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf |
286 | fi | 286 | fi |
287 | if grep -q "CONFIG_CROND=y" ${B}/.config; then | 287 | if grep -q "CONFIG_CROND=y" ${B}/.config; then |
288 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ | 288 | install -m 0755 ${UNPACKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ |
289 | fi | 289 | fi |
290 | if grep -q "CONFIG_HTTPD=y" ${B}/.config; then | 290 | if grep -q "CONFIG_HTTPD=y" ${B}/.config; then |
291 | install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ | 291 | install -m 0755 ${UNPACKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ |
292 | install -d ${D}/srv/www | 292 | install -d ${D}/srv/www |
293 | fi | 293 | fi |
294 | if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then | 294 | if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then |
295 | install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ | 295 | install -m 0755 ${UNPACKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ |
296 | fi | 296 | fi |
297 | if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then | 297 | if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then |
298 | install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ | 298 | install -m 0755 ${UNPACKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ |
299 | fi | 299 | fi |
300 | if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then | 300 | if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then |
301 | install -d ${D}${sysconfdir}/udhcpc.d | 301 | install -d ${D}${sysconfdir}/udhcpc.d |
302 | install -d ${D}${datadir}/udhcpc | 302 | install -d ${D}${datadir}/udhcpc |
303 | install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default | 303 | install -m 0755 ${UNPACKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default |
304 | sed -i "s:/SBIN_DIR/:${base_sbindir}/:" ${D}${sysconfdir}/udhcpc.d/50default | 304 | sed -i "s:/SBIN_DIR/:${base_sbindir}/:" ${D}${sysconfdir}/udhcpc.d/50default |
305 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script | 305 | install -m 0755 ${UNPACKDIR}/default.script ${D}${datadir}/udhcpc/default.script |
306 | fi | 306 | fi |
307 | if grep -q "CONFIG_INETD=y" ${B}/.config; then | 307 | if grep -q "CONFIG_INETD=y" ${B}/.config; then |
308 | install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} | 308 | install -m 0755 ${UNPACKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} |
309 | sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} | 309 | sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} |
310 | install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ | 310 | install -m 0644 ${UNPACKDIR}/inetd.conf ${D}${sysconfdir}/ |
311 | fi | 311 | fi |
312 | if grep -q "CONFIG_MDEV=y" ${B}/.config; then | 312 | if grep -q "CONFIG_MDEV=y" ${B}/.config; then |
313 | install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev | 313 | install -m 0755 ${UNPACKDIR}/mdev ${D}${sysconfdir}/init.d/mdev |
314 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then | 314 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then |
315 | install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf | 315 | install -m 644 ${UNPACKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf |
316 | install -d ${D}${sysconfdir}/mdev | 316 | install -d ${D}${sysconfdir}/mdev |
317 | install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev | 317 | install -m 0755 ${UNPACKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev |
318 | install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev | 318 | install -m 0755 ${UNPACKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev |
319 | fi | 319 | fi |
320 | fi | 320 | fi |
321 | if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then | 321 | if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then |
322 | install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | 322 | install -D -m 0755 ${UNPACKDIR}/rcS ${D}${sysconfdir}/init.d/rcS |
323 | install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | 323 | install -D -m 0755 ${UNPACKDIR}/rcK ${D}${sysconfdir}/init.d/rcK |
324 | install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS | 324 | install -D -m 0755 ${UNPACKDIR}/rcS.default ${D}${sysconfdir}/default/rcS |
325 | fi | 325 | fi |
326 | 326 | ||
327 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 327 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
328 | if grep -q "CONFIG_KLOGD=y" ${B}/.config; then | 328 | if grep -q "CONFIG_KLOGD=y" ${B}/.config; then |
329 | install -d ${D}${systemd_system_unitdir} | 329 | install -d ${D}${systemd_system_unitdir} |
330 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ | 330 | sed 's,@base_sbindir@,${base_sbindir},g' < ${UNPACKDIR}/busybox-klogd.service.in \ |
331 | > ${D}${systemd_system_unitdir}/busybox-klogd.service | 331 | > ${D}${systemd_system_unitdir}/busybox-klogd.service |
332 | fi | 332 | fi |
333 | 333 | ||
334 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then | 334 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then |
335 | install -d ${D}${systemd_system_unitdir} | 335 | install -d ${D}${systemd_system_unitdir} |
336 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ | 336 | sed 's,@base_sbindir@,${base_sbindir},g' < ${UNPACKDIR}/busybox-syslog.service.in \ |
337 | > ${D}${systemd_system_unitdir}/busybox-syslog.service | 337 | > ${D}${systemd_system_unitdir}/busybox-syslog.service |
338 | if [ ! -e ${D}${systemd_system_unitdir}/busybox-klogd.service ] ; then | 338 | if [ ! -e ${D}${systemd_system_unitdir}/busybox-klogd.service ] ; then |
339 | sed -i '/klog/d' ${D}${systemd_system_unitdir}/busybox-syslog.service | 339 | sed -i '/klog/d' ${D}${systemd_system_unitdir}/busybox-syslog.service |
340 | fi | 340 | fi |
341 | if [ -f ${WORKDIR}/busybox-syslog.default ] ; then | 341 | if [ -f ${UNPACKDIR}/busybox-syslog.default ] ; then |
342 | install -d ${D}${sysconfdir}/default | 342 | install -d ${D}${sysconfdir}/default |
343 | install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog | 343 | install -m 0644 ${UNPACKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog |
344 | fi | 344 | fi |
345 | fi | 345 | fi |
346 | fi | 346 | fi |
diff --git a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch index 4635250170..ceb3ad7250 100644 --- a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch +++ b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch | |||
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are | |||
5 | returned for the hostname part | 5 | returned for the hostname part |
6 | 6 | ||
7 | CVE: CVE-2022-28391 | 7 | CVE: CVE-2022-28391 |
8 | Upstream-Status: Pending | 8 | Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] |
9 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> | 9 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> |
10 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | 10 | Signed-off-by: Steve Sakoman <steve@sakoman.com> |
11 | --- | 11 | --- |
diff --git a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch index 0d7409ddc3..1dbc3388a4 100644 --- a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch +++ b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch | |||
@@ -8,7 +8,7 @@ Otherwise, terminal sequences can be injected, which enables various terminal in | |||
8 | attacks from DNS results. | 8 | attacks from DNS results. |
9 | 9 | ||
10 | CVE: CVE-2022-28391 | 10 | CVE: CVE-2022-28391 |
11 | Upstream-Status: Pending | 11 | Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] |
12 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> | 12 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> |
13 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | 13 | Signed-off-by: Steve Sakoman <steve@sakoman.com> |
14 | --- | 14 | --- |
diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch deleted file mode 100644 index 948932a3e8..0000000000 --- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | From 53626cd06a3ef05ed847daea802ef0aa9661caa7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anders Darander <anders@chargestorm.se> | ||
3 | Date: Thu, 3 Nov 2011 08:51:31 +0100 | ||
4 | Subject: [PATCH] busybox-udhcpc-no_deconfig.patch | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Add a new option -D to the udhcpc client that allows for | ||
9 | dhcp renewal to occur without having to down the interface | ||
10 | in the process. | ||
11 | |||
12 | Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com> | ||
13 | |||
14 | Updated to latest Busybox 1.17.3 | ||
15 | |||
16 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
17 | |||
18 | Updated to Busybox 1.18.4 | ||
19 | option spec is changed | ||
20 | |||
21 | Signed-off-by: Qing He <qing.he@intel.com> | ||
22 | |||
23 | Updated to Busybox 1.19.3 | ||
24 | |||
25 | Signed-off-by: Anders Darander <anders@chargestorm.se> | ||
26 | |||
27 | Fixed options -b, -a and -P. | ||
28 | |||
29 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
30 | --- | ||
31 | networking/udhcp/dhcpc.c | 29 ++++++++++++++++------ | ||
32 | 1 file changed, 21 insertions(+), 8 deletions(-) | ||
33 | |||
34 | Index: busybox-1.34.0/networking/udhcp/dhcpc.c | ||
35 | =================================================================== | ||
36 | --- busybox-1.34.0.orig/networking/udhcp/dhcpc.c | ||
37 | +++ busybox-1.34.0/networking/udhcp/dhcpc.c | ||
38 | @@ -48,6 +48,8 @@ | ||
39 | }; | ||
40 | #endif | ||
41 | |||
42 | +/* option whether to down the interface when reconfiguring */ | ||
43 | +static int allow_deconfig = 1; | ||
44 | |||
45 | /* "struct client_data_t client_data" is in bb_common_bufsiz1 */ | ||
46 | |||
47 | @@ -100,8 +102,10 @@ | ||
48 | OPT_x = 1 << 16, | ||
49 | OPT_f = 1 << 17, | ||
50 | OPT_B = 1 << 18, | ||
51 | + OPT_D = 1 << 19, | ||
52 | /* The rest has variable bit positions, need to be clever */ | ||
53 | OPTBIT_B = 18, | ||
54 | + OPTBIT_D = 19, | ||
55 | USE_FOR_MMU( OPTBIT_b,) | ||
56 | IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) | ||
57 | IF_FEATURE_UDHCP_PORT( OPTBIT_P,) | ||
58 | @@ -587,7 +591,8 @@ | ||
59 | |||
60 | static void d4_run_script_deconfig(void) | ||
61 | { | ||
62 | - d4_run_script(NULL, "deconfig"); | ||
63 | + if (allow_deconfig) | ||
64 | + d4_run_script(NULL, "deconfig"); | ||
65 | } | ||
66 | |||
67 | /*** Sending/receiving packets ***/ | ||
68 | @@ -1244,7 +1249,7 @@ | ||
69 | /* Parse command line */ | ||
70 | opt = getopt32long(argv, "^" | ||
71 | /* O,x: list; -T,-t,-A take numeric param */ | ||
72 | - "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB" | ||
73 | + "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD" | ||
74 | USE_FOR_MMU("b") | ||
75 | IF_FEATURE_UDHCPC_ARPING("a::") | ||
76 | IF_FEATURE_UDHCP_PORT("P:") | ||
77 | @@ -1361,6 +1366,10 @@ | ||
78 | logmode |= LOGMODE_SYSLOG; | ||
79 | } | ||
80 | |||
81 | + if (opt & OPT_D) { | ||
82 | + allow_deconfig = 0; | ||
83 | + } | ||
84 | + | ||
85 | /* Create pidfile */ | ||
86 | write_pidfile(client_data.pidfile); | ||
87 | /* Goes to stdout (unless NOMMU) and possibly syslog */ | ||
diff --git a/meta/recipes-core/busybox/busybox_1.36.1.bb b/meta/recipes-core/busybox/busybox_1.36.1.bb index 06eb9eb999..373a6b7781 100644 --- a/meta/recipes-core/busybox/busybox_1.36.1.bb +++ b/meta/recipes-core/busybox/busybox_1.36.1.bb | |||
@@ -2,7 +2,6 @@ require busybox.inc | |||
2 | 2 | ||
3 | SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 3 | SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
4 | file://0001-depmod-Ignore-.debug-directories.patch \ | 4 | file://0001-depmod-Ignore-.debug-directories.patch \ |
5 | file://busybox-udhcpc-no_deconfig.patch \ | ||
6 | file://find-touchscreen.sh \ | 5 | file://find-touchscreen.sh \ |
7 | file://busybox-cron \ | 6 | file://busybox-cron \ |
8 | file://busybox-httpd \ | 7 | file://busybox-httpd \ |
diff --git a/meta/recipes-core/dbus/dbus_1.14.10.bb b/meta/recipes-core/dbus/dbus_1.14.10.bb index 4fe7af7512..6a08f6984e 100644 --- a/meta/recipes-core/dbus/dbus_1.14.10.bb +++ b/meta/recipes-core/dbus/dbus_1.14.10.bb | |||
@@ -129,8 +129,8 @@ do_install() { | |||
129 | 129 | ||
130 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 130 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
131 | install -d ${D}${sysconfdir}/init.d | 131 | install -d ${D}${sysconfdir}/init.d |
132 | sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh | 132 | sed 's:@bindir@:${bindir}:' < ${UNPACKDIR}/dbus-1.init > ${S}/dbus-1.init.sh |
133 | install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 | 133 | install -m 0755 ${S}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 |
134 | install -d ${D}${sysconfdir}/default/volatiles | 134 | install -d ${D}${sysconfdir}/default/volatiles |
135 | echo "d messagebus messagebus 0755 /run/dbus none" \ | 135 | echo "d messagebus messagebus 0755 /run/dbus none" \ |
136 | > ${D}${sysconfdir}/default/volatiles/99_dbus | 136 | > ${D}${sysconfdir}/default/volatiles/99_dbus |
diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch index 99adcfd770..c74f09e484 100644 --- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +++ b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch | |||
@@ -2,14 +2,14 @@ Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h | |||
2 | 2 | ||
3 | Upstream-Status: Inappropriate [configuration] | 3 | Upstream-Status: Inappropriate [configuration] |
4 | --- | 4 | --- |
5 | default_options.h | 2 +- | 5 | src/default_options.h | 2 +- |
6 | 1 file changed, 1 insertion(+), 1 deletion(-) | 6 | 1 file changed, 1 insertion(+), 1 deletion(-) |
7 | 7 | ||
8 | diff --git a/default_options.h b/default_options.h | 8 | diff --git a/src/default_options.h b/src/default_options.h |
9 | index 349338c..5ffac25 100644 | 9 | index 6e970bb..ccc8b47 100644 |
10 | --- a/default_options.h | 10 | --- a/src/default_options.h |
11 | +++ b/default_options.h | 11 | +++ b/src/default_options.h |
12 | @@ -289,7 +289,7 @@ group1 in Dropbear server too */ | 12 | @@ -311,7 +311,7 @@ group1 in Dropbear server too */ |
13 | 13 | ||
14 | /* The command to invoke for xauth when using X11 forwarding. | 14 | /* The command to invoke for xauth when using X11 forwarding. |
15 | * "-q" for quiet */ | 15 | * "-q" for quiet */ |
@@ -19,5 +19,5 @@ index 349338c..5ffac25 100644 | |||
19 | 19 | ||
20 | /* If you want to enable running an sftp server (such as the one included with | 20 | /* If you want to enable running an sftp server (such as the one included with |
21 | -- | 21 | -- |
22 | 2.25.1 | 22 | 2.34.1 |
23 | 23 | ||
diff --git a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch index 32c3ea5f08..fe667ddc25 100644 --- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch +++ b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch | |||
@@ -11,13 +11,13 @@ Upstream-Status: Pending | |||
11 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | 11 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
13 | --- | 13 | --- |
14 | default_options.h | 4 ++-- | 14 | src/default_options.h | 4 ++-- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/default_options.h b/default_options.h | 17 | diff --git a/src/default_options.h b/src/default_options.h |
18 | index 0e3d027..349338c 100644 | 18 | index 0e3d027..349338c 100644 |
19 | --- a/default_options.h | 19 | --- a/src/default_options.h |
20 | +++ b/default_options.h | 20 | +++ b/src/default_options.h |
21 | @@ -210,7 +210,7 @@ group1 in Dropbear server too */ | 21 | @@ -210,7 +210,7 @@ group1 in Dropbear server too */ |
22 | 22 | ||
23 | /* Authentication Types - at least one required. | 23 | /* Authentication Types - at least one required. |
diff --git a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch index deed78ffb9..f54f634a4e 100644 --- a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch +++ b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch | |||
@@ -12,13 +12,13 @@ Signed-off-by: Maxin B. John <maxin.john@enea.com> | |||
12 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | 12 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
13 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 13 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
14 | --- | 14 | --- |
15 | svr-authpam.c | 2 +- | 15 | src/svr-authpam.c | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/svr-authpam.c b/svr-authpam.c | 18 | diff --git a/srec/svr-authpam.c b/src/svr-authpam.c |
19 | index d201bc9..165ec5c 100644 | 19 | index d201bc9..165ec5c 100644 |
20 | --- a/svr-authpam.c | 20 | --- a/src/svr-authpam.c |
21 | +++ b/svr-authpam.c | 21 | +++ b/src/svr-authpam.c |
22 | @@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) { | 22 | @@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) { |
23 | } | 23 | } |
24 | 24 | ||
diff --git a/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch b/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch deleted file mode 100644 index ec50d69816..0000000000 --- a/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch +++ /dev/null | |||
@@ -1,144 +0,0 @@ | |||
1 | From beba892bc0d4e4ded4d667ab1d2a94f4d75109a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: czurnieden <czurnieden@gmx.de> | ||
3 | Date: Fri, 8 Sep 2023 10:07:32 +0000 | ||
4 | Subject: [PATCH] Fix possible integer overflow | ||
5 | |||
6 | CVE: CVE-2023-36328 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/libtom/libtommath/commit/beba892bc0d4e4ded4d667ab1d2a94f4d75109a9] | ||
9 | |||
10 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
11 | --- | ||
12 | libtommath/bn_mp_2expt.c | 4 ++++ | ||
13 | libtommath/bn_mp_grow.c | 4 ++++ | ||
14 | libtommath/bn_mp_init_size.c | 5 +++++ | ||
15 | libtommath/bn_mp_mul_2d.c | 4 ++++ | ||
16 | libtommath/bn_s_mp_mul_digs.c | 4 ++++ | ||
17 | libtommath/bn_s_mp_mul_digs_fast.c | 4 ++++ | ||
18 | libtommath/bn_s_mp_mul_high_digs.c | 4 ++++ | ||
19 | libtommath/bn_s_mp_mul_high_digs_fast.c | 4 ++++ | ||
20 | 8 files changed, 33 insertions(+) | ||
21 | |||
22 | diff --git a/libtommath/bn_mp_2expt.c b/libtommath/bn_mp_2expt.c | ||
23 | index 0ae3df1..ca6fbc3 100644 | ||
24 | --- a/libtommath/bn_mp_2expt.c | ||
25 | +++ b/libtommath/bn_mp_2expt.c | ||
26 | @@ -12,6 +12,10 @@ mp_err mp_2expt(mp_int *a, int b) | ||
27 | { | ||
28 | mp_err err; | ||
29 | |||
30 | + if (b < 0) { | ||
31 | + return MP_VAL; | ||
32 | + } | ||
33 | + | ||
34 | /* zero a as per default */ | ||
35 | mp_zero(a); | ||
36 | |||
37 | diff --git a/libtommath/bn_mp_grow.c b/libtommath/bn_mp_grow.c | ||
38 | index 9e904c5..2b16826 100644 | ||
39 | --- a/libtommath/bn_mp_grow.c | ||
40 | +++ b/libtommath/bn_mp_grow.c | ||
41 | @@ -9,6 +9,10 @@ mp_err mp_grow(mp_int *a, int size) | ||
42 | int i; | ||
43 | mp_digit *tmp; | ||
44 | |||
45 | + if (size < 0) { | ||
46 | + return MP_VAL; | ||
47 | + } | ||
48 | + | ||
49 | /* if the alloc size is smaller alloc more ram */ | ||
50 | if (a->alloc < size) { | ||
51 | /* reallocate the array a->dp | ||
52 | diff --git a/libtommath/bn_mp_init_size.c b/libtommath/bn_mp_init_size.c | ||
53 | index d622687..5fefa96 100644 | ||
54 | --- a/libtommath/bn_mp_init_size.c | ||
55 | +++ b/libtommath/bn_mp_init_size.c | ||
56 | @@ -6,6 +6,11 @@ | ||
57 | /* init an mp_init for a given size */ | ||
58 | mp_err mp_init_size(mp_int *a, int size) | ||
59 | { | ||
60 | + | ||
61 | + if (size < 0) { | ||
62 | + return MP_VAL; | ||
63 | + } | ||
64 | + | ||
65 | size = MP_MAX(MP_MIN_PREC, size); | ||
66 | |||
67 | /* alloc mem */ | ||
68 | diff --git a/libtommath/bn_mp_mul_2d.c b/libtommath/bn_mp_mul_2d.c | ||
69 | index 87354de..2744163 100644 | ||
70 | --- a/libtommath/bn_mp_mul_2d.c | ||
71 | +++ b/libtommath/bn_mp_mul_2d.c | ||
72 | @@ -9,6 +9,10 @@ mp_err mp_mul_2d(const mp_int *a, int b, mp_int *c) | ||
73 | mp_digit d; | ||
74 | mp_err err; | ||
75 | |||
76 | + if (b < 0) { | ||
77 | + return MP_VAL; | ||
78 | + } | ||
79 | + | ||
80 | /* copy */ | ||
81 | if (a != c) { | ||
82 | if ((err = mp_copy(a, c)) != MP_OKAY) { | ||
83 | diff --git a/libtommath/bn_s_mp_mul_digs.c b/libtommath/bn_s_mp_mul_digs.c | ||
84 | index 64509d4..2d2f5b0 100644 | ||
85 | --- a/libtommath/bn_s_mp_mul_digs.c | ||
86 | +++ b/libtommath/bn_s_mp_mul_digs.c | ||
87 | @@ -16,6 +16,10 @@ mp_err s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs) | ||
88 | mp_word r; | ||
89 | mp_digit tmpx, *tmpt, *tmpy; | ||
90 | |||
91 | + if (digs < 0) { | ||
92 | + return MP_VAL; | ||
93 | + } | ||
94 | + | ||
95 | /* can we use the fast multiplier? */ | ||
96 | if ((digs < MP_WARRAY) && | ||
97 | (MP_MIN(a->used, b->used) < MP_MAXFAST)) { | ||
98 | diff --git a/libtommath/bn_s_mp_mul_digs_fast.c b/libtommath/bn_s_mp_mul_digs_fast.c | ||
99 | index b2a287b..d6dd3cc 100644 | ||
100 | --- a/libtommath/bn_s_mp_mul_digs_fast.c | ||
101 | +++ b/libtommath/bn_s_mp_mul_digs_fast.c | ||
102 | @@ -26,6 +26,10 @@ mp_err s_mp_mul_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int digs) | ||
103 | mp_digit W[MP_WARRAY]; | ||
104 | mp_word _W; | ||
105 | |||
106 | + if (digs < 0) { | ||
107 | + return MP_VAL; | ||
108 | + } | ||
109 | + | ||
110 | /* grow the destination as required */ | ||
111 | if (c->alloc < digs) { | ||
112 | if ((err = mp_grow(c, digs)) != MP_OKAY) { | ||
113 | diff --git a/libtommath/bn_s_mp_mul_high_digs.c b/libtommath/bn_s_mp_mul_high_digs.c | ||
114 | index 2bb2a50..c9dd355 100644 | ||
115 | --- a/libtommath/bn_s_mp_mul_high_digs.c | ||
116 | +++ b/libtommath/bn_s_mp_mul_high_digs.c | ||
117 | @@ -15,6 +15,10 @@ mp_err s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs) | ||
118 | mp_word r; | ||
119 | mp_digit tmpx, *tmpt, *tmpy; | ||
120 | |||
121 | + if (digs < 0) { | ||
122 | + return MP_VAL; | ||
123 | + } | ||
124 | + | ||
125 | /* can we use the fast multiplier? */ | ||
126 | if (MP_HAS(S_MP_MUL_HIGH_DIGS_FAST) | ||
127 | && ((a->used + b->used + 1) < MP_WARRAY) | ||
128 | diff --git a/libtommath/bn_s_mp_mul_high_digs_fast.c b/libtommath/bn_s_mp_mul_high_digs_fast.c | ||
129 | index a2c4fb6..afe3e4b 100644 | ||
130 | --- a/libtommath/bn_s_mp_mul_high_digs_fast.c | ||
131 | +++ b/libtommath/bn_s_mp_mul_high_digs_fast.c | ||
132 | @@ -19,6 +19,10 @@ mp_err s_mp_mul_high_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int | ||
133 | mp_digit W[MP_WARRAY]; | ||
134 | mp_word _W; | ||
135 | |||
136 | + if (digs < 0) { | ||
137 | + return MP_VAL; | ||
138 | + } | ||
139 | + | ||
140 | /* grow the destination as required */ | ||
141 | pa = a->used + b->used; | ||
142 | if (c->alloc < pa) { | ||
143 | -- | ||
144 | 2.35.5 | ||
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch index 5c60868ed8..f998caa255 100644 --- a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch +++ b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch | |||
@@ -10,13 +10,13 @@ and we want to support the stong algorithms. | |||
10 | Upstream-Status: Inappropriate [configuration] | 10 | Upstream-Status: Inappropriate [configuration] |
11 | Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com> | 11 | Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com> |
12 | --- | 12 | --- |
13 | default_options.h | 2 +- | 13 | src/default_options.h | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/default_options.h b/default_options.h | 16 | diff --git a/src/default_options.h b/src/default_options.h |
17 | index d417588..bc5200f 100644 | 17 | index d417588..bc5200f 100644 |
18 | --- a/default_options.h | 18 | --- a/src/default_options.h |
19 | +++ b/default_options.h | 19 | +++ b/src/default_options.h |
20 | @@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */ | 20 | @@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */ |
21 | * Small systems should generally include either curve25519 or ecdh for performance. | 21 | * Small systems should generally include either curve25519 or ecdh for performance. |
22 | * curve25519 is less widely supported but is faster | 22 | * curve25519 is less widely supported but is faster |
diff --git a/meta/recipes-core/dropbear/dropbear_2022.83.bb b/meta/recipes-core/dropbear/dropbear_2024.84.bb index 528eff1a10..3ea64b13d0 100644 --- a/meta/recipes-core/dropbear/dropbear_2022.83.bb +++ b/meta/recipes-core/dropbear/dropbear_2024.84.bb | |||
@@ -21,10 +21,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ | |||
21 | file://dropbear.default \ | 21 | file://dropbear.default \ |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
23 | ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \ | 23 | ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \ |
24 | file://CVE-2023-36328.patch \ | ||
25 | " | 24 | " |
26 | 25 | ||
27 | SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b" | 26 | SRC_URI[sha256sum] = "16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009" |
28 | 27 | ||
29 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ | 28 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ |
30 | file://0006-dropbear-configuration-file.patch \ | 29 | file://0006-dropbear-configuration-file.patch \ |
@@ -77,7 +76,7 @@ do_install() { | |||
77 | ${D}${sbindir} \ | 76 | ${D}${sbindir} \ |
78 | ${D}${localstatedir} | 77 | ${D}${localstatedir} |
79 | 78 | ||
80 | install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear | 79 | install -m 0644 ${UNPACKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear |
81 | 80 | ||
82 | install -m 0755 dropbearmulti ${D}${sbindir}/ | 81 | install -m 0755 dropbearmulti ${D}${sbindir}/ |
83 | 82 | ||
@@ -95,18 +94,18 @@ do_install() { | |||
95 | -e 's,/usr/sbin,${sbindir},g' \ | 94 | -e 's,/usr/sbin,${sbindir},g' \ |
96 | -e 's,/var,${localstatedir},g' \ | 95 | -e 's,/var,${localstatedir},g' \ |
97 | -e 's,/usr/bin,${bindir},g' \ | 96 | -e 's,/usr/bin,${bindir},g' \ |
98 | -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear | 97 | -e 's,/usr,${prefix},g' ${UNPACKDIR}/init > ${D}${sysconfdir}/init.d/dropbear |
99 | chmod 755 ${D}${sysconfdir}/init.d/dropbear | 98 | chmod 755 ${D}${sysconfdir}/init.d/dropbear |
100 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 99 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
101 | install -d ${D}${sysconfdir}/pam.d | 100 | install -d ${D}${sysconfdir}/pam.d |
102 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ | 101 | install -m 0644 ${UNPACKDIR}/dropbear ${D}${sysconfdir}/pam.d/ |
103 | fi | 102 | fi |
104 | 103 | ||
105 | # deal with systemd unit files | 104 | # deal with systemd unit files |
106 | install -d ${D}${systemd_system_unitdir} | 105 | install -d ${D}${systemd_system_unitdir} |
107 | install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} | 106 | install -m 0644 ${UNPACKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} |
108 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir} | 107 | install -m 0644 ${UNPACKDIR}/dropbear@.service ${D}${systemd_system_unitdir} |
109 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir} | 108 | install -m 0644 ${UNPACKDIR}/dropbear.socket ${D}${systemd_system_unitdir} |
110 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 109 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
111 | -e 's,@BINDIR@,${bindir},g' \ | 110 | -e 's,@BINDIR@,${bindir},g' \ |
112 | -e 's,@SBINDIR@,${sbindir},g' \ | 111 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch index 8e6598fbef..f6eba04fd4 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch | |||
@@ -1,26 +1,30 @@ | |||
1 | From e7077aa23bfcd31a8e72e39dc93ce4f854678376 Mon Sep 17 00:00:00 2001 | 1 | From 0561dcbf0918631d8106c3f6c2d8e92a5ec4b887 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 | 3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 |
4 | Subject: [PATCH] Do not write $bindir into pkg-config files | 4 | Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files |
5 | 5 | ||
6 | This would otherwise break when using the files to build other target | 6 | This would otherwise break when using the executables to build other target |
7 | components (we need to rely on PATH containing the paths to utilities, | 7 | components (we need to rely on PATH containing the paths to utilities, |
8 | rather than use target paths). | 8 | rather than use target paths). |
9 | 9 | ||
10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] | 10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | --- | 12 | --- |
13 | gio/meson.build | 16 ++++++++-------- | 13 | gio/meson.build | 17 +++++++++-------- |
14 | glib/meson.build | 6 +++--- | 14 | glib/meson.build | 7 ++++--- |
15 | 2 files changed, 11 insertions(+), 11 deletions(-) | 15 | 2 files changed, 13 insertions(+), 11 deletions(-) |
16 | 16 | ||
17 | diff --git a/gio/meson.build b/gio/meson.build | 17 | diff --git a/gio/meson.build b/gio/meson.build |
18 | index 5f91586..1a95f4f 100644 | 18 | index 77cba7b..25d709e 100644 |
19 | --- a/gio/meson.build | 19 | --- a/gio/meson.build |
20 | +++ b/gio/meson.build | 20 | +++ b/gio/meson.build |
21 | @@ -884,14 +884,14 @@ pkg.generate(libgio, | 21 | @@ -883,17 +883,18 @@ libgio_dep = declare_dependency(link_with : libgio, |
22 | pkg.generate(libgio, | ||
23 | requires : ['glib-2.0', 'gobject-2.0'], | ||
24 | variables : [ | ||
25 | + 'bindir=' + '${prefix}' / get_option('bindir'), | ||
26 | 'schemasdir=' + '${datadir}' / schemas_subdir, | ||
22 | 'dtdsdir=' + '${datadir}' / dtds_subdir, | 27 | 'dtdsdir=' + '${datadir}' / dtds_subdir, |
23 | 'bindir=' + '${prefix}' / get_option('bindir'), | ||
24 | 'giomoduledir=' + pkgconfig_giomodulesdir, | 28 | 'giomoduledir=' + pkgconfig_giomodulesdir, |
25 | - 'gio=' + '${bindir}' / 'gio', | 29 | - 'gio=' + '${bindir}' / 'gio', |
26 | - 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', | 30 | - 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', |
@@ -42,16 +46,17 @@ index 5f91586..1a95f4f 100644 | |||
42 | version : glib_version, | 46 | version : glib_version, |
43 | install_dir : glib_pkgconfigreldir, | 47 | install_dir : glib_pkgconfigreldir, |
44 | diff --git a/glib/meson.build b/glib/meson.build | 48 | diff --git a/glib/meson.build b/glib/meson.build |
45 | index c26a35e..1d8ca6b 100644 | 49 | index d2efeba..5f5841d 100644 |
46 | --- a/glib/meson.build | 50 | --- a/glib/meson.build |
47 | +++ b/glib/meson.build | 51 | +++ b/glib/meson.build |
48 | @@ -447,9 +447,9 @@ pkg.generate(libglib, | 52 | @@ -447,9 +447,10 @@ pkg.generate(libglib, |
53 | subdirs : ['glib-2.0'], | ||
54 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, | ||
49 | variables : [ | 55 | variables : [ |
50 | 'bindir=' + '${prefix}' / get_option('bindir'), | ||
51 | 'datadir=' + '${prefix}' / get_option('datadir'), | ||
52 | - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', | 56 | - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', |
53 | - 'gobject_query=' + '${bindir}' / 'gobject-query', | 57 | - 'gobject_query=' + '${bindir}' / 'gobject-query', |
54 | - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', | 58 | - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', |
59 | + 'bindir=' + '${prefix}' / get_option('bindir'), | ||
55 | + 'glib_genmarshal=glib-genmarshal', | 60 | + 'glib_genmarshal=glib-genmarshal', |
56 | + 'gobject_query=gobject-query', | 61 | + 'gobject_query=gobject-query', |
57 | + 'glib_mkenums=glib-mkenums', | 62 | + 'glib_mkenums=glib-mkenums', |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch index eb9dfdbcf9..129bc7f8ae 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9a5d4bf65b658d744d610ee27ecd2ae65b14b158 Mon Sep 17 00:00:00 2001 | 1 | From ccb25e8c0bab54eac8ba0e9d7083ce81461ab72a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 15 Mar 2014 22:42:29 -0700 | 3 | Date: Sat, 15 Mar 2014 22:42:29 -0700 |
4 | Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux | 4 | Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index ad69f7ec65..3e12f8abbe 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4933aef791857a5aac650b60af800778658b875b Mon Sep 17 00:00:00 2001 | 1 | From caab40411d8520dae77a4b7933ebaffbb00559fe Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 | 3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 |
4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM | 4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] | |||
13 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
14 | 14 | ||
15 | diff --git a/gio/meson.build b/gio/meson.build | 15 | diff --git a/gio/meson.build b/gio/meson.build |
16 | index f9fdf6e..5f91586 100644 | 16 | index 59c2b0f..77cba7b 100644 |
17 | --- a/gio/meson.build | 17 | --- a/gio/meson.build |
18 | +++ b/gio/meson.build | 18 | +++ b/gio/meson.build |
19 | @@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu | 19 | @@ -1007,6 +1007,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu |
20 | c_args : gio_c_args, | 20 | c_args : gio_c_args, |
21 | # intl.lib is not compatible with SAFESEH | 21 | # intl.lib is not compatible with SAFESEH |
22 | link_args : noseh_link_args, | 22 | link_args : noseh_link_args, |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index 0e3a62af6a..9b0b83afa4 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8ae2e9c2a04e089306693a021149dc6b7d1bd679 Mon Sep 17 00:00:00 2001 | 1 | From 65c036b1ede453e89893076f4ece21c946505096 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 | 3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 |
4 | Subject: [PATCH] Remove the warning about deprecated paths in schemas | 4 | Subject: [PATCH] Remove the warning about deprecated paths in schemas |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 32b4cea409..a2f9dd9672 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c0733f7a91dfe13152abc60c5a3064456b3e9d63 Mon Sep 17 00:00:00 2001 | 1 | From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 | 3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 |
4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 | 4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 |
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
12 | 3 files changed, 8 insertions(+), 5 deletions(-) | 12 | 3 files changed, 8 insertions(+), 5 deletions(-) |
13 | 13 | ||
14 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 14 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
15 | index 4ef3343..e498e7e 100644 | 15 | index 232ecca..563298b 100644 |
16 | --- a/gio/tests/meson.build | 16 | --- a/gio/tests/meson.build |
17 | +++ b/gio/tests/meson.build | 17 | +++ b/gio/tests/meson.build |
18 | @@ -29,7 +29,7 @@ endif | 18 | @@ -29,7 +29,7 @@ endif |
@@ -24,16 +24,16 @@ index 4ef3343..e498e7e 100644 | |||
24 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | 24 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] |
25 | endif | 25 | endif |
26 | 26 | ||
27 | @@ -230,7 +230,7 @@ if have_dbus_daemon | 27 | @@ -244,7 +244,7 @@ if have_dbus_daemon |
28 | endif | 28 | endif |
29 | 29 | ||
30 | # Test programs buildable on UNIX only | 30 | # Test programs buildable on UNIX only |
31 | -if host_machine.system() != 'windows' | 31 | -if host_machine.system() != 'windows' |
32 | +if host_system != 'windows' | 32 | +if host_system != 'windows' |
33 | gio_tests += { | 33 | gio_tests += { |
34 | 'file' : {}, | 34 | 'file' : { |
35 | 'gdbus-peer-object-manager' : {}, | 35 | # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148 |
36 | @@ -562,7 +562,7 @@ if host_machine.system() != 'windows' | 36 | @@ -593,7 +593,7 @@ if host_machine.system() != 'windows' |
37 | endif # unix | 37 | endif # unix |
38 | 38 | ||
39 | # Test programs buildable on Windows only | 39 | # Test programs buildable on Windows only |
@@ -42,7 +42,7 @@ index 4ef3343..e498e7e 100644 | |||
42 | gio_tests += {'win32-streams' : {}} | 42 | gio_tests += {'win32-streams' : {}} |
43 | endif | 43 | endif |
44 | 44 | ||
45 | @@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' | 45 | @@ -663,7 +663,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' |
46 | } | 46 | } |
47 | endif | 47 | endif |
48 | 48 | ||
@@ -52,10 +52,10 @@ index 4ef3343..e498e7e 100644 | |||
52 | 'gdbus-example-unix-fd-client' : { | 52 | 'gdbus-example-unix-fd-client' : { |
53 | 'install' : false, | 53 | 'install' : false, |
54 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | 54 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build |
55 | index d80c86e..5329cda 100644 | 55 | index f6efc59..83eb5a5 100644 |
56 | --- a/glib/tests/meson.build | 56 | --- a/glib/tests/meson.build |
57 | +++ b/glib/tests/meson.build | 57 | +++ b/glib/tests/meson.build |
58 | @@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') | 58 | @@ -226,7 +226,7 @@ if glib_conf.has('HAVE_EVENTFD') |
59 | } | 59 | } |
60 | endif | 60 | endif |
61 | 61 | ||
@@ -65,7 +65,7 @@ index d80c86e..5329cda 100644 | |||
65 | glib_tests += { | 65 | glib_tests += { |
66 | 'gpoll' : { | 66 | 'gpoll' : { |
67 | diff --git a/meson.build b/meson.build | 67 | diff --git a/meson.build b/meson.build |
68 | index 813c9b7..6ee775e 100644 | 68 | index 7534542..2560686 100644 |
69 | --- a/meson.build | 69 | --- a/meson.build |
70 | +++ b/meson.build | 70 | +++ b/meson.build |
71 | @@ -54,6 +54,9 @@ else | 71 | @@ -54,6 +54,9 @@ else |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch index aee2986033..bb84f3969e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 878e51f82100c698236fda0e069e14ea9249350c Mon Sep 17 00:00:00 2001 | 1 | From e8b4f53b567339aad90b585673d55a5c6176535a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 8 Jan 2020 18:22:46 +0100 | 3 | Date: Wed, 8 Jan 2020 18:22:46 +0100 |
4 | Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test | 4 | Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test |
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c | 15 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c |
16 | index f567914..b21b616 100644 | 16 | index f7dc039..f708876 100644 |
17 | --- a/gio/tests/resources.c | 17 | --- a/gio/tests/resources.c |
18 | +++ b/gio/tests/resources.c | 18 | +++ b/gio/tests/resources.c |
19 | @@ -1068,7 +1068,7 @@ main (int argc, | 19 | @@ -1068,7 +1068,7 @@ main (int argc, |
diff --git a/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch new file mode 100644 index 0000000000..76e5f58748 --- /dev/null +++ b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch | |||
@@ -0,0 +1,88 @@ | |||
1 | From 4e6be5d15e5d2f8e494d22a3d49b623064f9c1a5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 23 Apr 2024 11:24:34 +0200 | ||
4 | Subject: [PATCH] girepository/introspection: correctly install .gir files into | ||
5 | custom locations provided via meson option | ||
6 | |||
7 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4020] | ||
8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
9 | --- | ||
10 | girepository/introspection/meson.build | 9 +++++++++ | ||
11 | 1 file changed, 9 insertions(+) | ||
12 | |||
13 | diff --git a/girepository/introspection/meson.build b/girepository/introspection/meson.build | ||
14 | index 9405686..862ca61 100644 | ||
15 | --- a/girepository/introspection/meson.build | ||
16 | +++ b/girepository/introspection/meson.build | ||
17 | @@ -49,6 +49,7 @@ glib_gir = gnome.generate_gir(libglib, | ||
18 | export_packages: 'glib-2.0', | ||
19 | header: 'glib.h', | ||
20 | install: true, | ||
21 | + install_dir_gir: glib_girdir, | ||
22 | dependencies: [ | ||
23 | libgobject_dep, | ||
24 | ], | ||
25 | @@ -76,6 +77,7 @@ if host_system == 'windows' | ||
26 | header: 'glib.h', | ||
27 | includes: [ glib_gir[0] ], | ||
28 | install: true, | ||
29 | + install_dir_gir: glib_girdir, | ||
30 | dependencies: [ | ||
31 | libgobject_dep, | ||
32 | ], | ||
33 | @@ -104,6 +106,7 @@ else | ||
34 | header: 'glib.h', | ||
35 | includes: [ glib_gir[0] ], | ||
36 | install: true, | ||
37 | + install_dir_gir: glib_girdir, | ||
38 | dependencies: [ | ||
39 | libgobject_dep, | ||
40 | ], | ||
41 | @@ -137,6 +140,7 @@ gobject_gir = gnome.generate_gir(libgobject, | ||
42 | header: 'glib-object.h', | ||
43 | includes: [ glib_gir[0] ], | ||
44 | install: true, | ||
45 | + install_dir_gir: glib_girdir, | ||
46 | env: gi_gen_env_variables, | ||
47 | extra_args: gir_args + [ | ||
48 | '-DGOBJECT_COMPILATION', | ||
49 | @@ -162,6 +166,7 @@ gmodule_gir = gnome.generate_gir(libgmodule, | ||
50 | header: 'gmodule.h', | ||
51 | includes: [ glib_gir[0] ], | ||
52 | install: true, | ||
53 | + install_dir_gir: glib_girdir, | ||
54 | dependencies: [ | ||
55 | libglib_dep, | ||
56 | ], | ||
57 | @@ -224,6 +229,7 @@ gio_gir = gnome.generate_gir(libgio, | ||
58 | header: 'gio/gio.h', | ||
59 | includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0] ], | ||
60 | install: true, | ||
61 | + install_dir_gir: glib_girdir, | ||
62 | dependencies: [ | ||
63 | libglib_dep, | ||
64 | libgobject_dep, | ||
65 | @@ -249,6 +255,7 @@ if host_system == 'windows' | ||
66 | header: 'gio/gio.h', | ||
67 | includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], | ||
68 | install: true, | ||
69 | + install_dir_gir: glib_girdir, | ||
70 | dependencies: [ | ||
71 | libglib_dep, | ||
72 | libgobject_dep, | ||
73 | @@ -277,6 +284,7 @@ else | ||
74 | header: 'gio/gio.h', | ||
75 | includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], | ||
76 | install: true, | ||
77 | + install_dir_gir: glib_girdir, | ||
78 | dependencies: [ | ||
79 | libglib_dep, | ||
80 | libgobject_dep, | ||
81 | @@ -314,6 +322,7 @@ girepository_gir = gnome.generate_gir(libgirepository, | ||
82 | header: 'girepository/girepository.h', | ||
83 | includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], | ||
84 | install: true, | ||
85 | + install_dir_gir: glib_girdir, | ||
86 | dependencies: [ libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep ], | ||
87 | extra_args: gir_args + libgirepository_gir_args, | ||
88 | ) | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch index 0b10269114..2f80529987 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b4b523160ef550a53705fcc45ac6e10d086ce491 Mon Sep 17 00:00:00 2001 | 1 | From 3dc2e741e18ccb740e98eb4e808ff83153b70e83 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 12 Oct 2019 17:46:26 -0700 | 3 | Date: Sat, 12 Oct 2019 17:46:26 -0700 |
4 | Subject: [PATCH] meson: Run atomics test on clang as well | 4 | Subject: [PATCH] meson: Run atomics test on clang as well |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
17 | index 6ee775e..8bc5fa7 100644 | 17 | index 2560686..5c46d0b 100644 |
18 | --- a/meson.build | 18 | --- a/meson.build |
19 | +++ b/meson.build | 19 | +++ b/meson.build |
20 | @@ -1938,7 +1938,7 @@ atomicdefine = ''' | 20 | @@ -2024,7 +2024,7 @@ atomicdefine = ''' |
21 | # We know that we can always use real ("lock free") atomic operations with MSVC | 21 | # We know that we can always use real ("lock free") atomic operations with MSVC |
22 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') | 22 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') |
23 | have_atomic_lock_free = true | 23 | have_atomic_lock_free = true |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch index 14dcb278e0..82955de671 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 294f3e6e9a0a9f4733e85ed6810d1b743055370b Mon Sep 17 00:00:00 2001 | 1 | From 59525eedfbbfe4a16fdd0b340bc3f2479431c7d5 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Sat, 16 Sep 2023 22:28:27 +0200 | 3 | Date: Sat, 16 Sep 2023 22:28:27 +0200 |
4 | Subject: [PATCH] meson.build: do not enable pidfd features on native glib | 4 | Subject: [PATCH] meson.build: do not enable pidfd features on native glib |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
17 | index 8bc5fa7..df1fa60 100644 | 17 | index 5c46d0b..222c1a1 100644 |
18 | --- a/meson.build | 18 | --- a/meson.build |
19 | +++ b/meson.build | 19 | +++ b/meson.build |
20 | @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> | 20 | @@ -1022,7 +1022,8 @@ if cc.links('''#include <sys/syscall.h> |
21 | waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); | 21 | waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); |
22 | return 0; | 22 | return 0; |
23 | }''', name : 'pidfd_open(2) system call') | 23 | }''', name : 'pidfd_open(2) system call') |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch index 6dff5179c7..a51c186b00 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 50636758c73e5e61212a8f801c6c602b8aab5ba7 Mon Sep 17 00:00:00 2001 | 1 | From e6784ba43af83e22556921786c8f15e4cd246298 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 3 Oct 2017 10:45:55 +0300 | 3 | Date: Tue, 3 Oct 2017 10:45:55 +0300 |
4 | Subject: [PATCH] Do not hardcode python path into various tools | 4 | Subject: [PATCH] Do not hardcode python path into various tools |
@@ -32,7 +32,7 @@ index aa5af43..56e8e2e 100755 | |||
32 | # pylint: disable=too-many-lines, missing-docstring, invalid-name | 32 | # pylint: disable=too-many-lines, missing-docstring, invalid-name |
33 | 33 | ||
34 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in | 34 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in |
35 | index 353e53a..8ed6c39 100755 | 35 | index e10b910..4b619f8 100755 |
36 | --- a/gobject/glib-mkenums.in | 36 | --- a/gobject/glib-mkenums.in |
37 | +++ b/gobject/glib-mkenums.in | 37 | +++ b/gobject/glib-mkenums.in |
38 | @@ -1,4 +1,4 @@ | 38 | @@ -1,4 +1,4 @@ |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common b/meta/recipes-core/glib-2.0/files/meson.cross.d/common index 0d7c5fa3f8..0d7c5fa3f8 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common +++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc index 3049e5116e..3049e5116e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc +++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux index adad7e62ee..adad7e62ee 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux +++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw index 75f911ba1e..75f911ba1e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw +++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl index 3049e5116e..3049e5116e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl +++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/files/relocate-modules.patch index 3e79bbf679..d6e9019f39 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/files/relocate-modules.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f40e89b3852df37959606ee13b1a14ade81fa886 Mon Sep 17 00:00:00 2001 | 1 | From 47ea2576a13d5bc86692b4ba8cb4a8f2fd38c6ca Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | 3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 |
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | 4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds |
@@ -18,10 +18,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
18 | 1 file changed, 7 deletions(-) | 18 | 1 file changed, 7 deletions(-) |
19 | 19 | ||
20 | diff --git a/gio/giomodule.c b/gio/giomodule.c | 20 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
21 | index 17fabe6..8021208 100644 | 21 | index 1e14955..3c09bb5 100644 |
22 | --- a/gio/giomodule.c | 22 | --- a/gio/giomodule.c |
23 | +++ b/gio/giomodule.c | 23 | +++ b/gio/giomodule.c |
24 | @@ -1271,11 +1271,6 @@ get_gio_module_dir (void) | 24 | @@ -1259,11 +1259,6 @@ get_gio_module_dir (void) |
25 | g_free (install_dir); | 25 | g_free (install_dir); |
26 | #else | 26 | #else |
27 | module_dir = g_strdup (GIO_MODULE_DIR); | 27 | module_dir = g_strdup (GIO_MODULE_DIR); |
@@ -33,7 +33,7 @@ index 17fabe6..8021208 100644 | |||
33 | #include <dlfcn.h> | 33 | #include <dlfcn.h> |
34 | { | 34 | { |
35 | g_autofree gchar *path = NULL; | 35 | g_autofree gchar *path = NULL; |
36 | @@ -1294,8 +1289,6 @@ get_gio_module_dir (void) | 36 | @@ -1282,8 +1277,6 @@ get_gio_module_dir (void) |
37 | } | 37 | } |
38 | } | 38 | } |
39 | } | 39 | } |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/files/run-ptest index 831bc3b91f..831bc3b91f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/files/run-ptest | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch b/meta/recipes-core/glib-2.0/files/skip-timeout.patch index cd5ac287c3..b1c62cc39c 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch +++ b/meta/recipes-core/glib-2.0/files/skip-timeout.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bb11d1a4ae77d93ec0743e54077cf0f990243fa6 Mon Sep 17 00:00:00 2001 | 1 | From 682d8a616ca111c0e45c8a9cb02e992e63c69586 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@arm.com> | 2 | From: Ross Burton <ross.burton@arm.com> |
3 | Date: Thu, 28 Mar 2024 16:27:09 +0000 | 3 | Date: Thu, 28 Mar 2024 16:27:09 +0000 |
4 | Subject: [PATCH] Skip /timeout/rounding test | 4 | Subject: [PATCH] Skip /timeout/rounding test |
@@ -16,7 +16,7 @@ Signed-off-by: Ross Burton <ross.burton@arm.com> | |||
16 | 1 file changed, 1 deletion(-) | 16 | 1 file changed, 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c | 18 | diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c |
19 | index 1ae3f3a34..85a715b0f 100644 | 19 | index 1ae3f3a..85a715b 100644 |
20 | --- a/glib/tests/timeout.c | 20 | --- a/glib/tests/timeout.c |
21 | +++ b/glib/tests/timeout.c | 21 | +++ b/glib/tests/timeout.c |
22 | @@ -214,7 +214,6 @@ main (int argc, char *argv[]) | 22 | @@ -214,7 +214,6 @@ main (int argc, char *argv[]) |
@@ -27,6 +27,3 @@ index 1ae3f3a34..85a715b0f 100644 | |||
27 | 27 | ||
28 | return g_test_run (); | 28 | return g_test_run (); |
29 | } | 29 | } |
30 | -- | ||
31 | 2.34.1 | ||
32 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.0.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.0.bb new file mode 100644 index 0000000000..7da2838265 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require glib.inc | ||
2 | PACKAGES = "" | ||
3 | PACKAGECONFIG = "" | ||
4 | |||
5 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch deleted file mode 100644 index b11c283e6d..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From a8eb944a10353403241608a084787f6efcbb2eb7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jordan Williams <jordan@jwillikers.com> | ||
3 | Date: Fri, 1 Dec 2023 09:53:50 -0600 | ||
4 | Subject: [PATCH] Switch from the deprecated distutils module to the packaging | ||
5 | module | ||
6 | |||
7 | The distutils module was removed in Python 3.12. | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291] | ||
10 | |||
11 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
12 | --- | ||
13 | gio/gdbus-2.0/codegen/utils.py | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py | ||
17 | index 0204610..08f1ba9 100644 | ||
18 | --- a/gio/gdbus-2.0/codegen/utils.py | ||
19 | +++ b/gio/gdbus-2.0/codegen/utils.py | ||
20 | @@ -19,7 +19,7 @@ | ||
21 | # | ||
22 | # Author: David Zeuthen <davidz@redhat.com> | ||
23 | |||
24 | -import distutils.version | ||
25 | +import packaging.version | ||
26 | import os | ||
27 | import sys | ||
28 | |||
29 | @@ -166,4 +166,4 @@ def version_cmp_key(key): | ||
30 | v = str(key[0]) | ||
31 | else: | ||
32 | v = "0" | ||
33 | - return (distutils.version.LooseVersion(v), key[1]) | ||
34 | + return (packaging.version.Version(v), key[1]) | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch deleted file mode 100644 index bdfbd55899..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <pwithnall@gnome.org> | ||
3 | Date: Mon, 26 Feb 2024 16:55:44 +0000 | ||
4 | Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | PCRE2 10.43 has now introduced support for variable-length lookbehind, | ||
10 | so these tests now fail if GLib is built against PCRE2 10.43 or higher. | ||
11 | |||
12 | See | ||
13 | https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94. | ||
14 | |||
15 | Rather than making the tests conditional on the version of PCRE2 in use, | ||
16 | just remove them. They are mostly testing the PCRE2 code rather than | ||
17 | any code in GLib, so don’t have much value. | ||
18 | |||
19 | This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2 | ||
20 | days ago. | ||
21 | |||
22 | Signed-off-by: Philip Withnall <pwithnall@gnome.org> | ||
23 | |||
24 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6] | ||
25 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
26 | --- | ||
27 | glib/tests/regex.c | 10 ---------- | ||
28 | 1 file changed, 10 deletions(-) | ||
29 | |||
30 | diff --git a/glib/tests/regex.c b/glib/tests/regex.c | ||
31 | index 1082526292..d7a698ec67 100644 | ||
32 | --- a/glib/tests/regex.c | ||
33 | +++ b/glib/tests/regex.c | ||
34 | @@ -1885,16 +1885,6 @@ test_lookbehind (void) | ||
35 | g_match_info_free (match); | ||
36 | g_regex_unref (regex); | ||
37 | |||
38 | - regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); | ||
39 | - g_assert (regex == NULL); | ||
40 | - g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); | ||
41 | - g_clear_error (&error); | ||
42 | - | ||
43 | - regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); | ||
44 | - g_assert (regex == NULL); | ||
45 | - g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); | ||
46 | - g_clear_error (&error); | ||
47 | - | ||
48 | regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); | ||
49 | g_assert (regex); | ||
50 | g_assert_no_error (error); | ||
51 | -- | ||
52 | GitLab | ||
53 | |||
54 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch b/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch deleted file mode 100644 index 4f38509da6..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch +++ /dev/null | |||
@@ -1,361 +0,0 @@ | |||
1 | From ce840b6b111e1e109e511f6833d6aa419e2b723a Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <philip@tecnocode.co.uk> | ||
3 | Date: Tue, 23 Jan 2024 11:16:52 +0000 | ||
4 | Subject: [PATCH] Merge branch '2887-memory-monitor-tests' into 'main' | ||
5 | |||
6 | tests: Fix race condition in memory-monitor-dbus.test | ||
7 | |||
8 | Closes #2887 | ||
9 | |||
10 | See merge request GNOME/glib!3844 | ||
11 | |||
12 | Hopefully these commits fix the occasional failures we've been seeing: | ||
13 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=15362 | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
17 | --- | ||
18 | gio/tests/memory-monitor-dbus.py.in | 64 +++++++++++++------- | ||
19 | gio/tests/memory-monitor-portal.py.in | 54 ++++++++++------- | ||
20 | gio/tests/power-profile-monitor-dbus.py.in | 35 ++++++----- | ||
21 | gio/tests/power-profile-monitor-portal.py.in | 34 ++++++----- | ||
22 | 4 files changed, 113 insertions(+), 74 deletions(-) | ||
23 | |||
24 | diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in | ||
25 | index bf32918..7aae01e 100755 | ||
26 | --- a/gio/tests/memory-monitor-dbus.py.in | ||
27 | +++ b/gio/tests/memory-monitor-dbus.py.in | ||
28 | @@ -16,7 +16,6 @@ import sys | ||
29 | import subprocess | ||
30 | import fcntl | ||
31 | import os | ||
32 | -import time | ||
33 | |||
34 | import taptestrunner | ||
35 | |||
36 | @@ -57,53 +56,74 @@ try: | ||
37 | fcntl.fcntl(self.p_mock.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK) | ||
38 | self.last_warning = -1 | ||
39 | self.dbusmock = dbus.Interface(self.obj_lmm, dbusmock.MOCK_IFACE) | ||
40 | + | ||
41 | + try: | ||
42 | + self.wait_for_bus_object('org.freedesktop.LowMemoryMonitor', | ||
43 | + '/org/freedesktop/LowMemoryMonitor', | ||
44 | + system_bus=True) | ||
45 | + except: | ||
46 | + raise | ||
47 | + | ||
48 | self.memory_monitor = Gio.MemoryMonitor.dup_default() | ||
49 | + assert("GMemoryMonitorDBus" in str(self.memory_monitor)) | ||
50 | self.memory_monitor.connect("low-memory-warning", self.memory_warning_cb) | ||
51 | self.mainloop = GLib.MainLoop() | ||
52 | self.main_context = self.mainloop.get_context() | ||
53 | |||
54 | + # The LowMemoryMonitor API is stateless: it doesn’t expose any | ||
55 | + # properties, just a warning signal. Emit the signal in a loop until | ||
56 | + # the GMemoryMonitor instance has initialised and synchronised to | ||
57 | + # the right state. | ||
58 | + def emit_warning(level): | ||
59 | + self.dbusmock.EmitWarning(level) | ||
60 | + return GLib.SOURCE_CONTINUE | ||
61 | + | ||
62 | + idle_id = GLib.idle_add(emit_warning, 0) | ||
63 | + while self.last_warning != 0: | ||
64 | + self.main_context.iteration(True) | ||
65 | + GLib.source_remove(idle_id) | ||
66 | + | ||
67 | def tearDown(self): | ||
68 | self.p_mock.terminate() | ||
69 | self.p_mock.wait() | ||
70 | |||
71 | - def assertEventually(self, condition, message=None, timeout=50): | ||
72 | + def assertEventually(self, condition, message=None, timeout=5): | ||
73 | '''Assert that condition function eventually returns True. | ||
74 | |||
75 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
76 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
77 | printed on failure. | ||
78 | ''' | ||
79 | - while timeout >= 0: | ||
80 | - context = GLib.MainContext.default() | ||
81 | - while context.iteration(False): | ||
82 | - pass | ||
83 | - if condition(): | ||
84 | - break | ||
85 | - timeout -= 1 | ||
86 | - time.sleep(0.1) | ||
87 | - else: | ||
88 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
89 | + if not message: | ||
90 | + message = 'timed out waiting for ' + str(condition) | ||
91 | + | ||
92 | + def timed_out_cb(message): | ||
93 | + self.fail(message) | ||
94 | + return GLib.SOURCE_REMOVE | ||
95 | + | ||
96 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
97 | + timeout_source.set_callback(timed_out_cb, message) | ||
98 | + timeout_source.attach(self.main_context) | ||
99 | + | ||
100 | + while not condition(): | ||
101 | + self.main_context.iteration(True) | ||
102 | + | ||
103 | + timeout_source.destroy() | ||
104 | |||
105 | def memory_warning_cb(self, monitor, level): | ||
106 | + print("Received memory warning signal, level", level) | ||
107 | self.last_warning = level | ||
108 | self.main_context.wakeup() | ||
109 | |||
110 | def test_low_memory_warning_signal(self): | ||
111 | '''LowMemoryWarning signal''' | ||
112 | |||
113 | - # Wait 2 seconds | ||
114 | - timeout = 2 | ||
115 | - while timeout > 0: | ||
116 | - time.sleep(0.5) | ||
117 | - timeout -= 0.5 | ||
118 | - self.main_context.iteration(False) | ||
119 | - | ||
120 | self.dbusmock.EmitWarning(100) | ||
121 | # Wait 2 seconds or until warning | ||
122 | - self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20) | ||
123 | + self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 2) | ||
124 | |||
125 | self.dbusmock.EmitWarning(255) | ||
126 | # Wait 2 seconds or until warning | ||
127 | - self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20) | ||
128 | + self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 2) | ||
129 | |||
130 | except ImportError as e: | ||
131 | @unittest.skip("Cannot import %s" % e.name) | ||
132 | diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in | ||
133 | index 748cee8..f570508 100755 | ||
134 | --- a/gio/tests/memory-monitor-portal.py.in | ||
135 | +++ b/gio/tests/memory-monitor-portal.py.in | ||
136 | @@ -16,7 +16,6 @@ import sys | ||
137 | import subprocess | ||
138 | import fcntl | ||
139 | import os | ||
140 | -import time | ||
141 | |||
142 | import taptestrunner | ||
143 | |||
144 | @@ -80,26 +79,44 @@ try: | ||
145 | self.mainloop = GLib.MainLoop() | ||
146 | self.main_context = self.mainloop.get_context() | ||
147 | |||
148 | + # The LowMemoryMonitor API is stateless: it doesn’t expose any | ||
149 | + # properties, just a warning signal. Emit the signal in a loop until | ||
150 | + # the GMemoryMonitor instance has initialised and synchronised to | ||
151 | + # the right state. | ||
152 | + def emit_warning(level): | ||
153 | + self.dbusmock.EmitWarning(level) | ||
154 | + return GLib.SOURCE_CONTINUE | ||
155 | + | ||
156 | + idle_id = GLib.idle_add(self.emit_warning, 0) | ||
157 | + while self.last_warning != 0: | ||
158 | + self.main_context.iteration(True) | ||
159 | + GLib.source_remove(idle_id) | ||
160 | + | ||
161 | def tearDown(self): | ||
162 | self.p_mock.terminate() | ||
163 | self.p_mock.wait() | ||
164 | |||
165 | - def assertEventually(self, condition, message=None, timeout=50): | ||
166 | + def assertEventually(self, condition, message=None, timeout=5): | ||
167 | '''Assert that condition function eventually returns True. | ||
168 | |||
169 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
170 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
171 | printed on failure. | ||
172 | ''' | ||
173 | - while timeout >= 0: | ||
174 | - context = GLib.MainContext.default() | ||
175 | - while context.iteration(False): | ||
176 | - pass | ||
177 | - if condition(): | ||
178 | - break | ||
179 | - timeout -= 1 | ||
180 | - time.sleep(0.1) | ||
181 | - else: | ||
182 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
183 | + if not message: | ||
184 | + message = 'timed out waiting for ' + str(condition) | ||
185 | + | ||
186 | + def timed_out_cb(message): | ||
187 | + self.fail(message) | ||
188 | + return GLib.SOURCE_REMOVE | ||
189 | + | ||
190 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
191 | + timeout_source.set_callback(timed_out_cb, message) | ||
192 | + timeout_source.attach(self.main_context) | ||
193 | + | ||
194 | + while not condition(): | ||
195 | + self.main_context.iteration(True) | ||
196 | + | ||
197 | + timeout_source.destroy() | ||
198 | |||
199 | def portal_memory_warning_cb(self, monitor, level): | ||
200 | self.last_warning = level | ||
201 | @@ -108,20 +125,13 @@ try: | ||
202 | def test_low_memory_warning_portal_signal(self): | ||
203 | '''LowMemoryWarning signal''' | ||
204 | |||
205 | - # Wait 2 seconds | ||
206 | - timeout = 2 | ||
207 | - while timeout > 0: | ||
208 | - time.sleep(0.5) | ||
209 | - timeout -= 0.5 | ||
210 | - self.main_context.iteration(False) | ||
211 | - | ||
212 | self.dbusmock.EmitWarning(100) | ||
213 | # Wait 2 seconds or until warning | ||
214 | - self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20) | ||
215 | + self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 2) | ||
216 | |||
217 | self.dbusmock.EmitWarning(255) | ||
218 | # Wait 2 seconds or until warning | ||
219 | - self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20) | ||
220 | + self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 2) | ||
221 | |||
222 | except ImportError as e: | ||
223 | @unittest.skip("Cannot import %s" % e.name) | ||
224 | diff --git a/gio/tests/power-profile-monitor-dbus.py.in b/gio/tests/power-profile-monitor-dbus.py.in | ||
225 | index 06e594f..f955afc 100755 | ||
226 | --- a/gio/tests/power-profile-monitor-dbus.py.in | ||
227 | +++ b/gio/tests/power-profile-monitor-dbus.py.in | ||
228 | @@ -16,7 +16,6 @@ import sys | ||
229 | import subprocess | ||
230 | import fcntl | ||
231 | import os | ||
232 | -import time | ||
233 | |||
234 | import taptestrunner | ||
235 | |||
236 | @@ -58,6 +57,7 @@ try: | ||
237 | self.power_saver_enabled = False | ||
238 | self.dbus_props = dbus.Interface(self.obj_ppd, dbus.PROPERTIES_IFACE) | ||
239 | self.power_profile_monitor = Gio.PowerProfileMonitor.dup_default() | ||
240 | + assert("GPowerProfileMonitorDBus" in str(self.power_profile_monitor)) | ||
241 | self.power_profile_monitor.connect("notify::power-saver-enabled", self.power_saver_enabled_cb) | ||
242 | self.mainloop = GLib.MainLoop() | ||
243 | self.main_context = self.mainloop.get_context() | ||
244 | @@ -66,22 +66,27 @@ try: | ||
245 | self.p_mock.terminate() | ||
246 | self.p_mock.wait() | ||
247 | |||
248 | - def assertEventually(self, condition, message=None, timeout=50): | ||
249 | + def assertEventually(self, condition, message=None, timeout=5): | ||
250 | '''Assert that condition function eventually returns True. | ||
251 | |||
252 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
253 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
254 | printed on failure. | ||
255 | ''' | ||
256 | - while timeout >= 0: | ||
257 | - context = GLib.MainContext.default() | ||
258 | - while context.iteration(False): | ||
259 | - pass | ||
260 | - if condition(): | ||
261 | - break | ||
262 | - timeout -= 1 | ||
263 | - time.sleep(0.1) | ||
264 | - else: | ||
265 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
266 | + if not message: | ||
267 | + message = 'timed out waiting for ' + str(condition) | ||
268 | + | ||
269 | + def timed_out_cb(message): | ||
270 | + self.fail(message) | ||
271 | + return GLib.SOURCE_REMOVE | ||
272 | + | ||
273 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
274 | + timeout_source.set_callback(timed_out_cb, message) | ||
275 | + timeout_source.attach(self.main_context) | ||
276 | + | ||
277 | + while not condition(): | ||
278 | + self.main_context.iteration(True) | ||
279 | + | ||
280 | + timeout_source.destroy() | ||
281 | |||
282 | def power_saver_enabled_cb(self, spec, data): | ||
283 | self.power_saver_enabled = self.power_profile_monitor.get_power_saver_enabled() | ||
284 | @@ -92,10 +97,10 @@ try: | ||
285 | |||
286 | self.assertEqual(self.power_profile_monitor.get_power_saver_enabled(), False) | ||
287 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('power-saver', variant_level=1)) | ||
288 | - self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 10) | ||
289 | + self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 1) | ||
290 | |||
291 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('balanced', variant_level=1)) | ||
292 | - self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 10) | ||
293 | + self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 1) | ||
294 | |||
295 | except ImportError as e: | ||
296 | @unittest.skip("Cannot import %s" % e.name) | ||
297 | diff --git a/gio/tests/power-profile-monitor-portal.py.in b/gio/tests/power-profile-monitor-portal.py.in | ||
298 | index 09e9a45..ad2abf6 100755 | ||
299 | --- a/gio/tests/power-profile-monitor-portal.py.in | ||
300 | +++ b/gio/tests/power-profile-monitor-portal.py.in | ||
301 | @@ -16,7 +16,6 @@ import sys | ||
302 | import subprocess | ||
303 | import fcntl | ||
304 | import os | ||
305 | -import time | ||
306 | |||
307 | import taptestrunner | ||
308 | |||
309 | @@ -90,22 +89,27 @@ try: | ||
310 | self.p_mock.terminate() | ||
311 | self.p_mock.wait() | ||
312 | |||
313 | - def assertEventually(self, condition, message=None, timeout=50): | ||
314 | + def assertEventually(self, condition, message=None, timeout=5): | ||
315 | '''Assert that condition function eventually returns True. | ||
316 | |||
317 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
318 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
319 | printed on failure. | ||
320 | ''' | ||
321 | - while timeout >= 0: | ||
322 | - context = GLib.MainContext.default() | ||
323 | - while context.iteration(False): | ||
324 | - pass | ||
325 | - if condition(): | ||
326 | - break | ||
327 | - timeout -= 1 | ||
328 | - time.sleep(0.1) | ||
329 | - else: | ||
330 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
331 | + if not message: | ||
332 | + message = 'timed out waiting for ' + str(condition) | ||
333 | + | ||
334 | + def timed_out_cb(message): | ||
335 | + self.fail(message) | ||
336 | + return GLib.SOURCE_REMOVE | ||
337 | + | ||
338 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
339 | + timeout_source.set_callback(timed_out_cb, message) | ||
340 | + timeout_source.attach(self.main_context) | ||
341 | + | ||
342 | + while not condition(): | ||
343 | + self.main_context.iteration(True) | ||
344 | + | ||
345 | + timeout_source.destroy() | ||
346 | |||
347 | def power_saver_enabled_cb(self, spec, data): | ||
348 | self.power_saver_enabled = self.power_profile_monitor.get_power_saver_enabled() | ||
349 | @@ -116,10 +120,10 @@ try: | ||
350 | |||
351 | self.assertEqual(self.power_profile_monitor.get_power_saver_enabled(), False) | ||
352 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('power-saver', variant_level=1)) | ||
353 | - self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 10) | ||
354 | + self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 1) | ||
355 | |||
356 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('balanced', variant_level=1)) | ||
357 | - self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 10) | ||
358 | + self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 1) | ||
359 | |||
360 | def test_power_profile_power_saver_enabled_portal_default(self): | ||
361 | '''power-saver-enabled property default value''' | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb deleted file mode 100644 index b1669ead75..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | require glib.inc | ||
2 | |||
3 | PE = "1" | ||
4 | |||
5 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
6 | |||
7 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | ||
8 | file://run-ptest \ | ||
9 | file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ | ||
10 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ | ||
11 | file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ | ||
12 | file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ | ||
13 | file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ | ||
14 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | ||
15 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ | ||
16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | ||
17 | file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ | ||
18 | file://memory-monitor.patch \ | ||
19 | file://fix-regex.patch \ | ||
20 | file://skip-timeout.patch \ | ||
21 | " | ||
22 | SRC_URI:append:class-native = " file://relocate-modules.patch \ | ||
23 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[sha256sum] = "24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63" | ||
27 | |||
28 | # Find any meson cross files in FILESPATH that are relevant for the current | ||
29 | # build (using siteinfo) and add them to EXTRA_OEMESON. | ||
30 | inherit siteinfo | ||
31 | def find_meson_cross_files(d): | ||
32 | if bb.data.inherits_class('native', d): | ||
33 | return "" | ||
34 | |||
35 | thisdir = os.path.normpath(d.getVar("THISDIR")) | ||
36 | import collections | ||
37 | sitedata = siteinfo_data(d) | ||
38 | # filename -> found | ||
39 | files = collections.OrderedDict() | ||
40 | for path in d.getVar("FILESPATH").split(":"): | ||
41 | for element in sitedata: | ||
42 | filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) | ||
43 | sanitized_path = filename.replace(thisdir, "${THISDIR}") | ||
44 | if sanitized_path == filename: | ||
45 | if os.path.exists(filename): | ||
46 | bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) | ||
47 | continue | ||
48 | files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) | ||
49 | |||
50 | items = ["--cross-file=" + k for k,v in files.items() if v] | ||
51 | d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) | ||
52 | items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] | ||
53 | d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) | ||
54 | |||
55 | python () { | ||
56 | find_meson_cross_files(d) | ||
57 | } | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb new file mode 100644 index 0000000000..e22810a55b --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb | |||
@@ -0,0 +1 @@ | |||
require glib.inc | |||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index fac8875d84..1a97a0d02a 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -28,21 +28,26 @@ PACKAGES += "${PN}-codegen ${PN}-utils" | |||
28 | 28 | ||
29 | LEAD_SONAME = "libglib-2.0.*" | 29 | LEAD_SONAME = "libglib-2.0.*" |
30 | 30 | ||
31 | inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages gobject-introspection-data | 31 | inherit meson gettext gi-docgen pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages gobject-introspection-data |
32 | |||
33 | GTKDOC_MESON_OPTION = "gtk_doc" | ||
34 | 32 | ||
35 | S = "${WORKDIR}/glib-${PV}" | 33 | S = "${WORKDIR}/glib-${PV}" |
36 | 34 | ||
35 | GIDOCGEN_MESON_OPTION = "documentation" | ||
36 | |||
37 | PACKAGECONFIG ??= "libmount \ | 37 | PACKAGECONFIG ??= "libmount \ |
38 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection', '', d)} \ | ||
38 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 39 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
40 | PACKAGECONFIG:class-native = "" | ||
41 | |||
39 | PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" | 42 | PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" |
40 | PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" | 43 | PACKAGECONFIG[manpages] = "-Dman-pages=enabled, -Dman-pages=disabled, python3-docutils-native" |
41 | PACKAGECONFIG[libelf] = "-Dlibelf=enabled,-Dlibelf=disabled,elfutils" | 44 | PACKAGECONFIG[libelf] = "-Dlibelf=enabled,-Dlibelf=disabled,elfutils" |
42 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," | 45 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," |
43 | PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" | 46 | PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" |
47 | PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,gobject-introspection-native gobject-introspection glib-2.0-initial" | ||
44 | 48 | ||
45 | EXTRA_OEMESON = "-Ddtrace=false -Dsystemtap=false" | 49 | EXTRA_OEMESON = "-Ddtrace=false -Dsystemtap=false" |
50 | EXTRA_OEMESON:append:class-target = " ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''}" | ||
46 | 51 | ||
47 | do_configure:prepend() { | 52 | do_configure:prepend() { |
48 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | 53 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in |
@@ -53,14 +58,16 @@ FILES:${PN} = "${libdir}/lib*${SOLIBS} \ | |||
53 | ${libexecdir}/*gio-querymodules \ | 58 | ${libexecdir}/*gio-querymodules \ |
54 | ${libexecdir}/*gio-launch-desktop \ | 59 | ${libexecdir}/*gio-launch-desktop \ |
55 | ${datadir}/glib-2.0/dtds \ | 60 | ${datadir}/glib-2.0/dtds \ |
56 | ${datadir}/glib-2.0/schemas" | 61 | ${datadir}/glib-2.0/schemas \ |
57 | 62 | ${libdir}/girepository-*/*.typelib \ | |
63 | " | ||
58 | FILES:${PN}-dev += "${libdir}/glib-2.0/include \ | 64 | FILES:${PN}-dev += "${libdir}/glib-2.0/include \ |
59 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ | 65 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ |
60 | ${libdir}/gio/modules/*.la \ | 66 | ${libdir}/gio/modules/*.la \ |
61 | ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ | 67 | ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ |
62 | ${datadir}/glib-2.0/schemas/gschema.dtd \ | 68 | ${datadir}/glib-2.0/schemas/gschema.dtd \ |
63 | ${datadir}/glib-2.0/valgrind/glib.supp \ | 69 | ${datadir}/glib-2.0/valgrind/glib.supp \ |
70 | ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir \ | ||
64 | ${datadir}/gettext/its" | 71 | ${datadir}/gettext/its" |
65 | FILES:${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" | 72 | FILES:${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" |
66 | FILES:${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ | 73 | FILES:${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ |
@@ -204,3 +211,57 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ | |||
204 | locale-base-pl-pl.iso-8859-2 \ | 211 | locale-base-pl-pl.iso-8859-2 \ |
205 | locale-base-tr-tr \ | 212 | locale-base-tr-tr \ |
206 | " | 213 | " |
214 | |||
215 | PE = "1" | ||
216 | |||
217 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
218 | |||
219 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | ||
220 | file://run-ptest \ | ||
221 | file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ | ||
222 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ | ||
223 | file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ | ||
224 | file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ | ||
225 | file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ | ||
226 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | ||
227 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ | ||
228 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | ||
229 | file://skip-timeout.patch \ | ||
230 | file://0001-girepository-introspection-correctly-install-.gir-fi.patch \ | ||
231 | " | ||
232 | SRC_URI:append:class-native = " file://relocate-modules.patch \ | ||
233 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | ||
234 | " | ||
235 | |||
236 | SRC_URI[sha256sum] = "8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d" | ||
237 | |||
238 | # Find any meson cross files in FILESPATH that are relevant for the current | ||
239 | # build (using siteinfo) and add them to EXTRA_OEMESON. | ||
240 | inherit siteinfo | ||
241 | def find_meson_cross_files(d): | ||
242 | if bb.data.inherits_class('native', d): | ||
243 | return "" | ||
244 | |||
245 | thisdir = os.path.normpath(d.getVar("THISDIR")) | ||
246 | import collections | ||
247 | sitedata = siteinfo_data(d) | ||
248 | # filename -> found | ||
249 | files = collections.OrderedDict() | ||
250 | for path in d.getVar("FILESPATH").split(":"): | ||
251 | for element in sitedata: | ||
252 | filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) | ||
253 | sanitized_path = filename.replace(thisdir, "${THISDIR}") | ||
254 | if sanitized_path == filename: | ||
255 | if os.path.exists(filename): | ||
256 | bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) | ||
257 | continue | ||
258 | files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) | ||
259 | |||
260 | items = ["--cross-file=" + k for k,v in files.items() if v] | ||
261 | d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) | ||
262 | items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] | ||
263 | d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) | ||
264 | |||
265 | python () { | ||
266 | find_meson_cross_files(d) | ||
267 | } | ||
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index b9516e77f0..91a3f5bcd5 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc | |||
@@ -2,7 +2,7 @@ SUMMARY = "GLIBC (GNU C Library)" | |||
2 | DESCRIPTION = "The GNU C Library is used as the system C library in most systems with the Linux kernel." | 2 | DESCRIPTION = "The GNU C Library is used as the system C library in most systems with the Linux kernel." |
3 | HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" | 3 | HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" | 5 | LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ | 7 | LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ |
8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 1ef987be0a..0c5e3b4c3d 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -69,9 +69,9 @@ inherit multilib_header | |||
69 | 69 | ||
70 | do_install() { | 70 | do_install() { |
71 | oe_runmake install_root=${D} install | 71 | oe_runmake install_root=${D} install |
72 | install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf | 72 | install -Dm 0644 ${UNPACKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf |
73 | install -d ${D}${localedir} | 73 | install -d ${D}${localedir} |
74 | make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" | 74 | make -f ${UNPACKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" |
75 | # get rid of some broken files... | 75 | # get rid of some broken files... |
76 | for i in ${GLIBC_BROKEN_LOCALES}; do | 76 | for i in ${GLIBC_BROKEN_LOCALES}; do |
77 | sed -i "/$i/d" ${WORKDIR}/SUPPORTED | 77 | sed -i "/$i/d" ${WORKDIR}/SUPPORTED |
@@ -101,7 +101,7 @@ do_install() { | |||
101 | install -d ${D}${localstatedir}/db/nscd | 101 | install -d ${D}${localstatedir}/db/nscd |
102 | install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd | 102 | install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd |
103 | install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf | 103 | install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf |
104 | install -m 0755 ${WORKDIR}/makedbs.sh ${D}${localstatedir}/db | 104 | install -m 0755 ${UNPACKDIR}/makedbs.sh ${D}${localstatedir}/db |
105 | sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd | 105 | sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd |
106 | sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf | 106 | sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf |
107 | 107 | ||
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 618a574566..1e4a323d64 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | SRCBRANCH ?= "release/2.39/master" | 1 | SRCBRANCH ?= "release/2.39/master" |
2 | PV = "2.39+git" | 2 | PV = "2.39+git" |
3 | SRCREV_glibc ?= "1b9c1a0047fb26a65a9b2a7b8cd977243f7d353c" | 3 | SRCREV_glibc ?= "273a835fe7c685cc54266bb8b502787bad5e9bae" |
4 | SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" | 4 | SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" |
5 | 5 | ||
6 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" | 6 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" |
diff --git a/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb b/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb index be49ca4cb7..b760230aec 100644 --- a/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb +++ b/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb | |||
@@ -76,7 +76,7 @@ do_install_ptest_base () { | |||
76 | done | 76 | done |
77 | 77 | ||
78 | install -d ${D}${PTEST_PATH} | 78 | install -d ${D}${PTEST_PATH} |
79 | cp ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/ | 79 | cp ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/ |
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 066c3b1ea2..9bdfa76318 100644 --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | |||
@@ -11,16 +11,15 @@ Upstream-Status: Inappropriate [ OE-Specific ] | |||
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 13 | --- |
14 | sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- | 14 | sysdeps/aarch64/bits/wordsize.h | 11 +++++++++-- |
15 | sysdeps/arm/bits/wordsize.h | 1 + | 15 | sysdeps/arm/bits/wordsize.h | 22 +--------------------- |
16 | 2 files changed, 7 insertions(+), 2 deletions(-) | 16 | 2 files changed, 10 insertions(+), 23 deletions(-) |
17 | create mode 120000 sysdeps/arm/bits/wordsize.h | ||
18 | 17 | ||
19 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h | 18 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h |
20 | index 118e59172d..b4b0692eb5 100644 | 19 | index 118e59172d..ff86359fe8 100644 |
21 | --- a/sysdeps/aarch64/bits/wordsize.h | 20 | --- a/sysdeps/aarch64/bits/wordsize.h |
22 | +++ b/sysdeps/aarch64/bits/wordsize.h | 21 | +++ b/sysdeps/aarch64/bits/wordsize.h |
23 | @@ -17,12 +17,16 @@ | 22 | @@ -17,12 +17,19 @@ |
24 | License along with the GNU C Library; if not, see | 23 | License along with the GNU C Library; if not, see |
25 | <https://www.gnu.org/licenses/>. */ | 24 | <https://www.gnu.org/licenses/>. */ |
26 | 25 | ||
@@ -33,12 +32,42 @@ index 118e59172d..b4b0692eb5 100644 | |||
33 | # define __WORDSIZE32_SIZE_ULONG 1 | 32 | # define __WORDSIZE32_SIZE_ULONG 1 |
34 | # define __WORDSIZE32_PTRDIFF_LONG 1 | 33 | # define __WORDSIZE32_PTRDIFF_LONG 1 |
35 | +#else | 34 | +#else |
36 | +# define __WORDSIZE 32 | 35 | +#define __WORDSIZE 32 |
37 | +# define __WORDSIZE32_SIZE_ULONG 0 | 36 | +#define __WORDSIZE_TIME64_COMPAT32 1 |
38 | +# define __WORDSIZE32_PTRDIFF_LONG 0 | 37 | +#define __WORDSIZE32_SIZE_ULONG 0 |
38 | +#define __WORDSIZE32_PTRDIFF_LONG 0 | ||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | +#ifdef __aarch64__ | ||
41 | #define __WORDSIZE_TIME64_COMPAT32 0 | 42 | #define __WORDSIZE_TIME64_COMPAT32 0 |
43 | +#endif | ||
44 | diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h | ||
45 | deleted file mode 100644 | ||
46 | index 6ecbfe7c86..0000000000 | ||
47 | --- a/sysdeps/arm/bits/wordsize.h | ||
48 | +++ /dev/null | ||
49 | @@ -1,21 +0,0 @@ | ||
50 | -/* Copyright (C) 1999-2024 Free Software Foundation, Inc. | ||
51 | - This file is part of the GNU C Library. | ||
52 | - | ||
53 | - The GNU C Library is free software; you can redistribute it and/or | ||
54 | - modify it under the terms of the GNU Lesser General Public | ||
55 | - License as published by the Free Software Foundation; either | ||
56 | - version 2.1 of the License, or (at your option) any later version. | ||
57 | - | ||
58 | - The GNU C Library is distributed in the hope that it will be useful, | ||
59 | - but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
60 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
61 | - Lesser General Public License for more details. | ||
62 | - | ||
63 | - You should have received a copy of the GNU Lesser General Public | ||
64 | - License along with the GNU C Library; if not, see | ||
65 | - <https://www.gnu.org/licenses/>. */ | ||
66 | - | ||
67 | -#define __WORDSIZE 32 | ||
68 | -#define __WORDSIZE_TIME64_COMPAT32 1 | ||
69 | -#define __WORDSIZE32_SIZE_ULONG 0 | ||
70 | -#define __WORDSIZE32_PTRDIFF_LONG 0 | ||
42 | diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h | 71 | diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h |
43 | new file mode 120000 | 72 | new file mode 120000 |
44 | index 0000000000..4c4a788ec2 | 73 | index 0000000000..4c4a788ec2 |
diff --git a/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch b/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch deleted file mode 100644 index f6523c5498..0000000000 --- a/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From 73c26018ed0ecd9c807bb363cc2c2ab4aca66a82 Mon Sep 17 00:00:00 2001 | ||
2 | From: Szabolcs Nagy <szabolcs.nagy@arm.com> | ||
3 | Date: Wed, 13 Mar 2024 14:34:14 +0000 | ||
4 | Subject: [PATCH] aarch64: fix check for SVE support in assembler | ||
5 | |||
6 | Due to GCC bug 110901 -mcpu can override -march setting when compiling | ||
7 | asm code and thus a compiler targetting a specific cpu can fail the | ||
8 | configure check even when binutils gas supports SVE. | ||
9 | |||
10 | The workaround is that explicit .arch directive overrides both -mcpu | ||
11 | and -march, and since that's what the actual SVE memcpy uses the | ||
12 | configure check should use that too even if the GCC issue is fixed | ||
13 | independently. | ||
14 | |||
15 | Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=73c26018ed0ecd9c807bb363cc2c2ab4aca66a82] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Reviewed-by: Florian Weimer <fweimer@redhat.com> | ||
18 | --- | ||
19 | sysdeps/aarch64/configure | 5 +++-- | ||
20 | sysdeps/aarch64/configure.ac | 5 +++-- | ||
21 | 2 files changed, 6 insertions(+), 4 deletions(-) | ||
22 | mode change 100644 => 100755 sysdeps/aarch64/configure | ||
23 | |||
24 | diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure | ||
25 | old mode 100644 | ||
26 | new mode 100755 | ||
27 | index ca57edce47..9606137e8d | ||
28 | --- a/sysdeps/aarch64/configure | ||
29 | +++ b/sysdeps/aarch64/configure | ||
30 | @@ -325,9 +325,10 @@ then : | ||
31 | printf %s "(cached) " >&6 | ||
32 | else $as_nop | ||
33 | cat > conftest.s <<\EOF | ||
34 | - ptrue p0.b | ||
35 | + .arch armv8.2-a+sve | ||
36 | + ptrue p0.b | ||
37 | EOF | ||
38 | -if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5' | ||
39 | +if { ac_try='${CC-cc} -c conftest.s 1>&5' | ||
40 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 | ||
41 | (eval $ac_try) 2>&5 | ||
42 | ac_status=$? | ||
43 | diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac | ||
44 | index 27874eceb4..56d12d661d 100644 | ||
45 | --- a/sysdeps/aarch64/configure.ac | ||
46 | +++ b/sysdeps/aarch64/configure.ac | ||
47 | @@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs]) | ||
48 | # Check if asm support armv8.2-a+sve | ||
49 | AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl | ||
50 | cat > conftest.s <<\EOF | ||
51 | - ptrue p0.b | ||
52 | + .arch armv8.2-a+sve | ||
53 | + ptrue p0.b | ||
54 | EOF | ||
55 | -if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then | ||
56 | +if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then | ||
57 | libc_cv_aarch64_sve_asm=yes | ||
58 | else | ||
59 | libc_cv_aarch64_sve_asm=no | ||
60 | -- | ||
61 | 2.44.0 | ||
62 | |||
diff --git a/meta/recipes-core/glibc/glibc/0024-qemu-stale-process.patch b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch index c0a467fcec..c0a467fcec 100644 --- a/meta/recipes-core/glibc/glibc/0024-qemu-stale-process.patch +++ b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch | |||
diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb index 9122472689..2484ae1cd9 100644 --- a/meta/recipes-core/glibc/glibc_2.39.bb +++ b/meta/recipes-core/glibc/glibc_2.39.bb | |||
@@ -16,6 +16,10 @@ CVE_STATUS[CVE-2019-1010025] = "disputed: \ | |||
16 | Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, may allow \ | 16 | Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, may allow \ |
17 | easier access for another. 'ASLR bypass itself is not a vulnerability.'" | 17 | easier access for another. 'ASLR bypass itself is not a vulnerability.'" |
18 | 18 | ||
19 | CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" | ||
20 | CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602" | ||
21 | CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" | ||
22 | |||
19 | DEPENDS += "gperf-native bison-native" | 23 | DEPENDS += "gperf-native bison-native" |
20 | 24 | ||
21 | NATIVESDKFIXES ?= "" | 25 | NATIVESDKFIXES ?= "" |
@@ -48,8 +52,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ | |||
48 | file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ | 52 | file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ |
49 | file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ | 53 | file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ |
50 | file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ | 54 | file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ |
51 | file://0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch \ | 55 | file://0023-qemu-stale-process.patch \ |
52 | file://0024-qemu-stale-process.patch \ | ||
53 | " | 56 | " |
54 | S = "${WORKDIR}/git" | 57 | S = "${WORKDIR}/git" |
55 | B = "${WORKDIR}/build-${TARGET_SYS}" | 58 | B = "${WORKDIR}/build-${TARGET_SYS}" |
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb index 16425ea9e4..c7004ab41d 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb | |||
@@ -35,7 +35,7 @@ do_install () { | |||
35 | 35 | ||
36 | # If volatiles are used, then we'll also need /run/network there too. | 36 | # If volatiles are used, then we'll also need /run/network there too. |
37 | install -d ${D}/etc/default/volatiles | 37 | install -d ${D}/etc/default/volatiles |
38 | install -m 0644 ${WORKDIR}/99_network ${D}/etc/default/volatiles | 38 | install -m 0644 ${UNPACKDIR}/99_network ${D}/etc/default/volatiles |
39 | 39 | ||
40 | install -m 0755 ifup ${D}${base_sbindir}/ | 40 | install -m 0755 ifup ${D}${base_sbindir}/ |
41 | ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown | 41 | ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown |
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index 409b1c0403..49c7fd71b1 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "This package provides high level tools to configure network inter | |||
3 | HOMEPAGE = "http://packages.debian.org/ifupdown" | 3 | HOMEPAGE = "http://packages.debian.org/ifupdown" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | LICENSE = "GPL-2.0-only" | 5 | LICENSE = "GPL-2.0-only" |
6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" | 6 | LIC_FILES_CHKSUM = "file://${S}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" |
7 | 7 | ||
8 | inherit update-rc.d | 8 | inherit update-rc.d |
9 | 9 | ||
@@ -23,9 +23,9 @@ do_install () { | |||
23 | ${D}${sysconfdir}/network/if-up.d \ | 23 | ${D}${sysconfdir}/network/if-up.d \ |
24 | ${D}${sysconfdir}/network/if-down.d \ | 24 | ${D}${sysconfdir}/network/if-down.d \ |
25 | ${D}${sysconfdir}/network/if-post-down.d | 25 | ${D}${sysconfdir}/network/if-post-down.d |
26 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking | 26 | install -m 0755 ${S}/init ${D}${sysconfdir}/init.d/networking |
27 | install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces | 27 | install -m 0644 ${S}/interfaces ${D}${sysconfdir}/network/interfaces |
28 | install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d | 28 | install -m 0755 ${S}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d |
29 | } | 29 | } |
30 | 30 | ||
31 | do_install:append:qemuall () { | 31 | do_install:append:qemuall () { |
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index 198459f2b2..01d2771e3f 100644 --- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "file://init-boot.sh" | |||
7 | S = "${WORKDIR}" | 7 | S = "${WORKDIR}" |
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init | 10 | install -m 0755 ${S}/init-boot.sh ${D}/init |
11 | 11 | ||
12 | # Create device nodes expected by some kernels in initramfs | 12 | # Create device nodes expected by some kernels in initramfs |
13 | # before even executing /init. | 13 | # before even executing /init. |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 39ea51ccbd..4dbb56a42d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | |||
@@ -26,31 +26,31 @@ do_install() { | |||
26 | install -d ${D}/init.d | 26 | install -d ${D}/init.d |
27 | 27 | ||
28 | # base | 28 | # base |
29 | install -m 0755 ${WORKDIR}/init ${D}/init | 29 | install -m 0755 ${S}/init ${D}/init |
30 | install -m 0755 ${WORKDIR}/nfsrootfs ${D}/init.d/85-nfsrootfs | 30 | install -m 0755 ${S}/nfsrootfs ${D}/init.d/85-nfsrootfs |
31 | install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs | 31 | install -m 0755 ${S}/rootfs ${D}/init.d/90-rootfs |
32 | install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish | 32 | install -m 0755 ${S}/finish ${D}/init.d/99-finish |
33 | 33 | ||
34 | # exec | 34 | # exec |
35 | install -m 0755 ${WORKDIR}/exec ${D}/init.d/89-exec | 35 | install -m 0755 ${S}/exec ${D}/init.d/89-exec |
36 | 36 | ||
37 | # mdev | 37 | # mdev |
38 | install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev | 38 | install -m 0755 ${S}/mdev ${D}/init.d/01-mdev |
39 | 39 | ||
40 | # udev | 40 | # udev |
41 | install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev | 41 | install -m 0755 ${S}/udev ${D}/init.d/01-udev |
42 | 42 | ||
43 | # e2fs | 43 | # e2fs |
44 | install -m 0755 ${WORKDIR}/e2fs ${D}/init.d/10-e2fs | 44 | install -m 0755 ${S}/e2fs ${D}/init.d/10-e2fs |
45 | 45 | ||
46 | # debug | 46 | # debug |
47 | install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug | 47 | install -m 0755 ${S}/debug ${D}/init.d/00-debug |
48 | 48 | ||
49 | # lvm | 49 | # lvm |
50 | install -m 0755 ${WORKDIR}/lvm ${D}/init.d/09-lvm | 50 | install -m 0755 ${S}/lvm ${D}/init.d/09-lvm |
51 | 51 | ||
52 | # overlayroot needs to run after rootfs module but before finish | 52 | # overlayroot needs to run after rootfs module but before finish |
53 | install -m 0755 ${WORKDIR}/overlayroot ${D}/init.d/91-overlayroot | 53 | install -m 0755 ${S}/overlayroot ${D}/init.d/91-overlayroot |
54 | 54 | ||
55 | # Create device nodes expected by some kernels in initramfs | 55 | # Create device nodes expected by some kernels in initramfs |
56 | # before even executing /init. | 56 | # before even executing /init. |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb index 847dbc0472..a06e7902ee 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "file://init-live.sh" | |||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}" |
10 | 10 | ||
11 | do_install() { | 11 | do_install() { |
12 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init | 12 | install -m 0755 ${S}/init-live.sh ${D}/init |
13 | install -d ${D}/dev | 13 | install -d ${D}/dev |
14 | mknod -m 622 ${D}/dev/console c 5 1 | 14 | mknod -m 622 ${D}/dev/console c 5 1 |
15 | } | 15 | } |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index b3b991b8fd..e1bf15d293 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "file://init-live.sh" | |||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}" |
10 | 10 | ||
11 | do_install() { | 11 | do_install() { |
12 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init | 12 | install -m 0755 ${S}/init-live.sh ${D}/init |
13 | install -d ${D}/dev | 13 | install -d ${D}/dev |
14 | mknod -m 622 ${D}/dev/console c 5 1 | 14 | mknod -m 622 ${D}/dev/console c 5 1 |
15 | } | 15 | } |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb index 495eccbeda..1225ce4df9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb | |||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools" | |||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh | 11 | install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh |
12 | } | 12 | } |
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index e10faadfbe..ae7d5beb2f 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | |||
@@ -10,7 +10,7 @@ RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | |||
10 | S = "${WORKDIR}" | 10 | S = "${WORKDIR}" |
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh | 13 | install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh |
14 | } | 14 | } |
15 | 15 | ||
16 | # While this package maybe an allarch due to it being a | 16 | # While this package maybe an allarch due to it being a |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb index d347e323b3..018911f5d1 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb | |||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs" | |||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh | 11 | install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh |
12 | } | 12 | } |
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 9046d06c02..12b2820318 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | |||
@@ -10,7 +10,7 @@ RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIM | |||
10 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 10 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh | 13 | install -m 0755 ${S}/init-install.sh ${D}/install.sh |
14 | } | 14 | } |
15 | 15 | ||
16 | # While this package maybe an allarch due to it being a | 16 | # While this package maybe an allarch due to it being a |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb index b7499644f0..adea2330ae 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb | |||
@@ -11,7 +11,7 @@ S = "${WORKDIR}" | |||
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -d ${D}/init.d | 13 | install -d ${D}/init.d |
14 | install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh | 14 | install -m 0755 ${S}/init-install-efi.sh ${D}/init.d/install-efi.sh |
15 | } | 15 | } |
16 | 16 | ||
17 | FILES:${PN} = "/init.d/install-efi.sh" | 17 | FILES:${PN} = "/init.d/install-efi.sh" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb index 11db7124af..e4ae466d7c 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}" | |||
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -d ${D}/init.d | 18 | install -d ${D}/init.d |
19 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh | 19 | install -m 0755 ${S}/init-install.sh ${D}/init.d/install.sh |
20 | } | 20 | } |
21 | 21 | ||
22 | FILES:${PN} = "/init.d/install.sh" | 22 | FILES:${PN} = "/init.d/install.sh" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb index 48a779e9aa..4d2c11f452 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb | |||
@@ -13,7 +13,7 @@ S = "${WORKDIR}" | |||
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | install -d ${D}/init.d | 15 | install -d ${D}/init.d |
16 | install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live | 16 | install -m 0755 ${S}/setup-live ${D}/init.d/80-setup-live |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES:${PN} = "/init.d/80-setup-live" | 19 | FILES:${PN} = "/init.d/80-setup-live" |
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index e61ac554f3..68eeb5e117 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -61,9 +61,9 @@ HALTARGS ?= "-d -f" | |||
61 | VARLIBMOUNTARGS ?= "" | 61 | VARLIBMOUNTARGS ?= "" |
62 | 62 | ||
63 | do_configure() { | 63 | do_configure() { |
64 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt | 64 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/halt |
65 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot | 65 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/reboot |
66 | sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${WORKDIR}/read-only-rootfs-hook.sh | 66 | sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${S}/read-only-rootfs-hook.sh |
67 | } | 67 | } |
68 | 68 | ||
69 | do_install () { | 69 | do_install () { |
@@ -84,27 +84,27 @@ do_install () { | |||
84 | # Holds state information pertaining to urandom | 84 | # Holds state information pertaining to urandom |
85 | install -d ${D}${localstatedir}/lib/urandom | 85 | install -d ${D}${localstatedir}/lib/urandom |
86 | 86 | ||
87 | install -m 0644 ${WORKDIR}/functions ${D}${sysconfdir}/init.d | 87 | install -m 0644 ${S}/functions ${D}${sysconfdir}/init.d |
88 | install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d | 88 | install -m 0755 ${S}/bootmisc.sh ${D}${sysconfdir}/init.d |
89 | install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d | 89 | install -m 0755 ${S}/checkroot.sh ${D}${sysconfdir}/init.d |
90 | install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d | 90 | install -m 0755 ${S}/halt ${D}${sysconfdir}/init.d |
91 | install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d | 91 | install -m 0755 ${S}/hostname.sh ${D}${sysconfdir}/init.d |
92 | install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d | 92 | install -m 0755 ${S}/mountall.sh ${D}${sysconfdir}/init.d |
93 | install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d | 93 | install -m 0755 ${S}/mountnfs.sh ${D}${sysconfdir}/init.d |
94 | install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d | 94 | install -m 0755 ${S}/reboot ${D}${sysconfdir}/init.d |
95 | install -m 0755 ${WORKDIR}/rmnologin.sh ${D}${sysconfdir}/init.d | 95 | install -m 0755 ${S}/rmnologin.sh ${D}${sysconfdir}/init.d |
96 | install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d | 96 | install -m 0755 ${S}/sendsigs ${D}${sysconfdir}/init.d |
97 | install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d | 97 | install -m 0755 ${S}/single ${D}${sysconfdir}/init.d |
98 | install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d | 98 | install -m 0755 ${S}/umountnfs.sh ${D}${sysconfdir}/init.d |
99 | install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d | 99 | install -m 0755 ${S}/urandom ${D}${sysconfdir}/init.d |
100 | sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g' | 100 | sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g' |
101 | install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d | 101 | install -m 0755 ${S}/devpts.sh ${D}${sysconfdir}/init.d |
102 | install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default | 102 | install -m 0755 ${S}/devpts ${D}${sysconfdir}/default |
103 | install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d | 103 | install -m 0755 ${S}/sysfs.sh ${D}${sysconfdir}/init.d |
104 | install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d | 104 | install -m 0755 ${S}/populate-volatile.sh ${D}${sysconfdir}/init.d |
105 | install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d | 105 | install -m 0755 ${S}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d |
106 | install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d | 106 | install -m 0755 ${S}/save-rtc.sh ${D}${sysconfdir}/init.d |
107 | install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core | 107 | install -m 0644 ${S}/volatiles ${D}${sysconfdir}/default/volatiles/00_core |
108 | if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then | 108 | if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then |
109 | sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ | 109 | sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ |
110 | ${D}${sysconfdir}/default/volatiles/00_core | 110 | ${D}${sysconfdir}/default/volatiles/00_core |
@@ -112,22 +112,22 @@ do_install () { | |||
112 | if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then | 112 | if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then |
113 | sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core | 113 | sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core |
114 | fi | 114 | fi |
115 | install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d | 115 | install -m 0755 ${S}/dmesg.sh ${D}${sysconfdir}/init.d |
116 | install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ | 116 | install -m 0644 ${S}/logrotate-dmesg.conf ${D}${sysconfdir}/ |
117 | 117 | ||
118 | if [ "${TARGET_ARCH}" = "arm" ]; then | 118 | if [ "${TARGET_ARCH}" = "arm" ]; then |
119 | install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d | 119 | install -m 0755 ${S}/alignment.sh ${D}${sysconfdir}/init.d |
120 | fi | 120 | fi |
121 | 121 | ||
122 | if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then | 122 | if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then |
123 | install -d ${D}/${base_sbindir} | 123 | install -d ${D}/${base_sbindir} |
124 | install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir} | 124 | install -m 0755 ${S}/sushell ${D}/${base_sbindir} |
125 | fi | 125 | fi |
126 | # | 126 | # |
127 | # Install device dependent scripts | 127 | # Install device dependent scripts |
128 | # | 128 | # |
129 | install -m 0755 ${WORKDIR}/banner.sh ${D}${sysconfdir}/init.d/banner.sh | 129 | install -m 0755 ${S}/banner.sh ${D}${sysconfdir}/init.d/banner.sh |
130 | install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs | 130 | install -m 0755 ${S}/umountfs ${D}${sysconfdir}/init.d/umountfs |
131 | # | 131 | # |
132 | # Create runlevel links | 132 | # Create runlevel links |
133 | # | 133 | # |
diff --git a/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch new file mode 100644 index 0000000000..4b743f9b33 --- /dev/null +++ b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 592dcdcf243576bd2517d3da9bc18990de08e37e Mon Sep 17 00:00:00 2001 | ||
2 | From: Kamalesh Babulal <kamalesh.babulal@oracle.com> | ||
3 | Date: Mon, 27 Nov 2023 20:07:33 +0530 | ||
4 | Subject: [PATCH 1/1] include/Makefile: install systemd.h by default | ||
5 | |||
6 | Install systemd.h header file by default, as we have stub and defined | ||
7 | versions of the systemd functions for both non-systemd and systemd | ||
8 | enabled configurations. This will help packagers to ship package | ||
9 | without systemd support (--enable-systemd=no). | ||
10 | |||
11 | Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> | ||
12 | Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> | ||
13 | |||
14 | Upstream-Status: Backport [https://github.com/libcgroup/libcgroup/commit/592dcdcf243576bd2517d3da9bc18990de08e37e] | ||
15 | |||
16 | Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com> | ||
17 | --- | ||
18 | include/Makefile.am | 6 +----- | ||
19 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
20 | |||
21 | diff --git a/include/Makefile.am b/include/Makefile.am | ||
22 | index 23cebaac..4cb05529 100644 | ||
23 | --- a/include/Makefile.am | ||
24 | +++ b/include/Makefile.am | ||
25 | @@ -2,8 +2,4 @@ | ||
26 | nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h \ | ||
27 | libcgroup/groups.h libcgroup/tasks.h \ | ||
28 | libcgroup/iterators.h libcgroup/config.h \ | ||
29 | - libcgroup/log.h libcgroup/tools.h | ||
30 | - | ||
31 | -if WITH_SYSTEMD | ||
32 | -nobase_include_HEADERS += libcgroup/systemd.h | ||
33 | -endif | ||
34 | + libcgroup/log.h libcgroup/tools.h libcgroup/systemd.h | ||
35 | -- | ||
36 | 2.39.2 | ||
37 | |||
diff --git a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb b/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb index 4b4f19e36f..a1d27c7e7f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb +++ b/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb | |||
@@ -13,6 +13,7 @@ DEPENDS = "bison-native flex-native" | |||
13 | DEPENDS:append:libc-musl = " fts" | 13 | DEPENDS:append:libc-musl = " fts" |
14 | 14 | ||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
16 | file://0001-include-Makefile-install-systemd.h-by-default.patch \ | ||
16 | " | 17 | " |
17 | UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" | 18 | UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" |
18 | 19 | ||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb index d5546ce9ba..30ec6a4674 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular | 2 | # This provides libcrypt.so.1 which contains obsolete APIs, needed for uninative in particular |
3 | # | 3 | # |
4 | 4 | ||
5 | require libxcrypt.inc | 5 | require libxcrypt.inc |
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index dc075763e6..92fbda335d 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -11,6 +11,7 @@ TOOLCHAIN_HOST_TASK ?= "\ | |||
11 | nativesdk-python3-git \ | 11 | nativesdk-python3-git \ |
12 | nativesdk-python3-jinja2 \ | 12 | nativesdk-python3-jinja2 \ |
13 | nativesdk-python3-testtools \ | 13 | nativesdk-python3-testtools \ |
14 | nativesdk-python3-pip \ | ||
14 | nativesdk-python3-setuptools \ | 15 | nativesdk-python3-setuptools \ |
15 | nativesdk-python3-subunit \ | 16 | nativesdk-python3-subunit \ |
16 | nativesdk-python3-pyyaml \ | 17 | nativesdk-python3-pyyaml \ |
diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index 7eebcaf11a..0fd01fdb64 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb | |||
@@ -58,6 +58,8 @@ fakeroot archive_sdk() { | |||
58 | DEST="./${SDK_ARCH}-${SDK_OS}" | 58 | DEST="./${SDK_ARCH}-${SDK_OS}" |
59 | mv sysroots/${SDK_SYS} $DEST | 59 | mv sysroots/${SDK_SYS} $DEST |
60 | rm sysroots -rf | 60 | rm sysroots -rf |
61 | # There is a check in meta/files/toolchain-shar-extract.sh -- make sure to | ||
62 | # keep that check up to date if changing the `1024` | ||
61 | patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf | 63 | patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf |
62 | mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative | 64 | mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative |
63 | ${SDK_ARCHIVE_CMD} | 65 | ${SDK_ARCHIVE_CMD} |
diff --git a/meta/recipes-core/ncurses/files/CVE-2023-45918.patch b/meta/recipes-core/ncurses/files/CVE-2023-45918.patch new file mode 100644 index 0000000000..fbdae49a61 --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-45918.patch | |||
@@ -0,0 +1,180 @@ | |||
1 | From bcf02d3242f1c7d57224a95f7903fcf4b5e7695d Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas E. Dickey <dickey@invisible-island.net> | ||
3 | Date: Fri, 16 Jun 2023 02:54:29 +0530 | ||
4 | Subject: [PATCH] Fix CVE-2023-45918 | ||
5 | |||
6 | CVE: CVE-2023-45918 | ||
7 | |||
8 | Upstream-Status: Backport [https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=bcf02d3242f1c7d57224a95f7903fcf4b5e7695d] | ||
9 | |||
10 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
11 | --- | ||
12 | ncurses/tinfo/comp_error.c | 15 ++++++--- | ||
13 | ncurses/tinfo/read_entry.c | 65 ++++++++++++++++++++++++++------------ | ||
14 | 2 files changed, 56 insertions(+), 24 deletions(-) | ||
15 | |||
16 | diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c | ||
17 | index 48f48784..ee518e28 100644 | ||
18 | --- a/ncurses/tinfo/comp_error.c | ||
19 | +++ b/ncurses/tinfo/comp_error.c | ||
20 | @@ -60,8 +60,15 @@ _nc_get_source(void) | ||
21 | NCURSES_EXPORT(void) | ||
22 | _nc_set_source(const char *const name) | ||
23 | { | ||
24 | - FreeIfNeeded(SourceName); | ||
25 | - SourceName = strdup(name); | ||
26 | + if (name == NULL) { | ||
27 | + free(SourceName); | ||
28 | + SourceName = NULL; | ||
29 | + } else if (SourceName == NULL) { | ||
30 | + SourceName = strdup(name); | ||
31 | + } else if (strcmp(name, SourceName)) { | ||
32 | + free(SourceName); | ||
33 | + SourceName = strdup(name); | ||
34 | + } | ||
35 | } | ||
36 | |||
37 | NCURSES_EXPORT(void) | ||
38 | @@ -95,9 +102,9 @@ static NCURSES_INLINE void | ||
39 | where_is_problem(void) | ||
40 | { | ||
41 | fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?"); | ||
42 | - if (_nc_curr_line >= 0) | ||
43 | + if (_nc_curr_line > 0) | ||
44 | fprintf(stderr, ", line %d", _nc_curr_line); | ||
45 | - if (_nc_curr_col >= 0) | ||
46 | + if (_nc_curr_col > 0) | ||
47 | fprintf(stderr, ", col %d", _nc_curr_col); | ||
48 | if (TermType != 0 && TermType[0] != '\0') | ||
49 | fprintf(stderr, ", terminal '%s'", TermType); | ||
50 | diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c | ||
51 | index 341337d2..b0c3ad26 100644 | ||
52 | --- a/ncurses/tinfo/read_entry.c | ||
53 | +++ b/ncurses/tinfo/read_entry.c | ||
54 | @@ -138,12 +138,13 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) | ||
55 | } | ||
56 | #endif | ||
57 | |||
58 | -static void | ||
59 | -convert_strings(char *buf, char **Strings, int count, int size, char *table) | ||
60 | +static bool | ||
61 | +convert_strings(char *buf, char **Strings, int count, int size, | ||
62 | + char *table, bool always) | ||
63 | { | ||
64 | int i; | ||
65 | char *p; | ||
66 | - bool corrupt = FALSE; | ||
67 | + bool success = TRUE; | ||
68 | |||
69 | for (i = 0; i < count; i++) { | ||
70 | if (IS_NEG1(buf + 2 * i)) { | ||
71 | @@ -159,13 +160,10 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) | ||
72 | TR(TRACE_DATABASE, ("Strings[%d] = %s", i, | ||
73 | _nc_visbuf(Strings[i]))); | ||
74 | } else { | ||
75 | - if (!corrupt) { | ||
76 | - corrupt = TRUE; | ||
77 | - TR(TRACE_DATABASE, | ||
78 | - ("ignore out-of-range index %d to Strings[]", nn)); | ||
79 | - _nc_warning("corrupt data found in convert_strings"); | ||
80 | - } | ||
81 | - Strings[i] = ABSENT_STRING; | ||
82 | + TR(TRACE_DATABASE, | ||
83 | + ("found out-of-range index %d to Strings[%d]", nn, i)); | ||
84 | + success = FALSE; | ||
85 | + break; | ||
86 | } | ||
87 | } | ||
88 | |||
89 | @@ -175,10 +173,25 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) | ||
90 | if (*p == '\0') | ||
91 | break; | ||
92 | /* if there is no NUL, ignore the string */ | ||
93 | - if (p >= table + size) | ||
94 | + if (p >= table + size) { | ||
95 | Strings[i] = ABSENT_STRING; | ||
96 | + } else if (p == Strings[i] && always) { | ||
97 | + TR(TRACE_DATABASE, | ||
98 | + ("found empty but required Strings[%d]", i)); | ||
99 | + success = FALSE; | ||
100 | + break; | ||
101 | + } | ||
102 | + } else if (always) { /* names are always needed */ | ||
103 | + TR(TRACE_DATABASE, | ||
104 | + ("found invalid but required Strings[%d]", i)); | ||
105 | + success = FALSE; | ||
106 | + break; | ||
107 | } | ||
108 | } | ||
109 | + if (!success) { | ||
110 | + _nc_warning("corrupt data found in convert_strings"); | ||
111 | + } | ||
112 | + return success; | ||
113 | } | ||
114 | |||
115 | static int | ||
116 | @@ -382,7 +395,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) | ||
117 | if (Read(string_table, (unsigned) str_size) != str_size) { | ||
118 | returnDB(TGETENT_NO); | ||
119 | } | ||
120 | - convert_strings(buf, ptr->Strings, str_count, str_size, string_table); | ||
121 | + if (!convert_strings(buf, ptr->Strings, str_count, str_size, | ||
122 | + string_table, FALSE)) { | ||
123 | + returnDB(TGETENT_NO); | ||
124 | + } | ||
125 | } | ||
126 | #if NCURSES_XNAMES | ||
127 | |||
128 | @@ -483,8 +499,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) | ||
129 | ("Before computing extended-string capabilities " | ||
130 | "str_count=%d, ext_str_count=%d", | ||
131 | str_count, ext_str_count)); | ||
132 | - convert_strings(buf, ptr->Strings + str_count, ext_str_count, | ||
133 | - ext_str_limit, ptr->ext_str_table); | ||
134 | + if (!convert_strings(buf, ptr->Strings + str_count, ext_str_count, | ||
135 | + ext_str_limit, ptr->ext_str_table, FALSE)) { | ||
136 | + returnDB(TGETENT_NO); | ||
137 | + } | ||
138 | for (i = ext_str_count - 1; i >= 0; i--) { | ||
139 | TR(TRACE_DATABASE, ("MOVE from [%d:%d] %s", | ||
140 | i, i + str_count, | ||
141 | @@ -516,10 +534,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) | ||
142 | TR(TRACE_DATABASE, | ||
143 | ("ext_NAMES starting @%d in extended_strings, first = %s", | ||
144 | base, _nc_visbuf(ptr->ext_str_table + base))); | ||
145 | - convert_strings(buf + (2 * ext_str_count), | ||
146 | - ptr->ext_Names, | ||
147 | - (int) need, | ||
148 | - ext_str_limit, ptr->ext_str_table + base); | ||
149 | + if (!convert_strings(buf + (2 * ext_str_count), | ||
150 | + ptr->ext_Names, | ||
151 | + (int) need, | ||
152 | + ext_str_limit, ptr->ext_str_table + base, | ||
153 | + TRUE)) { | ||
154 | + returnDB(TGETENT_NO); | ||
155 | + } | ||
156 | } | ||
157 | |||
158 | TR(TRACE_DATABASE, | ||
159 | @@ -572,13 +593,17 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr) | ||
160 | int limit; | ||
161 | char buffer[MAX_ENTRY_SIZE + 1]; | ||
162 | |||
163 | - if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp)) | ||
164 | - > 0) { | ||
165 | + limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp); | ||
166 | + if (limit > 0) { | ||
167 | + const char *old_source = _nc_get_source(); | ||
168 | |||
169 | TR(TRACE_DATABASE, ("read terminfo %s", filename)); | ||
170 | + if (old_source == NULL) | ||
171 | + _nc_set_source(filename); | ||
172 | if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) { | ||
173 | _nc_free_termtype2(ptr); | ||
174 | } | ||
175 | + _nc_set_source(old_source); | ||
176 | } else { | ||
177 | code = TGETENT_NO; | ||
178 | } | ||
179 | -- | ||
180 | 2.40.0 | ||
diff --git a/meta/recipes-core/ncurses/files/CVE-2023-50495.patch b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch new file mode 100644 index 0000000000..7d90ddd30f --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch | |||
@@ -0,0 +1,301 @@ | |||
1 | From 7daae3f2139a678fe0ae0b42fcf8d807cbff485c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Sun, 4 Feb 2024 13:42:38 +0800 | ||
4 | Subject: [PATCH] parse_entry.c: check return value of _nc_save_str | ||
5 | |||
6 | * check return value of _nc_save_str(), in special case for tic where | ||
7 | extended capabilities are processed but the terminal description was | ||
8 | not initialized (report by Ziqiao Kong). | ||
9 | |||
10 | * regenerate llib-* files. | ||
11 | |||
12 | CVE: CVE-2023-50495 | ||
13 | |||
14 | Upstream-Status: Backport [http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=7723dd6799ab10b32047ec73b14df9f107bafe99] | ||
15 | |||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
17 | --- | ||
18 | ncurses/llib-lncurses | 15 +++++++++++++++ | ||
19 | ncurses/llib-lncursest | 15 +++++++++++++++ | ||
20 | ncurses/llib-lncursestw | 15 +++++++++++++++ | ||
21 | ncurses/llib-lncursesw | 15 +++++++++++++++ | ||
22 | ncurses/llib-ltinfo | 15 +++++++++++++++ | ||
23 | ncurses/llib-ltinfot | 15 +++++++++++++++ | ||
24 | ncurses/llib-ltinfotw | 15 +++++++++++++++ | ||
25 | ncurses/llib-ltinfow | 15 +++++++++++++++ | ||
26 | ncurses/tinfo/parse_entry.c | 23 ++++++++++++++++------- | ||
27 | 9 files changed, 136 insertions(+), 7 deletions(-) | ||
28 | |||
29 | diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses | ||
30 | index 211cf3b7..e4190aa2 100644 | ||
31 | --- a/ncurses/llib-lncurses | ||
32 | +++ b/ncurses/llib-lncurses | ||
33 | @@ -3656,6 +3656,21 @@ char *tiparm( | ||
34 | ...) | ||
35 | { return(*(char **)0); } | ||
36 | |||
37 | +#undef tiparm_s | ||
38 | +char *tiparm_s( | ||
39 | + int num_expected, | ||
40 | + int tparm_type, | ||
41 | + const char *string, | ||
42 | + ...) | ||
43 | + { return(*(char **)0); } | ||
44 | + | ||
45 | +#undef tiscan_s | ||
46 | +int tiscan_s( | ||
47 | + int *num_expected, | ||
48 | + int *tparm_type, | ||
49 | + const char *string) | ||
50 | + { return(*(int *)0); } | ||
51 | + | ||
52 | #undef _nc_tiparm | ||
53 | char *_nc_tiparm( | ||
54 | int expected, | ||
55 | diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest | ||
56 | index 1b09d676..e07abba6 100644 | ||
57 | --- a/ncurses/llib-lncursest | ||
58 | +++ b/ncurses/llib-lncursest | ||
59 | @@ -3741,6 +3741,21 @@ char *tiparm( | ||
60 | ...) | ||
61 | { return(*(char **)0); } | ||
62 | |||
63 | +#undef tiparm_s | ||
64 | +char *tiparm_s( | ||
65 | + int num_expected, | ||
66 | + int tparm_type, | ||
67 | + const char *string, | ||
68 | + ...) | ||
69 | + { return(*(char **)0); } | ||
70 | + | ||
71 | +#undef tiscan_s | ||
72 | +int tiscan_s( | ||
73 | + int *num_expected, | ||
74 | + int *tparm_type, | ||
75 | + const char *string) | ||
76 | + { return(*(int *)0); } | ||
77 | + | ||
78 | #undef _nc_tiparm | ||
79 | char *_nc_tiparm( | ||
80 | int expected, | ||
81 | diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw | ||
82 | index 4576e0fc..747c6be8 100644 | ||
83 | --- a/ncurses/llib-lncursestw | ||
84 | +++ b/ncurses/llib-lncursestw | ||
85 | @@ -4702,6 +4702,21 @@ char *tiparm( | ||
86 | ...) | ||
87 | { return(*(char **)0); } | ||
88 | |||
89 | +#undef tiparm_s | ||
90 | +char *tiparm_s( | ||
91 | + int num_expected, | ||
92 | + int tparm_type, | ||
93 | + const char *string, | ||
94 | + ...) | ||
95 | + { return(*(char **)0); } | ||
96 | + | ||
97 | +#undef tiscan_s | ||
98 | +int tiscan_s( | ||
99 | + int *num_expected, | ||
100 | + int *tparm_type, | ||
101 | + const char *string) | ||
102 | + { return(*(int *)0); } | ||
103 | + | ||
104 | #undef _nc_tiparm | ||
105 | char *_nc_tiparm( | ||
106 | int expected, | ||
107 | diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw | ||
108 | index 127350d2..862305d9 100644 | ||
109 | --- a/ncurses/llib-lncursesw | ||
110 | +++ b/ncurses/llib-lncursesw | ||
111 | @@ -4617,6 +4617,21 @@ char *tiparm( | ||
112 | ...) | ||
113 | { return(*(char **)0); } | ||
114 | |||
115 | +#undef tiparm_s | ||
116 | +char *tiparm_s( | ||
117 | + int num_expected, | ||
118 | + int tparm_type, | ||
119 | + const char *string, | ||
120 | + ...) | ||
121 | + { return(*(char **)0); } | ||
122 | + | ||
123 | +#undef tiscan_s | ||
124 | +int tiscan_s( | ||
125 | + int *num_expected, | ||
126 | + int *tparm_type, | ||
127 | + const char *string) | ||
128 | + { return(*(int *)0); } | ||
129 | + | ||
130 | #undef _nc_tiparm | ||
131 | char *_nc_tiparm( | ||
132 | int expected, | ||
133 | diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo | ||
134 | index a5cd7cd3..31e5e9a6 100644 | ||
135 | --- a/ncurses/llib-ltinfo | ||
136 | +++ b/ncurses/llib-ltinfo | ||
137 | @@ -927,6 +927,21 @@ char *tiparm( | ||
138 | ...) | ||
139 | { return(*(char **)0); } | ||
140 | |||
141 | +#undef tiparm_s | ||
142 | +char *tiparm_s( | ||
143 | + int num_expected, | ||
144 | + int tparm_type, | ||
145 | + const char *string, | ||
146 | + ...) | ||
147 | + { return(*(char **)0); } | ||
148 | + | ||
149 | +#undef tiscan_s | ||
150 | +int tiscan_s( | ||
151 | + int *num_expected, | ||
152 | + int *tparm_type, | ||
153 | + const char *string) | ||
154 | + { return(*(int *)0); } | ||
155 | + | ||
156 | #undef _nc_tiparm | ||
157 | char *_nc_tiparm( | ||
158 | int expected, | ||
159 | diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot | ||
160 | index bd3de812..48e5c25a 100644 | ||
161 | --- a/ncurses/llib-ltinfot | ||
162 | +++ b/ncurses/llib-ltinfot | ||
163 | @@ -1003,6 +1003,21 @@ char *tiparm( | ||
164 | ...) | ||
165 | { return(*(char **)0); } | ||
166 | |||
167 | +#undef tiparm_s | ||
168 | +char *tiparm_s( | ||
169 | + int num_expected, | ||
170 | + int tparm_type, | ||
171 | + const char *string, | ||
172 | + ...) | ||
173 | + { return(*(char **)0); } | ||
174 | + | ||
175 | +#undef tiscan_s | ||
176 | +int tiscan_s( | ||
177 | + int *num_expected, | ||
178 | + int *tparm_type, | ||
179 | + const char *string) | ||
180 | + { return(*(int *)0); } | ||
181 | + | ||
182 | #undef _nc_tiparm | ||
183 | char *_nc_tiparm( | ||
184 | int expected, | ||
185 | diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw | ||
186 | index 4d35a1e1..64dfdfa5 100644 | ||
187 | --- a/ncurses/llib-ltinfotw | ||
188 | +++ b/ncurses/llib-ltinfotw | ||
189 | @@ -1025,6 +1025,21 @@ char *tiparm( | ||
190 | ...) | ||
191 | { return(*(char **)0); } | ||
192 | |||
193 | +#undef tiparm_s | ||
194 | +char *tiparm_s( | ||
195 | + int num_expected, | ||
196 | + int tparm_type, | ||
197 | + const char *string, | ||
198 | + ...) | ||
199 | + { return(*(char **)0); } | ||
200 | + | ||
201 | +#undef tiscan_s | ||
202 | +int tiscan_s( | ||
203 | + int *num_expected, | ||
204 | + int *tparm_type, | ||
205 | + const char *string) | ||
206 | + { return(*(int *)0); } | ||
207 | + | ||
208 | #undef _nc_tiparm | ||
209 | char *_nc_tiparm( | ||
210 | int expected, | ||
211 | diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow | ||
212 | index db846764..7e17a35f 100644 | ||
213 | --- a/ncurses/llib-ltinfow | ||
214 | +++ b/ncurses/llib-ltinfow | ||
215 | @@ -949,6 +949,21 @@ char *tiparm( | ||
216 | ...) | ||
217 | { return(*(char **)0); } | ||
218 | |||
219 | +#undef tiparm_s | ||
220 | +char *tiparm_s( | ||
221 | + int num_expected, | ||
222 | + int tparm_type, | ||
223 | + const char *string, | ||
224 | + ...) | ||
225 | + { return(*(char **)0); } | ||
226 | + | ||
227 | +#undef tiscan_s | ||
228 | +int tiscan_s( | ||
229 | + int *num_expected, | ||
230 | + int *tparm_type, | ||
231 | + const char *string) | ||
232 | + { return(*(int *)0); } | ||
233 | + | ||
234 | #undef _nc_tiparm | ||
235 | char *_nc_tiparm( | ||
236 | int expected, | ||
237 | diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c | ||
238 | index 14bcb67e..0a0b5637 100644 | ||
239 | --- a/ncurses/tinfo/parse_entry.c | ||
240 | +++ b/ncurses/tinfo/parse_entry.c | ||
241 | @@ -110,7 +110,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) | ||
242 | /* Well, we are given a cancel for a name that we don't recognize */ | ||
243 | return _nc_extend_names(entryp, name, STRING); | ||
244 | default: | ||
245 | - return 0; | ||
246 | + return NULL; | ||
247 | } | ||
248 | |||
249 | /* Adjust the 'offset' (insertion-point) to keep the lists of extended | ||
250 | @@ -142,6 +142,11 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) | ||
251 | for (last = (unsigned) (max - 1); last > tindex; last--) | ||
252 | |||
253 | if (!found) { | ||
254 | + char *saved; | ||
255 | + | ||
256 | + if ((saved = _nc_save_str(name)) == NULL) | ||
257 | + return NULL; | ||
258 | + | ||
259 | switch (token_type) { | ||
260 | case BOOLEAN: | ||
261 | tp->ext_Booleans++; | ||
262 | @@ -169,7 +174,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) | ||
263 | TYPE_REALLOC(char *, actual, tp->ext_Names); | ||
264 | while (--actual > offset) | ||
265 | tp->ext_Names[actual] = tp->ext_Names[actual - 1]; | ||
266 | - tp->ext_Names[offset] = _nc_save_str(name); | ||
267 | + tp->ext_Names[offset] = saved; | ||
268 | } | ||
269 | |||
270 | temp.nte_name = tp->ext_Names[offset]; | ||
271 | @@ -364,6 +369,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) | ||
272 | bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0); | ||
273 | bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0); | ||
274 | if (is_use || is_tc) { | ||
275 | + char *saved; | ||
276 | + | ||
277 | if (!VALID_STRING(_nc_curr_token.tk_valstring) | ||
278 | || _nc_curr_token.tk_valstring[0] == '\0') { | ||
279 | _nc_warning("missing name for use-clause"); | ||
280 | @@ -377,11 +384,13 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) | ||
281 | _nc_curr_token.tk_valstring); | ||
282 | continue; | ||
283 | } | ||
284 | - entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); | ||
285 | - entryp->uses[entryp->nuses].line = _nc_curr_line; | ||
286 | - entryp->nuses++; | ||
287 | - if (entryp->nuses > 1 && is_tc) { | ||
288 | - BAD_TC_USAGE | ||
289 | + if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) { | ||
290 | + entryp->uses[entryp->nuses].name = saved; | ||
291 | + entryp->uses[entryp->nuses].line = _nc_curr_line; | ||
292 | + entryp->nuses++; | ||
293 | + if (entryp->nuses > 1 && is_tc) { | ||
294 | + BAD_TC_USAGE | ||
295 | + } | ||
296 | } | ||
297 | } else { | ||
298 | /* normal token lookup */ | ||
299 | -- | ||
300 | 2.25.1 | ||
301 | |||
diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb index 2c621525f9..97130c06d6 100644 --- a/meta/recipes-core/ncurses/ncurses_6.4.bb +++ b/meta/recipes-core/ncurses/ncurses_6.4.bb | |||
@@ -6,6 +6,8 @@ SRC_URI += "file://0001-tic-hang.patch \ | |||
6 | file://exit_prototype.patch \ | 6 | file://exit_prototype.patch \ |
7 | file://0001-Fix-CVE-2023-29491.patch \ | 7 | file://0001-Fix-CVE-2023-29491.patch \ |
8 | file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ | 8 | file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ |
9 | file://CVE-2023-50495.patch \ | ||
10 | file://CVE-2023-45918.patch \ | ||
9 | " | 11 | " |
10 | # commit id corresponds to the revision in package version | 12 | # commit id corresponds to the revision in package version |
11 | SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" | 13 | SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" |
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 40937098e6..c7b96bc6a7 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -80,7 +80,7 @@ python do_compile () { | |||
80 | import subprocess | 80 | import subprocess |
81 | 81 | ||
82 | # Build a separate executable for each splash image | 82 | # Build a separate executable for each splash image |
83 | workdir = d.getVar('WORKDIR') | 83 | workdir = d.getVar('UNPACKDIR') |
84 | convertscript = "%s/make-image-header.sh" % d.getVar('S') | 84 | convertscript = "%s/make-image-header.sh" % d.getVar('S') |
85 | destfile = "%s/psplash-poky-img.h" % d.getVar('B') | 85 | destfile = "%s/psplash-poky-img.h" % d.getVar('B') |
86 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() | 86 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() |
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4aefc5636d..555bd0876f 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -38,7 +38,7 @@ do_install:append () { | |||
38 | rmdir ${D}${datadir}/${BPN} || true | 38 | rmdir ${D}${datadir}/${BPN} || true |
39 | 39 | ||
40 | install -m 0755 -d ${D}${sysconfdir} | 40 | install -m 0755 -d ${D}${sysconfdir} |
41 | install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc | 41 | install -m 0644 ${UNPACKDIR}/inputrc ${D}${sysconfdir}/inputrc |
42 | } | 42 | } |
43 | 43 | ||
44 | BBCLASSEXTEND = "native nativesdk" | 44 | BBCLASSEXTEND = "native nativesdk" |
@@ -54,4 +54,4 @@ ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" | |||
54 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs | 54 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs |
55 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. | 55 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. |
56 | SRC_URI:append:class-native = " file://rl-native.map" | 56 | SRC_URI:append:class-native = " file://rl-native.map" |
57 | LDFLAGS:append:class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" | 57 | LDFLAGS:append:class-native = " -Wl,--version-script=${UNPACKDIR}/rl-native.map" |
diff --git a/meta/recipes-core/seatd/seatd_0.8.0.bb b/meta/recipes-core/seatd/seatd_0.8.0.bb index 14c5b1b7ae..df5fe35f98 100644 --- a/meta/recipes-core/seatd/seatd_0.8.0.bb +++ b/meta/recipes-core/seatd/seatd_0.8.0.bb | |||
@@ -26,7 +26,7 @@ PACKAGECONFIG[systemd] = ",,systemd" | |||
26 | 26 | ||
27 | do_install:append() { | 27 | do_install:append() { |
28 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then | 28 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then |
29 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/seatd | 29 | install -Dm755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/seatd |
30 | fi | 30 | fi |
31 | } | 31 | } |
32 | 32 | ||
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb index 2355936631..752ad7c2b7 100644 --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb | |||
@@ -22,18 +22,18 @@ SRC_URI = "\ | |||
22 | " | 22 | " |
23 | 23 | ||
24 | do_install() { | 24 | do_install() { |
25 | install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf | 25 | install -D -m0644 ${UNPACKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf |
26 | install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf | 26 | install -D -m0644 ${UNPACKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf |
27 | install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf | 27 | install -D -m0644 ${UNPACKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf |
28 | 28 | ||
29 | if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then | 29 | if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then |
30 | install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network | 30 | install -D -m0644 ${UNPACKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network |
31 | fi | 31 | fi |
32 | } | 32 | } |
33 | 33 | ||
34 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 | 34 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 |
35 | do_install:append:qemuall() { | 35 | do_install:append:qemuall() { |
36 | install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf | 36 | install -D -m0644 ${UNPACKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf |
37 | } | 37 | } |
38 | 38 | ||
39 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 39 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index 44a93ac684..987a8bf89d 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -21,7 +21,7 @@ do_install() { | |||
21 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` | 21 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` |
22 | install -d ${D}${systemd_system_unitdir}/ | 22 | install -d ${D}${systemd_system_unitdir}/ |
23 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ | 23 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ |
24 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_system_unitdir}/ | 24 | install -m 0644 ${S}/serial-getty@.service ${D}${systemd_system_unitdir}/ |
25 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_system_unitdir}/serial-getty@.service | 25 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_system_unitdir}/serial-getty@.service |
26 | sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_system_unitdir}/serial-getty@.service | 26 | sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_system_unitdir}/serial-getty@.service |
27 | 27 | ||
@@ -35,7 +35,7 @@ do_install() { | |||
35 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service | 35 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service |
36 | else | 36 | else |
37 | # install custom service file for the non-default baudrate | 37 | # install custom service file for the non-default baudrate |
38 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service | 38 | install -m 0644 ${S}/serial-getty@.service ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service |
39 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service | 39 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service |
40 | # enable the service | 40 | # enable the service |
41 | ln -sf ${systemd_system_unitdir}/serial-getty$baudrate@.service \ | 41 | ln -sf ${systemd_system_unitdir}/serial-getty$baudrate@.service \ |
diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb b/meta/recipes-core/systemd/systemd-systemctl-native.bb index 54283bcba1..0036e4dd8b 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native.bb +++ b/meta/recipes-core/systemd/systemd-systemctl-native.bb | |||
@@ -12,5 +12,5 @@ S = "${WORKDIR}" | |||
12 | 12 | ||
13 | do_install() { | 13 | do_install() { |
14 | install -d ${D}${bindir} | 14 | install -d ${D}${bindir} |
15 | install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} | 15 | install -m 0755 ${S}/systemctl ${D}${bindir} |
16 | } | 16 | } |
diff --git a/meta/recipes-core/systemd/systemd_255.4.bb b/meta/recipes-core/systemd/systemd_255.4.bb index e7498c802d..62842d43c8 100644 --- a/meta/recipes-core/systemd/systemd_255.4.bb +++ b/meta/recipes-core/systemd/systemd_255.4.bb | |||
@@ -271,14 +271,16 @@ WATCHDOG_TIMEOUT ??= "60" | |||
271 | 271 | ||
272 | do_install() { | 272 | do_install() { |
273 | meson_do_install | 273 | meson_do_install |
274 | # Change the root user's home directory in /lib/sysusers.d/basic.conf. | 274 | if ${@bb.utils.contains('PACKAGECONFIG', 'sysusers', 'true', 'false', d)}; then |
275 | # This is done merely for backward compatibility with previous systemd recipes. | 275 | # Change the root user's home directory in /lib/sysusers.d/basic.conf. |
276 | # systemd hardcodes root user's HOME to be "/root". Changing to use other values | 276 | # This is done merely for backward compatibility with previous systemd recipes. |
277 | # may have unexpected runtime behaviors. | 277 | # systemd hardcodes root user's HOME to be "/root". Changing to use other values |
278 | if [ "${ROOT_HOME}" != "/root" ]; then | 278 | # may have unexpected runtime behaviors. |
279 | bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" | 279 | if [ "${ROOT_HOME}" != "/root" ]; then |
280 | sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf | 280 | bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" |
281 | fi | 281 | sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf |
282 | fi | ||
283 | fi | ||
282 | install -d ${D}/${base_sbindir} | 284 | install -d ${D}/${base_sbindir} |
283 | if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then | 285 | if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then |
284 | # Provided by a separate recipe | 286 | # Provided by a separate recipe |
@@ -291,15 +293,15 @@ do_install() { | |||
291 | 293 | ||
292 | install -d ${D}${sysconfdir}/udev/rules.d/ | 294 | install -d ${D}${sysconfdir}/udev/rules.d/ |
293 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 295 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
294 | for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do | 296 | for rule in $(find ${UNPACKDIR} -maxdepth 1 -type f -name "*.rules"); do |
295 | install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/ | 297 | install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/ |
296 | done | 298 | done |
297 | 299 | ||
298 | install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${nonarch_libdir}/tmpfiles.d/ | 300 | install -m 0644 ${UNPACKDIR}/00-create-volatile.conf ${D}${nonarch_libdir}/tmpfiles.d/ |
299 | 301 | ||
300 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 302 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
301 | install -d ${D}${sysconfdir}/init.d | 303 | install -d ${D}${sysconfdir}/init.d |
302 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd | 304 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd |
303 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd | 305 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd |
304 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install | 306 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install |
305 | fi | 307 | fi |
@@ -370,9 +372,9 @@ do_install() { | |||
370 | # request hostname changes via DBUS without elevating its privileges | 372 | # request hostname changes via DBUS without elevating its privileges |
371 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then | 373 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then |
372 | install -d ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ | 374 | install -d ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ |
373 | install -m 0644 ${WORKDIR}/00-hostnamed-network-user.conf ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ | 375 | install -m 0644 ${UNPACKDIR}/00-hostnamed-network-user.conf ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ |
374 | install -d ${D}${datadir}/dbus-1/system.d/ | 376 | install -d ${D}${datadir}/dbus-1/system.d/ |
375 | install -m 0644 ${WORKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/ | 377 | install -m 0644 ${UNPACKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/ |
376 | fi | 378 | fi |
377 | 379 | ||
378 | # create link for existing udev rules | 380 | # create link for existing udev rules |
@@ -380,10 +382,10 @@ do_install() { | |||
380 | 382 | ||
381 | # install default policy for presets | 383 | # install default policy for presets |
382 | # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto | 384 | # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto |
383 | install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset | 385 | install -Dm 0644 ${UNPACKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset |
384 | 386 | ||
385 | # add a profile fragment to disable systemd pager with busybox less | 387 | # add a profile fragment to disable systemd pager with busybox less |
386 | install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh | 388 | install -Dm 0644 ${UNPACKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh |
387 | 389 | ||
388 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then | 390 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then |
389 | sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ | 391 | sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ |
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 6bbe517df1..17a01e8640 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | |||
@@ -16,9 +16,9 @@ do_compile() { | |||
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -d ${D}${sysconfdir} | 18 | install -d ${D}${sysconfdir} |
19 | install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab | 19 | install -m 0644 ${S}/inittab ${D}${sysconfdir}/inittab |
20 | install -d ${D}${base_bindir} | 20 | install -d ${D}${base_bindir} |
21 | install -m 0755 ${WORKDIR}/start_getty ${D}${base_bindir}/start_getty | 21 | install -m 0755 ${S}/start_getty ${D}${base_bindir}/start_getty |
22 | sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty | 22 | sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty |
23 | 23 | ||
24 | CONSOLES="${SERIAL_CONSOLES}" | 24 | CONSOLES="${SERIAL_CONSOLES}" |
diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb index 6a612468f3..fb9d00891c 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb | |||
@@ -97,18 +97,18 @@ do_install () { | |||
97 | 97 | ||
98 | sed -e \ | 98 | sed -e \ |
99 | 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ | 99 | 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ |
100 | ${WORKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS | 100 | ${UNPACKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS |
101 | chmod 0644 ${D}${sysconfdir}/default/rcS | 101 | chmod 0644 ${D}${sysconfdir}/default/rcS |
102 | install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d | 102 | install -m 0755 ${UNPACKDIR}/rc ${D}${sysconfdir}/init.d |
103 | install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d | 103 | install -m 0755 ${UNPACKDIR}/rcS ${D}${sysconfdir}/init.d |
104 | install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd | 104 | install -m 0755 ${UNPACKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd |
105 | ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd | 105 | ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd |
106 | 106 | ||
107 | update-rc.d -r ${D} bootlogd start 07 S . | 107 | update-rc.d -r ${D} bootlogd start 07 S . |
108 | update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . | 108 | update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . |
109 | 109 | ||
110 | install -d ${D}${sysconfdir}/default/volatiles | 110 | install -d ${D}${sysconfdir}/default/volatiles |
111 | install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles | 111 | install -m 0644 ${UNPACKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles |
112 | 112 | ||
113 | chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 113 | chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
114 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 114 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
diff --git a/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb b/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb index 9a8be15dab..815f625a67 100644 --- a/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb +++ b/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb | |||
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af" | |||
9 | SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master" | 9 | SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master" |
10 | SRCREV = "9eea78b3ad8ab3710fb3b2d80b9cd058d7c8aba7" | 10 | SRCREV = "9eea78b3ad8ab3710fb3b2d80b9cd058d7c8aba7" |
11 | 11 | ||
12 | CVE_PRODUCT = "s390-tools" | ||
13 | |||
12 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
13 | 15 | ||
14 | EXTRA_OEMAKE = "\ | 16 | EXTRA_OEMAKE = "\ |
diff --git a/meta/recipes-core/udev/eudev_3.2.14.bb b/meta/recipes-core/udev/eudev_3.2.14.bb index 18696679c8..0e5610f77c 100644 --- a/meta/recipes-core/udev/eudev_3.2.14.bb +++ b/meta/recipes-core/udev/eudev_3.2.14.bb | |||
@@ -42,12 +42,12 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | |||
42 | 42 | ||
43 | do_install:append() { | 43 | do_install:append() { |
44 | install -d ${D}${sysconfdir}/init.d | 44 | install -d ${D}${sysconfdir}/init.d |
45 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | 45 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/udev |
46 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev | 46 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev |
47 | sed -i s%@KMOD@%${base_bindir}/kmod% ${D}${sysconfdir}/init.d/udev | 47 | sed -i s%@KMOD@%${base_bindir}/kmod% ${D}${sysconfdir}/init.d/udev |
48 | 48 | ||
49 | install -d ${D}${sysconfdir}/udev/rules.d | 49 | install -d ${D}${sysconfdir}/udev/rules.d |
50 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | 50 | install -m 0644 ${UNPACKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules |
51 | 51 | ||
52 | # Use classic network interface naming scheme if no 'pni-names' distro feature | 52 | # Use classic network interface naming scheme if no 'pni-names' distro feature |
53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', 'false', 'true', d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', 'false', 'true', d)}; then |
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 30f1fe76d0..a3e5d12b81 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb | |||
@@ -20,21 +20,21 @@ MOUNT_BASE = "/run/media" | |||
20 | do_install() { | 20 | do_install() { |
21 | install -d ${D}${sysconfdir}/udev/rules.d | 21 | install -d ${D}${sysconfdir}/udev/rules.d |
22 | 22 | ||
23 | install -m 0644 ${WORKDIR}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules | 23 | install -m 0644 ${S}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules |
24 | install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules | 24 | install -m 0644 ${S}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules |
25 | install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules | 25 | install -m 0644 ${S}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules |
26 | 26 | ||
27 | install -d ${D}${sysconfdir}/udev/mount.ignorelist.d | 27 | install -d ${D}${sysconfdir}/udev/mount.ignorelist.d |
28 | install -m 0644 ${WORKDIR}/mount.ignorelist ${D}${sysconfdir}/udev/ | 28 | install -m 0644 ${S}/mount.ignorelist ${D}${sysconfdir}/udev/ |
29 | 29 | ||
30 | install -d ${D}${sysconfdir}/udev/scripts/ | 30 | install -d ${D}${sysconfdir}/udev/scripts/ |
31 | 31 | ||
32 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | 32 | install -m 0755 ${S}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh |
33 | sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 33 | sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
34 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 34 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
35 | sed -i 's|@MOUNT_BASE@|${MOUNT_BASE}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 35 | sed -i 's|@MOUNT_BASE@|${MOUNT_BASE}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
36 | 36 | ||
37 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | 37 | install -m 0755 ${S}/network.sh ${D}${sysconfdir}/udev/scripts |
38 | } | 38 | } |
39 | 39 | ||
40 | pkg_postinst:${PN} () { | 40 | pkg_postinst:${PN} () { |
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index ba622fe716..27723c88ef 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | |||
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f5354 | |||
8 | 8 | ||
9 | SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master;protocol=https" | 9 | SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master;protocol=https" |
10 | SRCREV = "b8f950105010270a768aa12245d6abf166346015" | 10 | SRCREV = "b8f950105010270a768aa12245d6abf166346015" |
11 | PV .= "+git" | ||
11 | 12 | ||
12 | UPSTREAM_CHECK_COMMITS = "1" | 13 | UPSTREAM_CHECK_COMMITS = "1" |
13 | 14 | ||
diff --git a/meta/recipes-core/util-linux/util-linux_2.39.3.bb b/meta/recipes-core/util-linux/util-linux_2.39.3.bb index 83b3f4e05b..2cd7750afc 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.3.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.3.bb | |||
@@ -148,7 +148,7 @@ SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" | |||
148 | SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" | 148 | SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" |
149 | 149 | ||
150 | do_compile:append () { | 150 | do_compile:append () { |
151 | cp ${WORKDIR}/fcntl-lock.c ${S}/fcntl-lock.c | 151 | cp ${UNPACKDIR}/fcntl-lock.c ${S}/fcntl-lock.c |
152 | ${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock | 152 | ${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock |
153 | } | 153 | } |
154 | 154 | ||
@@ -194,8 +194,8 @@ do_install () { | |||
194 | do_install:append:class-target () { | 194 | do_install:append:class-target () { |
195 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | 195 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then |
196 | install -d ${D}${sysconfdir}/pam.d | 196 | install -d ${D}${sysconfdir}/pam.d |
197 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 197 | install -m 0644 ${UNPACKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
198 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l | 198 | install -m 0644 ${UNPACKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l |
199 | # Required for "su -" aka "su --login" because | 199 | # Required for "su -" aka "su --login" because |
200 | # otherwise it uses "other", which has "auth pam_deny.so" | 200 | # otherwise it uses "other", which has "auth pam_deny.so" |
201 | # and thus prevents the operation. | 201 | # and thus prevents the operation. |
@@ -282,8 +282,11 @@ blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 | |||
282 | mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ | 282 | mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ |
283 | " | 283 | " |
284 | ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" | 284 | ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" |
285 | ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'chfn-chsh', 'chfn.1 chsh.1', '', d)}" | ||
285 | 286 | ||
286 | ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" | 287 | ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" |
288 | ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" | ||
289 | ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" | ||
287 | ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" | 290 | ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" |
288 | ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" | 291 | ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" |
289 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | 292 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" |
@@ -319,7 +322,7 @@ do_install_ptest() { | |||
319 | cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ | 322 | cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ |
320 | cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected | 323 | cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected |
321 | cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ | 324 | cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ |
322 | cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} | 325 | cp ${B}/config.h ${D}${PTEST_PATH} |
323 | 326 | ||
324 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest | 327 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest |
325 | 328 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index 8f74c639d5..05f1ed0dc5 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch | |||
@@ -19543,18 +19543,6 @@ index 3701bd8e796..9e36ae7c51c 100755 | |||
19543 | # FIXME: first we should search . and the directory the executable is in | 19543 | # FIXME: first we should search . and the directory the executable is in |
19544 | shlibpath_var=PATH | 19544 | shlibpath_var=PATH |
19545 | ;; | 19545 | ;; |
19546 | @@ -13596,7 +14245,11 @@ else | ||
19547 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
19548 | lt_status=$lt_dlunknown | ||
19549 | cat > conftest.$ac_ext <<_LT_EOF | ||
19550 | +<<<<<<< HEAD | ||
19551 | #line 13599 "configure" | ||
19552 | +======= | ||
19553 | +#line $LINENO "configure" | ||
19554 | +>>>>>>> b932158cf4c (Use libtool 2.4) | ||
19555 | #include "confdefs.h" | ||
19556 | |||
19557 | #if HAVE_DLFCN_H | ||
19558 | @@ -13640,10 +14293,10 @@ else | 19546 | @@ -13640,10 +14293,10 @@ else |
19559 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19547 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19560 | correspondingly for the symbols needed. */ | 19548 | correspondingly for the symbols needed. */ |
@@ -19568,18 +19556,6 @@ index 3701bd8e796..9e36ae7c51c 100755 | |||
19568 | int main () | 19556 | int main () |
19569 | { | 19557 | { |
19570 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 19558 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
19571 | @@ -13702,7 +14355,11 @@ else | ||
19572 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
19573 | lt_status=$lt_dlunknown | ||
19574 | cat > conftest.$ac_ext <<_LT_EOF | ||
19575 | +<<<<<<< HEAD | ||
19576 | #line 13705 "configure" | ||
19577 | +======= | ||
19578 | +#line $LINENO "configure" | ||
19579 | +>>>>>>> b932158cf4c (Use libtool 2.4) | ||
19580 | #include "confdefs.h" | ||
19581 | |||
19582 | #if HAVE_DLFCN_H | ||
19583 | @@ -13746,10 +14403,10 @@ else | 19559 | @@ -13746,10 +14403,10 @@ else |
19584 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19560 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19585 | correspondingly for the symbols needed. */ | 19561 | correspondingly for the symbols needed. */ |
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index 4d8ce4c741..8a211366bf 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | |||
@@ -132,7 +132,7 @@ do_install () { | |||
132 | 132 | ||
133 | oe_runmake install NO_PYTHON_COMPILE=1 | 133 | oe_runmake install NO_PYTHON_COMPILE=1 |
134 | install -d ${D}${sysconfdir}/init.d | 134 | install -d ${D}${sysconfdir}/init.d |
135 | install -m 0755 ${WORKDIR}/bootchartd_stop.sh ${D}${sysconfdir}/init.d | 135 | install -m 0755 ${UNPACKDIR}/bootchartd_stop.sh ${D}${sysconfdir}/init.d |
136 | 136 | ||
137 | echo 'EXIT_PROC="$EXIT_PROC matchbox-window-manager"' >> ${D}${sysconfdir}/bootchartd.conf | 137 | echo 'EXIT_PROC="$EXIT_PROC matchbox-window-manager"' >> ${D}${sysconfdir}/bootchartd.conf |
138 | 138 | ||
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb index 546d117156..7f89441fb4 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb | |||
@@ -54,9 +54,9 @@ do_install() { | |||
54 | # The following codes are here because eSDK needs to provide compatibilty | 54 | # The following codes are here because eSDK needs to provide compatibilty |
55 | # for SDK. That is, eSDK could also be used like traditional SDK. | 55 | # for SDK. That is, eSDK could also be used like traditional SDK. |
56 | mkdir -p ${D}${datadir}/cmake | 56 | mkdir -p ${D}${datadir}/cmake |
57 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | 57 | install -m 644 ${UNPACKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ |
58 | mkdir -p ${D}${base_prefix}/environment-setup.d | 58 | mkdir -p ${D}${base_prefix}/environment-setup.d |
59 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh | 59 | install -m 644 ${UNPACKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh |
60 | 60 | ||
61 | # Help docs create tons of files in the native sysroot and aren't needed there | 61 | # Help docs create tons of files in the native sysroot and aren't needed there |
62 | rm -rf ${D}${datadir}/cmake-*/Help | 62 | rm -rf ${D}${datadir}/cmake-*/Help |
diff --git a/meta/recipes-devtools/cmake/cmake_3.28.3.bb b/meta/recipes-devtools/cmake/cmake_3.28.3.bb index 6a9a3266df..9146fa8c0f 100644 --- a/meta/recipes-devtools/cmake/cmake_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake_3.28.3.bb | |||
@@ -48,15 +48,15 @@ EXTRA_OECMAKE=" \ | |||
48 | 48 | ||
49 | do_install:append:class-nativesdk() { | 49 | do_install:append:class-nativesdk() { |
50 | mkdir -p ${D}${datadir}/cmake | 50 | mkdir -p ${D}${datadir}/cmake |
51 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | 51 | install -m 644 ${UNPACKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ |
52 | 52 | ||
53 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 53 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
54 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh | 54 | install -m 644 ${UNPACKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh |
55 | 55 | ||
56 | # install cmake-setup.py to create arch-specific toolchain cmake file from template | 56 | # install cmake-setup.py to create arch-specific toolchain cmake file from template |
57 | install -m 0644 ${WORKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/ | 57 | install -m 0644 ${UNPACKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/ |
58 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 58 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
59 | install -m 0755 ${WORKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 59 | install -m 0755 ${UNPACKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
60 | } | 60 | } |
61 | 61 | ||
62 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" | 62 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" |
diff --git a/meta/recipes-devtools/distcc/distcc_3.4.bb b/meta/recipes-devtools/distcc/distcc_3.4.bb index 45fc7cde53..ab138b3ab6 100644 --- a/meta/recipes-devtools/distcc/distcc_3.4.bb +++ b/meta/recipes-devtools/distcc/distcc_3.4.bb | |||
@@ -50,10 +50,10 @@ do_install() { | |||
50 | oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install | 50 | oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install |
51 | install -d ${D}${sysconfdir}/init.d/ | 51 | install -d ${D}${sysconfdir}/init.d/ |
52 | install -d ${D}${sysconfdir}/default | 52 | install -d ${D}${sysconfdir}/default |
53 | install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ | 53 | install -m 0755 ${UNPACKDIR}/distcc ${D}${sysconfdir}/init.d/ |
54 | install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc | 54 | install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/distcc |
55 | install -d ${D}${systemd_system_unitdir}/ | 55 | install -d ${D}${systemd_system_unitdir}/ |
56 | install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_system_unitdir} | 56 | install -m 0644 ${UNPACKDIR}/distcc.service ${D}${systemd_system_unitdir} |
57 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service | 57 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service |
58 | } | 58 | } |
59 | 59 | ||
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index e4b4201b1f..bbd574e287 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://docbook.org" | |||
8 | # upgrading this recipe, please verify whether this is still needed. | 8 | # upgrading this recipe, please verify whether this is still needed. |
9 | 9 | ||
10 | LICENSE = "OASIS" | 10 | LICENSE = "OASIS" |
11 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" | 11 | LIC_FILES_CHKSUM = "file://${S}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" |
12 | 12 | ||
13 | # To support apps with xml schema backward compatibility, we must | 13 | # To support apps with xml schema backward compatibility, we must |
14 | # install a set of schemas. Install the latest based on PV and then | 14 | # install a set of schemas. Install the latest based on PV and then |
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.22.5.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb index 9f1d00e208..3f5f7395e0 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.22.5.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb | |||
@@ -17,6 +17,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main | |||
17 | 17 | ||
18 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" | 18 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" |
19 | 19 | ||
20 | SRCREV = "1c92a4a8bfbeea30ceb0109b096c4ec845e3c6ce" | 20 | SRCREV = "b2f9600ead232a2dd3c27f8b52807a9ca5854d17" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch index af1d8c626c..bfb6dcd89a 100644 --- a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch +++ b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch | |||
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com> | |||
3 | Date: Thu, 23 Mar 2017 13:44:41 +0200 | 3 | Date: Thu, 23 Mar 2017 13:44:41 +0200 |
4 | Subject: [PATCH] Resolve string formatting issues. | 4 | Subject: [PATCH] Resolve string formatting issues. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [upstream seems dead] | 6 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | --- | 8 | --- |
9 | exp_clib.c | 4 ++-- | 9 | exp_clib.c | 4 ++-- |
diff --git a/meta/recipes-devtools/expect/expect/0001-configure.in.patch b/meta/recipes-devtools/expect/expect/0001-configure.in.patch index 7595a254a8..618c4bee8e 100644 --- a/meta/recipes-devtools/expect/expect/0001-configure.in.patch +++ b/meta/recipes-devtools/expect/expect/0001-configure.in.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Allow cross compiling. | 1 | Allow cross compiling. |
2 | 2 | ||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | 3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
5 | --- | 5 | --- |
6 | diff -uNr a/configure.in b/configure.in | 6 | diff -uNr a/configure.in b/configure.in |
7 | --- a/configure.in 2012-12-14 15:31:32.623180450 +0100 | 7 | --- a/configure.in 2012-12-14 15:31:32.623180450 +0100 |
diff --git a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch index 37512fb9bc..d73f4c3421 100644 --- a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch +++ b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch | |||
@@ -10,7 +10,7 @@ Aborted (core dumped) | |||
10 | 10 | ||
11 | Use PATH_MAX to fix the problem. | 11 | Use PATH_MAX to fix the problem. |
12 | 12 | ||
13 | Upstream-Status: Pending [Upstream seems dead] | 13 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
14 | 14 | ||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
16 | --- | 16 | --- |
diff --git a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch index b1d322d5c9..40f7f3bd85 100644 --- a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch +++ b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch | |||
@@ -42,7 +42,7 @@ Example: | |||
42 | } | 42 | } |
43 | Author: Sergei Golovan <sgolovan@debian.org> | 43 | Author: Sergei Golovan <sgolovan@debian.org> |
44 | 44 | ||
45 | Upstream-Status: Pending | 45 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
46 | This patch is backported from fedora changes for expect: | 46 | This patch is backported from fedora changes for expect: |
47 | http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/ | 47 | http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/ |
48 | ?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3 | 48 | ?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3 |
diff --git a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch index dc4c6ba406..eb178f462a 100644 --- a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch +++ b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Use proper -L path when cross compiling. | 1 | Use proper -L path when cross compiling. |
2 | 2 | ||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | 3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
5 | --- | 5 | --- |
6 | diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 | 6 | diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 |
7 | --- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100 | 7 | --- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100 |
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 7b610b1ff2..18904ebc10 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb | |||
@@ -81,3 +81,7 @@ FILES:${PN} += "${libdir}/libexpect${PV}.so \ | |||
81 | " | 81 | " |
82 | 82 | ||
83 | BBCLASSEXTEND = "native nativesdk" | 83 | BBCLASSEXTEND = "native nativesdk" |
84 | |||
85 | # http://errors.yoctoproject.org/Errors/Details/766950/ | ||
86 | # expect5.45.4/exp_chan.c:62:5: error: initialization of 'struct Tcl_ChannelTypeVersion_ *' from incompatible pointer type 'int (*)(void *, int)' [-Wincompatible-pointer-types] | ||
87 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index f9d864b987..95a7d5485b 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb | |||
@@ -24,7 +24,7 @@ do_compile[noexec] = "1" | |||
24 | do_install () { | 24 | do_install () { |
25 | install -d ${D}${datadir}/gnu-config \ | 25 | install -d ${D}${datadir}/gnu-config \ |
26 | ${D}${bindir} | 26 | ${D}${bindir} |
27 | cat ${WORKDIR}/gnu-configize.in | \ | 27 | cat ${UNPACKDIR}/gnu-configize.in | \ |
28 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ | 28 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ |
29 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize | 29 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize |
30 | # In the native case we want the system perl as perl-native can't have built yet | 30 | # In the native case we want the system perl as perl-native can't have built yet |
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 3f1e795dd9..413cf6d33f 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc | |||
@@ -15,7 +15,7 @@ export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-pr | |||
15 | export GOCACHE = "${B}/.cache" | 15 | export GOCACHE = "${B}/.cache" |
16 | 16 | ||
17 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" | 17 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" |
18 | GO_SHLIB_LDFLAGS ?= '-ldflags="--linkmode=external -extldflags '${GO_EXTLDFLAGS}'"' | 18 | GO_SHLIB_LDFLAGS ?= '-ldflags="-extldflags '${GO_EXTLDFLAGS}'"' |
19 | 19 | ||
20 | do_configure() { | 20 | do_configure() { |
21 | : | 21 | : |
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb index 1826c7a40e..56a9321fb9 100644 --- a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb | |||
@@ -30,7 +30,7 @@ S = "${WORKDIR}" | |||
30 | 30 | ||
31 | do_install() { | 31 | do_install() { |
32 | install -d ${D}/${bindir} | 32 | install -d ${D}/${bindir} |
33 | install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} | 33 | install -m 0755 ${S}/icecc-create-env ${D}/${bindir} |
34 | } | 34 | } |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb index 034a0047d7..d03d8adcb0 100644 --- a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb +++ b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | SUMMARY = "Generates Icecream toolchain for SDK" | 3 | SUMMARY = "Generates Icecream toolchain for SDK" |
4 | DESCRIPTION = "${SUMMARY}" | 4 | DESCRIPTION = "${SUMMARY}" |
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/icecc-env.sh;beginline=2;endline=20;md5=dd6b68c1efed8a9fb04e409b3b287d47" | 6 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/icecc-env.sh;beginline=2;endline=20;md5=dd6b68c1efed8a9fb04e409b3b287d47" |
7 | 7 | ||
8 | INHIBIT_DEFAULT_DEPS = "1" | 8 | INHIBIT_DEFAULT_DEPS = "1" |
9 | 9 | ||
@@ -23,12 +23,12 @@ do_install() { | |||
23 | install -d ${D}${SDKPATHNATIVE}${datadir}/icecream/bin | 23 | install -d ${D}${SDKPATHNATIVE}${datadir}/icecream/bin |
24 | 24 | ||
25 | install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ | 25 | install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ |
26 | install -m 0644 ${WORKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/ | 26 | install -m 0644 ${UNPACKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/ |
27 | sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \ | 27 | sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \ |
28 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' | 28 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' |
29 | 29 | ||
30 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 30 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
31 | install -m 0755 ${WORKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 31 | install -m 0755 ${UNPACKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
32 | sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \ | 32 | sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \ |
33 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' | 33 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' |
34 | } | 34 | } |
diff --git a/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch b/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch index 48af6fc283..a5c53b6657 100644 --- a/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch +++ b/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 86940d87026432683fb6741cd8a34d3b9b18e40d Mon Sep 17 00:00:00 2001 | 1 | From 3b30a9bda88374e8f03bf96e972aee5bd214b98b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 27 Nov 2020 10:11:08 +0000 | 3 | Date: Fri, 27 Nov 2020 10:11:08 +0000 |
4 | Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well | 4 | Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 4 insertions(+), 1 deletion(-) | 14 | 1 file changed, 4 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp | 16 | diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp |
17 | index ccf0959389b..1f801e83b7d 100644 | 17 | index 73724e662f9e..1ca9c73415db 100644 |
18 | --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp | 18 | --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp |
19 | +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp | 19 | +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp |
20 | @@ -359,7 +359,10 @@ public: | 20 | @@ -361,7 +361,10 @@ public: |
21 | // name of a class shouldn't be significant. However, some of the backends | 21 | // name of a class shouldn't be significant. However, some of the backends |
22 | // accidentally rely on this behaviour, so it will have to stay like this | 22 | // accidentally rely on this behaviour, so it will have to stay like this |
23 | // until they are fixed. | 23 | // until they are fixed. |
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_18.1.5.bb index c4fd73f2d7..9c80b46b60 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_18.1.5.bb | |||
@@ -13,27 +13,26 @@ DEPENDS = "libffi libxml2 zlib zstd libedit ninja-native llvm-native" | |||
13 | RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" | 13 | RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" |
14 | 14 | ||
15 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
16 | |||
17 | # could be 'rcX' or 'git' or empty ( for release ) | 16 | # could be 'rcX' or 'git' or empty ( for release ) |
18 | VER_SUFFIX = "" | 17 | VER_SUFFIX = "" |
19 | 18 | ||
20 | PV = "18.1.3${VER_SUFFIX}" | 19 | PV .= "${VER_SUFFIX}" |
21 | 20 | ||
22 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | 21 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" |
23 | 22 | ||
24 | LLVM_RELEASE = "${PV}" | 23 | LLVM_RELEASE = "${PV}" |
25 | 24 | ||
26 | BRANCH = "release/${MAJOR_VERSION}.x" | 25 | SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/llvm-project-${PV}.src.tar.xz \ |
27 | SRCREV = "c13b7485b87909fcf739f62cfa382b55407433c0" | ||
28 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ | ||
29 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ | 26 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ |
30 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ | 27 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ |
31 | file://llvm-config \ | 28 | file://llvm-config \ |
32 | " | 29 | " |
30 | SRC_URI[sha256sum] = "3591a52761a7d390ede51af01ea73abfecc4b1d16445f9d019b67a57edd7de56" | ||
33 | 31 | ||
34 | UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project" |
33 | UPSTREAM_CHECK_REGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" | ||
35 | 34 | ||
36 | S = "${WORKDIR}/git/llvm" | 35 | S = "${WORKDIR}/llvm-project-${PV}.src/llvm" |
37 | 36 | ||
38 | LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" | 37 | LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" |
39 | 38 | ||
@@ -134,7 +133,7 @@ SYSROOT_PREPROCESS_FUNCS:append:class-target = " llvm_sysroot_preprocess" | |||
134 | 133 | ||
135 | llvm_sysroot_preprocess() { | 134 | llvm_sysroot_preprocess() { |
136 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | 135 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ |
137 | install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | 136 | install -m 0755 ${UNPACKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ |
138 | ln -sf llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} | 137 | ln -sf llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} |
139 | } | 138 | } |
140 | 139 | ||
diff --git a/meta/recipes-devtools/lua/lua_5.4.6.bb b/meta/recipes-devtools/lua/lua_5.4.6.bb index eabfc89575..65f19ae247 100644 --- a/meta/recipes-devtools/lua/lua_5.4.6.bb +++ b/meta/recipes-devtools/lua/lua_5.4.6.bb | |||
@@ -44,8 +44,8 @@ do_install () { | |||
44 | install | 44 | install |
45 | install -d ${D}${libdir}/pkgconfig | 45 | install -d ${D}${libdir}/pkgconfig |
46 | 46 | ||
47 | sed -e s/@VERSION@/${PV}/ -e s#@LIBDIR@#${libdir}# -e s#@INCLUDEDIR@#${includedir}# ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc | 47 | sed -e s/@VERSION@/${PV}/ -e s#@LIBDIR@#${libdir}# -e s#@INCLUDEDIR@#${includedir}# ${UNPACKDIR}/lua.pc.in > ${S}/lua.pc |
48 | install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ | 48 | install -m 0644 ${S}/lua.pc ${D}${libdir}/pkgconfig/ |
49 | rmdir ${D}${datadir}/lua/5.4 | 49 | rmdir ${D}${datadir}/lua/5.4 |
50 | rmdir ${D}${datadir}/lua | 50 | rmdir ${D}${datadir}/lua |
51 | } | 51 | } |
diff --git a/meta/recipes-devtools/meson/meson_1.3.1.bb b/meta/recipes-devtools/meson/meson_1.3.1.bb index 9cc0cc31ab..3d2eedca10 100644 --- a/meta/recipes-devtools/meson/meson_1.3.1.bb +++ b/meta/recipes-devtools/meson/meson_1.3.1.bb | |||
@@ -132,11 +132,11 @@ do_install:append:class-nativesdk() { | |||
132 | install_templates | 132 | install_templates |
133 | 133 | ||
134 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 134 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
135 | install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 135 | install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
136 | 136 | ||
137 | # We need to wrap the real meson with a thin env setup wrapper. | 137 | # We need to wrap the real meson with a thin env setup wrapper. |
138 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real | 138 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real |
139 | install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson | 139 | install -m 0755 ${UNPACKDIR}/meson-wrapper ${D}${bindir}/meson |
140 | } | 140 | } |
141 | 141 | ||
142 | FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" | 142 | FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" |
@@ -149,10 +149,10 @@ do_install:append:class-native() { | |||
149 | install_templates | 149 | install_templates |
150 | 150 | ||
151 | install -d ${D}${datadir}/post-relocate-setup.d | 151 | install -d ${D}${datadir}/post-relocate-setup.d |
152 | install -m 0755 ${WORKDIR}/meson-setup.py ${D}${datadir}/post-relocate-setup.d/ | 152 | install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${datadir}/post-relocate-setup.d/ |
153 | 153 | ||
154 | # We need to wrap the real meson with a thin wrapper that substitues native/cross files | 154 | # We need to wrap the real meson with a thin wrapper that substitues native/cross files |
155 | # when running in a direct SDK environment. | 155 | # when running in a direct SDK environment. |
156 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real | 156 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real |
157 | install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson | 157 | install -m 0755 ${UNPACKDIR}/meson-wrapper ${D}${bindir}/meson |
158 | } | 158 | } |
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index a7e4d369ff..7c6be93a9c 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" | |||
5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" | 5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" |
6 | 6 | ||
7 | SRCBRANCH ?= "master" | 7 | SRCBRANCH ?= "master" |
8 | SRCREV = "b5ca140312d279ad2f22068fd72a6230eea13436" | 8 | SRCREV = "f757f413dea4a143ad7c3b48b8264176f0499a82" |
9 | 9 | ||
10 | PV = "0.1+git" | 10 | PV = "0.1+git" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/ninja/ninja_1.11.1.bb b/meta/recipes-devtools/ninja/ninja_1.12.0.bb index 8e297ec4d4..ef7f80d0ae 100644 --- a/meta/recipes-devtools/ninja/ninja_1.11.1.bb +++ b/meta/recipes-devtools/ninja/ninja_1.12.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" | |||
6 | 6 | ||
7 | DEPENDS = "re2c-native ninja-native" | 7 | DEPENDS = "re2c-native ninja-native" |
8 | 8 | ||
9 | SRCREV = "a524bf3f6bacd1b4ad85d719eed2737d8562f27a" | 9 | SRCREV = "65d0dfcbbea6b8ca7d8a3a0f673ecb522379e43c" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" | 11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" |
12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" |
diff --git a/meta/recipes-devtools/opkg/opkg_0.6.3.bb b/meta/recipes-devtools/opkg/opkg_0.6.3.bb index 9592ffc5d6..ef7c4f3a72 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.3.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.3.bb | |||
@@ -47,7 +47,7 @@ EXTRA_OECONF:append:class-native = " --localstatedir=/${@os.path.relpath('${loca | |||
47 | 47 | ||
48 | do_install:append () { | 48 | do_install:append () { |
49 | install -d ${D}${sysconfdir}/opkg | 49 | install -d ${D}${sysconfdir}/opkg |
50 | install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf | 50 | install -m 0644 ${UNPACKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf |
51 | echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf | 51 | echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf |
52 | echo "option info_dir ${OPKGLIBDIR}/opkg/info" >>${D}${sysconfdir}/opkg/opkg.conf | 52 | echo "option info_dir ${OPKGLIBDIR}/opkg/info" >>${D}${sysconfdir}/opkg/opkg.conf |
53 | echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf | 53 | echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf |
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb index e98458ea55..5f4ef73d43 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb | |||
@@ -29,18 +29,18 @@ EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig | |||
29 | do_install:append () { | 29 | do_install:append () { |
30 | # Install a wrapper which deals, as much as possible with pkgconf vs | 30 | # Install a wrapper which deals, as much as possible with pkgconf vs |
31 | # pkg-config compatibility issues. | 31 | # pkg-config compatibility issues. |
32 | install -m 0755 "${WORKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" | 32 | install -m 0755 "${UNPACKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" |
33 | } | 33 | } |
34 | 34 | ||
35 | do_install:append:class-native () { | 35 | do_install:append:class-native () { |
36 | # Install a pkg-config-native wrapper that will use the native sysroot instead | 36 | # Install a pkg-config-native wrapper that will use the native sysroot instead |
37 | # of the MACHINE sysroot, for using pkg-config when building native tools. | 37 | # of the MACHINE sysroot, for using pkg-config when building native tools. |
38 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 38 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
39 | < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native | 39 | < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native |
40 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native | 40 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native |
41 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 41 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
42 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 42 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
43 | < ${WORKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk | 43 | < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk |
44 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk | 44 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk |
45 | } | 45 | } |
46 | 46 | ||
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 16e6c5b609..6f13d0177e 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | |||
@@ -51,11 +51,11 @@ RPROVIDES:${PN} += "pkgconfig(pkg-config)" | |||
51 | do_install:append:class-native () { | 51 | do_install:append:class-native () { |
52 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 52 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
53 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 53 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
54 | < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native | 54 | < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native |
55 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native | 55 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native |
56 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 56 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
57 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 57 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
58 | < ${WORKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk | 58 | < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk |
59 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk | 59 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk |
60 | } | 60 | } |
61 | 61 | ||
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 7e09b6d58c..36283ffa74 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -133,8 +133,8 @@ do_install:append:class-native () { | |||
133 | chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/` | 133 | chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/` |
134 | install -d ${D}${sysconfdir} | 134 | install -d ${D}${sysconfdir} |
135 | # The fallback files should never be modified | 135 | # The fallback files should never be modified |
136 | install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd | 136 | install -m 444 ${UNPACKDIR}/fallback-passwd ${D}${sysconfdir}/passwd |
137 | install -m 444 ${WORKDIR}/fallback-group ${D}${sysconfdir}/group | 137 | install -m 444 ${UNPACKDIR}/fallback-group ${D}${sysconfdir}/group |
138 | 138 | ||
139 | # Two native/nativesdk entries below are the same | 139 | # Two native/nativesdk entries below are the same |
140 | # If necessary install for the alternative machine arch. This is only | 140 | # If necessary install for the alternative machine arch. This is only |
diff --git a/meta/recipes-devtools/python/python-cython.inc b/meta/recipes-devtools/python/python-cython.inc index 2235aa9332..87a2e88a1a 100644 --- a/meta/recipes-devtools/python/python-cython.inc +++ b/meta/recipes-devtools/python/python-cython.inc | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=61c3ee8961575861fa86c7e62bc9f69c" | |||
9 | PYPI_PACKAGE = "Cython" | 9 | PYPI_PACKAGE = "Cython" |
10 | BBCLASSEXTEND = "native nativesdk" | 10 | BBCLASSEXTEND = "native nativesdk" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "a2d354f059d1f055d34cfaa62c5b68bc78ac2ceab6407148d47fb508cf3ba4f3" | 12 | SRC_URI[sha256sum] = "dcc96739331fb854dcf503f94607576cfe8488066c61ca50dfd55836f132de99" |
13 | UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" | 13 | UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" |
14 | 14 | ||
15 | inherit pypi | 15 | inherit pypi |
diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb b/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb index 93fa645f33..57b08b3700 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb | |||
@@ -33,5 +33,4 @@ RDEPENDS:${PN}:class-target += "\ | |||
33 | python3-cffi \ | 33 | python3-cffi \ |
34 | python3-ctypes \ | 34 | python3-ctypes \ |
35 | python3-shell \ | 35 | python3-shell \ |
36 | python3-six \ | ||
37 | " | 36 | " |
diff --git a/meta/recipes-devtools/python/python3-beartype_0.18.2.bb b/meta/recipes-devtools/python/python3-beartype_0.18.5.bb index 1b6ab6a42b..04fbd3139f 100644 --- a/meta/recipes-devtools/python/python3-beartype_0.18.2.bb +++ b/meta/recipes-devtools/python/python3-beartype_0.18.5.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://beartype.readthedocs.io" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e71f94261c1b39896cacacfeaf60560e" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e71f94261c1b39896cacacfeaf60560e" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "a6fbc0be9269889312388bfec6a9ddf41bf8fe31b68bcf9c8239db35cd38f411" | 7 | SRC_URI[sha256sum] = "264ddc2f1da9ec94ff639141fbe33d22e12a9f75aa863b83b7046ffff1381927" |
8 | 8 | ||
9 | inherit setuptools3 pypi | 9 | inherit setuptools3 pypi |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-cython_3.0.9.bb b/meta/recipes-devtools/python/python3-cython_3.0.10.bb index 07638d7ad7..07638d7ad7 100644 --- a/meta/recipes-devtools/python/python3-cython_3.0.9.bb +++ b/meta/recipes-devtools/python/python3-cython_3.0.10.bb | |||
diff --git a/meta/recipes-devtools/python/python3-dtschema_2024.2.bb b/meta/recipes-devtools/python/python3-dtschema_2024.4.bb index 0e911dfb3d..9583cd57b9 100644 --- a/meta/recipes-devtools/python/python3-dtschema_2024.2.bb +++ b/meta/recipes-devtools/python/python3-dtschema_2024.4.bb | |||
@@ -7,7 +7,7 @@ inherit pypi python_setuptools_build_meta | |||
7 | 7 | ||
8 | PYPI_PACKAGE = "dtschema" | 8 | PYPI_PACKAGE = "dtschema" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "df4e5afb35bda93894209d2465e87fb7103f1a95a05909ebcb594fc4cf4fdd1e" | 10 | SRC_URI[sha256sum] = "18dd1d34b4a5e451291e5444e9ceb4a6febc605871cdaef22673b6f80aa4a131" |
11 | 11 | ||
12 | DEPENDS += "python3-setuptools-scm-native" | 12 | DEPENDS += "python3-setuptools-scm-native" |
13 | RDEPENDS:${PN} += "\ | 13 | RDEPENDS:${PN} += "\ |
diff --git a/meta/recipes-devtools/python/python3-hatchling_1.22.4.bb b/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb index d2f32d8b1a..fc8d953281 100644 --- a/meta/recipes-devtools/python/python3-hatchling_1.22.4.bb +++ b/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb | |||
@@ -8,7 +8,7 @@ inherit pypi python_hatchling | |||
8 | DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" | 8 | DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" |
9 | DEPENDS:remove:class-native = "python3-hatchling-native" | 9 | DEPENDS:remove:class-native = "python3-hatchling-native" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "8a2dcec96d7fb848382ef5848e5ac43fdae641f35a08a3fab5116bd495f3416e" | 11 | SRC_URI[sha256sum] = "51f861891e98c4044eb455163a737e5d2328d7aa74890b182db2d80fee22a497" |
12 | 12 | ||
13 | do_compile:prepend() { | 13 | do_compile:prepend() { |
14 | export PYTHONPATH=src | 14 | export PYTHONPATH=src |
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.99.4.bb b/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb index 64b8cf2c31..af7facfe7e 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.99.4.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb | |||
@@ -13,7 +13,7 @@ SRC_URI += " \ | |||
13 | file://test_rle.py \ | 13 | file://test_rle.py \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "edc8f984dba5d1b69a6a4564246b7850fa7ec351d2b27c9e7a43c91deab8d45c" | 16 | SRC_URI[sha256sum] = "ebff09d7fa4f1fb6a855a812baf17e578b4481b7b70ec6d96496210d1a4c6c35" |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-attrs \ | 19 | python3-attrs \ |
diff --git a/meta/recipes-devtools/python/python3-idna_3.6.bb b/meta/recipes-devtools/python/python3-idna_3.7.bb index 47c080cdf8..729aff1c46 100644 --- a/meta/recipes-devtools/python/python3-idna_3.6.bb +++ b/meta/recipes-devtools/python/python3-idna_3.7.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "Internationalised Domain Names in Applications" | 1 | SUMMARY = "Internationalised Domain Names in Applications" |
2 | HOMEPAGE = "https://github.com/kjd/idna" | 2 | HOMEPAGE = "https://github.com/kjd/idna" |
3 | LICENSE = "BSD-3-Clause & Python-2.0 & Unicode-TOU" | 3 | LICENSE = "BSD-3-Clause & Python-2.0 & Unicode-TOU" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dbec47b98e1469f6a104c82ff9698cee" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca" | 6 | SRC_URI[sha256sum] = "028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc" |
7 | 7 | ||
8 | inherit pypi python_flit_core | 8 | inherit pypi python_flit_core |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-lxml_5.1.0.bb b/meta/recipes-devtools/python/python3-lxml_5.2.1.bb index 43719086f0..44a10505f3 100644 --- a/meta/recipes-devtools/python/python3-lxml_5.1.0.bb +++ b/meta/recipes-devtools/python/python3-lxml_5.2.1.bb | |||
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ | |||
18 | 18 | ||
19 | DEPENDS += "libxml2 libxslt" | 19 | DEPENDS += "libxml2 libxslt" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "3eea6ed6e6c918e468e693c41ef07f3c3acc310b70ddd9cc72d9ef84bc9564ca" | 21 | SRC_URI[sha256sum] = "3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306" |
22 | 22 | ||
23 | SRC_URI += "${PYPI_SRC_URI}" | 23 | SRC_URI += "${PYPI_SRC_URI}" |
24 | inherit pkgconfig pypi setuptools3 | 24 | inherit pkgconfig pypi setuptools3 |
diff --git a/meta/recipes-devtools/python/python3-mako_1.3.2.bb b/meta/recipes-devtools/python/python3-mako_1.3.3.bb index 5b7df9192f..7545cbef99 100644 --- a/meta/recipes-devtools/python/python3-mako_1.3.2.bb +++ b/meta/recipes-devtools/python/python3-mako_1.3.3.bb | |||
@@ -8,7 +8,7 @@ PYPI_PACKAGE = "Mako" | |||
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "2a0c8ad7f6274271b3bb7467dd37cf9cc6dab4bc19cb69a4ef10669402de698e" | 11 | SRC_URI[sha256sum] = "e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73" |
12 | 12 | ||
13 | RDEPENDS:${PN} = "python3-html \ | 13 | RDEPENDS:${PN} = "python3-html \ |
14 | python3-markupsafe \ | 14 | python3-markupsafe \ |
diff --git a/meta/recipes-devtools/python/python3-maturin-crates.inc b/meta/recipes-devtools/python/python3-maturin-crates.inc index 3cb614d52a..ba207458ef 100644 --- a/meta/recipes-devtools/python/python3-maturin-crates.inc +++ b/meta/recipes-devtools/python/python3-maturin-crates.inc | |||
@@ -3,24 +3,22 @@ | |||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/adler/1.0.2 \ | 5 | crate://crates.io/adler/1.0.2 \ |
6 | crate://crates.io/ahash/0.8.6 \ | 6 | crate://crates.io/ahash/0.8.7 \ |
7 | crate://crates.io/aho-corasick/1.1.2 \ | 7 | crate://crates.io/aho-corasick/1.1.2 \ |
8 | crate://crates.io/allocator-api2/0.2.16 \ | 8 | crate://crates.io/allocator-api2/0.2.16 \ |
9 | crate://crates.io/anstream/0.3.2 \ | 9 | crate://crates.io/anstream/0.6.11 \ |
10 | crate://crates.io/anstream/0.6.4 \ | 10 | crate://crates.io/anstyle/1.0.4 \ |
11 | crate://crates.io/anstyle/1.0.2 \ | 11 | crate://crates.io/anstyle-parse/0.2.3 \ |
12 | crate://crates.io/anstyle-parse/0.2.1 \ | 12 | crate://crates.io/anstyle-query/1.0.2 \ |
13 | crate://crates.io/anstyle-query/1.0.0 \ | 13 | crate://crates.io/anstyle-wincon/3.0.2 \ |
14 | crate://crates.io/anstyle-wincon/1.0.2 \ | 14 | crate://crates.io/anyhow/1.0.80 \ |
15 | crate://crates.io/anstyle-wincon/3.0.1 \ | ||
16 | crate://crates.io/anyhow/1.0.75 \ | ||
17 | crate://crates.io/autocfg/1.1.0 \ | 15 | crate://crates.io/autocfg/1.1.0 \ |
18 | crate://crates.io/base64/0.13.1 \ | 16 | crate://crates.io/base64/0.13.1 \ |
19 | crate://crates.io/base64/0.21.5 \ | 17 | crate://crates.io/base64/0.21.7 \ |
20 | crate://crates.io/bitflags/1.3.2 \ | 18 | crate://crates.io/bitflags/1.3.2 \ |
21 | crate://crates.io/bitflags/2.4.1 \ | 19 | crate://crates.io/bitflags/2.4.2 \ |
22 | crate://crates.io/block-buffer/0.10.4 \ | 20 | crate://crates.io/block-buffer/0.10.4 \ |
23 | crate://crates.io/bstr/1.8.0 \ | 21 | crate://crates.io/bstr/1.9.0 \ |
24 | crate://crates.io/byteorder/1.5.0 \ | 22 | crate://crates.io/byteorder/1.5.0 \ |
25 | crate://crates.io/bytes/1.5.0 \ | 23 | crate://crates.io/bytes/1.5.0 \ |
26 | crate://crates.io/bytesize/1.3.0 \ | 24 | crate://crates.io/bytesize/1.3.0 \ |
@@ -28,42 +26,42 @@ SRC_URI += " \ | |||
28 | crate://crates.io/bzip2-sys/0.1.11+1.0.8 \ | 26 | crate://crates.io/bzip2-sys/0.1.11+1.0.8 \ |
29 | crate://crates.io/cab/0.4.1 \ | 27 | crate://crates.io/cab/0.4.1 \ |
30 | crate://crates.io/camino/1.1.6 \ | 28 | crate://crates.io/camino/1.1.6 \ |
31 | crate://crates.io/cargo-config2/0.1.16 \ | 29 | crate://crates.io/cargo-config2/0.1.19 \ |
32 | crate://crates.io/cargo-options/0.7.2 \ | 30 | crate://crates.io/cargo-options/0.7.2 \ |
33 | crate://crates.io/cargo-platform/0.1.5 \ | 31 | crate://crates.io/cargo-platform/0.1.6 \ |
34 | crate://crates.io/cargo-xwin/0.16.2 \ | 32 | crate://crates.io/cargo-xwin/0.16.4 \ |
35 | crate://crates.io/cargo-zigbuild/0.18.0 \ | 33 | crate://crates.io/cargo-zigbuild/0.18.3 \ |
36 | crate://crates.io/cargo_metadata/0.18.1 \ | 34 | crate://crates.io/cargo_metadata/0.18.1 \ |
37 | crate://crates.io/cbindgen/0.26.0 \ | 35 | crate://crates.io/cbindgen/0.26.0 \ |
38 | crate://crates.io/cc/1.0.83 \ | 36 | crate://crates.io/cc/1.0.88 \ |
39 | crate://crates.io/cfb/0.9.0 \ | 37 | crate://crates.io/cfb/0.9.0 \ |
40 | crate://crates.io/cfg-if/1.0.0 \ | 38 | crate://crates.io/cfg-if/1.0.0 \ |
41 | crate://crates.io/charset/0.1.3 \ | 39 | crate://crates.io/charset/0.1.3 \ |
42 | crate://crates.io/chumsky/0.9.3 \ | 40 | crate://crates.io/chumsky/0.9.3 \ |
43 | crate://crates.io/clap/4.3.24 \ | 41 | crate://crates.io/clap/4.4.18 \ |
44 | crate://crates.io/clap_builder/4.3.24 \ | 42 | crate://crates.io/clap_builder/4.4.18 \ |
45 | crate://crates.io/clap_complete/4.3.2 \ | 43 | crate://crates.io/clap_complete/4.4.9 \ |
46 | crate://crates.io/clap_complete_command/0.5.1 \ | 44 | crate://crates.io/clap_complete_command/0.5.1 \ |
47 | crate://crates.io/clap_complete_fig/4.3.1 \ | ||
48 | crate://crates.io/clap_complete_nushell/0.1.11 \ | 45 | crate://crates.io/clap_complete_nushell/0.1.11 \ |
49 | crate://crates.io/clap_derive/4.3.12 \ | 46 | crate://crates.io/clap_derive/4.4.7 \ |
50 | crate://crates.io/clap_lex/0.5.0 \ | 47 | crate://crates.io/clap_lex/0.6.0 \ |
51 | crate://crates.io/cli-table/0.4.7 \ | 48 | crate://crates.io/cli-table/0.4.7 \ |
52 | crate://crates.io/colorchoice/1.0.0 \ | 49 | crate://crates.io/colorchoice/1.0.0 \ |
53 | crate://crates.io/configparser/3.0.3 \ | 50 | crate://crates.io/configparser/3.0.4 \ |
54 | crate://crates.io/console/0.15.7 \ | 51 | crate://crates.io/console/0.15.8 \ |
55 | crate://crates.io/content_inspector/0.2.4 \ | 52 | crate://crates.io/content_inspector/0.2.4 \ |
56 | crate://crates.io/core-foundation/0.9.3 \ | 53 | crate://crates.io/core-foundation/0.9.4 \ |
57 | crate://crates.io/core-foundation-sys/0.8.4 \ | 54 | crate://crates.io/core-foundation-sys/0.8.6 \ |
58 | crate://crates.io/cpufeatures/0.2.11 \ | 55 | crate://crates.io/cpufeatures/0.2.12 \ |
59 | crate://crates.io/crc32fast/1.3.2 \ | 56 | crate://crates.io/crc32fast/1.3.2 \ |
60 | crate://crates.io/crossbeam-channel/0.5.8 \ | 57 | crate://crates.io/crossbeam-channel/0.5.11 \ |
61 | crate://crates.io/crossbeam-deque/0.8.3 \ | 58 | crate://crates.io/crossbeam-deque/0.8.5 \ |
62 | crate://crates.io/crossbeam-epoch/0.9.15 \ | 59 | crate://crates.io/crossbeam-epoch/0.9.18 \ |
63 | crate://crates.io/crossbeam-utils/0.8.16 \ | 60 | crate://crates.io/crossbeam-utils/0.8.19 \ |
64 | crate://crates.io/crypto-common/0.1.6 \ | 61 | crate://crates.io/crypto-common/0.1.6 \ |
65 | crate://crates.io/data-encoding/2.5.0 \ | 62 | crate://crates.io/data-encoding/2.5.0 \ |
66 | crate://crates.io/deranged/0.3.9 \ | 63 | crate://crates.io/deranged/0.3.11 \ |
64 | crate://crates.io/derivative/2.2.0 \ | ||
67 | crate://crates.io/dialoguer/0.11.0 \ | 65 | crate://crates.io/dialoguer/0.11.0 \ |
68 | crate://crates.io/diff/0.1.13 \ | 66 | crate://crates.io/diff/0.1.13 \ |
69 | crate://crates.io/digest/0.10.7 \ | 67 | crate://crates.io/digest/0.10.7 \ |
@@ -78,8 +76,8 @@ SRC_URI += " \ | |||
78 | crate://crates.io/errno/0.3.8 \ | 76 | crate://crates.io/errno/0.3.8 \ |
79 | crate://crates.io/expect-test/1.4.1 \ | 77 | crate://crates.io/expect-test/1.4.1 \ |
80 | crate://crates.io/fastrand/2.0.1 \ | 78 | crate://crates.io/fastrand/2.0.1 \ |
81 | crate://crates.io/fat-macho/0.4.7 \ | 79 | crate://crates.io/fat-macho/0.4.8 \ |
82 | crate://crates.io/filetime/0.2.22 \ | 80 | crate://crates.io/filetime/0.2.23 \ |
83 | crate://crates.io/flate2/1.0.28 \ | 81 | crate://crates.io/flate2/1.0.28 \ |
84 | crate://crates.io/fnv/1.0.7 \ | 82 | crate://crates.io/fnv/1.0.7 \ |
85 | crate://crates.io/foreign-types/0.3.2 \ | 83 | crate://crates.io/foreign-types/0.3.2 \ |
@@ -87,47 +85,42 @@ SRC_URI += " \ | |||
87 | crate://crates.io/form_urlencoded/1.2.1 \ | 85 | crate://crates.io/form_urlencoded/1.2.1 \ |
88 | crate://crates.io/fs-err/2.11.0 \ | 86 | crate://crates.io/fs-err/2.11.0 \ |
89 | crate://crates.io/generic-array/0.14.7 \ | 87 | crate://crates.io/generic-array/0.14.7 \ |
90 | crate://crates.io/getrandom/0.2.11 \ | 88 | crate://crates.io/getrandom/0.2.12 \ |
91 | crate://crates.io/glob/0.3.1 \ | 89 | crate://crates.io/glob/0.3.1 \ |
92 | crate://crates.io/globset/0.4.14 \ | 90 | crate://crates.io/globset/0.4.14 \ |
93 | crate://crates.io/goblin/0.7.1 \ | 91 | crate://crates.io/goblin/0.8.0 \ |
94 | crate://crates.io/hashbrown/0.12.3 \ | 92 | crate://crates.io/hashbrown/0.12.3 \ |
95 | crate://crates.io/hashbrown/0.14.3 \ | 93 | crate://crates.io/hashbrown/0.14.3 \ |
96 | crate://crates.io/heck/0.4.1 \ | 94 | crate://crates.io/heck/0.4.1 \ |
97 | crate://crates.io/hermit-abi/0.3.3 \ | 95 | crate://crates.io/home/0.5.9 \ |
98 | crate://crates.io/home/0.5.5 \ | ||
99 | crate://crates.io/humantime/2.1.0 \ | 96 | crate://crates.io/humantime/2.1.0 \ |
100 | crate://crates.io/humantime-serde/1.1.1 \ | 97 | crate://crates.io/humantime-serde/1.1.1 \ |
101 | crate://crates.io/idna/0.5.0 \ | 98 | crate://crates.io/idna/0.5.0 \ |
102 | crate://crates.io/ignore/0.4.20 \ | 99 | crate://crates.io/ignore/0.4.22 \ |
103 | crate://crates.io/indexmap/1.9.3 \ | 100 | crate://crates.io/indexmap/1.9.3 \ |
104 | crate://crates.io/indexmap/2.1.0 \ | 101 | crate://crates.io/indexmap/2.2.3 \ |
105 | crate://crates.io/indicatif/0.17.7 \ | 102 | crate://crates.io/indicatif/0.17.7 \ |
106 | crate://crates.io/indoc/2.0.4 \ | 103 | crate://crates.io/indoc/2.0.4 \ |
107 | crate://crates.io/instant/0.1.12 \ | 104 | crate://crates.io/instant/0.1.12 \ |
108 | crate://crates.io/io-lifetimes/1.0.11 \ | ||
109 | crate://crates.io/is-terminal/0.4.9 \ | ||
110 | crate://crates.io/itertools/0.11.0 \ | 105 | crate://crates.io/itertools/0.11.0 \ |
111 | crate://crates.io/itertools/0.12.0 \ | 106 | crate://crates.io/itertools/0.12.1 \ |
112 | crate://crates.io/itoa/1.0.9 \ | 107 | crate://crates.io/itoa/1.0.10 \ |
113 | crate://crates.io/keyring/2.0.5 \ | 108 | crate://crates.io/keyring/2.3.2 \ |
114 | crate://crates.io/lazy_static/1.4.0 \ | 109 | crate://crates.io/lazy_static/1.4.0 \ |
115 | crate://crates.io/lddtree/0.3.3 \ | 110 | crate://crates.io/lddtree/0.3.4 \ |
116 | crate://crates.io/libc/0.2.150 \ | 111 | crate://crates.io/libc/0.2.153 \ |
117 | crate://crates.io/libredox/0.0.1 \ | 112 | crate://crates.io/libredox/0.0.1 \ |
118 | crate://crates.io/linux-keyutils/0.2.3 \ | 113 | crate://crates.io/linux-keyutils/0.2.4 \ |
119 | crate://crates.io/linux-raw-sys/0.3.8 \ | 114 | crate://crates.io/linux-raw-sys/0.4.13 \ |
120 | crate://crates.io/linux-raw-sys/0.4.11 \ | ||
121 | crate://crates.io/lock_api/0.4.11 \ | 115 | crate://crates.io/lock_api/0.4.11 \ |
122 | crate://crates.io/log/0.4.20 \ | 116 | crate://crates.io/log/0.4.20 \ |
123 | crate://crates.io/lzxd/0.1.4 \ | 117 | crate://crates.io/lzxd/0.1.4 \ |
124 | crate://crates.io/mailparse/0.14.0 \ | 118 | crate://crates.io/mailparse/0.14.1 \ |
125 | crate://crates.io/matchers/0.1.0 \ | 119 | crate://crates.io/matchers/0.1.0 \ |
126 | crate://crates.io/memchr/2.6.4 \ | 120 | crate://crates.io/memchr/2.7.1 \ |
127 | crate://crates.io/memoffset/0.9.0 \ | ||
128 | crate://crates.io/mime/0.3.17 \ | 121 | crate://crates.io/mime/0.3.17 \ |
129 | crate://crates.io/mime_guess/2.0.4 \ | 122 | crate://crates.io/mime_guess/2.0.4 \ |
130 | crate://crates.io/minijinja/1.0.10 \ | 123 | crate://crates.io/minijinja/1.0.12 \ |
131 | crate://crates.io/minimal-lexical/0.2.1 \ | 124 | crate://crates.io/minimal-lexical/0.2.1 \ |
132 | crate://crates.io/miniz_oxide/0.7.1 \ | 125 | crate://crates.io/miniz_oxide/0.7.1 \ |
133 | crate://crates.io/msi/0.7.0 \ | 126 | crate://crates.io/msi/0.7.0 \ |
@@ -137,128 +130,130 @@ SRC_URI += " \ | |||
137 | crate://crates.io/normalize-line-endings/0.3.0 \ | 130 | crate://crates.io/normalize-line-endings/0.3.0 \ |
138 | crate://crates.io/normpath/1.1.1 \ | 131 | crate://crates.io/normpath/1.1.1 \ |
139 | crate://crates.io/nu-ansi-term/0.46.0 \ | 132 | crate://crates.io/nu-ansi-term/0.46.0 \ |
133 | crate://crates.io/num-conv/0.1.0 \ | ||
140 | crate://crates.io/number_prefix/0.4.0 \ | 134 | crate://crates.io/number_prefix/0.4.0 \ |
141 | crate://crates.io/once_cell/1.18.0 \ | 135 | crate://crates.io/once_cell/1.19.0 \ |
142 | crate://crates.io/openssl/0.10.60 \ | 136 | crate://crates.io/openssl/0.10.63 \ |
143 | crate://crates.io/openssl-macros/0.1.1 \ | 137 | crate://crates.io/openssl-macros/0.1.1 \ |
144 | crate://crates.io/openssl-probe/0.1.5 \ | 138 | crate://crates.io/openssl-probe/0.1.5 \ |
145 | crate://crates.io/openssl-sys/0.9.96 \ | 139 | crate://crates.io/openssl-sys/0.9.99 \ |
146 | crate://crates.io/option-ext/0.2.0 \ | 140 | crate://crates.io/option-ext/0.2.0 \ |
147 | crate://crates.io/os_pipe/1.1.4 \ | 141 | crate://crates.io/os_pipe/1.1.5 \ |
148 | crate://crates.io/overload/0.1.1 \ | 142 | crate://crates.io/overload/0.1.1 \ |
149 | crate://crates.io/parking_lot/0.12.1 \ | 143 | crate://crates.io/parking_lot/0.12.1 \ |
150 | crate://crates.io/parking_lot_core/0.9.9 \ | 144 | crate://crates.io/parking_lot_core/0.9.9 \ |
151 | crate://crates.io/paste/1.0.14 \ | 145 | crate://crates.io/paste/1.0.14 \ |
152 | crate://crates.io/path-slash/0.2.1 \ | 146 | crate://crates.io/path-slash/0.2.1 \ |
153 | crate://crates.io/pep440_rs/0.3.12 \ | 147 | crate://crates.io/pep440_rs/0.5.0 \ |
154 | crate://crates.io/pep508_rs/0.2.3 \ | 148 | crate://crates.io/pep508_rs/0.4.2 \ |
155 | crate://crates.io/percent-encoding/2.3.1 \ | 149 | crate://crates.io/percent-encoding/2.3.1 \ |
156 | crate://crates.io/pin-project-lite/0.2.13 \ | 150 | crate://crates.io/pin-project-lite/0.2.13 \ |
157 | crate://crates.io/pkg-config/0.3.27 \ | 151 | crate://crates.io/pkg-config/0.3.29 \ |
158 | crate://crates.io/plain/0.2.3 \ | 152 | crate://crates.io/plain/0.2.3 \ |
159 | crate://crates.io/platform-info/2.0.2 \ | 153 | crate://crates.io/platform-info/2.0.2 \ |
160 | crate://crates.io/portable-atomic/1.5.1 \ | 154 | crate://crates.io/portable-atomic/1.6.0 \ |
161 | crate://crates.io/powerfmt/0.2.0 \ | 155 | crate://crates.io/powerfmt/0.2.0 \ |
162 | crate://crates.io/ppv-lite86/0.2.17 \ | 156 | crate://crates.io/ppv-lite86/0.2.17 \ |
163 | crate://crates.io/pretty_assertions/1.4.0 \ | 157 | crate://crates.io/pretty_assertions/1.4.0 \ |
164 | crate://crates.io/proc-macro2/1.0.70 \ | 158 | crate://crates.io/proc-macro2/1.0.78 \ |
165 | crate://crates.io/psm/0.1.21 \ | 159 | crate://crates.io/psm/0.1.21 \ |
166 | crate://crates.io/pyproject-toml/0.8.1 \ | 160 | crate://crates.io/pyproject-toml/0.10.0 \ |
167 | crate://crates.io/python-pkginfo/0.6.0 \ | 161 | crate://crates.io/python-pkginfo/0.6.0 \ |
168 | crate://crates.io/quote/1.0.33 \ | 162 | crate://crates.io/quote/1.0.35 \ |
169 | crate://crates.io/quoted_printable/0.4.8 \ | 163 | crate://crates.io/quoted_printable/0.4.8 \ |
164 | crate://crates.io/quoted_printable/0.5.0 \ | ||
170 | crate://crates.io/rand/0.8.5 \ | 165 | crate://crates.io/rand/0.8.5 \ |
171 | crate://crates.io/rand_chacha/0.3.1 \ | 166 | crate://crates.io/rand_chacha/0.3.1 \ |
172 | crate://crates.io/rand_core/0.6.4 \ | 167 | crate://crates.io/rand_core/0.6.4 \ |
173 | crate://crates.io/rayon/1.8.0 \ | 168 | crate://crates.io/rayon/1.8.1 \ |
174 | crate://crates.io/rayon-core/1.12.0 \ | 169 | crate://crates.io/rayon-core/1.12.1 \ |
175 | crate://crates.io/redox_syscall/0.3.5 \ | ||
176 | crate://crates.io/redox_syscall/0.4.1 \ | 170 | crate://crates.io/redox_syscall/0.4.1 \ |
177 | crate://crates.io/redox_users/0.4.4 \ | 171 | crate://crates.io/redox_users/0.4.4 \ |
178 | crate://crates.io/regex/1.10.2 \ | 172 | crate://crates.io/regex/1.10.3 \ |
179 | crate://crates.io/regex-automata/0.1.10 \ | 173 | crate://crates.io/regex-automata/0.1.10 \ |
180 | crate://crates.io/regex-automata/0.4.3 \ | 174 | crate://crates.io/regex-automata/0.4.5 \ |
181 | crate://crates.io/regex-syntax/0.6.29 \ | 175 | crate://crates.io/regex-syntax/0.6.29 \ |
182 | crate://crates.io/regex-syntax/0.8.2 \ | 176 | crate://crates.io/regex-syntax/0.8.2 \ |
183 | crate://crates.io/rfc2047-decoder/0.2.2 \ | 177 | crate://crates.io/rfc2047-decoder/0.2.2 \ |
184 | crate://crates.io/ring/0.17.6 \ | 178 | crate://crates.io/ring/0.17.7 \ |
185 | crate://crates.io/rustc_version/0.4.0 \ | 179 | crate://crates.io/rustc_version/0.4.0 \ |
186 | crate://crates.io/rustix/0.37.27 \ | 180 | crate://crates.io/rustix/0.38.32 \ |
187 | crate://crates.io/rustix/0.38.21 \ | 181 | crate://crates.io/rustls/0.22.2 \ |
188 | crate://crates.io/rustls/0.21.9 \ | 182 | crate://crates.io/rustls-pemfile/2.1.0 \ |
189 | crate://crates.io/rustls-pemfile/2.0.0 \ | 183 | crate://crates.io/rustls-pki-types/1.3.1 \ |
190 | crate://crates.io/rustls-pki-types/1.0.0 \ | 184 | crate://crates.io/rustls-webpki/0.102.1 \ |
191 | crate://crates.io/rustls-webpki/0.101.7 \ | ||
192 | crate://crates.io/rustversion/1.0.14 \ | 185 | crate://crates.io/rustversion/1.0.14 \ |
193 | crate://crates.io/ryu/1.0.15 \ | 186 | crate://crates.io/ryu/1.0.16 \ |
194 | crate://crates.io/same-file/1.0.6 \ | 187 | crate://crates.io/same-file/1.0.6 \ |
195 | crate://crates.io/schannel/0.1.22 \ | 188 | crate://crates.io/schannel/0.1.23 \ |
196 | crate://crates.io/scopeguard/1.2.0 \ | 189 | crate://crates.io/scopeguard/1.2.0 \ |
197 | crate://crates.io/scroll/0.11.0 \ | 190 | crate://crates.io/scroll/0.12.0 \ |
198 | crate://crates.io/scroll_derive/0.11.1 \ | 191 | crate://crates.io/scroll_derive/0.12.0 \ |
199 | crate://crates.io/sct/0.7.1 \ | ||
200 | crate://crates.io/security-framework/2.9.2 \ | 192 | crate://crates.io/security-framework/2.9.2 \ |
201 | crate://crates.io/security-framework-sys/2.9.1 \ | 193 | crate://crates.io/security-framework-sys/2.9.1 \ |
202 | crate://crates.io/semver/1.0.20 \ | 194 | crate://crates.io/semver/1.0.22 \ |
203 | crate://crates.io/serde/1.0.193 \ | 195 | crate://crates.io/serde/1.0.197 \ |
204 | crate://crates.io/serde_derive/1.0.193 \ | 196 | crate://crates.io/serde_derive/1.0.197 \ |
205 | crate://crates.io/serde_json/1.0.108 \ | 197 | crate://crates.io/serde_json/1.0.114 \ |
206 | crate://crates.io/serde_spanned/0.6.4 \ | 198 | crate://crates.io/serde_spanned/0.6.5 \ |
207 | crate://crates.io/sha2/0.10.8 \ | 199 | crate://crates.io/sha2/0.10.8 \ |
208 | crate://crates.io/sharded-slab/0.1.7 \ | 200 | crate://crates.io/sharded-slab/0.1.7 \ |
209 | crate://crates.io/shell-words/1.1.0 \ | 201 | crate://crates.io/shell-words/1.1.0 \ |
210 | crate://crates.io/shlex/1.2.0 \ | 202 | crate://crates.io/shlex/1.3.0 \ |
211 | crate://crates.io/similar/2.3.0 \ | 203 | crate://crates.io/similar/2.4.0 \ |
212 | crate://crates.io/smallvec/1.11.2 \ | 204 | crate://crates.io/smallvec/1.13.1 \ |
213 | crate://crates.io/smawk/0.3.2 \ | 205 | crate://crates.io/smawk/0.3.2 \ |
214 | crate://crates.io/snapbox/0.4.14 \ | 206 | crate://crates.io/snapbox/0.5.7 \ |
215 | crate://crates.io/snapbox-macros/0.3.6 \ | 207 | crate://crates.io/snapbox-macros/0.3.8 \ |
216 | crate://crates.io/socks/0.3.4 \ | 208 | crate://crates.io/socks/0.3.4 \ |
217 | crate://crates.io/spin/0.9.8 \ | 209 | crate://crates.io/spin/0.9.8 \ |
218 | crate://crates.io/stacker/0.1.15 \ | 210 | crate://crates.io/stacker/0.1.15 \ |
219 | crate://crates.io/static_assertions/1.1.0 \ | 211 | crate://crates.io/static_assertions/1.1.0 \ |
220 | crate://crates.io/strsim/0.10.0 \ | 212 | crate://crates.io/strsim/0.10.0 \ |
213 | crate://crates.io/subtle/2.5.0 \ | ||
221 | crate://crates.io/syn/1.0.109 \ | 214 | crate://crates.io/syn/1.0.109 \ |
222 | crate://crates.io/syn/2.0.39 \ | 215 | crate://crates.io/syn/2.0.48 \ |
223 | crate://crates.io/tar/0.4.40 \ | 216 | crate://crates.io/tar/0.4.40 \ |
224 | crate://crates.io/target-lexicon/0.12.12 \ | 217 | crate://crates.io/target-lexicon/0.12.14 \ |
225 | crate://crates.io/tempfile/3.8.1 \ | 218 | crate://crates.io/tempfile/3.9.0 \ |
226 | crate://crates.io/termcolor/1.4.0 \ | 219 | crate://crates.io/termcolor/1.4.1 \ |
227 | crate://crates.io/terminal_size/0.2.6 \ | 220 | crate://crates.io/terminal_size/0.3.0 \ |
228 | crate://crates.io/textwrap/0.16.0 \ | 221 | crate://crates.io/textwrap/0.16.1 \ |
229 | crate://crates.io/thiserror/1.0.50 \ | 222 | crate://crates.io/thiserror/1.0.57 \ |
230 | crate://crates.io/thiserror-impl/1.0.50 \ | 223 | crate://crates.io/thiserror-impl/1.0.57 \ |
231 | crate://crates.io/thread_local/1.1.7 \ | 224 | crate://crates.io/thread_local/1.1.7 \ |
232 | crate://crates.io/time/0.3.30 \ | 225 | crate://crates.io/time/0.3.34 \ |
233 | crate://crates.io/time-core/0.1.2 \ | 226 | crate://crates.io/time-core/0.1.2 \ |
234 | crate://crates.io/time-macros/0.2.15 \ | 227 | crate://crates.io/time-macros/0.2.17 \ |
235 | crate://crates.io/tinyvec/1.6.0 \ | 228 | crate://crates.io/tinyvec/1.6.0 \ |
236 | crate://crates.io/tinyvec_macros/0.1.1 \ | 229 | crate://crates.io/tinyvec_macros/0.1.1 \ |
237 | crate://crates.io/toml/0.5.11 \ | 230 | crate://crates.io/toml/0.5.11 \ |
238 | crate://crates.io/toml/0.8.8 \ | 231 | crate://crates.io/toml/0.8.10 \ |
239 | crate://crates.io/toml_datetime/0.6.5 \ | 232 | crate://crates.io/toml_datetime/0.6.5 \ |
240 | crate://crates.io/toml_edit/0.20.7 \ | 233 | crate://crates.io/toml_edit/0.22.6 \ |
241 | crate://crates.io/toml_edit/0.21.0 \ | ||
242 | crate://crates.io/tracing/0.1.40 \ | 234 | crate://crates.io/tracing/0.1.40 \ |
243 | crate://crates.io/tracing-attributes/0.1.27 \ | 235 | crate://crates.io/tracing-attributes/0.1.27 \ |
244 | crate://crates.io/tracing-core/0.1.32 \ | 236 | crate://crates.io/tracing-core/0.1.32 \ |
245 | crate://crates.io/tracing-log/0.2.0 \ | 237 | crate://crates.io/tracing-log/0.2.0 \ |
246 | crate://crates.io/tracing-serde/0.1.3 \ | 238 | crate://crates.io/tracing-serde/0.1.3 \ |
247 | crate://crates.io/tracing-subscriber/0.3.18 \ | 239 | crate://crates.io/tracing-subscriber/0.3.18 \ |
248 | crate://crates.io/trycmd/0.14.19 \ | 240 | crate://crates.io/trycmd/0.15.0 \ |
249 | crate://crates.io/twox-hash/1.6.3 \ | 241 | crate://crates.io/twox-hash/1.6.3 \ |
250 | crate://crates.io/typenum/1.17.0 \ | 242 | crate://crates.io/typenum/1.17.0 \ |
251 | crate://crates.io/unicase/2.7.0 \ | 243 | crate://crates.io/unicase/2.7.0 \ |
252 | crate://crates.io/unicode-bidi/0.3.13 \ | 244 | crate://crates.io/unicode-bidi/0.3.15 \ |
253 | crate://crates.io/unicode-ident/1.0.12 \ | 245 | crate://crates.io/unicode-ident/1.0.12 \ |
254 | crate://crates.io/unicode-linebreak/0.1.5 \ | 246 | crate://crates.io/unicode-linebreak/0.1.5 \ |
255 | crate://crates.io/unicode-normalization/0.1.22 \ | 247 | crate://crates.io/unicode-normalization/0.1.22 \ |
256 | crate://crates.io/unicode-width/0.1.11 \ | 248 | crate://crates.io/unicode-width/0.1.11 \ |
249 | crate://crates.io/unicode-xid/0.2.4 \ | ||
250 | crate://crates.io/unscanny/0.1.0 \ | ||
257 | crate://crates.io/untrusted/0.9.0 \ | 251 | crate://crates.io/untrusted/0.9.0 \ |
258 | crate://crates.io/ureq/2.9.1 \ | 252 | crate://crates.io/ureq/2.9.6 \ |
259 | crate://crates.io/url/2.5.0 \ | 253 | crate://crates.io/url/2.5.0 \ |
254 | crate://crates.io/urlencoding/2.1.3 \ | ||
260 | crate://crates.io/utf8parse/0.2.1 \ | 255 | crate://crates.io/utf8parse/0.2.1 \ |
261 | crate://crates.io/uuid/1.6.1 \ | 256 | crate://crates.io/uuid/1.7.0 \ |
262 | crate://crates.io/valuable/0.1.0 \ | 257 | crate://crates.io/valuable/0.1.0 \ |
263 | crate://crates.io/vcpkg/0.2.15 \ | 258 | crate://crates.io/vcpkg/0.2.15 \ |
264 | crate://crates.io/version_check/0.9.4 \ | 259 | crate://crates.io/version_check/0.9.4 \ |
@@ -266,69 +261,59 @@ SRC_URI += " \ | |||
266 | crate://crates.io/wait-timeout/0.2.0 \ | 261 | crate://crates.io/wait-timeout/0.2.0 \ |
267 | crate://crates.io/walkdir/2.4.0 \ | 262 | crate://crates.io/walkdir/2.4.0 \ |
268 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 263 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
269 | crate://crates.io/webpki-roots/0.25.3 \ | 264 | crate://crates.io/webpki-roots/0.26.0 \ |
270 | crate://crates.io/which/5.0.0 \ | 265 | crate://crates.io/which/5.0.0 \ |
271 | crate://crates.io/wild/2.2.0 \ | 266 | crate://crates.io/which/6.0.0 \ |
267 | crate://crates.io/wild/2.2.1 \ | ||
272 | crate://crates.io/winapi/0.3.9 \ | 268 | crate://crates.io/winapi/0.3.9 \ |
273 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | 269 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ |
274 | crate://crates.io/winapi-util/0.1.6 \ | 270 | crate://crates.io/winapi-util/0.1.6 \ |
275 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | 271 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ |
276 | crate://crates.io/windows-sys/0.45.0 \ | ||
277 | crate://crates.io/windows-sys/0.48.0 \ | 272 | crate://crates.io/windows-sys/0.48.0 \ |
278 | crate://crates.io/windows-sys/0.52.0 \ | 273 | crate://crates.io/windows-sys/0.52.0 \ |
279 | crate://crates.io/windows-targets/0.42.2 \ | ||
280 | crate://crates.io/windows-targets/0.48.5 \ | 274 | crate://crates.io/windows-targets/0.48.5 \ |
281 | crate://crates.io/windows-targets/0.52.0 \ | 275 | crate://crates.io/windows-targets/0.52.0 \ |
282 | crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ | ||
283 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ | 276 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ |
284 | crate://crates.io/windows_aarch64_gnullvm/0.52.0 \ | 277 | crate://crates.io/windows_aarch64_gnullvm/0.52.0 \ |
285 | crate://crates.io/windows_aarch64_msvc/0.42.2 \ | ||
286 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ | 278 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ |
287 | crate://crates.io/windows_aarch64_msvc/0.52.0 \ | 279 | crate://crates.io/windows_aarch64_msvc/0.52.0 \ |
288 | crate://crates.io/windows_i686_gnu/0.42.2 \ | ||
289 | crate://crates.io/windows_i686_gnu/0.48.5 \ | 280 | crate://crates.io/windows_i686_gnu/0.48.5 \ |
290 | crate://crates.io/windows_i686_gnu/0.52.0 \ | 281 | crate://crates.io/windows_i686_gnu/0.52.0 \ |
291 | crate://crates.io/windows_i686_msvc/0.42.2 \ | ||
292 | crate://crates.io/windows_i686_msvc/0.48.5 \ | 282 | crate://crates.io/windows_i686_msvc/0.48.5 \ |
293 | crate://crates.io/windows_i686_msvc/0.52.0 \ | 283 | crate://crates.io/windows_i686_msvc/0.52.0 \ |
294 | crate://crates.io/windows_x86_64_gnu/0.42.2 \ | ||
295 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ | 284 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ |
296 | crate://crates.io/windows_x86_64_gnu/0.52.0 \ | 285 | crate://crates.io/windows_x86_64_gnu/0.52.0 \ |
297 | crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ | ||
298 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ | 286 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ |
299 | crate://crates.io/windows_x86_64_gnullvm/0.52.0 \ | 287 | crate://crates.io/windows_x86_64_gnullvm/0.52.0 \ |
300 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ | ||
301 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ | 288 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ |
302 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ | 289 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ |
303 | crate://crates.io/winnow/0.5.19 \ | 290 | crate://crates.io/winnow/0.6.2 \ |
304 | crate://crates.io/xattr/1.0.1 \ | 291 | crate://crates.io/xattr/1.3.1 \ |
305 | crate://crates.io/xwin/0.5.0 \ | 292 | crate://crates.io/xwin/0.5.0 \ |
306 | crate://crates.io/yansi/0.5.1 \ | 293 | crate://crates.io/yansi/0.5.1 \ |
307 | crate://crates.io/zerocopy/0.7.28 \ | 294 | crate://crates.io/zerocopy/0.7.32 \ |
308 | crate://crates.io/zerocopy-derive/0.7.28 \ | 295 | crate://crates.io/zerocopy-derive/0.7.32 \ |
309 | crate://crates.io/zeroize/1.7.0 \ | 296 | crate://crates.io/zeroize/1.7.0 \ |
310 | crate://crates.io/zip/0.6.6 \ | 297 | crate://crates.io/zip/0.6.6 \ |
311 | " | 298 | " |
312 | 299 | ||
313 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" | 300 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" |
314 | SRC_URI[ahash-0.8.6.sha256sum] = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" | 301 | SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" |
315 | SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" | 302 | SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" |
316 | SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" | 303 | SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" |
317 | SRC_URI[anstream-0.3.2.sha256sum] = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" | 304 | SRC_URI[anstream-0.6.11.sha256sum] = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" |
318 | SRC_URI[anstream-0.6.4.sha256sum] = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" | 305 | SRC_URI[anstyle-1.0.4.sha256sum] = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" |
319 | SRC_URI[anstyle-1.0.2.sha256sum] = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" | 306 | SRC_URI[anstyle-parse-0.2.3.sha256sum] = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" |
320 | SRC_URI[anstyle-parse-0.2.1.sha256sum] = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" | 307 | SRC_URI[anstyle-query-1.0.2.sha256sum] = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" |
321 | SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" | 308 | SRC_URI[anstyle-wincon-3.0.2.sha256sum] = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" |
322 | SRC_URI[anstyle-wincon-1.0.2.sha256sum] = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" | 309 | SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" |
323 | SRC_URI[anstyle-wincon-3.0.1.sha256sum] = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" | ||
324 | SRC_URI[anyhow-1.0.75.sha256sum] = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" | ||
325 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 310 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
326 | SRC_URI[base64-0.13.1.sha256sum] = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" | 311 | SRC_URI[base64-0.13.1.sha256sum] = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" |
327 | SRC_URI[base64-0.21.5.sha256sum] = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" | 312 | SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" |
328 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 313 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
329 | SRC_URI[bitflags-2.4.1.sha256sum] = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" | 314 | SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" |
330 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" | 315 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" |
331 | SRC_URI[bstr-1.8.0.sha256sum] = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" | 316 | SRC_URI[bstr-1.9.0.sha256sum] = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" |
332 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | 317 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" |
333 | SRC_URI[bytes-1.5.0.sha256sum] = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" | 318 | SRC_URI[bytes-1.5.0.sha256sum] = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" |
334 | SRC_URI[bytesize-1.3.0.sha256sum] = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" | 319 | SRC_URI[bytesize-1.3.0.sha256sum] = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" |
@@ -336,42 +321,42 @@ SRC_URI[bzip2-0.4.4.sha256sum] = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb8849 | |||
336 | SRC_URI[bzip2-sys-0.1.11+1.0.8.sha256sum] = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" | 321 | SRC_URI[bzip2-sys-0.1.11+1.0.8.sha256sum] = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" |
337 | SRC_URI[cab-0.4.1.sha256sum] = "ae6b4de23c7d39c0631fd3cc952d87951c86c75a13812d7247cb7a896e7b3551" | 322 | SRC_URI[cab-0.4.1.sha256sum] = "ae6b4de23c7d39c0631fd3cc952d87951c86c75a13812d7247cb7a896e7b3551" |
338 | SRC_URI[camino-1.1.6.sha256sum] = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" | 323 | SRC_URI[camino-1.1.6.sha256sum] = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" |
339 | SRC_URI[cargo-config2-0.1.16.sha256sum] = "7f387366785e82c7ec7ef5b845a7f61324fbf5d467d6a878469eac30c1c44b1b" | 324 | SRC_URI[cargo-config2-0.1.19.sha256sum] = "3a7fb69d74d76f8c254afd1c0e76aca40c305707b28aebe3c5a0fd2ee62aeeeb" |
340 | SRC_URI[cargo-options-0.7.2.sha256sum] = "cad71bf996c8e5b9d28ef3472d7ee41f277edf4e38cd597f51ad0438d05d76ea" | 325 | SRC_URI[cargo-options-0.7.2.sha256sum] = "cad71bf996c8e5b9d28ef3472d7ee41f277edf4e38cd597f51ad0438d05d76ea" |
341 | SRC_URI[cargo-platform-0.1.5.sha256sum] = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" | 326 | SRC_URI[cargo-platform-0.1.6.sha256sum] = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" |
342 | SRC_URI[cargo-xwin-0.16.2.sha256sum] = "02bb6bf59526935e47445f959a19c2168f151284dbf7e57f5577934334e9a61d" | 327 | SRC_URI[cargo-xwin-0.16.4.sha256sum] = "5e6c3dd7f20fdd197397532ac882e918cfe1d56f262a97ded7460a50e031e06b" |
343 | SRC_URI[cargo-zigbuild-0.18.0.sha256sum] = "edc9c2fe646a29983b5f7263bd789175f2aaad7ea42525affa40e2172be93286" | 328 | SRC_URI[cargo-zigbuild-0.18.3.sha256sum] = "cb76e6ab558f9138291c7e1fa954ffd58e060712eab13f97a317da712218ca24" |
344 | SRC_URI[cargo_metadata-0.18.1.sha256sum] = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" | 329 | SRC_URI[cargo_metadata-0.18.1.sha256sum] = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" |
345 | SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" | 330 | SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" |
346 | SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" | 331 | SRC_URI[cc-1.0.88.sha256sum] = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" |
347 | SRC_URI[cfb-0.9.0.sha256sum] = "b390793e912300f1aa713429f7fd0c391024e6c18b988962558bc4f96a349b1f" | 332 | SRC_URI[cfb-0.9.0.sha256sum] = "b390793e912300f1aa713429f7fd0c391024e6c18b988962558bc4f96a349b1f" |
348 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 333 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
349 | SRC_URI[charset-0.1.3.sha256sum] = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" | 334 | SRC_URI[charset-0.1.3.sha256sum] = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" |
350 | SRC_URI[chumsky-0.9.3.sha256sum] = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" | 335 | SRC_URI[chumsky-0.9.3.sha256sum] = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" |
351 | SRC_URI[clap-4.3.24.sha256sum] = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" | 336 | SRC_URI[clap-4.4.18.sha256sum] = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" |
352 | SRC_URI[clap_builder-4.3.24.sha256sum] = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" | 337 | SRC_URI[clap_builder-4.4.18.sha256sum] = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" |
353 | SRC_URI[clap_complete-4.3.2.sha256sum] = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" | 338 | SRC_URI[clap_complete-4.4.9.sha256sum] = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" |
354 | SRC_URI[clap_complete_command-0.5.1.sha256sum] = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" | 339 | SRC_URI[clap_complete_command-0.5.1.sha256sum] = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" |
355 | SRC_URI[clap_complete_fig-4.3.1.sha256sum] = "99fee1d30a51305a6c2ed3fc5709be3c8af626c9c958e04dd9ae94e27bcbce9f" | ||
356 | SRC_URI[clap_complete_nushell-0.1.11.sha256sum] = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" | 340 | SRC_URI[clap_complete_nushell-0.1.11.sha256sum] = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" |
357 | SRC_URI[clap_derive-4.3.12.sha256sum] = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" | 341 | SRC_URI[clap_derive-4.4.7.sha256sum] = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" |
358 | SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" | 342 | SRC_URI[clap_lex-0.6.0.sha256sum] = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" |
359 | SRC_URI[cli-table-0.4.7.sha256sum] = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" | 343 | SRC_URI[cli-table-0.4.7.sha256sum] = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" |
360 | SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" | 344 | SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" |
361 | SRC_URI[configparser-3.0.3.sha256sum] = "e0e56e414a2a52ab2a104f85cd40933c2fbc278b83637facf646ecf451b49237" | 345 | SRC_URI[configparser-3.0.4.sha256sum] = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" |
362 | SRC_URI[console-0.15.7.sha256sum] = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" | 346 | SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" |
363 | SRC_URI[content_inspector-0.2.4.sha256sum] = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" | 347 | SRC_URI[content_inspector-0.2.4.sha256sum] = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" |
364 | SRC_URI[core-foundation-0.9.3.sha256sum] = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" | 348 | SRC_URI[core-foundation-0.9.4.sha256sum] = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" |
365 | SRC_URI[core-foundation-sys-0.8.4.sha256sum] = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" | 349 | SRC_URI[core-foundation-sys-0.8.6.sha256sum] = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" |
366 | SRC_URI[cpufeatures-0.2.11.sha256sum] = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" | 350 | SRC_URI[cpufeatures-0.2.12.sha256sum] = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" |
367 | SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" | 351 | SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" |
368 | SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" | 352 | SRC_URI[crossbeam-channel-0.5.11.sha256sum] = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" |
369 | SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" | 353 | SRC_URI[crossbeam-deque-0.8.5.sha256sum] = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" |
370 | SRC_URI[crossbeam-epoch-0.9.15.sha256sum] = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" | 354 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" |
371 | SRC_URI[crossbeam-utils-0.8.16.sha256sum] = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" | 355 | SRC_URI[crossbeam-utils-0.8.19.sha256sum] = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" |
372 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" | 356 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" |
373 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" | 357 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" |
374 | SRC_URI[deranged-0.3.9.sha256sum] = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" | 358 | SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" |
359 | SRC_URI[derivative-2.2.0.sha256sum] = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" | ||
375 | SRC_URI[dialoguer-0.11.0.sha256sum] = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" | 360 | SRC_URI[dialoguer-0.11.0.sha256sum] = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" |
376 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | 361 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" |
377 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 362 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
@@ -386,8 +371,8 @@ SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca62 | |||
386 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" | 371 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" |
387 | SRC_URI[expect-test-1.4.1.sha256sum] = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" | 372 | SRC_URI[expect-test-1.4.1.sha256sum] = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" |
388 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" | 373 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" |
389 | SRC_URI[fat-macho-0.4.7.sha256sum] = "63fa117c7dcabeb8c83d5c229764cfa46518545d2dba5a9a08912014711f997b" | 374 | SRC_URI[fat-macho-0.4.8.sha256sum] = "0d4c93f393add03d72bc10dd3dea43a1610ecb29e0c0a6459c70b53b82931adf" |
390 | SRC_URI[filetime-0.2.22.sha256sum] = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" | 375 | SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" |
391 | SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" | 376 | SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" |
392 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | 377 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" |
393 | SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" | 378 | SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" |
@@ -395,47 +380,42 @@ SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70 | |||
395 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" | 380 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" |
396 | SRC_URI[fs-err-2.11.0.sha256sum] = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" | 381 | SRC_URI[fs-err-2.11.0.sha256sum] = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" |
397 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | 382 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" |
398 | SRC_URI[getrandom-0.2.11.sha256sum] = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" | 383 | SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" |
399 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" | 384 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" |
400 | SRC_URI[globset-0.4.14.sha256sum] = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" | 385 | SRC_URI[globset-0.4.14.sha256sum] = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" |
401 | SRC_URI[goblin-0.7.1.sha256sum] = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134" | 386 | SRC_URI[goblin-0.8.0.sha256sum] = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" |
402 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" | 387 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" |
403 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" | 388 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" |
404 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" | 389 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" |
405 | SRC_URI[hermit-abi-0.3.3.sha256sum] = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" | 390 | SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" |
406 | SRC_URI[home-0.5.5.sha256sum] = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" | ||
407 | SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" | 391 | SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" |
408 | SRC_URI[humantime-serde-1.1.1.sha256sum] = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" | 392 | SRC_URI[humantime-serde-1.1.1.sha256sum] = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" |
409 | SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" | 393 | SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" |
410 | SRC_URI[ignore-0.4.20.sha256sum] = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" | 394 | SRC_URI[ignore-0.4.22.sha256sum] = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" |
411 | SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" | 395 | SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" |
412 | SRC_URI[indexmap-2.1.0.sha256sum] = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" | 396 | SRC_URI[indexmap-2.2.3.sha256sum] = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" |
413 | SRC_URI[indicatif-0.17.7.sha256sum] = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" | 397 | SRC_URI[indicatif-0.17.7.sha256sum] = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" |
414 | SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" | 398 | SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" |
415 | SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" | 399 | SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" |
416 | SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" | ||
417 | SRC_URI[is-terminal-0.4.9.sha256sum] = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" | ||
418 | SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" | 400 | SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" |
419 | SRC_URI[itertools-0.12.0.sha256sum] = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" | 401 | SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" |
420 | SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" | 402 | SRC_URI[itoa-1.0.10.sha256sum] = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" |
421 | SRC_URI[keyring-2.0.5.sha256sum] = "9549a129bd08149e0a71b2d1ce2729780d47127991bfd0a78cc1df697ec72492" | 403 | SRC_URI[keyring-2.3.2.sha256sum] = "1be8bc4c6b6e9d85ecdad090fcf342a9216f53d747a537cc05e3452fd650ca46" |
422 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" | 404 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" |
423 | SRC_URI[lddtree-0.3.3.sha256sum] = "2f5bfec46830ad3a95199ae6804dfe9f51fdad43d7a95fbb6c185efa9824c295" | 405 | SRC_URI[lddtree-0.3.4.sha256sum] = "f88a93876d2485ede9c97d698c164cf5c024491908483964a998faae9705dea6" |
424 | SRC_URI[libc-0.2.150.sha256sum] = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" | 406 | SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" |
425 | SRC_URI[libredox-0.0.1.sha256sum] = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" | 407 | SRC_URI[libredox-0.0.1.sha256sum] = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" |
426 | SRC_URI[linux-keyutils-0.2.3.sha256sum] = "3f27bb67f6dd1d0bb5ab582868e4f65052e58da6401188a08f0da09cf512b84b" | 408 | SRC_URI[linux-keyutils-0.2.4.sha256sum] = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e" |
427 | SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" | 409 | SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" |
428 | SRC_URI[linux-raw-sys-0.4.11.sha256sum] = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" | ||
429 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" | 410 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" |
430 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" | 411 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" |
431 | SRC_URI[lzxd-0.1.4.sha256sum] = "784462f20dddd9dfdb45de963fa4ad4a288cb10a7889ac5d2c34fb6481c6b213" | 412 | SRC_URI[lzxd-0.1.4.sha256sum] = "784462f20dddd9dfdb45de963fa4ad4a288cb10a7889ac5d2c34fb6481c6b213" |
432 | SRC_URI[mailparse-0.14.0.sha256sum] = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa" | 413 | SRC_URI[mailparse-0.14.1.sha256sum] = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757" |
433 | SRC_URI[matchers-0.1.0.sha256sum] = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" | 414 | SRC_URI[matchers-0.1.0.sha256sum] = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" |
434 | SRC_URI[memchr-2.6.4.sha256sum] = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" | 415 | SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" |
435 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" | ||
436 | SRC_URI[mime-0.3.17.sha256sum] = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" | 416 | SRC_URI[mime-0.3.17.sha256sum] = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" |
437 | SRC_URI[mime_guess-2.0.4.sha256sum] = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" | 417 | SRC_URI[mime_guess-2.0.4.sha256sum] = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" |
438 | SRC_URI[minijinja-1.0.10.sha256sum] = "208758577ef2c86cf5dd3e85730d161413ec3284e2d73b2ef65d9a24d9971bcb" | 418 | SRC_URI[minijinja-1.0.12.sha256sum] = "6fe0ff215195a22884d867b547c70a0c4815cbbcc70991f281dca604b20d10ce" |
439 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | 419 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" |
440 | SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" | 420 | SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" |
441 | SRC_URI[msi-0.7.0.sha256sum] = "226b2404f03d2cf47375b9715c8adfae4e388bb2377cff908e8a40f31e421514" | 421 | SRC_URI[msi-0.7.0.sha256sum] = "226b2404f03d2cf47375b9715c8adfae4e388bb2377cff908e8a40f31e421514" |
@@ -445,128 +425,130 @@ SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b7382641 | |||
445 | SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" | 425 | SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" |
446 | SRC_URI[normpath-1.1.1.sha256sum] = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" | 426 | SRC_URI[normpath-1.1.1.sha256sum] = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" |
447 | SRC_URI[nu-ansi-term-0.46.0.sha256sum] = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" | 427 | SRC_URI[nu-ansi-term-0.46.0.sha256sum] = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" |
428 | SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" | ||
448 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" | 429 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" |
449 | SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" | 430 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
450 | SRC_URI[openssl-0.10.60.sha256sum] = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" | 431 | SRC_URI[openssl-0.10.63.sha256sum] = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" |
451 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" | 432 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" |
452 | SRC_URI[openssl-probe-0.1.5.sha256sum] = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" | 433 | SRC_URI[openssl-probe-0.1.5.sha256sum] = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" |
453 | SRC_URI[openssl-sys-0.9.96.sha256sum] = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" | 434 | SRC_URI[openssl-sys-0.9.99.sha256sum] = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" |
454 | SRC_URI[option-ext-0.2.0.sha256sum] = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" | 435 | SRC_URI[option-ext-0.2.0.sha256sum] = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" |
455 | SRC_URI[os_pipe-1.1.4.sha256sum] = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" | 436 | SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" |
456 | SRC_URI[overload-0.1.1.sha256sum] = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" | 437 | SRC_URI[overload-0.1.1.sha256sum] = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" |
457 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 438 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
458 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 439 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" |
459 | SRC_URI[paste-1.0.14.sha256sum] = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" | 440 | SRC_URI[paste-1.0.14.sha256sum] = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" |
460 | SRC_URI[path-slash-0.2.1.sha256sum] = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" | 441 | SRC_URI[path-slash-0.2.1.sha256sum] = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" |
461 | SRC_URI[pep440_rs-0.3.12.sha256sum] = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" | 442 | SRC_URI[pep440_rs-0.5.0.sha256sum] = "15efd4d885c29126cc93e12af3087896e2518bd5ca0fb328c19c4ef9cecfa8be" |
462 | SRC_URI[pep508_rs-0.2.3.sha256sum] = "e4516b53d9ea6112ebb38b4af08d5707d30b994fb7f98ff133c5dcf7ed8fa854" | 443 | SRC_URI[pep508_rs-0.4.2.sha256sum] = "1455babf8edd3eedcdfcb39700e455a4bb189e71b4f1fa0eacc9b244cc5a55e6" |
463 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | 444 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" |
464 | SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" | 445 | SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" |
465 | SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" | 446 | SRC_URI[pkg-config-0.3.29.sha256sum] = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" |
466 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" | 447 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" |
467 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" | 448 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" |
468 | SRC_URI[portable-atomic-1.5.1.sha256sum] = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" | 449 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
469 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" | 450 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" |
470 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" | 451 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" |
471 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" | 452 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" |
472 | SRC_URI[proc-macro2-1.0.70.sha256sum] = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" | 453 | SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" |
473 | SRC_URI[psm-0.1.21.sha256sum] = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" | 454 | SRC_URI[psm-0.1.21.sha256sum] = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" |
474 | SRC_URI[pyproject-toml-0.8.1.sha256sum] = "46d4a5e69187f23a29f8aa0ea57491d104ba541bc55f76552c2a74962aa20e04" | 455 | SRC_URI[pyproject-toml-0.10.0.sha256sum] = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898" |
475 | SRC_URI[python-pkginfo-0.6.0.sha256sum] = "037469c164f08c891bf6d69ca02f1d56210011451e229618669777df82124cfa" | 456 | SRC_URI[python-pkginfo-0.6.0.sha256sum] = "037469c164f08c891bf6d69ca02f1d56210011451e229618669777df82124cfa" |
476 | SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" | 457 | SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" |
477 | SRC_URI[quoted_printable-0.4.8.sha256sum] = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" | 458 | SRC_URI[quoted_printable-0.4.8.sha256sum] = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" |
459 | SRC_URI[quoted_printable-0.5.0.sha256sum] = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" | ||
478 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | 460 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" |
479 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | 461 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" |
480 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" | 462 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" |
481 | SRC_URI[rayon-1.8.0.sha256sum] = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" | 463 | SRC_URI[rayon-1.8.1.sha256sum] = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" |
482 | SRC_URI[rayon-core-1.12.0.sha256sum] = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" | 464 | SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" |
483 | SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" | ||
484 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" | 465 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" |
485 | SRC_URI[redox_users-0.4.4.sha256sum] = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" | 466 | SRC_URI[redox_users-0.4.4.sha256sum] = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" |
486 | SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" | 467 | SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" |
487 | SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" | 468 | SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" |
488 | SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" | 469 | SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" |
489 | SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" | 470 | SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" |
490 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" | 471 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" |
491 | SRC_URI[rfc2047-decoder-0.2.2.sha256sum] = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" | 472 | SRC_URI[rfc2047-decoder-0.2.2.sha256sum] = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" |
492 | SRC_URI[ring-0.17.6.sha256sum] = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" | 473 | SRC_URI[ring-0.17.7.sha256sum] = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" |
493 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" | 474 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" |
494 | SRC_URI[rustix-0.37.27.sha256sum] = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" | 475 | SRC_URI[rustix-0.38.32.sha256sum] = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" |
495 | SRC_URI[rustix-0.38.21.sha256sum] = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" | 476 | SRC_URI[rustls-0.22.2.sha256sum] = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" |
496 | SRC_URI[rustls-0.21.9.sha256sum] = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" | 477 | SRC_URI[rustls-pemfile-2.1.0.sha256sum] = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" |
497 | SRC_URI[rustls-pemfile-2.0.0.sha256sum] = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" | 478 | SRC_URI[rustls-pki-types-1.3.1.sha256sum] = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" |
498 | SRC_URI[rustls-pki-types-1.0.0.sha256sum] = "eb0a1f9b9efec70d32e6d6aa3e58ebd88c3754ec98dfe9145c63cf54cc829b83" | 479 | SRC_URI[rustls-webpki-0.102.1.sha256sum] = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" |
499 | SRC_URI[rustls-webpki-0.101.7.sha256sum] = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" | ||
500 | SRC_URI[rustversion-1.0.14.sha256sum] = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" | 480 | SRC_URI[rustversion-1.0.14.sha256sum] = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" |
501 | SRC_URI[ryu-1.0.15.sha256sum] = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" | 481 | SRC_URI[ryu-1.0.16.sha256sum] = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" |
502 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | 482 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" |
503 | SRC_URI[schannel-0.1.22.sha256sum] = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" | 483 | SRC_URI[schannel-0.1.23.sha256sum] = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" |
504 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 484 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
505 | SRC_URI[scroll-0.11.0.sha256sum] = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" | 485 | SRC_URI[scroll-0.12.0.sha256sum] = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" |
506 | SRC_URI[scroll_derive-0.11.1.sha256sum] = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" | 486 | SRC_URI[scroll_derive-0.12.0.sha256sum] = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" |
507 | SRC_URI[sct-0.7.1.sha256sum] = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" | ||
508 | SRC_URI[security-framework-2.9.2.sha256sum] = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" | 487 | SRC_URI[security-framework-2.9.2.sha256sum] = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" |
509 | SRC_URI[security-framework-sys-2.9.1.sha256sum] = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" | 488 | SRC_URI[security-framework-sys-2.9.1.sha256sum] = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" |
510 | SRC_URI[semver-1.0.20.sha256sum] = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" | 489 | SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" |
511 | SRC_URI[serde-1.0.193.sha256sum] = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" | 490 | SRC_URI[serde-1.0.197.sha256sum] = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" |
512 | SRC_URI[serde_derive-1.0.193.sha256sum] = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" | 491 | SRC_URI[serde_derive-1.0.197.sha256sum] = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" |
513 | SRC_URI[serde_json-1.0.108.sha256sum] = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" | 492 | SRC_URI[serde_json-1.0.114.sha256sum] = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" |
514 | SRC_URI[serde_spanned-0.6.4.sha256sum] = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" | 493 | SRC_URI[serde_spanned-0.6.5.sha256sum] = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" |
515 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" | 494 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" |
516 | SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" | 495 | SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" |
517 | SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" | 496 | SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" |
518 | SRC_URI[shlex-1.2.0.sha256sum] = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" | 497 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
519 | SRC_URI[similar-2.3.0.sha256sum] = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" | 498 | SRC_URI[similar-2.4.0.sha256sum] = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" |
520 | SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" | 499 | SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" |
521 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" | 500 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" |
522 | SRC_URI[snapbox-0.4.14.sha256sum] = "4b377c0b6e4715c116473d8e40d51e3fa5b0a2297ca9b2a931ba800667b259ed" | 501 | SRC_URI[snapbox-0.5.7.sha256sum] = "4a99efa20de5053229642a477436cdb39828c7651c614622eb4888f9688523e6" |
523 | SRC_URI[snapbox-macros-0.3.6.sha256sum] = "ed1559baff8a696add3322b9be3e940d433e7bb4e38d79017205fd37ff28b28e" | 502 | SRC_URI[snapbox-macros-0.3.8.sha256sum] = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40" |
524 | SRC_URI[socks-0.3.4.sha256sum] = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" | 503 | SRC_URI[socks-0.3.4.sha256sum] = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" |
525 | SRC_URI[spin-0.9.8.sha256sum] = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" | 504 | SRC_URI[spin-0.9.8.sha256sum] = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" |
526 | SRC_URI[stacker-0.1.15.sha256sum] = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" | 505 | SRC_URI[stacker-0.1.15.sha256sum] = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" |
527 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" | 506 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" |
528 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" | 507 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" |
508 | SRC_URI[subtle-2.5.0.sha256sum] = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" | ||
529 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | 509 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" |
530 | SRC_URI[syn-2.0.39.sha256sum] = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" | 510 | SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" |
531 | SRC_URI[tar-0.4.40.sha256sum] = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" | 511 | SRC_URI[tar-0.4.40.sha256sum] = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" |
532 | SRC_URI[target-lexicon-0.12.12.sha256sum] = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" | 512 | SRC_URI[target-lexicon-0.12.14.sha256sum] = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" |
533 | SRC_URI[tempfile-3.8.1.sha256sum] = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" | 513 | SRC_URI[tempfile-3.9.0.sha256sum] = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" |
534 | SRC_URI[termcolor-1.4.0.sha256sum] = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" | 514 | SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" |
535 | SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" | 515 | SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" |
536 | SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" | 516 | SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" |
537 | SRC_URI[thiserror-1.0.50.sha256sum] = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" | 517 | SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" |
538 | SRC_URI[thiserror-impl-1.0.50.sha256sum] = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" | 518 | SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" |
539 | SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" | 519 | SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" |
540 | SRC_URI[time-0.3.30.sha256sum] = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" | 520 | SRC_URI[time-0.3.34.sha256sum] = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" |
541 | SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" | 521 | SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" |
542 | SRC_URI[time-macros-0.2.15.sha256sum] = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" | 522 | SRC_URI[time-macros-0.2.17.sha256sum] = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" |
543 | SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" | 523 | SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" |
544 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" | 524 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" |
545 | SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" | 525 | SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" |
546 | SRC_URI[toml-0.8.8.sha256sum] = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" | 526 | SRC_URI[toml-0.8.10.sha256sum] = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" |
547 | SRC_URI[toml_datetime-0.6.5.sha256sum] = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" | 527 | SRC_URI[toml_datetime-0.6.5.sha256sum] = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" |
548 | SRC_URI[toml_edit-0.20.7.sha256sum] = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" | 528 | SRC_URI[toml_edit-0.22.6.sha256sum] = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" |
549 | SRC_URI[toml_edit-0.21.0.sha256sum] = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" | ||
550 | SRC_URI[tracing-0.1.40.sha256sum] = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" | 529 | SRC_URI[tracing-0.1.40.sha256sum] = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" |
551 | SRC_URI[tracing-attributes-0.1.27.sha256sum] = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" | 530 | SRC_URI[tracing-attributes-0.1.27.sha256sum] = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" |
552 | SRC_URI[tracing-core-0.1.32.sha256sum] = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" | 531 | SRC_URI[tracing-core-0.1.32.sha256sum] = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" |
553 | SRC_URI[tracing-log-0.2.0.sha256sum] = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" | 532 | SRC_URI[tracing-log-0.2.0.sha256sum] = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" |
554 | SRC_URI[tracing-serde-0.1.3.sha256sum] = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" | 533 | SRC_URI[tracing-serde-0.1.3.sha256sum] = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" |
555 | SRC_URI[tracing-subscriber-0.3.18.sha256sum] = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" | 534 | SRC_URI[tracing-subscriber-0.3.18.sha256sum] = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" |
556 | SRC_URI[trycmd-0.14.19.sha256sum] = "ed009372a42fb103e6f8767b9222925485e03cca032b700d203e2c5b67bee4fb" | 535 | SRC_URI[trycmd-0.15.0.sha256sum] = "464edb3603a81a50b4c8f47b11dfade69ef48ffdc0af2f8b194ad87cbda75317" |
557 | SRC_URI[twox-hash-1.6.3.sha256sum] = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" | 536 | SRC_URI[twox-hash-1.6.3.sha256sum] = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" |
558 | SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" | 537 | SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" |
559 | SRC_URI[unicase-2.7.0.sha256sum] = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" | 538 | SRC_URI[unicase-2.7.0.sha256sum] = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" |
560 | SRC_URI[unicode-bidi-0.3.13.sha256sum] = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" | 539 | SRC_URI[unicode-bidi-0.3.15.sha256sum] = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" |
561 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" | 540 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" |
562 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" | 541 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" |
563 | SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" | 542 | SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" |
564 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" | 543 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" |
544 | SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" | ||
545 | SRC_URI[unscanny-0.1.0.sha256sum] = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" | ||
565 | SRC_URI[untrusted-0.9.0.sha256sum] = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" | 546 | SRC_URI[untrusted-0.9.0.sha256sum] = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" |
566 | SRC_URI[ureq-2.9.1.sha256sum] = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" | 547 | SRC_URI[ureq-2.9.6.sha256sum] = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" |
567 | SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" | 548 | SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" |
549 | SRC_URI[urlencoding-2.1.3.sha256sum] = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" | ||
568 | SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" | 550 | SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" |
569 | SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" | 551 | SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" |
570 | SRC_URI[valuable-0.1.0.sha256sum] = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" | 552 | SRC_URI[valuable-0.1.0.sha256sum] = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" |
571 | SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" | 553 | SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" |
572 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" | 554 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" |
@@ -574,45 +556,37 @@ SRC_URI[versions-5.0.1.sha256sum] = "c73a36bc44e3039f51fbee93e39f41225f6b17b380e | |||
574 | SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" | 556 | SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" |
575 | SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" | 557 | SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" |
576 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 558 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
577 | SRC_URI[webpki-roots-0.25.3.sha256sum] = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" | 559 | SRC_URI[webpki-roots-0.26.0.sha256sum] = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" |
578 | SRC_URI[which-5.0.0.sha256sum] = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" | 560 | SRC_URI[which-5.0.0.sha256sum] = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" |
579 | SRC_URI[wild-2.2.0.sha256sum] = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" | 561 | SRC_URI[which-6.0.0.sha256sum] = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" |
562 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" | ||
580 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | 563 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
581 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 564 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
582 | SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" | 565 | SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" |
583 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | 566 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
584 | SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" | ||
585 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" | 567 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" |
586 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" | 568 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" |
587 | SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" | ||
588 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" | 569 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" |
589 | SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" | 570 | SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" |
590 | SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" | ||
591 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" | 571 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" |
592 | SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" | 572 | SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" |
593 | SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" | ||
594 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" | 573 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" |
595 | SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" | 574 | SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" |
596 | SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" | ||
597 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" | 575 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" |
598 | SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" | 576 | SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" |
599 | SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" | ||
600 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" | 577 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" |
601 | SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" | 578 | SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" |
602 | SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" | ||
603 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" | 579 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" |
604 | SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" | 580 | SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" |
605 | SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" | ||
606 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" | 581 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" |
607 | SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" | 582 | SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" |
608 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" | ||
609 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" | 583 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" |
610 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" | 584 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" |
611 | SRC_URI[winnow-0.5.19.sha256sum] = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" | 585 | SRC_URI[winnow-0.6.2.sha256sum] = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" |
612 | SRC_URI[xattr-1.0.1.sha256sum] = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" | 586 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" |
613 | SRC_URI[xwin-0.5.0.sha256sum] = "c43e0202f5457b48558096cb7b36d0e473f267551a89c82ed72d73b01dfd4007" | 587 | SRC_URI[xwin-0.5.0.sha256sum] = "c43e0202f5457b48558096cb7b36d0e473f267551a89c82ed72d73b01dfd4007" |
614 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" | 588 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" |
615 | SRC_URI[zerocopy-0.7.28.sha256sum] = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" | 589 | SRC_URI[zerocopy-0.7.32.sha256sum] = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" |
616 | SRC_URI[zerocopy-derive-0.7.28.sha256sum] = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" | 590 | SRC_URI[zerocopy-derive-0.7.32.sha256sum] = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" |
617 | SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" | 591 | SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" |
618 | SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" | 592 | SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" |
diff --git a/meta/recipes-devtools/python/python3-maturin/0001-Add-32-bit-RISC-V-support.patch b/meta/recipes-devtools/python/python3-maturin/0001-Add-32-bit-RISC-V-support.patch deleted file mode 100644 index a0ef0c9e22..0000000000 --- a/meta/recipes-devtools/python/python3-maturin/0001-Add-32-bit-RISC-V-support.patch +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | From a945706bd610c5400fc85a248d5e0c96ebd2e953 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Feb 2024 10:38:49 -0800 | ||
4 | Subject: [PATCH] Add 32-bit RISC-V support | ||
5 | |||
6 | Tested with qemuriscv32 and it builds fine with all tests passed on a | ||
7 | qemu machine. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/PyO3/maturin/pull/1969] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/target.rs | 11 ++++++++++- | ||
13 | 1 file changed, 10 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/target.rs b/src/target.rs | ||
16 | index fbb93531..33fa9273 100644 | ||
17 | --- a/src/target.rs | ||
18 | +++ b/src/target.rs | ||
19 | @@ -69,6 +69,7 @@ pub enum Arch { | ||
20 | X86_64, | ||
21 | S390X, | ||
22 | Wasm32, | ||
23 | + Riscv32, | ||
24 | Riscv64, | ||
25 | Mips64el, | ||
26 | Mips64, | ||
27 | @@ -91,6 +92,7 @@ impl fmt::Display for Arch { | ||
28 | Arch::X86_64 => write!(f, "x86_64"), | ||
29 | Arch::S390X => write!(f, "s390x"), | ||
30 | Arch::Wasm32 => write!(f, "wasm32"), | ||
31 | + Arch::Riscv32 => write!(f, "riscv32"), | ||
32 | Arch::Riscv64 => write!(f, "riscv64"), | ||
33 | Arch::Mips64el => write!(f, "mips64el"), | ||
34 | Arch::Mips64 => write!(f, "mips64"), | ||
35 | @@ -115,7 +117,7 @@ impl Arch { | ||
36 | Arch::Powerpc | Arch::Powerpc64Le | Arch::Powerpc64 => "powerpc", | ||
37 | Arch::X86 => "i386", | ||
38 | Arch::X86_64 => "amd64", | ||
39 | - Arch::Riscv64 => "riscv", | ||
40 | + Arch::Riscv32 | Arch::Riscv64 => "riscv", | ||
41 | Arch::Mips64el | Arch::Mips64 | Arch::Mipsel | Arch::Mips => "mips", | ||
42 | // sparc64 is unsupported since FreeBSD 13.0 | ||
43 | Arch::Sparc64 => "sparc64", | ||
44 | @@ -139,6 +141,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> { | ||
45 | Arch::S390X, | ||
46 | Arch::X86, | ||
47 | Arch::X86_64, | ||
48 | + Arch::Riscv32, | ||
49 | Arch::Riscv64, | ||
50 | Arch::Mips64el, | ||
51 | Arch::Mips64, | ||
52 | @@ -158,6 +161,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> { | ||
53 | Arch::Powerpc64Le, | ||
54 | Arch::X86, | ||
55 | Arch::X86_64, | ||
56 | + Arch::Riscv32, | ||
57 | Arch::Riscv64, | ||
58 | Arch::Mips64el, | ||
59 | Arch::Mipsel, | ||
60 | @@ -171,6 +175,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> { | ||
61 | Arch::Powerpc, | ||
62 | Arch::Powerpc64, | ||
63 | Arch::Powerpc64Le, | ||
64 | + Arch::Riscv32, | ||
65 | Arch::Riscv64, | ||
66 | Arch::Sparc64, | ||
67 | ], | ||
68 | @@ -255,6 +260,7 @@ impl Target { | ||
69 | Architecture::Powerpc64le => Arch::Powerpc64Le, | ||
70 | Architecture::S390x => Arch::S390X, | ||
71 | Architecture::Wasm32 => Arch::Wasm32, | ||
72 | + Architecture::Riscv32(_) => Arch::Riscv32, | ||
73 | Architecture::Riscv64(_) => Arch::Riscv64, | ||
74 | Architecture::Mips64(mips64_arch) => match mips64_arch { | ||
75 | Mips64Architecture::Mips64el => Arch::Mips64el, | ||
76 | @@ -343,6 +349,7 @@ impl Target { | ||
77 | Arch::X86_64 => "x86_64", | ||
78 | Arch::S390X => "s390x", | ||
79 | Arch::Wasm32 => "wasm32", | ||
80 | + Arch::Riscv32 => "riscv32", | ||
81 | Arch::Riscv64 => "riscv64", | ||
82 | // It's kinda surprising that Python doesn't include the `el` suffix | ||
83 | Arch::Mips64el | Arch::Mips64 => "mips64", | ||
84 | @@ -388,6 +395,7 @@ impl Target { | ||
85 | } | ||
86 | Arch::Armv6L | ||
87 | | Arch::Wasm32 | ||
88 | + | Arch::Riscv32 | ||
89 | | Arch::Riscv64 | ||
90 | | Arch::Mips64el | ||
91 | | Arch::Mips64 | ||
92 | @@ -418,6 +426,7 @@ impl Target { | ||
93 | | Arch::Wasm32 | ||
94 | | Arch::Mipsel | ||
95 | | Arch::Mips | ||
96 | + | Arch::Riscv32 | ||
97 | | Arch::Powerpc => 32, | ||
98 | } | ||
99 | } | ||
100 | -- | ||
101 | 2.44.0 | ||
102 | |||
diff --git a/meta/recipes-devtools/python/python3-maturin_1.4.0.bb b/meta/recipes-devtools/python/python3-maturin_1.5.1.bb index ed19ee647a..96b046feba 100644 --- a/meta/recipes-devtools/python/python3-maturin_1.4.0.bb +++ b/meta/recipes-devtools/python/python3-maturin_1.5.1.bb | |||
@@ -5,8 +5,7 @@ LICENSE = "MIT | Apache-2.0" | |||
5 | LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ | 5 | LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ |
6 | file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" | 6 | file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" |
7 | 7 | ||
8 | SRC_URI += "file://0001-Add-32-bit-RISC-V-support.patch" | 8 | SRC_URI[sha256sum] = "3dd834ece80edb866af18cbd4635e0ecac40139c726428d5f1849ae154b26dca" |
9 | SRC_URI[sha256sum] = "ed12e1768094a7adeafc3a74ebdb8dc2201fa64c4e7e31f14cfc70378bf93790" | ||
10 | 9 | ||
11 | S = "${WORKDIR}/maturin-${PV}" | 10 | S = "${WORKDIR}/maturin-${PV}" |
12 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-pluggy_1.4.0.bb b/meta/recipes-devtools/python/python3-pluggy_1.5.0.bb index 76acc4ae27..9822cd59f3 100644 --- a/meta/recipes-devtools/python/python3-pluggy_1.4.0.bb +++ b/meta/recipes-devtools/python/python3-pluggy_1.5.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pluggy" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be" | 6 | SRC_URI[sha256sum] = "2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1" |
7 | 7 | ||
8 | DEPENDS += "python3-setuptools-scm-native" | 8 | DEPENDS += "python3-setuptools-scm-native" |
9 | RDEPENDS:${PN} += "python3-importlib-metadata \ | 9 | RDEPENDS:${PN} += "python3-importlib-metadata \ |
diff --git a/meta/recipes-devtools/python/python3-pycparser_2.21.bb b/meta/recipes-devtools/python/python3-pycparser_2.22.bb index 00deceebf9..0be39ea383 100644 --- a/meta/recipes-devtools/python/python3-pycparser_2.21.bb +++ b/meta/recipes-devtools/python/python3-pycparser_2.22.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "Parser of the C language, written in pure Python" | 1 | SUMMARY = "Parser of the C language, written in pure Python" |
2 | HOMEPAGE = "https://github.com/eliben/pycparser" | 2 | HOMEPAGE = "https://github.com/eliben/pycparser" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9761c3ffee7ba99c60dca0408fd3262b" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" | 6 | SRC_URI[sha256sum] = "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
@@ -11,9 +11,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
11 | 11 | ||
12 | RDEPENDS:${PN}:class-target += "\ | 12 | RDEPENDS:${PN}:class-target += "\ |
13 | python3-netclient \ | 13 | python3-netclient \ |
14 | python3-ply \ | 14 | " |
15 | python3-pprint \ | ||
16 | " | ||
17 | 15 | ||
18 | RSUGGESTS:${PN}:class-target += "\ | 16 | RSUGGESTS:${PN}:class-target += "\ |
19 | cpp \ | 17 | cpp \ |
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.48.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.48.2.bb index 4754e41c04..3d83a8a1c2 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.48.1.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.48.2.bb | |||
@@ -19,7 +19,7 @@ DEPENDS += "python3 glib-2.0" | |||
19 | SRCNAME="pygobject" | 19 | SRCNAME="pygobject" |
20 | 20 | ||
21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz" | 21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz" |
22 | SRC_URI[sha256sum] = "3a0a2c0c0f25931b5840649c54834b9e58a63148d37fa9f6308887b7027e15c2" | 22 | SRC_URI[sha256sum] = "0794aeb4a9be31a092ac20621b5f54ec280f9185943d328b105cdae6298ad1a7" |
23 | 23 | ||
24 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 24 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
25 | 25 | ||
diff --git a/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb b/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb index e714ad838e..9ef3145bf8 100644 --- a/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb +++ b/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb | |||
@@ -15,7 +15,6 @@ FILES:${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test" | |||
15 | 15 | ||
16 | RDEPENDS:${PN}:class-target = " \ | 16 | RDEPENDS:${PN}:class-target = " \ |
17 | python3-cryptography \ | 17 | python3-cryptography \ |
18 | python3-six \ | ||
19 | python3-threading \ | 18 | python3-threading \ |
20 | " | 19 | " |
21 | RDEPENDS:${PN}-tests = "${PN}" | 20 | RDEPENDS:${PN}-tests = "${PN}" |
diff --git a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb index 9d08e7acc4..c3f1fb75ed 100644 --- a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb +++ b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb | |||
@@ -22,5 +22,3 @@ RDEPENDS:${PN} += " \ | |||
22 | do_compile:class-native () { | 22 | do_compile:class-native () { |
23 | python_flit_core_do_manual_build | 23 | python_flit_core_do_manual_build |
24 | } | 24 | } |
25 | |||
26 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
diff --git a/meta/recipes-devtools/python/python3-pytest_8.1.1.bb b/meta/recipes-devtools/python/python3-pytest_8.2.0.bb index b1cf23fbc4..1e6674079f 100644 --- a/meta/recipes-devtools/python/python3-pytest_8.1.1.bb +++ b/meta/recipes-devtools/python/python3-pytest_8.2.0.bb | |||
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044" | 8 | SRC_URI[sha256sum] = "d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f" |
9 | 9 | ||
10 | DEPENDS += "python3-setuptools-scm-native" | 10 | DEPENDS += "python3-setuptools-scm-native" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-setuptools_69.2.0.bb b/meta/recipes-devtools/python/python3-setuptools_69.5.1.bb index 897398afc5..8261b09d16 100644 --- a/meta/recipes-devtools/python/python3-setuptools_69.2.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_69.5.1.bb | |||
@@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e | |||
11 | SRC_URI += " \ | 11 | SRC_URI += " \ |
12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" | 12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e" | 14 | SRC_URI[sha256sum] = "6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987" |
15 | 15 | ||
16 | DEPENDS += "python3" | 16 | DEPENDS += "python3" |
17 | 17 | ||
diff --git a/meta/recipes-devtools/python/python3-trove-classifiers_2024.3.3.bb b/meta/recipes-devtools/python/python3-trove-classifiers_2024.4.10.bb index b912efcf55..357b428983 100644 --- a/meta/recipes-devtools/python/python3-trove-classifiers_2024.3.3.bb +++ b/meta/recipes-devtools/python/python3-trove-classifiers_2024.4.10.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/trove-classifiers" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "df7edff9c67ff86b733628998330b180e81d125b1e096536d83ac0fd79673fdc" | 6 | SRC_URI[sha256sum] = "49f40bb6a746b72a1cba4f8d55ee8252169cda0f70802e3fd24f04b7fb25a492" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta ptest | 8 | inherit pypi python_setuptools_build_meta ptest |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch new file mode 100644 index 0000000000..88b84c6024 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 | ||
2 | From: Petr Viktorin <encukou@gmail.com> | ||
3 | Date: Wed, 23 Aug 2023 20:00:07 +0200 | ||
4 | Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to | ||
5 | set it (#108369) | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/python/cpython/pull/108369] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Lib/tarfile.py | 3 ++- | ||
11 | .../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++ | ||
12 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
13 | create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
14 | |||
15 | diff --git a/Lib/tarfile.py b/Lib/tarfile.py | ||
16 | index 3bbbcaa..473167d 100755 | ||
17 | --- a/Lib/tarfile.py | ||
18 | +++ b/Lib/tarfile.py | ||
19 | @@ -2557,7 +2557,8 @@ class TarFile(object): | ||
20 | os.lchown(targetpath, u, g) | ||
21 | else: | ||
22 | os.chown(targetpath, u, g) | ||
23 | - except OSError as e: | ||
24 | + except (OSError, OverflowError) as e: | ||
25 | + # OverflowError can be raised if an ID doesn't fit in `id_t` | ||
26 | raise ExtractError("could not change owner") from e | ||
27 | |||
28 | def chmod(self, tarinfo, targetpath): | ||
29 | diff --git a/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
30 | new file mode 100644 | ||
31 | index 0000000..ffca413 | ||
32 | --- /dev/null | ||
33 | +++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
34 | @@ -0,0 +1,3 @@ | ||
35 | +:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on | ||
36 | +an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to | ||
37 | +set the ID. | ||
38 | -- | ||
39 | 2.45.0 | ||
40 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch new file mode 100644 index 0000000000..1d4cda18b1 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 9d4cdbde100798ba9fa1cf3f82dbaf18fd10a543 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Wed, 8 May 2024 11:58:09 -0400 | ||
4 | Subject: [PATCH] test_shutdown: skip problematic test | ||
5 | |||
6 | This test hangs frequently when run on the Autobuilder. Disable it in | ||
7 | testing until the cause can be determined. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | |||
11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
12 | --- | ||
13 | Lib/test/test_concurrent_futures/test_shutdown.py | 3 +++ | ||
14 | 1 file changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py | ||
17 | index 7a4065afd4..6b878a48bf 100644 | ||
18 | --- a/Lib/test/test_concurrent_futures/test_shutdown.py | ||
19 | +++ b/Lib/test/test_concurrent_futures/test_shutdown.py | ||
20 | @@ -20,6 +20,7 @@ def sleep_and_print(t, msg): | ||
21 | sys.stdout.flush() | ||
22 | |||
23 | |||
24 | +@unittest.skip("skipping problematic test") | ||
25 | class ExecutorShutdownTest: | ||
26 | def test_run_after_shutdown(self): | ||
27 | self.executor.shutdown() | ||
28 | @@ -156,6 +157,7 @@ def timeout(_signum, _frame): | ||
29 | signal.signal(signal.SIGALRM, old_handler) | ||
30 | |||
31 | |||
32 | +@unittest.skip("skipping problematic test") | ||
33 | class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): | ||
34 | def test_threads_terminate(self): | ||
35 | def acquire_lock(lock): | ||
36 | @@ -252,6 +254,7 @@ def test_cancel_futures_wait_false(self): | ||
37 | self.assertIn(out.strip(), [b"apple", b""]) | ||
38 | |||
39 | |||
40 | +@unittest.skip("skipping problematic test") | ||
41 | class ProcessPoolShutdownTest(ExecutorShutdownTest): | ||
42 | def test_processes_terminate(self): | ||
43 | def acquire_lock(lock): | ||
44 | -- | ||
45 | 2.45.0 | ||
46 | |||
diff --git a/meta/recipes-devtools/python/python3_3.12.3.bb b/meta/recipes-devtools/python/python3_3.12.3.bb index b49a58a101..37afa442fa 100644 --- a/meta/recipes-devtools/python/python3_3.12.3.bb +++ b/meta/recipes-devtools/python/python3_3.12.3.bb | |||
@@ -30,6 +30,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ | 30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ |
31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ | 31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ |
32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ | 32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ |
33 | file://0001-test_shutdown-skip-problematic-test.patch \ | ||
34 | file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ | ||
33 | " | 35 | " |
34 | 36 | ||
35 | SRC_URI:append:class-native = " \ | 37 | SRC_URI:append:class-native = " \ |
@@ -157,7 +159,7 @@ do_compile:prepend() { | |||
157 | } | 159 | } |
158 | 160 | ||
159 | do_install:prepend() { | 161 | do_install:prepend() { |
160 | ${WORKDIR}/check_build_completeness.py ${T}/log.do_compile | 162 | ${UNPACKDIR}/check_build_completeness.py ${T}/log.do_compile |
161 | } | 163 | } |
162 | 164 | ||
163 | do_install:append:class-target() { | 165 | do_install:append:class-target() { |
@@ -197,7 +199,7 @@ do_install:append:class-native() { | |||
197 | 199 | ||
198 | do_install:append() { | 200 | do_install:append() { |
199 | for c in ${D}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do | 201 | for c in ${D}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do |
200 | python3 ${WORKDIR}/reformat_sysconfig.py $c | 202 | python3 ${UNPACKDIR}/reformat_sysconfig.py $c |
201 | done | 203 | done |
202 | rm -f ${D}${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata*.cpython* | 204 | rm -f ${D}${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata*.cpython* |
203 | 205 | ||
@@ -284,7 +286,7 @@ py_package_preprocess () { | |||
284 | # Reformat _sysconfigdata after modifying it so that it remains | 286 | # Reformat _sysconfigdata after modifying it so that it remains |
285 | # reproducible | 287 | # reproducible |
286 | for c in ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do | 288 | for c in ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do |
287 | python3 ${WORKDIR}/reformat_sysconfig.py $c | 289 | python3 ${UNPACKDIR}/reformat_sysconfig.py $c |
288 | done | 290 | done |
289 | 291 | ||
290 | # Recompile _sysconfigdata after modifying it | 292 | # Recompile _sysconfigdata after modifying it |
@@ -397,6 +399,7 @@ do_create_manifest() { | |||
397 | # e.g. BerkeleyDB is an optional build dependency so it may or may not | 399 | # e.g. BerkeleyDB is an optional build dependency so it may or may not |
398 | # be present, we must ensure it is. | 400 | # be present, we must ensure it is. |
399 | 401 | ||
402 | cp ${UNPACKDIR}/create_manifest3.py ${WORKDIR} | ||
400 | cd ${WORKDIR} | 403 | cd ${WORKDIR} |
401 | # This needs to be executed by python-native and NOT by HOST's python | 404 | # This needs to be executed by python-native and NOT by HOST's python |
402 | nativepython3 create_manifest3.py ${PYTHON_MAJMIN} | 405 | nativepython3 create_manifest3.py ${PYTHON_MAJMIN} |
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index 5d40784201..997f72e6e7 100644 --- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | |||
@@ -28,6 +28,6 @@ do_compile() { | |||
28 | 28 | ||
29 | do_install() { | 29 | do_install() { |
30 | install -d ${D}${bindir} | 30 | install -d ${D}${bindir} |
31 | install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/ | 31 | install -m 0755 ${S}${COREBASE}/scripts/oe-* ${D}${bindir}/ |
32 | install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/ | 32 | install -m 0755 ${S}${COREBASE}/scripts/runqemu* ${D}${bindir}/ |
33 | } | 33 | } |
diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index 1dfce0e4c7..8bb6ef0995 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Helper utilities needed by the runqemu script" | |||
2 | LICENSE = "GPL-2.0-only" | 2 | LICENSE = "GPL-2.0-only" |
3 | RDEPENDS:${PN} = "qemu-system-native" | 3 | RDEPENDS:${PN} = "qemu-system-native" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab86f2caaa8462eacda77f4d7" | 5 | LIC_FILES_CHKSUM = "file://${S}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab86f2caaa8462eacda77f4d7" |
6 | 6 | ||
7 | SRC_URI = "file://qemu-oe-bridge-helper.c" | 7 | SRC_URI = "file://qemu-oe-bridge-helper.c" |
8 | 8 | ||
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb index 0634b34242..5d2fbcbc02 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb | |||
@@ -17,7 +17,7 @@ PACKAGECONFIG ??= "fdt alsa kvm pie slirp png \ | |||
17 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" | 17 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" |
18 | 18 | ||
19 | do_install:append() { | 19 | do_install:append() { |
20 | install -Dm 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu | 20 | install -Dm 0755 ${UNPACKDIR}/powerpc_rom.bin ${D}${datadir}/qemu |
21 | 21 | ||
22 | # The following is also installed by qemu-native | 22 | # The following is also installed by qemu-native |
23 | rm -f ${D}${datadir}/qemu/trace-events-all | 23 | rm -f ${D}${datadir}/qemu/trace-events-all |
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4501f84c2b..f76cbbb5cb 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -168,11 +168,11 @@ do_install () { | |||
168 | # If we built the guest agent, also install startup/udev rules | 168 | # If we built the guest agent, also install startup/udev rules |
169 | if [ -e "${D}${bindir}/qemu-ga" ]; then | 169 | if [ -e "${D}${bindir}/qemu-ga" ]; then |
170 | install -d ${D}${sysconfdir}/init.d/ | 170 | install -d ${D}${sysconfdir}/init.d/ |
171 | install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent | 171 | install -m 0755 ${UNPACKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent |
172 | sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent | 172 | sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent |
173 | 173 | ||
174 | install -d ${D}${sysconfdir}/udev/rules.d/ | 174 | install -d ${D}${sysconfdir}/udev/rules.d/ |
175 | install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules | 175 | install -m 0644 ${UNPACKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules |
176 | 176 | ||
177 | install -d ${D}${systemd_unitdir}/system/ | 177 | install -d ${D}${systemd_unitdir}/system/ |
178 | install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system | 178 | install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system |
diff --git a/meta/recipes-devtools/repo/repo_2.44.bb b/meta/recipes-devtools/repo/repo_2.45.bb index 875897851a..dd12373e3a 100644 --- a/meta/recipes-devtools/repo/repo_2.44.bb +++ b/meta/recipes-devtools/repo/repo_2.45.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
11 | 11 | ||
12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ |
13 | " | 13 | " |
14 | SRCREV = "fff1d2d74c2078b62cc9c2561330e41a842dc197" | 14 | SRCREV = "73356f1d5ccbebf5a33e5e9aa1ba06c5f5437fed" |
15 | 15 | ||
16 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" | 16 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" |
17 | 17 | ||
@@ -22,7 +22,7 @@ do_configure:prepend() { | |||
22 | } | 22 | } |
23 | 23 | ||
24 | do_install() { | 24 | do_install() { |
25 | install -D ${WORKDIR}/git/repo ${D}${bindir}/repo | 25 | install -D ${S}/repo ${D}${bindir}/repo |
26 | } | 26 | } |
27 | 27 | ||
28 | RDEPENDS:${PN} = "python3 git" | 28 | RDEPENDS:${PN} = "python3 git" |
diff --git a/meta/recipes-devtools/rsync/rsync_3.3.0.bb b/meta/recipes-devtools/rsync/rsync_3.3.0.bb index b42026331d..a90d2887bd 100644 --- a/meta/recipes-devtools/rsync/rsync_3.3.0.bb +++ b/meta/recipes-devtools/rsync/rsync_3.3.0.bb | |||
@@ -61,7 +61,7 @@ do_configure:append () { | |||
61 | 61 | ||
62 | do_install:append() { | 62 | do_install:append() { |
63 | install -d ${D}${sysconfdir} | 63 | install -d ${D}${sysconfdir} |
64 | install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir} | 64 | install -m 0644 ${UNPACKDIR}/rsyncd.conf ${D}${sysconfdir} |
65 | } | 65 | } |
66 | 66 | ||
67 | BBCLASSEXTEND = "native nativesdk" | 67 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/ruby/ruby_3.3.0.bb b/meta/recipes-devtools/ruby/ruby_3.3.0.bb index 17eb6d73c2..657fc31b4d 100644 --- a/meta/recipes-devtools/ruby/ruby_3.3.0.bb +++ b/meta/recipes-devtools/ruby/ruby_3.3.0.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ | |||
13 | file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \ | 13 | file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS = "zlib openssl libyaml gdbm readline libffi" | 16 | DEPENDS = "zlib openssl libyaml libffi" |
17 | DEPENDS:append:class-target = " ruby-native" | 17 | DEPENDS:append:class-target = " ruby-native" |
18 | DEPENDS:append:class-nativesdk = " ruby-native" | 18 | DEPENDS:append:class-nativesdk = " ruby-native" |
19 | 19 | ||
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index e977942de8..e3d63df852 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | |||
@@ -29,13 +29,13 @@ do_compile () { | |||
29 | 29 | ||
30 | do_install() { | 30 | do_install() { |
31 | install -d ${D}${sbindir} | 31 | install -d ${D}${sbindir} |
32 | install -m 0755 ${WORKDIR}/run-postinsts ${D}${sbindir}/ | 32 | install -m 0755 ${S}/run-postinsts ${D}${sbindir}/ |
33 | 33 | ||
34 | install -d ${D}${sysconfdir}/init.d/ | 34 | install -d ${D}${sysconfdir}/init.d/ |
35 | install -m 0755 ${WORKDIR}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts | 35 | install -m 0755 ${S}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts |
36 | 36 | ||
37 | install -d ${D}${systemd_system_unitdir}/ | 37 | install -d ${D}${systemd_system_unitdir}/ |
38 | install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_system_unitdir}/ | 38 | install -m 0644 ${S}/run-postinsts.service ${D}${systemd_system_unitdir}/ |
39 | 39 | ||
40 | sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ | 40 | sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ |
41 | -e 's:#SBINDIR#:${sbindir}:g' \ | 41 | -e 's:#SBINDIR#:${sbindir}:g' \ |
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index 7bfef6d175..f59fee7cdd 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc | |||
@@ -46,7 +46,7 @@ do_install () { | |||
46 | # where the context is easier to do the env maniupations needed | 46 | # where the context is easier to do the env maniupations needed |
47 | install -d ${SYS_BINDIR} | 47 | install -d ${SYS_BINDIR} |
48 | outfile="${SYS_BINDIR}/target-rust-ccld" | 48 | outfile="${SYS_BINDIR}/target-rust-ccld" |
49 | ${CC} ${WORKDIR}/target-rust-ccld.c -o $outfile | 49 | ${CC} ${S}/target-rust-ccld.c -o $outfile |
50 | chmod +x "$outfile" | 50 | chmod +x "$outfile" |
51 | create_sdk_wrapper "${SYS_BINDIR}/target-rust-ccld-wrapper" "CC" | 51 | create_sdk_wrapper "${SYS_BINDIR}/target-rust-ccld-wrapper" "CC" |
52 | 52 | ||
diff --git a/meta/recipes-devtools/strace/strace_6.7.bb b/meta/recipes-devtools/strace/strace_6.8.bb index f365477ccd..e1cc65e053 100644 --- a/meta/recipes-devtools/strace/strace_6.7.bb +++ b/meta/recipes-devtools/strace/strace_6.8.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ | |||
15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ | 15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ |
16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ | 16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7" | 18 | SRC_URI[sha256sum] = "ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149" |
19 | 19 | ||
20 | inherit autotools ptest | 20 | inherit autotools ptest |
21 | 21 | ||
@@ -47,10 +47,6 @@ do_install_ptest() { | |||
47 | sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile | 47 | sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile |
48 | } | 48 | } |
49 | 49 | ||
50 | RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed" | 50 | RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed locale-base-en-us" |
51 | |||
52 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ | ||
53 | locale-base-en-us.iso-8859-1 \ | ||
54 | " | ||
55 | 51 | ||
56 | BBCLASSEXTEND = "native" | 52 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc deleted file mode 100644 index 7a6c4d7359..0000000000 --- a/meta/recipes-devtools/swig/swig.inc +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" | ||
2 | DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ | ||
3 | code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ | ||
4 | Mzscheme, Chicken, OCaml, Pike, and C#." | ||
5 | HOMEPAGE = "http://swig.sourceforge.net/" | ||
6 | LICENSE = "BSD-3-Clause & GPL-3.0-only" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ | ||
8 | file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" | ||
10 | |||
11 | SECTION = "devel" | ||
12 | |||
13 | DEPENDS = "libpcre2 bison-native" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" | ||
16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" | ||
17 | UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
19 | inherit autotools python3native pkgconfig | ||
20 | |||
21 | EXTRA_OECONF = " \ | ||
22 | --with-python3=${PYTHON} \ | ||
23 | --without-allegrocl \ | ||
24 | --without-android \ | ||
25 | --without-boost \ | ||
26 | --without-chicken \ | ||
27 | --without-clisp \ | ||
28 | --without-csharp \ | ||
29 | --without-d \ | ||
30 | --without-gcj \ | ||
31 | --without-go \ | ||
32 | --without-guile \ | ||
33 | --without-java \ | ||
34 | --without-lua \ | ||
35 | --without-mzscheme \ | ||
36 | --without-ocaml \ | ||
37 | --without-octave \ | ||
38 | --without-perl5 \ | ||
39 | --without-pike \ | ||
40 | --without-php \ | ||
41 | --without-r \ | ||
42 | --without-ruby \ | ||
43 | --without-tcl \ | ||
44 | " | ||
45 | |||
46 | EXTRA_AUTORECONF += "-I Tools/config" | ||
47 | |||
48 | BBCLASSEXTEND = "native nativesdk" | ||
49 | |||
50 | # necessary together with bison dependency until a new upstream version after | ||
51 | # 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch | ||
52 | do_configure:append() { | ||
53 | mkdir -p ${B}/Source/CParse | ||
54 | } | ||
55 | |||
56 | do_install:append:class-nativesdk() { | ||
57 | cd ${D}${bindir} | ||
58 | ln -s swig swig2.0 | ||
59 | } | ||
60 | |||
61 | def swiglib_relpath(d): | ||
62 | swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') | ||
63 | return os.path.relpath(swiglib, d.getVar('bindir')) | ||
64 | |||
65 | do_install:append:class-native() { | ||
66 | create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} | ||
67 | } | ||
diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch deleted file mode 100644 index 5e83e92725..0000000000 --- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From b88a98348b3841f0b702e314631883d46f9f362d Mon Sep 17 00:00:00 2001 | ||
2 | From: "NODA, Kai" <nodakai@gmail.com> | ||
3 | Date: Sun, 22 Apr 2012 17:01:02 +0900 | ||
4 | Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32 | ||
5 | platforms. | ||
6 | |||
7 | If it wasn't found, then fall back to a fixed string just as before. | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | http://sourceforge.net/mailarchive/message.php?msg_id=29179733 | ||
11 | --- | ||
12 | Source/Modules/main.cxx | 24 ++++++++++++++++++++++-- | ||
13 | 1 file changed, 22 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx | ||
16 | index 76b4f9d..de0a512 100644 | ||
17 | --- a/Source/Modules/main.cxx | ||
18 | +++ b/Source/Modules/main.cxx | ||
19 | @@ -25,6 +25,11 @@ | ||
20 | #include <ctype.h> | ||
21 | #include <errno.h> | ||
22 | #include <limits.h> // for INT_MAX | ||
23 | +#ifndef _WIN32 | ||
24 | +#include <cstddef> | ||
25 | +#include <unistd.h> // for readlink | ||
26 | +#include <sys/stat.h> // for stat | ||
27 | +#endif | ||
28 | |||
29 | // Global variables | ||
30 | |||
31 | @@ -895,9 +900,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { | ||
32 | |||
33 | // Check for SWIG_LIB environment variable | ||
34 | if ((c = getenv("SWIG_LIB")) == (char *) 0) { | ||
35 | + char *p; | ||
36 | #if defined(_WIN32) | ||
37 | char buf[MAX_PATH]; | ||
38 | - char *p; | ||
39 | if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) { | ||
40 | *(p + 1) = '\0'; | ||
41 | SwigLib = NewStringf("%sLib", buf); // Native windows installation path | ||
42 | @@ -907,7 +912,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { | ||
43 | if (Len(SWIG_LIB_WIN_UNIX) > 0) | ||
44 | SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw) | ||
45 | #else | ||
46 | - SwigLib = NewString(SWIG_LIB); | ||
47 | + char buf[PATH_MAX]; | ||
48 | + if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) && | ||
49 | + (p = ::strstr(buf, "/bin/swig"))) { | ||
50 | + int major, minor, patch; | ||
51 | + const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch); | ||
52 | + if (3 == ret) { | ||
53 | + const ::ptrdiff_t dir_part_len = p - buf; | ||
54 | + ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch); | ||
55 | + struct ::stat stat_res; | ||
56 | + if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) { | ||
57 | + SwigLib = NewString(buf); | ||
58 | + } | ||
59 | + } | ||
60 | + } | ||
61 | + if (NULL == SwigLib) | ||
62 | + SwigLib = NewString(SWIG_LIB); | ||
63 | #endif | ||
64 | } else { | ||
65 | SwigLib = NewString(c); | ||
diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch deleted file mode 100644 index 9e16caecca..0000000000 --- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Tue, 17 Jun 2014 08:18:17 +0200 | ||
4 | Subject: [PATCH] configure: use pkg-config for pcre detection | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | configure.ac | 39 +++++++-------------------------------- | ||
11 | 1 file changed, 7 insertions(+), 32 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index c060028..a330266 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -49,39 +49,14 @@ AC_MSG_RESULT([$with_pcre]) | ||
18 | |||
19 | dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script | ||
20 | if test x"${with_pcre}" = xyes ; then | ||
21 | - AC_MSG_CHECKING([whether to use local PCRE2]) | ||
22 | - local_pcre_config=no | ||
23 | - if test -z "$PCRE2_CONFIG"; then | ||
24 | - if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then | ||
25 | - PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config | ||
26 | - local_pcre_config=$PCRE2_CONFIG | ||
27 | - fi | ||
28 | - fi | ||
29 | - AC_MSG_RESULT([$local_pcre_config]) | ||
30 | -fi | ||
31 | -AS_IF([test "x$with_pcre" != xno], | ||
32 | - [AX_PATH_GENERIC([pcre2], | ||
33 | - [], dnl Minimal version of PCRE we need -- accept any | ||
34 | - [], dnl custom sed script for version parsing is not needed | ||
35 | - [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library]) | ||
36 | - LIBS="$LIBS $PCRE2_LIBS" | ||
37 | - CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS" | ||
38 | - ], | ||
39 | - [AC_MSG_FAILURE([ | ||
40 | - Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions) | ||
41 | - library package. This dependency is needed for configure to complete, | ||
42 | - Either: | ||
43 | - - Install the PCRE2 developer package on your system (preferred approach). | ||
44 | - - Download the PCRE2 source tarball, build and install on your system | ||
45 | - as you would for any package built from source distribution. | ||
46 | - - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically | ||
47 | - link against. Run 'Tools/pcre-build.sh --help' for instructions. | ||
48 | - (quite easy and does not require privileges to install PCRE2 on your system) | ||
49 | - - Use configure --without-pcre to disable regular expressions support in SWIG | ||
50 | - (not recommended).]) | ||
51 | - ], | ||
52 | - [],[],[--libs8]) | ||
53 | + PKG_CHECK_MODULES([PCRE], [libpcre2], [ | ||
54 | + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) | ||
55 | + LIBS="$LIBS $PCRE_LIBS" | ||
56 | + CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" | ||
57 | + ], [ | ||
58 | + AC_MSG_WARN([$PCRE_PKG_ERRORS]) | ||
59 | ]) | ||
60 | +fi | ||
61 | |||
62 | |||
63 | dnl CCache | ||
diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.2.1.bb index 4b438a7298..b564be9b36 100644 --- a/meta/recipes-devtools/swig/swig_4.2.1.bb +++ b/meta/recipes-devtools/swig/swig_4.2.1.bb | |||
@@ -1,7 +1,45 @@ | |||
1 | require ${BPN}.inc | 1 | SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" |
2 | DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ | ||
3 | code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ | ||
4 | Mzscheme, Chicken, OCaml, Pike, and C#." | ||
5 | HOMEPAGE = "http://swig.sourceforge.net/" | ||
6 | LICENSE = "BSD-3-Clause & GPL-3.0-only" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ | ||
8 | file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" | ||
2 | 10 | ||
3 | SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \ | 11 | SECTION = "devel" |
4 | file://0001-configure-use-pkg-config-for-pcre-detection.patch \ | 12 | |
13 | DEPENDS = "libpcre2 bison-native" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | ||
5 | file://determinism.patch \ | 16 | file://determinism.patch \ |
6 | " | 17 | " |
7 | SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8" | 18 | SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8" |
19 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" | ||
20 | UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)" | ||
21 | |||
22 | inherit cmake pkgconfig | ||
23 | |||
24 | BBCLASSEXTEND = "native nativesdk" | ||
25 | |||
26 | do_install:append:class-nativesdk() { | ||
27 | cd ${D}${bindir} | ||
28 | ln -s swig swig2.0 | ||
29 | } | ||
30 | |||
31 | def swiglib_relpath(d): | ||
32 | swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') | ||
33 | return os.path.relpath(swiglib, d.getVar('bindir')) | ||
34 | |||
35 | do_install:append:class-native() { | ||
36 | create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} | ||
37 | } | ||
38 | |||
39 | PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" | ||
40 | src_package_preprocess () { | ||
41 | # Trim build paths from comments and defines in generated sources to ensure reproducibility | ||
42 | sed -i -e "s,${WORKDIR},,g" \ | ||
43 | -e "s,YY_YY_.*_CPARSE_PARSER_H_INCLUDED,YY_YY_CPARSE_PARSER_H_INCLUDED,g" \ | ||
44 | ${B}/Source/CParse/parser.* | ||
45 | } | ||
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 59b9d7de78..214dd4b2a8 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | |||
@@ -54,9 +54,9 @@ CFLAGS:append:loongarch64 = " ${LCL_STOP_SERVICES}" | |||
54 | do_install() { | 54 | do_install() { |
55 | oe_runmake install INSTALLROOT=${D} | 55 | oe_runmake install INSTALLROOT=${D} |
56 | install -d ${D}${sysconfdir}/init.d/ | 56 | install -d ${D}${sysconfdir}/init.d/ |
57 | install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent | 57 | install -m 0755 ${UNPACKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent |
58 | install -d ${D}${systemd_system_unitdir} | 58 | install -d ${D}${systemd_system_unitdir} |
59 | install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_system_unitdir} | 59 | install -m 0644 ${UNPACKDIR}/tcf-agent.service ${D}${systemd_system_unitdir} |
60 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service | 60 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service |
61 | } | 61 | } |
62 | 62 | ||
diff --git a/meta/recipes-devtools/vala/vala_0.56.16.bb b/meta/recipes-devtools/vala/vala_0.56.17.bb index 1c8e4fc673..acd6c43096 100644 --- a/meta/recipes-devtools/vala/vala_0.56.16.bb +++ b/meta/recipes-devtools/vala/vala_0.56.17.bb | |||
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
19 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 19 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
20 | 20 | ||
21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" | 21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" |
22 | SRC_URI[sha256sum] = "05487b5600f5d2f09e66a753cccd8f39c1bff9f148aea1b7774d505b9c8bca9b" | 22 | SRC_URI[sha256sum] = "26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a" |
23 | 23 | ||
24 | inherit autotools pkgconfig upstream-version-is-even | 24 | inherit autotools pkgconfig upstream-version-is-even |
25 | 25 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch index e7af5efecc..832a1c3d6e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch | |||
@@ -10,11 +10,9 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | |||
10 | tests/vg_regtest.in | 1 + | 10 | tests/vg_regtest.in | 1 + |
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in | ||
14 | index 909af3be8..f2799c4e3 100755 | ||
15 | --- a/tests/vg_regtest.in | 13 | --- a/tests/vg_regtest.in |
16 | +++ b/tests/vg_regtest.in | 14 | +++ b/tests/vg_regtest.in |
17 | @@ -403,6 +403,7 @@ sub mysystem($) | 15 | @@ -401,6 +401,7 @@ sub mysystem($) |
18 | exit 1; | 16 | exit 1; |
19 | } | 17 | } |
20 | } | 18 | } |
@@ -22,6 +20,3 @@ index 909af3be8..f2799c4e3 100755 | |||
22 | } | 20 | } |
23 | # if $keepunfiltered, copies $1 to $1.unfiltered.out | 21 | # if $keepunfiltered, copies $1 to $1.unfiltered.out |
24 | # renames $0 tp $1 | 22 | # renames $0 tp $1 |
25 | -- | ||
26 | 2.17.0 | ||
27 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch new file mode 100644 index 0000000000..63a1a58c04 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From b17b6d7d3a65c14f91f090f3f4f9898d6fa3a9e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 10 May 2024 16:27:34 -0700 | ||
4 | Subject: [PATCH] configure: Drop setting mcpu=cortex-a8 on arm | ||
5 | |||
6 | The -march settings from environment expresses the flags | ||
7 | appropriately, moreover, this conflicts when using armhf | ||
8 | without neon [1] | ||
9 | |||
10 | [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928224 | ||
11 | |||
12 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | configure.ac | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index 39d8b6d..d61b3a6 100755 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -275,13 +275,13 @@ case "${host_cpu}" in | ||
23 | |||
24 | armv8*) | ||
25 | AC_MSG_RESULT([ok (${host_cpu})]) | ||
26 | - VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8" | ||
27 | + VGCONF_PLATFORM_ARM_ARCH="-marm" | ||
28 | ARCH_MAX="arm" | ||
29 | ;; | ||
30 | |||
31 | armv7*) | ||
32 | AC_MSG_RESULT([ok (${host_cpu})]) | ||
33 | - VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8" | ||
34 | + VGCONF_PLATFORM_ARM_ARCH="-marm" | ||
35 | ARCH_MAX="arm" | ||
36 | ;; | ||
37 | |||
38 | -- | ||
39 | 2.45.0 | ||
40 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch index 256ddb0c34..eba569c884 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch | |||
@@ -18,11 +18,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | docs/Makefile.am | 2 +- | 18 | docs/Makefile.am | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/docs/Makefile.am b/docs/Makefile.am | ||
22 | index d4250e8..c500306 100644 | ||
23 | --- a/docs/Makefile.am | 21 | --- a/docs/Makefile.am |
24 | +++ b/docs/Makefile.am | 22 | +++ b/docs/Makefile.am |
25 | @@ -192,7 +192,7 @@ valid-manpages: $(MANPAGES_XML_FILES) | 23 | @@ -194,7 +194,7 @@ valid-manpages: $(MANPAGES_XML_FILES) |
26 | touch $@; \ | 24 | touch $@; \ |
27 | fi | 25 | fi |
28 | 26 | ||
@@ -31,6 +29,3 @@ index d4250e8..c500306 100644 | |||
31 | 29 | ||
32 | # The text version of the FAQ. | 30 | # The text version of the FAQ. |
33 | FAQ.txt: | 31 | FAQ.txt: |
34 | -- | ||
35 | 2.34.1 | ||
36 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch index 073713c139..7996fa6e8f 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | |||
@@ -19,30 +19,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | none/tests/arm/Makefile.am | 18 +++++++++--------- | 19 | none/tests/arm/Makefile.am | 18 +++++++++--------- |
20 | 3 files changed, 15 insertions(+), 15 deletions(-) | 20 | 3 files changed, 15 insertions(+), 15 deletions(-) |
21 | 21 | ||
22 | diff --git a/Makefile.all.am b/Makefile.all.am | ||
23 | index 02059a3..c7c4700 100644 | ||
24 | --- a/Makefile.all.am | ||
25 | +++ b/Makefile.all.am | ||
26 | @@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g | ||
27 | |||
28 | AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ | ||
29 | AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ | ||
30 | - $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 | ||
31 | + $(AM_CFLAGS_BASE) -marm | ||
32 | AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ | ||
33 | - -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) | ||
34 | + -marm $(AM_CFLAGS_PSO_BASE) | ||
35 | AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ | ||
36 | - -marm -mcpu=cortex-a8 -g | ||
37 | + -marm -g | ||
38 | |||
39 | AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ | ||
40 | AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) | ||
41 | diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am | ||
42 | index df82169..07eb66a 100644 | ||
43 | --- a/helgrind/tests/Makefile.am | 22 | --- a/helgrind/tests/Makefile.am |
44 | +++ b/helgrind/tests/Makefile.am | 23 | +++ b/helgrind/tests/Makefile.am |
45 | @@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN | 24 | @@ -223,9 +223,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN |
46 | endif | 25 | endif |
47 | 26 | ||
48 | if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX | 27 | if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX |
@@ -55,11 +34,9 @@ index df82169..07eb66a 100644 | |||
55 | else | 34 | else |
56 | annotate_hbefore_CFLAGS = $(AM_CFLAGS) | 35 | annotate_hbefore_CFLAGS = $(AM_CFLAGS) |
57 | tc07_hbl1_CFLAGS = $(AM_CFLAGS) | 36 | tc07_hbl1_CFLAGS = $(AM_CFLAGS) |
58 | diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am | ||
59 | index 024eb6d..ccecb90 100644 | ||
60 | --- a/none/tests/arm/Makefile.am | 37 | --- a/none/tests/arm/Makefile.am |
61 | +++ b/none/tests/arm/Makefile.am | 38 | +++ b/none/tests/arm/Makefile.am |
62 | @@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ | 39 | @@ -56,10 +56,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_N |
63 | # need special helping w.r.t -mfpu and -mfloat-abi, though. | 40 | # need special helping w.r.t -mfpu and -mfloat-abi, though. |
64 | # Also force -O0 since -O takes hundreds of MB of memory | 41 | # Also force -O0 since -O takes hundreds of MB of memory |
65 | # for v6intThumb.c. | 42 | # for v6intThumb.c. |
@@ -71,11 +48,11 @@ index 024eb6d..ccecb90 100644 | |||
71 | -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb | 48 | -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb |
72 | +v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb | 49 | +v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb |
73 | 50 | ||
74 | v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm | 51 | v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a |
75 | v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb | 52 | v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a |
76 | @@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \ | 53 | @@ -74,23 +74,23 @@ v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 |
77 | v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \ | 54 | |
78 | -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb | 55 | vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mfpu=neon |
79 | 56 | ||
80 | -vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ | 57 | -vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ |
81 | +vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \ | 58 | +vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \ |
@@ -103,6 +80,3 @@ index 024eb6d..ccecb90 100644 | |||
103 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3 | 80 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3 |
104 | 81 | ||
105 | vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm | 82 | vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm |
106 | -- | ||
107 | 2.12.2 | ||
108 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch index 15fbbe954f..29a9e95a90 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch | |||
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 17 | ||
18 | --- a/config.h.in | 18 | --- a/config.h.in |
19 | +++ b/config.h.in | 19 | +++ b/config.h.in |
20 | @@ -301,6 +301,9 @@ | 20 | @@ -424,6 +424,9 @@ |
21 | /* Define to 1 if you have the <sys/sysnvl.h> header file. */ | 21 | /* Define to 1 if you have the <sys/sysnvl.h> header file. */ |
22 | #undef HAVE_SYS_SYSNVL_H | 22 | #undef HAVE_SYS_SYSNVL_H |
23 | 23 | ||
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 29 | ||
30 | --- a/configure.ac | 30 | --- a/configure.ac |
31 | +++ b/configure.ac | 31 | +++ b/configure.ac |
32 | @@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([ \ | 32 | @@ -4881,6 +4881,7 @@ AC_CHECK_HEADERS([ \ |
33 | sys/syscall.h \ | 33 | sys/syscall.h \ |
34 | sys/sysnvl.h \ | 34 | sys/sysnvl.h \ |
35 | sys/time.h \ | 35 | sys/time.h \ |
@@ -39,7 +39,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
39 | 39 | ||
40 | --- a/memcheck/tests/linux/timerfd-syscall.c | 40 | --- a/memcheck/tests/linux/timerfd-syscall.c |
41 | +++ b/memcheck/tests/linux/timerfd-syscall.c | 41 | +++ b/memcheck/tests/linux/timerfd-syscall.c |
42 | @@ -45,6 +45,9 @@ | 42 | @@ -42,6 +42,9 @@ |
43 | #if defined(HAVE_SYS_TIME_H) | 43 | #if defined(HAVE_SYS_TIME_H) |
44 | #include <sys/time.h> | 44 | #include <sys/time.h> |
45 | #endif | 45 | #endif |
@@ -49,7 +49,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
49 | #if defined(HAVE_SYS_TYPES_H) | 49 | #if defined(HAVE_SYS_TYPES_H) |
50 | #include <sys/types.h> | 50 | #include <sys/types.h> |
51 | #endif | 51 | #endif |
52 | @@ -54,7 +57,8 @@ | 52 | @@ -51,7 +54,8 @@ |
53 | * timerfd_* system call numbers introduced in 2.6.23. These constants are | 53 | * timerfd_* system call numbers introduced in 2.6.23. These constants are |
54 | * not yet in the glibc 2.7 headers, that is why they are defined here. | 54 | * not yet in the glibc 2.7 headers, that is why they are defined here. |
55 | */ | 55 | */ |
@@ -59,7 +59,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
59 | #if defined(__x86_64__) | 59 | #if defined(__x86_64__) |
60 | #define __NR_timerfd_create 283 | 60 | #define __NR_timerfd_create 283 |
61 | #elif defined(__i386__) | 61 | #elif defined(__i386__) |
62 | @@ -67,8 +71,10 @@ | 62 | @@ -64,8 +68,10 @@ |
63 | #error Cannot detect your architecture! | 63 | #error Cannot detect your architecture! |
64 | #endif | 64 | #endif |
65 | #endif | 65 | #endif |
@@ -71,7 +71,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
71 | #if defined(__x86_64__) | 71 | #if defined(__x86_64__) |
72 | #define __NR_timerfd_settime 286 | 72 | #define __NR_timerfd_settime 286 |
73 | #define __NR_timerfd_gettime 287 | 73 | #define __NR_timerfd_gettime 287 |
74 | @@ -85,7 +91,7 @@ | 74 | @@ -82,7 +88,7 @@ |
75 | #error Cannot detect your architecture! | 75 | #error Cannot detect your architecture! |
76 | #endif | 76 | #endif |
77 | #endif | 77 | #endif |
@@ -80,7 +80,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
80 | 80 | ||
81 | 81 | ||
82 | /* Definitions from include/linux/timerfd.h */ | 82 | /* Definitions from include/linux/timerfd.h */ |
83 | @@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr, | 83 | @@ -124,6 +130,7 @@ void set_timespec(struct timespec *tmr, |
84 | tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); | 84 | tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); |
85 | } | 85 | } |
86 | 86 | ||
@@ -88,7 +88,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
88 | int timerfd_create(int clockid, int flags) | 88 | int timerfd_create(int clockid, int flags) |
89 | { | 89 | { |
90 | return syscall(__NR_timerfd_create, clockid, flags); | 90 | return syscall(__NR_timerfd_create, clockid, flags); |
91 | @@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim | 91 | @@ -139,6 +146,7 @@ int timerfd_gettime(int ufc, struct itim |
92 | { | 92 | { |
93 | return syscall(__NR_timerfd_gettime, ufc, otmr); | 93 | return syscall(__NR_timerfd_gettime, ufc, otmr); |
94 | } | 94 | } |
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch new file mode 100644 index 0000000000..2d28bcb6c4 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 8e907753625faba3284925983ef8e83f8491aa76 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 10 May 2024 17:44:47 -0700 | ||
4 | Subject: [PATCH] tests/arm: Use -O instead of -O0 | ||
5 | |||
6 | GCC-14 fails to compile the testcase with -O2 [1] | ||
7 | therefore workaround it by using -O1, which works | ||
8 | and for OE/cross-compiling it is fine, -O0 is used | ||
9 | to make these tests compile natively on an arm target | ||
10 | and gcc would take less memory compiling with -O0 | ||
11 | -O would take a bit more memory but in cross compiling | ||
12 | we have enough of it on build host. | ||
13 | |||
14 | [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115042 | ||
15 | Upstream-Status: Inappropriate [WORKAROUND] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | none/tests/arm/Makefile.am | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | --- a/none/tests/arm/Makefile.am | ||
22 | +++ b/none/tests/arm/Makefile.am | ||
23 | @@ -57,9 +57,9 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_N | ||
24 | # Also force -O0 since -O takes hundreds of MB of memory | ||
25 | # for v6intThumb.c. | ||
26 | v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm | ||
27 | -v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb | ||
28 | +v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O -mthumb | ||
29 | |||
30 | -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb | ||
31 | +v6media_CFLAGS = $(AM_CFLAGS) -g -O -mthumb | ||
32 | |||
33 | v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a | ||
34 | v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch deleted file mode 100644 index 80a8e3a10b..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 027b649fdb831868e71be01cafdacc49a5f419ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Fri, 17 Nov 2023 14:01:21 +0100 | ||
4 | Subject: [PATCH 1/4] valgrind-monitor.py regular expressions should use raw | ||
5 | strings | ||
6 | |||
7 | With python 3.12 gdb will produce the following SyntaxWarning when | ||
8 | loading valgrind-monitor-def.py: | ||
9 | |||
10 | /usr/share/gdb/auto-load/valgrind-monitor-def.py:214: | ||
11 | SyntaxWarning: invalid escape sequence '\[' | ||
12 | if re.fullmatch("^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
13 | |||
14 | In a future python version this will become an SyntaxError. | ||
15 | |||
16 | Use a raw strings for the regular expression. | ||
17 | |||
18 | https://bugs.kde.org/show_bug.cgi?id=476708 | ||
19 | (cherry picked from commit 0fbfbe05028ad18efda786a256a2738d2c231ed4) | ||
20 | |||
21 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=027b649fdb831868e71be01cafdacc49a5f419ab] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | NEWS | 13 +++++++++++++ | ||
25 | coregrind/m_gdbserver/valgrind-monitor-def.py | 2 +- | ||
26 | 2 files changed, 14 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/NEWS b/NEWS | ||
29 | index f11da4be8..ee5b4ff11 100644 | ||
30 | --- a/NEWS | ||
31 | +++ b/NEWS | ||
32 | @@ -1,3 +1,16 @@ | ||
33 | +Branch 3.22 | ||
34 | +~~~~~~~~~~~ | ||
35 | + | ||
36 | +* ==================== FIXED BUGS ==================== | ||
37 | + | ||
38 | +The following bugs have been fixed or resolved on this branch. | ||
39 | + | ||
40 | +476708 valgrind-monitor.py regular expressions should use raw strings | ||
41 | + | ||
42 | +To see details of a given bug, visit | ||
43 | + https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
44 | +where XXXXXX is the bug number as listed above. | ||
45 | + | ||
46 | Release 3.22.0 (31 Oct 2023) | ||
47 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
48 | |||
49 | diff --git a/coregrind/m_gdbserver/valgrind-monitor-def.py b/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
50 | index b4e7b992d..d74b1590c 100644 | ||
51 | --- a/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
52 | +++ b/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
53 | @@ -211,7 +211,7 @@ class Valgrind_ADDR_LEN_opt(Valgrind_Command): | ||
54 | For compatibility reason with the Valgrind gdbserver monitor command, | ||
55 | we detect and accept usages such as 0x1234ABCD[10].""" | ||
56 | def invoke(self, arg_str : str, from_tty : bool) -> None: | ||
57 | - if re.fullmatch("^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
58 | + if re.fullmatch(r"^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
59 | arg_str = arg_str.replace("[", " ") | ||
60 | arg_str = arg_str.replace("]", " ") | ||
61 | eval_execute_2(self, arg_str, | ||
62 | -- | ||
63 | 2.44.0 | ||
64 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch b/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch deleted file mode 100644 index 5759fa039a..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | From 1d00e5ce0fb069911c4b525ec38289fb5d9021b0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Floyd <pjfloyd@wanadoo.fr> | ||
3 | Date: Sat, 18 Nov 2023 08:49:34 +0100 | ||
4 | Subject: [PATCH 2/4] Bug 476548 - valgrind 3.22.0 fails on assertion when | ||
5 | loading debuginfo file produced by mold | ||
6 | |||
7 | (cherry picked from commit 9ea4ae66707a4dcc6f4328e11911652e4418c585) | ||
8 | |||
9 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=1d00e5ce0fb069911c4b525ec38289fb5d9021b0] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | NEWS | 2 ++ | ||
13 | coregrind/m_debuginfo/image.c | 14 +++++++++ | ||
14 | coregrind/m_debuginfo/priv_image.h | 4 +++ | ||
15 | coregrind/m_debuginfo/readelf.c | 49 ++++++++++++++++++++++++++++-- | ||
16 | 4 files changed, 66 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/NEWS b/NEWS | ||
19 | index ee5b4ff11..6cd13429a 100644 | ||
20 | --- a/NEWS | ||
21 | +++ b/NEWS | ||
22 | @@ -5,6 +5,8 @@ Branch 3.22 | ||
23 | |||
24 | The following bugs have been fixed or resolved on this branch. | ||
25 | |||
26 | +476548 valgrind 3.22.0 fails on assertion when loading debuginfo | ||
27 | + file produced by mold | ||
28 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
29 | |||
30 | To see details of a given bug, visit | ||
31 | diff --git a/coregrind/m_debuginfo/image.c b/coregrind/m_debuginfo/image.c | ||
32 | index 02e509071..445f95555 100644 | ||
33 | --- a/coregrind/m_debuginfo/image.c | ||
34 | +++ b/coregrind/m_debuginfo/image.c | ||
35 | @@ -1221,6 +1221,20 @@ Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2) | ||
36 | } | ||
37 | } | ||
38 | |||
39 | +Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n) | ||
40 | +{ | ||
41 | + ensure_valid(img, off1, 1, "ML_(img_strcmp_c)"); | ||
42 | + while (n) { | ||
43 | + UChar c1 = get(img, off1); | ||
44 | + UChar c2 = *(const UChar*)str2; | ||
45 | + if (c1 < c2) return -1; | ||
46 | + if (c1 > c2) return 1; | ||
47 | + if (c1 == 0) return 0; | ||
48 | + off1++; str2++; --n; | ||
49 | + } | ||
50 | + return 0; | ||
51 | +} | ||
52 | + | ||
53 | UChar ML_(img_get_UChar)(DiImage* img, DiOffT offset) | ||
54 | { | ||
55 | ensure_valid(img, offset, 1, "ML_(img_get_UChar)"); | ||
56 | diff --git a/coregrind/m_debuginfo/priv_image.h b/coregrind/m_debuginfo/priv_image.h | ||
57 | index a49846f14..c91e49f01 100644 | ||
58 | --- a/coregrind/m_debuginfo/priv_image.h | ||
59 | +++ b/coregrind/m_debuginfo/priv_image.h | ||
60 | @@ -115,6 +115,10 @@ Int ML_(img_strcmp)(DiImage* img, DiOffT off1, DiOffT off2); | ||
61 | cast to HChar before comparison. */ | ||
62 | Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2); | ||
63 | |||
64 | +/* Do strncmp of a C string in the image vs a normal one. Chars are | ||
65 | + cast to HChar before comparison. */ | ||
66 | +Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n); | ||
67 | + | ||
68 | /* Do strlen of a C string in the image. */ | ||
69 | SizeT ML_(img_strlen)(DiImage* img, DiOffT off); | ||
70 | |||
71 | diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c | ||
72 | index fb64ed976..46f8c8343 100644 | ||
73 | --- a/coregrind/m_debuginfo/readelf.c | ||
74 | +++ b/coregrind/m_debuginfo/readelf.c | ||
75 | @@ -2501,8 +2501,7 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di ) | ||
76 | di->rodata_avma += inrw1->bias; | ||
77 | di->rodata_bias = inrw1->bias; | ||
78 | di->rodata_debug_bias = inrw1->bias; | ||
79 | - } | ||
80 | - else { | ||
81 | + } else { | ||
82 | BAD(".rodata"); /* should not happen? */ | ||
83 | } | ||
84 | di->rodata_present = True; | ||
85 | @@ -2977,6 +2976,46 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di ) | ||
86 | return retval; | ||
87 | } | ||
88 | |||
89 | +static void find_rodata(Word i, Word shnum, DiImage* dimg, struct _DebugInfo* di, DiOffT shdr_dioff, | ||
90 | + UWord shdr_dent_szB, DiOffT shdr_strtab_dioff, PtrdiffT rw_dbias) | ||
91 | +{ | ||
92 | + ElfXX_Shdr a_shdr; | ||
93 | + ElfXX_Shdr a_extra_shdr; | ||
94 | + ML_(img_get)(&a_shdr, dimg, | ||
95 | + INDEX_BIS(shdr_dioff, i, shdr_dent_szB), | ||
96 | + sizeof(a_shdr)); | ||
97 | + if (di->rodata_present && | ||
98 | + 0 == ML_(img_strcmp_c)(dimg, shdr_strtab_dioff | ||
99 | + + a_shdr.sh_name, ".rodata")) { | ||
100 | + Word sh_size = a_shdr.sh_size; | ||
101 | + Word j; | ||
102 | + Word next_addr = a_shdr.sh_addr + a_shdr.sh_size; | ||
103 | + for (j = i + 1; j < shnum; ++j) { | ||
104 | + ML_(img_get)(&a_extra_shdr, dimg, | ||
105 | + INDEX_BIS(shdr_dioff, j, shdr_dent_szB), | ||
106 | + sizeof(a_shdr)); | ||
107 | + if (0 == ML_(img_strcmp_n)(dimg, shdr_strtab_dioff | ||
108 | + + a_extra_shdr.sh_name, ".rodata", 7)) { | ||
109 | + if (a_extra_shdr.sh_addr == | ||
110 | + VG_ROUNDUP(next_addr, a_extra_shdr.sh_addralign)) { | ||
111 | + sh_size = VG_ROUNDUP(sh_size, a_extra_shdr.sh_addralign) + a_extra_shdr.sh_size; | ||
112 | + } | ||
113 | + next_addr = a_extra_shdr.sh_addr + a_extra_shdr.sh_size; | ||
114 | + } else { | ||
115 | + break; | ||
116 | + } | ||
117 | + } | ||
118 | + vg_assert(di->rodata_size == sh_size); | ||
119 | + vg_assert(di->rodata_avma + a_shdr.sh_addr + rw_dbias); | ||
120 | + di->rodata_debug_svma = a_shdr.sh_addr; | ||
121 | + di->rodata_debug_bias = di->rodata_bias + | ||
122 | + di->rodata_svma - di->rodata_debug_svma; | ||
123 | + TRACE_SYMTAB("acquiring .rodata debug svma = %#lx .. %#lx\n", | ||
124 | + di->rodata_debug_svma, | ||
125 | + di->rodata_debug_svma + di->rodata_size - 1); | ||
126 | + TRACE_SYMTAB("acquiring .rodata debug bias = %#lx\n", (UWord)di->rodata_debug_bias); | ||
127 | + } | ||
128 | +} | ||
129 | Bool ML_(read_elf_debug) ( struct _DebugInfo* di ) | ||
130 | { | ||
131 | Word i, j; | ||
132 | @@ -3391,7 +3430,11 @@ Bool ML_(read_elf_debug) ( struct _DebugInfo* di ) | ||
133 | FIND(text, rx) | ||
134 | FIND(data, rw) | ||
135 | FIND(sdata, rw) | ||
136 | - FIND(rodata, rw) | ||
137 | + // https://bugs.kde.org/show_bug.cgi?id=476548 | ||
138 | + // special handling for rodata as adjacent | ||
139 | + // rodata sections may have been merged in ML_(read_elf_object) | ||
140 | + //FIND(rodata, rw) | ||
141 | + find_rodata(i, ehdr_dimg.e_shnum, dimg, di, shdr_dioff, shdr_dent_szB, shdr_strtab_dioff, rw_dbias); | ||
142 | FIND(bss, rw) | ||
143 | FIND(sbss, rw) | ||
144 | |||
145 | -- | ||
146 | 2.44.0 | ||
147 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch deleted file mode 100644 index 2a09ca52b7..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch +++ /dev/null | |||
@@ -1,221 +0,0 @@ | |||
1 | From a43e62dddcf51ec6578a90c5988a41e856b44b05 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Sat, 18 Nov 2023 21:17:02 +0100 | ||
4 | Subject: [PATCH 3/4] Add fchmodat2 syscall on linux | ||
5 | |||
6 | fchmodat2 is a new syscall on linux 6.6. It is a variant of fchmodat | ||
7 | that takes an extra flags argument. | ||
8 | |||
9 | https://bugs.kde.org/show_bug.cgi?id=477198 | ||
10 | |||
11 | (cherry picked from commit 372d09fd9a8d76847c81092ebff71c80fd6c145d) | ||
12 | |||
13 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=a43e62dddcf51ec6578a90c5988a41e856b44b05] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | NEWS | 1 + | ||
17 | coregrind/m_syswrap/priv_syswrap-linux.h | 3 +++ | ||
18 | coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ | ||
19 | coregrind/m_syswrap/syswrap-arm-linux.c | 2 ++ | ||
20 | coregrind/m_syswrap/syswrap-arm64-linux.c | 2 ++ | ||
21 | coregrind/m_syswrap/syswrap-linux.c | 11 +++++++++++ | ||
22 | coregrind/m_syswrap/syswrap-mips32-linux.c | 2 ++ | ||
23 | coregrind/m_syswrap/syswrap-mips64-linux.c | 1 + | ||
24 | coregrind/m_syswrap/syswrap-nanomips-linux.c | 1 + | ||
25 | coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ | ||
26 | coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ | ||
27 | coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ | ||
28 | coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ | ||
29 | include/vki/vki-scnums-shared-linux.h | 2 ++ | ||
30 | 14 files changed, 35 insertions(+) | ||
31 | |||
32 | diff --git a/NEWS b/NEWS | ||
33 | index 6cd13429a..da0f8c1aa 100644 | ||
34 | --- a/NEWS | ||
35 | +++ b/NEWS | ||
36 | @@ -8,6 +8,7 @@ The following bugs have been fixed or resolved on this branch. | ||
37 | 476548 valgrind 3.22.0 fails on assertion when loading debuginfo | ||
38 | file produced by mold | ||
39 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
40 | +477198 Add fchmodat2 syscall on linux | ||
41 | |||
42 | To see details of a given bug, visit | ||
43 | https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
44 | diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h | ||
45 | index 7c9decf5a..798c456c9 100644 | ||
46 | --- a/coregrind/m_syswrap/priv_syswrap-linux.h | ||
47 | +++ b/coregrind/m_syswrap/priv_syswrap-linux.h | ||
48 | @@ -331,6 +331,9 @@ DECL_TEMPLATE(linux, sys_openat2); | ||
49 | // Linux-specific (new in Linux 5.14) | ||
50 | DECL_TEMPLATE(linux, sys_memfd_secret); | ||
51 | |||
52 | +// Since Linux 6.6 | ||
53 | +DECL_TEMPLATE(linux, sys_fchmodat2); | ||
54 | + | ||
55 | /* --------------------------------------------------------------------- | ||
56 | Wrappers for sockets and ipc-ery. These are split into standalone | ||
57 | procedures because x86-linux hides them inside multiplexors | ||
58 | diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
59 | index 008600798..fe17d118b 100644 | ||
60 | --- a/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
61 | +++ b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
62 | @@ -886,6 +886,8 @@ static SyscallTableEntry syscall_table[] = { | ||
63 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
64 | |||
65 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
66 | + | ||
67 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
68 | }; | ||
69 | |||
70 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
71 | diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
72 | index 9a7a1e0d2..811931d3b 100644 | ||
73 | --- a/coregrind/m_syswrap/syswrap-arm-linux.c | ||
74 | +++ b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
75 | @@ -1059,6 +1059,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
76 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
77 | |||
78 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
79 | + | ||
80 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
81 | }; | ||
82 | |||
83 | |||
84 | diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
85 | index 6af7bab83..3307bc2ca 100644 | ||
86 | --- a/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
87 | +++ b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
88 | @@ -840,6 +840,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
89 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
90 | |||
91 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
92 | + | ||
93 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
94 | }; | ||
95 | |||
96 | |||
97 | diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c | ||
98 | index d571fc327..efa47f2e6 100644 | ||
99 | --- a/coregrind/m_syswrap/syswrap-linux.c | ||
100 | +++ b/coregrind/m_syswrap/syswrap-linux.c | ||
101 | @@ -6059,6 +6059,17 @@ PRE(sys_fchmodat) | ||
102 | PRE_MEM_RASCIIZ( "fchmodat(path)", ARG2 ); | ||
103 | } | ||
104 | |||
105 | +PRE(sys_fchmodat2) | ||
106 | +{ | ||
107 | + PRINT("sys_fchmodat2 ( %ld, %#" FMT_REGWORD "x(%s), %" FMT_REGWORD "u, %" | ||
108 | + FMT_REGWORD "u )", | ||
109 | + SARG1, ARG2, (HChar*)(Addr)ARG2, ARG3, ARG4); | ||
110 | + PRE_REG_READ4(long, "fchmodat2", | ||
111 | + int, dfd, const char *, path, vki_mode_t, mode, | ||
112 | + unsigned int, flags); | ||
113 | + PRE_MEM_RASCIIZ( "fchmodat2(pathname)", ARG2 ); | ||
114 | +} | ||
115 | + | ||
116 | PRE(sys_faccessat) | ||
117 | { | ||
118 | PRINT("sys_faccessat ( %ld, %#" FMT_REGWORD "x(%s), %ld )", | ||
119 | diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
120 | index 6268a00dd..74a1f6eac 100644 | ||
121 | --- a/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
122 | +++ b/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
123 | @@ -1143,6 +1143,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
124 | LINX_ (__NR_faccessat2, sys_faccessat2), // 439 | ||
125 | |||
126 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
127 | + | ||
128 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
129 | }; | ||
130 | |||
131 | SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) | ||
132 | diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
133 | index 6cdf25893..4e8508b7a 100644 | ||
134 | --- a/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
135 | +++ b/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
136 | @@ -820,6 +820,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
137 | LINXY (__NR_close_range, sys_close_range), | ||
138 | LINX_ (__NR_faccessat2, sys_faccessat2), | ||
139 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), | ||
140 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), | ||
141 | }; | ||
142 | |||
143 | SyscallTableEntry * ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
144 | diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
145 | index d724cde74..7859900c1 100644 | ||
146 | --- a/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
147 | +++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
148 | @@ -829,6 +829,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
149 | LINXY (__NR_close_range, sys_close_range), | ||
150 | LINX_ (__NR_faccessat2, sys_faccessat2), | ||
151 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), | ||
152 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), | ||
153 | }; | ||
154 | |||
155 | SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) | ||
156 | diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
157 | index c0cfef235..1e19116ee 100644 | ||
158 | --- a/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
159 | +++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
160 | @@ -1063,6 +1063,8 @@ static SyscallTableEntry syscall_table[] = { | ||
161 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
162 | |||
163 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
164 | + | ||
165 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
166 | }; | ||
167 | |||
168 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
169 | diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
170 | index f5976f30c..1097212a4 100644 | ||
171 | --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
172 | +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
173 | @@ -1032,6 +1032,8 @@ static SyscallTableEntry syscall_table[] = { | ||
174 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
175 | |||
176 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
177 | + | ||
178 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
179 | }; | ||
180 | |||
181 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
182 | diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
183 | index afba154e7..3588672c7 100644 | ||
184 | --- a/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
185 | +++ b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
186 | @@ -873,6 +873,8 @@ static SyscallTableEntry syscall_table[] = { | ||
187 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
188 | |||
189 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
190 | + | ||
191 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
192 | }; | ||
193 | |||
194 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
195 | diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
196 | index da4fd8fa2..58badc6b0 100644 | ||
197 | --- a/coregrind/m_syswrap/syswrap-x86-linux.c | ||
198 | +++ b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
199 | @@ -1658,6 +1658,8 @@ static SyscallTableEntry syscall_table[] = { | ||
200 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
201 | |||
202 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
203 | + | ||
204 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
205 | }; | ||
206 | |||
207 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
208 | diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h | ||
209 | index 542382b53..a4cd87149 100644 | ||
210 | --- a/include/vki/vki-scnums-shared-linux.h | ||
211 | +++ b/include/vki/vki-scnums-shared-linux.h | ||
212 | @@ -50,4 +50,6 @@ | ||
213 | |||
214 | #define __NR_memfd_secret 447 | ||
215 | |||
216 | +#define __NR_fchmodat2 452 | ||
217 | + | ||
218 | #endif | ||
219 | -- | ||
220 | 2.44.0 | ||
221 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch b/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch deleted file mode 100644 index 4e9185508a..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch +++ /dev/null | |||
@@ -1,137 +0,0 @@ | |||
1 | From 41ff9aa49f6c54c66d0e6b37f265fd9cb0176057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Floyd <pjfloyd@wanadoo.fr> | ||
3 | Date: Sun, 17 Dec 2023 14:18:51 +0100 | ||
4 | Subject: [PATCH 4/4] Bug 478624 - Valgrind incompatibility with binutils-2.42 | ||
5 | on x86 with new nop patterns (unhandled instruction bytes: 0x2E 0x8D 0xB4 | ||
6 | 0x26) | ||
7 | |||
8 | It was a bit of a struggle to get the testcase to build | ||
9 | with both clang and gcc (oddly enough gcc was more difficult) so | ||
10 | I just resorted to using .byte arrays. | ||
11 | |||
12 | (cherry picked from commit d35005cef8ad8207542738812705ceabf137d7e0) | ||
13 | |||
14 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=41ff9aa49f6c54c66d0e6b37f265fd9cb0176057] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | .gitignore | 1 + | ||
18 | NEWS | 2 ++ | ||
19 | VEX/priv/guest_x86_toIR.c | 22 +++++++++++++- | ||
20 | none/tests/x86/Makefile.am | 2 ++ | ||
21 | none/tests/x86/gnu_binutils_nop.c | 34 ++++++++++++++++++++++ | ||
22 | none/tests/x86/gnu_binutils_nop.stderr.exp | 0 | ||
23 | none/tests/x86/gnu_binutils_nop.vgtest | 2 ++ | ||
24 | 7 files changed, 62 insertions(+), 1 deletion(-) | ||
25 | create mode 100644 none/tests/x86/gnu_binutils_nop.c | ||
26 | create mode 100644 none/tests/x86/gnu_binutils_nop.stderr.exp | ||
27 | create mode 100644 none/tests/x86/gnu_binutils_nop.vgtest | ||
28 | |||
29 | --- a/NEWS | ||
30 | +++ b/NEWS | ||
31 | @@ -9,6 +9,8 @@ The following bugs have been fixed or re | ||
32 | file produced by mold | ||
33 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
34 | 477198 Add fchmodat2 syscall on linux | ||
35 | +478624 Valgrind incompatibility with binutils-2.42 on x86 with new nop patterns | ||
36 | + (unhandled instruction bytes: 0x2E 0x8D 0xB4 0x26) | ||
37 | |||
38 | To see details of a given bug, visit | ||
39 | https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
40 | --- a/VEX/priv/guest_x86_toIR.c | ||
41 | +++ b/VEX/priv/guest_x86_toIR.c | ||
42 | @@ -8198,7 +8198,7 @@ DisResult disInstr_X86_WRK ( | ||
43 | delta += 5; | ||
44 | goto decode_success; | ||
45 | } | ||
46 | - /* Don't barf on recent binutils padding, | ||
47 | + /* Don't barf on recent (2010) binutils padding, | ||
48 | all variants of which are: nopw %cs:0x0(%eax,%eax,1) | ||
49 | 66 2e 0f 1f 84 00 00 00 00 00 | ||
50 | 66 66 2e 0f 1f 84 00 00 00 00 00 | ||
51 | @@ -8222,6 +8222,26 @@ DisResult disInstr_X86_WRK ( | ||
52 | goto decode_success; | ||
53 | } | ||
54 | } | ||
55 | + | ||
56 | + /* bug478624 GNU binutils uses a leal of esi into itself with | ||
57 | + a zero offset and CS prefix as an 8 byte no-op (Dec 2023). | ||
58 | + Since the CS prefix is hardly ever used we don't do much | ||
59 | + to decode it, just a few cases for conditional branches. | ||
60 | + So add handling here with other pseudo-no-ops. | ||
61 | + */ | ||
62 | + if (code[0] == 0x2E && code[1] == 0x8D) { | ||
63 | + if (code[2] == 0x74 && code[3] == 0x26 && code[4] == 0x00) { | ||
64 | + DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); | ||
65 | + delta += 5; | ||
66 | + goto decode_success; | ||
67 | + } | ||
68 | + if (code[2] == 0xB4 && code[3] == 0x26 && code[4] == 0x00 | ||
69 | + && code[5] == 0x00 && code[6] == 0x00 && code[7] == 0x00) { | ||
70 | + DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); | ||
71 | + delta += 8; | ||
72 | + goto decode_success; | ||
73 | + } | ||
74 | + } | ||
75 | |||
76 | // Intel CET requires the following opcodes to be treated as NOPs | ||
77 | // with any prefix and ModRM, SIB and disp combination: | ||
78 | --- a/none/tests/x86/Makefile.am | ||
79 | +++ b/none/tests/x86/Makefile.am | ||
80 | @@ -52,6 +52,7 @@ EXTRA_DIST = \ | ||
81 | fxtract.stdout.exp fxtract.stderr.exp fxtract.vgtest \ | ||
82 | fxtract.stdout.exp-older-glibc \ | ||
83 | getseg.stdout.exp getseg.stderr.exp getseg.vgtest \ | ||
84 | + gnu_binutils_nop.stderr.exp gnu_binutils_nop.vgtest \ | ||
85 | incdec_alt.stdout.exp incdec_alt.stderr.exp incdec_alt.vgtest \ | ||
86 | int.stderr.exp int.stdout.exp int.disabled \ | ||
87 | $(addsuffix .stderr.exp,$(INSN_TESTS)) \ | ||
88 | @@ -100,6 +101,7 @@ check_PROGRAMS = \ | ||
89 | fpu_lazy_eflags \ | ||
90 | fxtract \ | ||
91 | getseg \ | ||
92 | + gnu_binutils_nop \ | ||
93 | incdec_alt \ | ||
94 | $(INSN_TESTS) \ | ||
95 | int \ | ||
96 | --- /dev/null | ||
97 | +++ b/none/tests/x86/gnu_binutils_nop.c | ||
98 | @@ -0,0 +1,34 @@ | ||
99 | +int main(void) | ||
100 | +{ | ||
101 | + // GNU binutils uses various opcodes as alternatives for nop | ||
102 | + // the idea is that it is faster to execute one large opcode | ||
103 | + // with no side-effects than multiple repetitions of the | ||
104 | + // single byte 'nop'. This gives more choice when code | ||
105 | + // needs to be padded. | ||
106 | + | ||
107 | + // the following is based on | ||
108 | + // https://sourceware.org/cgit/binutils-gdb/tree/gas/config/tc-i386.c#n1256 | ||
109 | + | ||
110 | + // one byte | ||
111 | + __asm__ __volatile__("nop"); | ||
112 | + // two bytes | ||
113 | + __asm__ __volatile__("xchg %ax,%ax"); | ||
114 | + // three bytes | ||
115 | + //__asm__ __volatile__("leal 0(%esi),%esi"); | ||
116 | + __asm__ __volatile__(".byte 0x8d,0x76,0x00"); | ||
117 | + // four bytes | ||
118 | + //__asm__ __volatile__("leal 0(%esi,%eiz),%esi"); | ||
119 | + __asm__ __volatile__(".byte 0x8d,0x74,0x26,0x00"); | ||
120 | + // five bytes | ||
121 | + //__asm__ __volatile__("leal %cs:0(%esi,%eiz),%esi"); | ||
122 | + __asm__ __volatile__(".byte 0x2e,0x8d,0x74,0x26,0x00"); | ||
123 | + // six bytes | ||
124 | + //__asm__ __volatile__("leal 0L(%esi),%esi"); | ||
125 | + __asm__ __volatile__(".byte 0x8d,0xb6,0x00,0x00,0x00,0x00"); | ||
126 | + // seven bytes | ||
127 | + //__asm__ __volatile__("leal 0L(%esi,%eiz),%esi"); | ||
128 | + __asm__ __volatile__(".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); | ||
129 | + // eight bytes | ||
130 | + //__asm__ __volatile__("leal %cs:0L(%esi,%eiz),%esi"); | ||
131 | + __asm__ __volatile__(".byte 0x2e,0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); | ||
132 | +} | ||
133 | --- /dev/null | ||
134 | +++ b/none/tests/x86/gnu_binutils_nop.vgtest | ||
135 | @@ -0,0 +1,2 @@ | ||
136 | +prog: gnu_binutils_nop | ||
137 | +vgopts: -q | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch index 51cd3532d3..65de427d36 100644 --- a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch +++ b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch | |||
@@ -17,11 +17,9 @@ Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com> | |||
17 | VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ | 17 | VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ |
18 | 3 files changed, 42 insertions(+), 0 deletions(-) | 18 | 3 files changed, 42 insertions(+), 0 deletions(-) |
19 | 19 | ||
20 | diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h | ||
21 | index dd3c62e..11a34aa 100644 | ||
22 | --- a/VEX/priv/guest_ppc_defs.h | 20 | --- a/VEX/priv/guest_ppc_defs.h |
23 | +++ b/VEX/priv/guest_ppc_defs.h | 21 | +++ b/VEX/priv/guest_ppc_defs.h |
24 | @@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt ); | 22 | @@ -233,6 +233,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268 |
25 | 23 | ||
26 | extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); | 24 | extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); |
27 | 25 | ||
@@ -30,11 +28,9 @@ index dd3c62e..11a34aa 100644 | |||
30 | extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, | 28 | extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, |
31 | UInt vD_idx, UInt sh, | 29 | UInt vD_idx, UInt sh, |
32 | UInt shift_right ); | 30 | UInt shift_right ); |
33 | diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c | ||
34 | index 11aa428..b49ea3f 100644 | ||
35 | --- a/VEX/priv/guest_ppc_helpers.c | 31 | --- a/VEX/priv/guest_ppc_helpers.c |
36 | +++ b/VEX/priv/guest_ppc_helpers.c | 32 | +++ b/VEX/priv/guest_ppc_helpers.c |
37 | @@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void ) | 33 | @@ -118,6 +118,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void |
38 | # endif | 34 | # endif |
39 | } | 35 | } |
40 | 36 | ||
@@ -59,11 +55,9 @@ index 11aa428..b49ea3f 100644 | |||
59 | 55 | ||
60 | /* CALLED FROM GENERATED CODE */ | 56 | /* CALLED FROM GENERATED CODE */ |
61 | /* DIRTY HELPER (reads guest state, writes guest mem) */ | 57 | /* DIRTY HELPER (reads guest state, writes guest mem) */ |
62 | diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c | ||
63 | index f8d220d..37c8974 100644 | ||
64 | --- a/VEX/priv/guest_ppc_toIR.c | 58 | --- a/VEX/priv/guest_ppc_toIR.c |
65 | +++ b/VEX/priv/guest_ppc_toIR.c | 59 | +++ b/VEX/priv/guest_ppc_toIR.c |
66 | @@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr ) | 60 | @@ -11875,6 +11875,28 @@ static Bool dis_proc_ctl ( const VexAbiI |
67 | break; | 61 | break; |
68 | } | 62 | } |
69 | 63 | ||
@@ -92,5 +86,3 @@ index f8d220d..37c8974 100644 | |||
92 | default: | 86 | default: |
93 | vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); | 87 | vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); |
94 | return False; | 88 | return False; |
95 | -- | ||
96 | 1.7.0.4 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch index bde1241dc7..3ab339d215 100644 --- a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch +++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch | |||
@@ -17,19 +17,14 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
17 | VEX/priv/guest_s390_defs.h | 2 +- | 17 | VEX/priv/guest_s390_defs.h | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h | ||
21 | index 9054290..dab8002 100644 | ||
22 | --- a/VEX/priv/guest_s390_defs.h | 20 | --- a/VEX/priv/guest_s390_defs.h |
23 | +++ b/VEX/priv/guest_s390_defs.h | 21 | +++ b/VEX/priv/guest_s390_defs.h |
24 | @@ -284,7 +284,7 @@ typedef enum { | 22 | @@ -284,7 +284,7 @@ typedef enum { |
25 | S390_VEC_OP_VBPERM, | 23 | S390_VEC_OP_VCLFNL, |
26 | S390_VEC_OP_VMSL, | 24 | S390_VEC_OP_VCRNF, |
27 | S390_VEC_OP_LAST // supposed to be the last element in enum | 25 | S390_VEC_OP_LAST // supposed to be the last element in enum |
28 | -} s390x_vec_op_t; | 26 | -} s390x_vec_op_t; |
29 | +}; | 27 | +}; |
30 | 28 | ||
31 | /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one | 29 | /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one |
32 | ULong variable. | 30 | ULong variable. |
33 | -- | ||
34 | 2.29.2 | ||
35 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch index f15d04b173..afca874d02 100644 --- a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch +++ b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch | |||
@@ -22,11 +22,9 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
22 | none/tests/arm/Makefile.am | 6 ++++-- | 22 | none/tests/arm/Makefile.am | 6 ++++-- |
23 | 1 file changed, 4 insertions(+), 2 deletions(-) | 23 | 1 file changed, 4 insertions(+), 2 deletions(-) |
24 | 24 | ||
25 | diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am | ||
26 | index 4507a20..825290f 100644 | ||
27 | --- a/none/tests/arm/Makefile.am | 25 | --- a/none/tests/arm/Makefile.am |
28 | +++ b/none/tests/arm/Makefile.am | 26 | +++ b/none/tests/arm/Makefile.am |
29 | @@ -62,8 +62,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ | 27 | @@ -87,8 +87,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 |
30 | -mfpu=neon \ | 28 | -mfpu=neon \ |
31 | -mthumb | 29 | -mthumb |
32 | 30 | ||
@@ -39,6 +37,3 @@ index 4507a20..825290f 100644 | |||
39 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 | 37 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 |
40 | + | 38 | + |
41 | +vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm | 39 | +vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm |
42 | -- | ||
43 | 1.9.1 | ||
44 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch index d04297dca8..0895473fc0 100644 --- a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch +++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch | |||
@@ -16,11 +16,9 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
16 | coregrind/m_redir.c | 13 ++++++++++++- | 16 | coregrind/m_redir.c | 13 ++++++++++++- |
17 | 1 file changed, 12 insertions(+), 1 deletion(-) | 17 | 1 file changed, 12 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c | ||
20 | index ff35009..d7d6816 100644 | ||
21 | --- a/coregrind/m_redir.c | 19 | --- a/coregrind/m_redir.c |
22 | +++ b/coregrind/m_redir.c | 20 | +++ b/coregrind/m_redir.c |
23 | @@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt, | 21 | @@ -1307,7 +1307,18 @@ static void add_hardwired_spec (const H |
24 | spec->to_addr = to_addr; | 22 | spec->to_addr = to_addr; |
25 | spec->isWrap = False; | 23 | spec->isWrap = False; |
26 | spec->isGlobal = False; | 24 | spec->isGlobal = False; |
@@ -40,6 +38,3 @@ index ff35009..d7d6816 100644 | |||
40 | /* VARIABLE PARTS */ | 38 | /* VARIABLE PARTS */ |
41 | spec->mark = False; /* not significant */ | 39 | spec->mark = False; /* not significant */ |
42 | spec->done = False; /* not significant */ | 40 | spec->done = False; /* not significant */ |
43 | -- | ||
44 | 1.9.1 | ||
45 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb index 563d99f0e2..46719bf8a1 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
22 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ | 22 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ |
23 | file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ | 23 | file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ |
24 | file://avoid-neon-for-targets-which-don-t-support-it.patch \ | 24 | file://avoid-neon-for-targets-which-don-t-support-it.patch \ |
25 | file://0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch \ | ||
25 | file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ | 26 | file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ |
26 | file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ | 27 | file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ |
27 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ | 28 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ |
@@ -33,12 +34,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
33 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ | 34 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ |
34 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ | 35 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ |
35 | file://0001-docs-Disable-manual-validation.patch \ | 36 | file://0001-docs-Disable-manual-validation.patch \ |
36 | file://0001-valgrind-monitor.py-regular-expressions-should-use-r.patch \ | 37 | file://0001-tests-arm-Use-O-instead-of-O0.patch \ |
37 | file://0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch \ | ||
38 | file://0003-Add-fchmodat2-syscall-on-linux.patch \ | ||
39 | file://0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch \ | ||
40 | " | 38 | " |
41 | SRC_URI[sha256sum] = "c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c" | 39 | SRC_URI[sha256sum] = "c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d" |
42 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" | 40 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" |
43 | 41 | ||
44 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' | 42 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' |
diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index c0c876a644..112d1c4adc 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb | |||
@@ -55,22 +55,22 @@ SYSTEMD_SERVICE:${PN} = "atd.service" | |||
55 | do_patch[postfuncs] += "copy_posix_files" | 55 | do_patch[postfuncs] += "copy_posix_files" |
56 | 56 | ||
57 | copy_posix_files() { | 57 | copy_posix_files() { |
58 | cp -f ${WORKDIR}/posixtm.[ch] ${S} | 58 | cp -f ${UNPACKDIR}/posixtm.[ch] ${S} |
59 | } | 59 | } |
60 | 60 | ||
61 | do_install () { | 61 | do_install () { |
62 | oe_runmake -e "IROOT=${D}" install | 62 | oe_runmake -e "IROOT=${D}" install |
63 | 63 | ||
64 | install -d ${D}${sysconfdir}/init.d | 64 | install -d ${D}${sysconfdir}/init.d |
65 | install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd | 65 | install -m 0755 ${UNPACKDIR}/atd.init ${D}${sysconfdir}/init.d/atd |
66 | 66 | ||
67 | # install systemd unit files | 67 | # install systemd unit files |
68 | install -d ${D}${systemd_system_unitdir} | 68 | install -d ${D}${systemd_system_unitdir} |
69 | install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} | 69 | install -m 0644 ${UNPACKDIR}/atd.service ${D}${systemd_system_unitdir} |
70 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service | 70 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service |
71 | 71 | ||
72 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 72 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
73 | install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd | 73 | install -D -m 0644 ${S}/pam.conf ${D}${sysconfdir}/pam.d/atd |
74 | fi | 74 | fi |
75 | rm -f ${D}${datadir}/at/batch-job | 75 | rm -f ${D}${datadir}/at/batch-job |
76 | } | 76 | } |
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch index ea38bace9b..c1b9b8261f 100644 --- a/meta/recipes-extended/bash/bash/build-tests.patch +++ b/meta/recipes-extended/bash/bash/build-tests.patch | |||
@@ -4,7 +4,7 @@ Date: Wed, 19 Dec 2012 17:18:31 +0100 | |||
4 | Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking | 4 | Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking |
5 | dependencies. | 5 | dependencies. |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Inappropriate [ptest specific] |
8 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | 8 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
9 | 9 | ||
10 | Rebase to 5.0 | 10 | Rebase to 5.0 |
diff --git a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch new file mode 100644 index 0000000000..60f1852316 --- /dev/null +++ b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chet Ramey <chet.ramey@case.edu> | ||
3 | Date: Fri, 7 Apr 2023 00:28:46 -0700 | ||
4 | Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit | ||
5 | enabled | ||
6 | |||
7 | This is a trimmed-down version of a commit in the bash 'devel' branch | ||
8 | [1] that contains this fix as well as other unrelated ones. | ||
9 | |||
10 | [1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=ec9447ce9392a0f93d96789c3741285fede8a150 | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Zev Weiss <zev@bewilderbeest.net> | ||
15 | --- | ||
16 | builtins/evalstring.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/builtins/evalstring.c b/builtins/evalstring.c | ||
20 | index df3dd68e2a7e..6612081cd646 100644 | ||
21 | --- a/builtins/evalstring.c | ||
22 | +++ b/builtins/evalstring.c | ||
23 | @@ -753,7 +753,7 @@ open_redir_file (r, fnp) | ||
24 | fd = open(fn, O_RDONLY); | ||
25 | if (fd < 0) | ||
26 | { | ||
27 | - file_error (fn); | ||
28 | + internal_error ("%s: %s", fn, strerror (errno)); | ||
29 | free (fn); | ||
30 | if (fnp) | ||
31 | *fnp = 0; | ||
32 | -- | ||
33 | 2.40.0 | ||
34 | |||
diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.21.bb index 46d921bbe6..532adf4c1a 100644 --- a/meta/recipes-extended/bash/bash_5.2.21.bb +++ b/meta/recipes-extended/bash/bash_5.2.21.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ | |||
13 | file://fix-run-builtins.patch \ | 13 | file://fix-run-builtins.patch \ |
14 | file://use_aclocal.patch \ | 14 | file://use_aclocal.patch \ |
15 | file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ | 15 | file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ |
16 | file://fix-filesubst-errexit.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" | 19 | SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" |
diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 819da6cda6..74387c50ab 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb | |||
@@ -27,7 +27,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | |||
27 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" | 27 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" |
28 | 28 | ||
29 | do_compile:prepend() { | 29 | do_compile:prepend() { |
30 | cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h | 30 | cp -f ${UNPACKDIR}/libmath.h ${B}/bc/libmath.h |
31 | } | 31 | } |
32 | 32 | ||
33 | do_install_ptest() { | 33 | do_install_ptest() { |
diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb index 52070f59a2..95f82cdf3a 100644 --- a/meta/recipes-extended/cpio/cpio_2.15.bb +++ b/meta/recipes-extended/cpio/cpio_2.15.bb | |||
@@ -16,6 +16,7 @@ SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee41834 | |||
16 | inherit autotools gettext texinfo ptest | 16 | inherit autotools gettext texinfo ptest |
17 | 17 | ||
18 | CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" | 18 | CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" |
19 | CVE_STATUS[CVE-2023-7216] = "disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html" | ||
19 | 20 | ||
20 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" | 21 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" |
21 | 22 | ||
diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch index 20572b55c4..35229ae890 100644 --- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +++ b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch | |||
@@ -303,7 +303,7 @@ index 9396e1d..d0bb181 100644 | |||
303 | + PWDICT tmp_pwp; | 303 | + PWDICT tmp_pwp; |
304 | + | 304 | + |
305 | + memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); | 305 | + memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); |
306 | + HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); | 306 | + HwmsHostToBigEndian((char *)tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); |
307 | + fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); | 307 | + fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); |
308 | } | 308 | } |
309 | } | 309 | } |
diff --git a/meta/recipes-extended/cronie/cronie_1.7.1.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb index 854b68163c..e4711fa31c 100644 --- a/meta/recipes-extended/cronie/cronie_1.7.1.bb +++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ | |||
25 | PAM_SRC_URI = "file://crond_pam_config.patch" | 25 | PAM_SRC_URI = "file://crond_pam_config.patch" |
26 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" | 26 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" |
27 | 27 | ||
28 | SRC_URI[sha256sum] = "78033100c24413f0c40f93e6138774d6a4f55bc31050567b90db45a2f9f1b954" | 28 | SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571" |
29 | 29 | ||
30 | inherit autotools update-rc.d useradd systemd github-releases | 30 | inherit autotools update-rc.d useradd systemd github-releases |
31 | UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" | 31 | UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" |
@@ -49,18 +49,18 @@ do_install:append () { | |||
49 | install -d ${D}${sysconfdir}/sysconfig/ | 49 | install -d ${D}${sysconfdir}/sysconfig/ |
50 | install -d ${D}${sysconfdir}/init.d/ | 50 | install -d ${D}${sysconfdir}/init.d/ |
51 | install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond | 51 | install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond |
52 | install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond | 52 | install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond |
53 | 53 | ||
54 | # install systemd unit files | 54 | # install systemd unit files |
55 | install -d ${D}${systemd_system_unitdir} | 55 | install -d ${D}${systemd_system_unitdir} |
56 | install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} | 56 | install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir} |
57 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 57 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
58 | -e 's,@SBINDIR@,${sbindir},g' \ | 58 | -e 's,@SBINDIR@,${sbindir},g' \ |
59 | ${D}${systemd_system_unitdir}/crond.service | 59 | ${D}${systemd_system_unitdir}/crond.service |
60 | 60 | ||
61 | # below are necessary for a complete cron environment | 61 | # below are necessary for a complete cron environment |
62 | install -d ${D}${localstatedir}/spool/cron | 62 | install -d ${D}${localstatedir}/spool/cron |
63 | install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ | 63 | install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/ |
64 | mkdir -p ${D}${sysconfdir}/cron.d | 64 | mkdir -p ${D}${sysconfdir}/cron.d |
65 | mkdir -p ${D}${sysconfdir}/cron.hourly | 65 | mkdir -p ${D}${sysconfdir}/cron.hourly |
66 | mkdir -p ${D}${sysconfdir}/cron.daily | 66 | mkdir -p ${D}${sysconfdir}/cron.daily |
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b70ba3ae58..9688efafae 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -84,11 +84,11 @@ do_install () { | |||
84 | rm -rf ${D}${sysconfdir}/init.d/ | 84 | rm -rf ${D}${sysconfdir}/init.d/ |
85 | rm -rf ${D}${sysconfdir}/rc* | 85 | rm -rf ${D}${sysconfdir}/rc* |
86 | install -d ${D}${sysconfdir}/tmpfiles.d | 86 | install -d ${D}${sysconfdir}/tmpfiles.d |
87 | install -m 0644 ${WORKDIR}/cups-volatiles.conf \ | 87 | install -m 0644 ${UNPACKDIR}/cups-volatiles.conf \ |
88 | ${D}${sysconfdir}/tmpfiles.d/cups.conf | 88 | ${D}${sysconfdir}/tmpfiles.d/cups.conf |
89 | else | 89 | else |
90 | install -d ${D}${sysconfdir}/default/volatiles | 90 | install -d ${D}${sysconfdir}/default/volatiles |
91 | install -m 0644 ${WORKDIR}/volatiles.99_cups \ | 91 | install -m 0644 ${UNPACKDIR}/volatiles.99_cups \ |
92 | ${D}${sysconfdir}/default/volatiles/99_cups | 92 | ${D}${sysconfdir}/default/volatiles/99_cups |
93 | fi | 93 | fi |
94 | } | 94 | } |
diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index cd2f3bce0b..5a87897742 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb | |||
@@ -52,10 +52,10 @@ IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}" | |||
52 | 52 | ||
53 | do_install:append() { | 53 | do_install:append() { |
54 | install -d ${D}${IPTABLES_RULES_DIR} | 54 | install -d ${D}${IPTABLES_RULES_DIR} |
55 | install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} | 55 | install -m 0644 ${UNPACKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} |
56 | 56 | ||
57 | install -d ${D}${systemd_system_unitdir} | 57 | install -d ${D}${systemd_system_unitdir} |
58 | install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} | 58 | install -m 0644 ${UNPACKDIR}/iptables.service ${D}${systemd_system_unitdir} |
59 | 59 | ||
60 | sed -i \ | 60 | sed -i \ |
61 | -e 's,@SBINDIR@,${sbindir},g' \ | 61 | -e 's,@SBINDIR@,${sbindir},g' \ |
@@ -63,8 +63,8 @@ do_install:append() { | |||
63 | ${D}${systemd_system_unitdir}/iptables.service | 63 | ${D}${systemd_system_unitdir}/iptables.service |
64 | 64 | ||
65 | if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then | 65 | if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then |
66 | install -m 0644 ${WORKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} | 66 | install -m 0644 ${UNPACKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} |
67 | install -m 0644 ${WORKDIR}/ip6tables.service ${D}${systemd_system_unitdir} | 67 | install -m 0644 ${UNPACKDIR}/ip6tables.service ${D}${systemd_system_unitdir} |
68 | 68 | ||
69 | sed -i \ | 69 | sed -i \ |
70 | -e 's,@SBINDIR@,${sbindir},g' \ | 70 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20240117.bb index 5a5e15528e..3880689742 100644 --- a/meta/recipes-extended/iputils/iputils_20240117.bb +++ b/meta/recipes-extended/iputils/iputils_20240117.bb | |||
@@ -35,7 +35,11 @@ ALTERNATIVE_PRIORITY = "100" | |||
35 | ALTERNATIVE:${PN}-ping = "ping" | 35 | ALTERNATIVE:${PN}-ping = "ping" |
36 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 36 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
37 | 37 | ||
38 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" | 38 | ALTERNATIVE:${PN}-ping6 = "ping6" |
39 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" | ||
40 | |||
41 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \ | ||
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ping6', '', d)}" | ||
39 | PACKAGES += "${SPLITPKGS}" | 43 | PACKAGES += "${SPLITPKGS}" |
40 | 44 | ||
41 | ALLOW_EMPTY:${PN} = "1" | 45 | ALLOW_EMPTY:${PN} = "1" |
@@ -43,6 +47,13 @@ RDEPENDS:${PN} += "${SPLITPKGS}" | |||
43 | 47 | ||
44 | FILES:${PN} = "" | 48 | FILES:${PN} = "" |
45 | FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" | 49 | FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" |
50 | FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}" | ||
46 | FILES:${PN}-arping = "${base_bindir}/arping" | 51 | FILES:${PN}-arping = "${base_bindir}/arping" |
47 | FILES:${PN}-tracepath = "${base_bindir}/tracepath" | 52 | FILES:${PN}-tracepath = "${base_bindir}/tracepath" |
48 | FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" | 53 | FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" |
54 | |||
55 | do_install:append() { | ||
56 | if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}; then | ||
57 | ln -sf ping ${D}/${base_bindir}/ping6 | ||
58 | fi | ||
59 | } | ||
diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch index f3989d99eb..45fddd9147 100644 --- a/meta/recipes-extended/libarchive/libarchive/configurehack.patch +++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch | |||
@@ -2,12 +2,15 @@ To work with autoconf 2.73, tweak the macro ordering in configure.in. | |||
2 | 2 | ||
3 | Upstream-Status: Pending | 3 | Upstream-Status: Pending |
4 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 4 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
5 | --- | ||
6 | configure.ac | 26 +++++++++++++------------- | ||
7 | 1 file changed, 13 insertions(+), 13 deletions(-) | ||
5 | 8 | ||
6 | Index: libarchive-3.6.2/configure.ac | 9 | diff --git a/configure.ac b/configure.ac |
7 | =================================================================== | 10 | index 503bb75..e3101da 100644 |
8 | --- libarchive-3.6.2.orig/configure.ac | 11 | --- a/configure.ac |
9 | +++ libarchive-3.6.2/configure.ac | 12 | +++ b/configure.ac |
10 | @@ -357,6 +357,19 @@ if test "x$with_bz2lib" != "xno"; then | 13 | @@ -414,6 +414,19 @@ if test "x$with_bz2lib" != "xno"; then |
11 | esac | 14 | esac |
12 | fi | 15 | fi |
13 | 16 | ||
@@ -27,9 +30,9 @@ Index: libarchive-3.6.2/configure.ac | |||
27 | AC_ARG_WITH([libb2], | 30 | AC_ARG_WITH([libb2], |
28 | AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2])) | 31 | AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2])) |
29 | 32 | ||
30 | @@ -558,19 +571,6 @@ LDFLAGS=$save_LDFLAGS | 33 | @@ -678,19 +691,6 @@ fi |
31 | 34 | ||
32 | AC_SUBST(GC_SECTIONS) | 35 | AC_SUBST(DEAD_CODE_REMOVAL) |
33 | 36 | ||
34 | -# Checks for typedefs, structures, and compiler characteristics. | 37 | -# Checks for typedefs, structures, and compiler characteristics. |
35 | -AC_C_CONST | 38 | -AC_C_CONST |
@@ -47,3 +50,6 @@ Index: libarchive-3.6.2/configure.ac | |||
47 | # Check for tm_gmtoff in struct tm | 50 | # Check for tm_gmtoff in struct tm |
48 | AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,, | 51 | AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,, |
49 | [ | 52 | [ |
53 | -- | ||
54 | 2.34.1 | ||
55 | |||
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb b/meta/recipes-extended/libarchive/libarchive_3.7.3.bb index 91f521fa4d..bea91b6e97 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.3.bb | |||
@@ -33,7 +33,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" | |||
33 | SRC_URI += "file://configurehack.patch" | 33 | SRC_URI += "file://configurehack.patch" |
34 | UPSTREAM_CHECK_URI = "http://libarchive.org/" | 34 | UPSTREAM_CHECK_URI = "http://libarchive.org/" |
35 | 35 | ||
36 | SRC_URI[sha256sum] = "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104" | 36 | SRC_URI[sha256sum] = "f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2" |
37 | 37 | ||
38 | CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" | 38 | CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" |
39 | 39 | ||
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch index 6f0dea2e9c..da93a12ed5 100644 --- a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch +++ b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 | 1 | From e1db3c41fa84391b7ab299f7351f58b413ed2994 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 28 Oct 2021 22:28:45 -0700 | 3 | Date: Thu, 28 Oct 2021 22:28:45 -0700 |
4 | Subject: [PATCH] utils: Conside musl when wrapping qsort_r | 4 | Subject: [PATCH] utils: Conside musl when wrapping qsort_r |
@@ -29,6 +29,3 @@ index 72426e09..8f29bc5a 100644 | |||
29 | 29 | ||
30 | void | 30 | void |
31 | solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) | 31 | solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) |
32 | -- | ||
33 | 2.33.1 | ||
34 | |||
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb b/meta/recipes-extended/libsolv/libsolv_0.7.29.bb index 201059323a..ff0bd2d174 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.29.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \ | |||
12 | file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ | 12 | file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRCREV = "c8dbb3a77c86600ce09d4f80a504cf4e78a3c359" | 15 | SRCREV = "9c2b1a84b5a7ce0dc6e74226bdeb9527d6706791" |
16 | 16 | ||
17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
18 | 18 | ||
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.75.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb index fc3b7e005d..153f451ea7 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.75.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t | |||
16 | file://lighttpd \ | 16 | file://lighttpd \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "8b721ca939d312afaa6ef31dcbd6afb5161ed385ac828e6fccd4c5b76be189d6" | 19 | SRC_URI[sha256sum] = "8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011" |
20 | 20 | ||
21 | DEPENDS = "virtual/crypt" | 21 | DEPENDS = "virtual/crypt" |
22 | 22 | ||
@@ -47,9 +47,9 @@ SYSTEMD_SERVICE:${PN} = "lighttpd.service" | |||
47 | 47 | ||
48 | do_install:append() { | 48 | do_install:append() { |
49 | install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav | 49 | install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav |
50 | install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d | 50 | install -m 0755 ${UNPACKDIR}/lighttpd ${D}${sysconfdir}/init.d |
51 | install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd | 51 | install -m 0644 ${UNPACKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd |
52 | install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html | 52 | install -m 0644 ${UNPACKDIR}/index.html.lighttpd ${D}/www/pages/index.html |
53 | 53 | ||
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} | 55 | install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} |
diff --git a/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch b/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch new file mode 100644 index 0000000000..ae8dc8706e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 74074f9a71c876d6e95c2d72702888dd2fabc761 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 6 May 2024 11:43:20 -0700 | ||
4 | Subject: [PATCH] sched_stress: Use time_t instead of long for type | ||
5 | |||
6 | This ensures it works across different architectures | ||
7 | Fixes | ||
8 | |||
9 | | sched_driver.c:744:43: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
10 | | 744 | printf("\nend time = %s\n", ctime(&end_time)); | ||
11 | | | ^~~~~~~~~ | ||
12 | |||
13 | With gcc-14 | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/0a682f1af42d8d261202821be580fe26d17ee9b7] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | testcases/kernel/sched/sched_stress/sched_driver.c | 6 +++--- | ||
19 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/testcases/kernel/sched/sched_stress/sched_driver.c b/testcases/kernel/sched/sched_stress/sched_driver.c | ||
22 | index 61573d788..5b8c187fe 100644 | ||
23 | --- a/testcases/kernel/sched/sched_stress/sched_driver.c | ||
24 | +++ b/testcases/kernel/sched/sched_stress/sched_driver.c | ||
25 | @@ -136,7 +136,7 @@ int debug = 0; | ||
26 | /* | ||
27 | * Function prototypes | ||
28 | */ | ||
29 | -void startup(long); | ||
30 | +void startup(time_t); | ||
31 | int start_testcase(char *, char *, char *, char *, char *, char *); | ||
32 | int process_slots_in_use(); | ||
33 | int available_user_process_slots(); | ||
34 | @@ -251,7 +251,7 @@ int main(int argc, char **argv) | ||
35 | * information to the screen and . It also initializes the * | ||
36 | * process id list and other global variables. * | ||
37 | *-----------------------------------------------------------------------*/ | ||
38 | -void startup(long start_time) | ||
39 | +void startup(time_t start_time) | ||
40 | { | ||
41 | char tempbuffer[50]; /* temporary buffer to hold names */ | ||
42 | |||
43 | @@ -734,7 +734,7 @@ void kill_short_term_testcases() | ||
44 | void finishup(start_time) | ||
45 | long start_time; /* starting time to calculate elapsed time */ | ||
46 | { | ||
47 | - long end_time; /* time when program finished */ | ||
48 | + time_t end_time; /* time when program finished */ | ||
49 | |||
50 | /* | ||
51 | * Get the end time and calculate elapsed time; write all this out | ||
52 | -- | ||
53 | 2.45.0 | ||
54 | |||
diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240129.bb index 3e896957d1..f8e6d3987e 100644 --- a/meta/recipes-extended/ltp/ltp_20240129.bb +++ b/meta/recipes-extended/ltp/ltp_20240129.bb | |||
@@ -29,6 +29,7 @@ SRCREV = "68737d20556d37364c95776044b1119c0912a36a" | |||
29 | SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ | 29 | SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ |
30 | file://0001-Remove-OOM-tests-from-runtest-mm.patch \ | 30 | file://0001-Remove-OOM-tests-from-runtest-mm.patch \ |
31 | file://0001-scenario_groups-default-remove-connectors.patch \ | 31 | file://0001-scenario_groups-default-remove-connectors.patch \ |
32 | file://0001-sched_stress-Use-time_t-instead-of-long-for-type.patch \ | ||
32 | " | 33 | " |
33 | 34 | ||
34 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
@@ -98,6 +99,7 @@ RDEPENDS:${PN} = "\ | |||
98 | gdb \ | 99 | gdb \ |
99 | gzip \ | 100 | gzip \ |
100 | iproute2 \ | 101 | iproute2 \ |
102 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'iputils-ping6', '', d)} \ | ||
101 | ldd \ | 103 | ldd \ |
102 | libaio \ | 104 | libaio \ |
103 | logrotate \ | 105 | logrotate \ |
diff --git a/meta/recipes-extended/man-db/man-db_2.12.1.bb b/meta/recipes-extended/man-db/man-db_2.12.1.bb index 27b47a7f47..5c6797c8f1 100644 --- a/meta/recipes-extended/man-db/man-db_2.12.1.bb +++ b/meta/recipes-extended/man-db/man-db_2.12.1.bb | |||
@@ -37,7 +37,7 @@ do_install() { | |||
37 | 37 | ||
38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
39 | install -d ${D}/etc/default/volatiles | 39 | install -d ${D}/etc/default/volatiles |
40 | install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles | 40 | install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles |
41 | fi | 41 | fi |
42 | } | 42 | } |
43 | 43 | ||
diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index 228fc6f84e..63c61b68c9 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb | |||
@@ -61,7 +61,7 @@ do_install:append() { | |||
61 | install -d ${D}/${sysconfdir}/ | 61 | install -d ${D}/${sysconfdir}/ |
62 | install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf | 62 | install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf |
63 | install -d ${D}/${sysconfdir}/init.d | 63 | install -d ${D}/${sysconfdir}/init.d |
64 | install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor | 64 | install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor |
65 | } | 65 | } |
66 | 66 | ||
67 | do_install:append() { | 67 | do_install:append() { |
diff --git a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch b/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch deleted file mode 100644 index 124e5f1c3c..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jacob Heider <jacob@pkgx.dev> | ||
3 | Date: Wed, 17 Jan 2024 11:49:26 -0500 | ||
4 | Subject: [PATCH] pam_namespace: include stdint.h | ||
5 | |||
6 | pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, | ||
7 | resulting in the following build failures on 1.6.0: | ||
8 | |||
9 | pam_namespace.c: In function 'process_line': | ||
10 | pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) | ||
11 | 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ||
12 | | ^~~~~~~~ | ||
13 | pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'? | ||
14 | 40 | #include "argv_parse.h" | ||
15 | +++ |+#include <stdint.h> | ||
16 | 41 | | ||
17 | pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in | ||
18 | 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ||
19 | | ^~~~~~~~ | ||
20 | |||
21 | Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") | ||
22 | Resolves: https://github.com/linux-pam/linux-pam/issues/733 | ||
23 | |||
24 | Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13] | ||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
26 | --- | ||
27 | modules/pam_namespace/pam_namespace.c | 2 ++ | ||
28 | 1 file changed, 2 insertions(+) | ||
29 | |||
30 | diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c | ||
31 | index f72d67189..b16731c22 100644 | ||
32 | --- a/modules/pam_namespace/pam_namespace.c | ||
33 | +++ b/modules/pam_namespace/pam_namespace.c | ||
34 | @@ -34,6 +34,8 @@ | ||
35 | |||
36 | #define _ATFILE_SOURCE | ||
37 | |||
38 | +#include "config.h" | ||
39 | +#include <stdint.h> | ||
40 | #include "pam_cc_compat.h" | ||
41 | #include "pam_inline.h" | ||
42 | #include "pam_namespace.h" | ||
diff --git a/meta/recipes-extended/pam/libpam_1.6.0.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb index e1ed940d1e..9f2106ea73 100644 --- a/meta/recipes-extended/pam/libpam_1.6.0.bb +++ b/meta/recipes-extended/pam/libpam_1.6.1.bb | |||
@@ -23,10 +23,9 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ | |||
23 | file://libpam-xtests.patch \ | 23 | file://libpam-xtests.patch \ |
24 | file://run-ptest \ | 24 | file://run-ptest \ |
25 | file://pam-volatiles.conf \ | 25 | file://pam-volatiles.conf \ |
26 | file://0001-pam_namespace-include-stdint-h.patch \ | ||
27 | " | 26 | " |
28 | 27 | ||
29 | SRC_URI[sha256sum] = "fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad" | 28 | SRC_URI[sha256sum] = "f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e" |
30 | 29 | ||
31 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" | 30 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" |
32 | 31 | ||
@@ -139,16 +138,16 @@ do_install() { | |||
139 | rm -rf ${D}${sysconfdir}/init.d/ | 138 | rm -rf ${D}${sysconfdir}/init.d/ |
140 | rm -rf ${D}${sysconfdir}/rc* | 139 | rm -rf ${D}${sysconfdir}/rc* |
141 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 140 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
142 | install -m 0644 ${WORKDIR}/pam-volatiles.conf \ | 141 | install -m 0644 ${UNPACKDIR}/pam-volatiles.conf \ |
143 | ${D}${nonarch_libdir}/tmpfiles.d/pam.conf | 142 | ${D}${nonarch_libdir}/tmpfiles.d/pam.conf |
144 | else | 143 | else |
145 | install -d ${D}${sysconfdir}/default/volatiles | 144 | install -d ${D}${sysconfdir}/default/volatiles |
146 | install -m 0644 ${WORKDIR}/99_pam \ | 145 | install -m 0644 ${UNPACKDIR}/99_pam \ |
147 | ${D}${sysconfdir}/default/volatiles/ | 146 | ${D}${sysconfdir}/default/volatiles/ |
148 | fi | 147 | fi |
149 | 148 | ||
150 | install -d ${D}${sysconfdir}/pam.d/ | 149 | install -d ${D}${sysconfdir}/pam.d/ |
151 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | 150 | install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ |
152 | 151 | ||
153 | # The lsb requires unix_chkpwd has setuid permission | 152 | # The lsb requires unix_chkpwd has setuid permission |
154 | chmod 4755 ${D}${sbindir}/unix_chkpwd | 153 | chmod 4755 ${D}${sbindir}/unix_chkpwd |
diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.4.bb index 800384f22f..789e0c2747 100644 --- a/meta/recipes-extended/procps/procps_4.0.4.bb +++ b/meta/recipes-extended/procps/procps_4.0.4.bb | |||
@@ -41,7 +41,7 @@ do_install:append () { | |||
41 | fi | 41 | fi |
42 | 42 | ||
43 | install -d ${D}${sysconfdir} | 43 | install -d ${D}${sysconfdir} |
44 | install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf | 44 | install -m 0644 ${UNPACKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf |
45 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 45 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
46 | install -d ${D}${sysconfdir}/sysctl.d | 46 | install -d ${D}${sysconfdir}/sysctl.d |
47 | ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf | 47 | ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf |
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb index dbd4d32e0a..e751eb631c 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb | |||
@@ -46,9 +46,9 @@ do_install:append () { | |||
46 | install -d ${D}${sysconfdir}/init.d | 46 | install -d ${D}${sysconfdir}/init.d |
47 | sed -e 's,/etc/,${sysconfdir}/,g' \ | 47 | sed -e 's,/etc/,${sysconfdir}/,g' \ |
48 | -e 's,/sbin/,${sbindir}/,g' \ | 48 | -e 's,/sbin/,${sbindir}/,g' \ |
49 | ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind | 49 | ${UNPACKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind |
50 | chmod 0755 ${D}${sysconfdir}/init.d/rpcbind | 50 | chmod 0755 ${D}${sysconfdir}/init.d/rpcbind |
51 | install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf | 51 | install -m 0644 ${UNPACKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf |
52 | } | 52 | } |
53 | 53 | ||
54 | ALTERNATIVE:${PN} = "rpcinfo" | 54 | ALTERNATIVE:${PN} = "rpcinfo" |
diff --git a/meta/recipes-extended/screen/screen_4.9.1.bb b/meta/recipes-extended/screen/screen_4.9.1.bb index 7b040e6b57..57d1481049 100644 --- a/meta/recipes-extended/screen/screen_4.9.1.bb +++ b/meta/recipes-extended/screen/screen_4.9.1.bb | |||
@@ -36,7 +36,7 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sy | |||
36 | do_install:append () { | 36 | do_install:append () { |
37 | install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc | 37 | install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc |
38 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 38 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
39 | install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen | 39 | install -D -m 644 ${UNPACKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen |
40 | fi | 40 | fi |
41 | } | 41 | } |
42 | 42 | ||
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb index fe51ea1874..85c04b6af1 100644 --- a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb | |||
@@ -17,7 +17,7 @@ do_install () { | |||
17 | # Ensure we add a suitable securetty file to the package that has | 17 | # Ensure we add a suitable securetty file to the package that has |
18 | # most common embedded TTYs defined. | 18 | # most common embedded TTYs defined. |
19 | install -d ${D}${sysconfdir} | 19 | install -d ${D}${sysconfdir} |
20 | install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty | 20 | install -m 0400 ${S}/securetty ${D}${sysconfdir}/securetty |
21 | if [ ! -z "${SERIAL_CONSOLES}" ]; then | 21 | if [ ! -z "${SERIAL_CONSOLES}" ]; then |
22 | # Our SERIAL_CONSOLES contains a baud rate and sometimes extra | 22 | # Our SERIAL_CONSOLES contains a baud rate and sometimes extra |
23 | # options as well. The following pearl :) takes that and converts | 23 | # options as well. The following pearl :) takes that and converts |
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 7b9763d6db..25930b64c1 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -111,7 +111,7 @@ do_install() { | |||
111 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs | 111 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs |
112 | 112 | ||
113 | install -d ${D}${sysconfdir}/default | 113 | install -d ${D}${sysconfdir}/default |
114 | install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default | 114 | install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default |
115 | } | 115 | } |
116 | 116 | ||
117 | do_install:append() { | 117 | do_install:append() { |
@@ -121,11 +121,11 @@ do_install:append() { | |||
121 | install -m 0775 -d ${D}${localstatedir}/spool/mail | 121 | install -m 0775 -d ${D}${localstatedir}/spool/mail |
122 | chown root:mail ${D}${localstatedir}/spool/mail | 122 | chown root:mail ${D}${localstatedir}/spool/mail |
123 | 123 | ||
124 | if [ -e ${WORKDIR}/pam.d ]; then | 124 | if [ -e ${UNPACKDIR}/pam.d ]; then |
125 | install -d ${D}${sysconfdir}/pam.d/ | 125 | install -d ${D}${sysconfdir}/pam.d/ |
126 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | 126 | install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ |
127 | # Remove defaults that are not used when supporting PAM. | 127 | # Remove defaults that are not used when supporting PAM. |
128 | sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs | 128 | sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs |
129 | fi | 129 | fi |
130 | 130 | ||
131 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} | 131 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} |
@@ -168,6 +168,14 @@ do_install:append:class-native() { | |||
168 | SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" | 168 | SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" |
169 | INSANE_SKIP:${PN}:class-native = "already-stripped" | 169 | INSANE_SKIP:${PN}:class-native = "already-stripped" |
170 | 170 | ||
171 | do_install:append:class-nativesdk() { | ||
172 | oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man | ||
173 | } | ||
174 | |||
175 | do_install:append:class-target() { | ||
176 | oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man | ||
177 | } | ||
178 | |||
171 | PACKAGES =+ "${PN}-base" | 179 | PACKAGES =+ "${PN}-base" |
172 | FILES:${PN}-base = "\ | 180 | FILES:${PN}-base = "\ |
173 | ${base_bindir}/login.shadow \ | 181 | ${base_bindir}/login.shadow \ |
@@ -193,6 +201,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" | |||
193 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" | 201 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" |
194 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 202 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
195 | 203 | ||
204 | ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" | ||
205 | ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" | ||
206 | ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" | ||
207 | |||
196 | ALTERNATIVE:${PN}-base = "newgrp groups login su" | 208 | ALTERNATIVE:${PN}-base = "newgrp groups login su" |
197 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 209 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
198 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | 210 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" |
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.06.bb b/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb index a52b70d22f..fb88e06a7f 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.17.06.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
7 | 7 | ||
8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ | 8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ |
9 | " | 9 | " |
10 | SRCREV = "e6bda983cb48a201b6af173204372c7b37d6411f" | 10 | SRCREV = "519151f460738cd62b69b84f8096cd218131e0a2" |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | DEPENDS = "coreutils-native libbsd" | 13 | DEPENDS = "coreutils-native libbsd" |
diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb index 8e542015ad..2fd2ae6d05 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb | |||
@@ -30,7 +30,7 @@ EXTRA_OECONF += " \ | |||
30 | 30 | ||
31 | do_install:append () { | 31 | do_install:append () { |
32 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 32 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
33 | install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo | 33 | install -D -m 644 ${UNPACKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo |
34 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then | 34 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then |
35 | echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo | 35 | echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo |
36 | sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers | 36 | sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers |
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb index c9c9055142..e488603086 100644 --- a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb +++ b/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb | |||
@@ -24,7 +24,7 @@ do_install:append () { | |||
24 | install -d ${D}${sysconfdir} | 24 | install -d ${D}${sysconfdir} |
25 | install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf | 25 | install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf |
26 | install -d ${D}${sysconfdir}/init.d | 26 | install -d ${D}${sysconfdir}/init.d |
27 | install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog | 27 | install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog |
28 | } | 28 | } |
29 | 29 | ||
30 | SYSTEMD_PACKAGES = "${PN}" | 30 | SYSTEMD_PACKAGES = "${PN}" |
diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb index 150f4932d8..d598d5366f 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb | |||
@@ -45,7 +45,7 @@ do_install() { | |||
45 | rm -rf ${D}/var | 45 | rm -rf ${D}/var |
46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
47 | install -d ${D}/etc/default/volatiles | 47 | install -d ${D}/etc/default/volatiles |
48 | install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles | 48 | install -m 0644 ${UNPACKDIR}/99_sysstat ${D}/etc/default/volatiles |
49 | fi | 49 | fi |
50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
51 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 51 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
@@ -56,7 +56,7 @@ do_install() { | |||
56 | # systemd unit file. Otherwise the package will install one. | 56 | # systemd unit file. Otherwise the package will install one. |
57 | if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then | 57 | if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then |
58 | install -d ${D}${systemd_system_unitdir} | 58 | install -d ${D}${systemd_system_unitdir} |
59 | install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} | 59 | install -m 0644 ${UNPACKDIR}/sysstat.service ${D}${systemd_system_unitdir} |
60 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service | 60 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service |
61 | fi | 61 | fi |
62 | fi | 62 | fi |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index bcd1d6f792..8cf927153f 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | |||
@@ -120,8 +120,8 @@ do_install () { | |||
120 | install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 | 120 | install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 |
121 | done | 121 | done |
122 | 122 | ||
123 | install -m 0644 ${WORKDIR}/try-from.8 ${D}${mandir}/man8/ | 123 | install -m 0644 ${UNPACKDIR}/try-from.8 ${D}${mandir}/man8/ |
124 | install -m 0644 ${WORKDIR}/safe_finger.8 ${D}${mandir}/man8/ | 124 | install -m 0644 ${UNPACKDIR}/safe_finger.8 ${D}${mandir}/man8/ |
125 | 125 | ||
126 | install -d ${D}${includedir} | 126 | install -d ${D}${includedir} |
127 | install -m 0644 tcpd.h ${D}${includedir}/ | 127 | install -m 0644 tcpd.h ${D}${includedir}/ |
diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb index f138952128..e826a7d4a6 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb | |||
@@ -17,8 +17,8 @@ SRC_URI = " \ | |||
17 | WATCHDOG_TIMEOUT ??= "" | 17 | WATCHDOG_TIMEOUT ??= "" |
18 | 18 | ||
19 | do_install() { | 19 | do_install() { |
20 | install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog | 20 | install -Dm 0644 ${UNPACKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog |
21 | install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf | 21 | install -Dm 0644 ${UNPACKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf |
22 | 22 | ||
23 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then | 23 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then |
24 | echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf | 24 | echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf |
diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb index 5325ccafda..c88ea08ade 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb | |||
@@ -50,8 +50,8 @@ do_install:append() { | |||
50 | install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} | 50 | install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} |
51 | install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} | 51 | install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} |
52 | 52 | ||
53 | install -Dm 0755 ${WORKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog | 53 | install -Dm 0755 ${UNPACKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog |
54 | install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive | 54 | install -Dm 0755 ${UNPACKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive |
55 | 55 | ||
56 | # watchdog.conf is provided by the watchdog-config recipe | 56 | # watchdog.conf is provided by the watchdog-config recipe |
57 | rm ${D}${sysconfdir}/watchdog.conf | 57 | rm ${D}${sysconfdir}/watchdog.conf |
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 72eb1ae067..897747379b 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | |||
@@ -37,12 +37,12 @@ CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" | |||
37 | do_install:append() { | 37 | do_install:append() { |
38 | install -d "${D}${sysconfdir}/init.d" | 38 | install -d "${D}${sysconfdir}/init.d" |
39 | install -d "${D}${sysconfdir}/default" | 39 | install -d "${D}${sysconfdir}/default" |
40 | install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" | 40 | install -m 755 "${UNPACKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" |
41 | install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" | 41 | install -m 644 "${UNPACKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" |
42 | 42 | ||
43 | # Install systemd unit files | 43 | # Install systemd unit files |
44 | install -d ${D}${systemd_system_unitdir} | 44 | install -d ${D}${systemd_system_unitdir} |
45 | install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} | 45 | install -m 0644 ${UNPACKDIR}/xinetd.service ${D}${systemd_system_unitdir} |
46 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 46 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
47 | -e 's,@SBINDIR@,${sbindir},g' \ | 47 | -e 's,@SBINDIR@,${sbindir},g' \ |
48 | ${D}${systemd_system_unitdir}/xinetd.service | 48 | ${D}${systemd_system_unitdir}/xinetd.service |
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch new file mode 100644 index 0000000000..0d3af37ded --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 9db2f8cdbbc0dfb359d3b4e5dfe48c18652ce531 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 8 May 2024 19:02:46 -0700 | ||
4 | Subject: [PATCH] configure: Include dirent.h for closedir/opendir APIs | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | GCC-14 is strict about function prototypes and since the | ||
10 | testcase tries to compile/link opendir/closedir functions | ||
11 | without including signatures, it fails to build the test | ||
12 | due to missing signatures which come from dirent.h | ||
13 | |||
14 | Therefore include the needed system header and make it more | ||
15 | robust. | ||
16 | |||
17 | Fixes | ||
18 | a.c:2:21: error: implicit declaration of function ‘closedir’ [-Wimplicit-function-declaration] | ||
19 | 2 | int main() { return closedir(opendir(".")); } | ||
20 | | ^~~~~~~~ | ||
21 | a.c:2:30: error: implicit declaration of function ‘opendir’ [-Wimplicit-function-declaration] | ||
22 | 2 | int main() { return closedir(opendir(".")); } | ||
23 | | ^~~~~~~ | ||
24 | |||
25 | Upstream-Status: Inactive-Upstream | ||
26 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
27 | --- | ||
28 | unix/configure | 1 + | ||
29 | 1 file changed, 1 insertion(+) | ||
30 | |||
31 | diff --git a/unix/configure b/unix/configure | ||
32 | index f917086..1dd98c6 100644 | ||
33 | --- a/unix/configure | ||
34 | +++ b/unix/configure | ||
35 | @@ -591,6 +591,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null | ||
36 | |||
37 | echo Check for directory libraries | ||
38 | cat > conftest.c << _EOF_ | ||
39 | +#include <dirent.h> | ||
40 | int main() { return closedir(opendir(".")); } | ||
41 | _EOF_ | ||
42 | |||
43 | -- | ||
44 | 2.45.0 | ||
45 | |||
diff --git a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch deleted file mode 100644 index a86e03e620..0000000000 --- a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 10 Aug 2022 17:19:38 -0700 | ||
4 | Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE | ||
5 | |||
6 | DIR is already provided on Linux via | ||
7 | /usr/include/dirent.h system header | ||
8 | |||
9 | Upstream-Status: Inactive-Upstream | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | unix/unix.c | 2 -- | ||
13 | 1 file changed, 2 deletions(-) | ||
14 | |||
15 | diff --git a/unix/unix.c b/unix/unix.c | ||
16 | index ba87614..6e6f4d2 100644 | ||
17 | --- a/unix/unix.c | ||
18 | +++ b/unix/unix.c | ||
19 | @@ -61,13 +61,11 @@ local time_t label_utim = 0; | ||
20 | /* Local functions */ | ||
21 | local char *readd OF((DIR *)); | ||
22 | |||
23 | - | ||
24 | #ifdef NO_DIR /* for AT&T 3B1 */ | ||
25 | #include <sys/dir.h> | ||
26 | #ifndef dirent | ||
27 | # define dirent direct | ||
28 | #endif | ||
29 | -typedef FILE DIR; | ||
30 | /* | ||
31 | ** Apparently originally by Rich Salz. | ||
32 | ** Cleaned up and modified by James W. Birdsall. | ||
33 | -- | ||
34 | 2.37.1 | ||
35 | |||
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index 70df5ab872..ec54206335 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb | |||
@@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. | |||
17 | file://0002-configure-support-PIC-code-build.patch \ | 17 | file://0002-configure-support-PIC-code-build.patch \ |
18 | file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ | 18 | file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ |
19 | file://0001-configure-Specify-correct-function-signatures-and-de.patch \ | 19 | file://0001-configure-Specify-correct-function-signatures-and-de.patch \ |
20 | file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \ | ||
21 | file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ | 20 | file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ |
21 | file://0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch \ | ||
22 | " | 22 | " |
23 | UPSTREAM_VERSION_UNKNOWN = "1" | 23 | UPSTREAM_VERSION_UNKNOWN = "1" |
24 | 24 | ||
diff --git a/meta/recipes-gnome/gcr/gcr_4.2.1.bb b/meta/recipes-gnome/gcr/gcr_4.3.0.bb index 26dc1d1bc6..50c8cfe8d6 100644 --- a/meta/recipes-gnome/gcr/gcr_4.2.1.bb +++ b/meta/recipes-gnome/gcr/gcr_4.3.0.bb | |||
@@ -20,7 +20,7 @@ inherit gnomebase gtk-icon-cache gi-docgen features_check vala gobject-introspec | |||
20 | 20 | ||
21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" | 21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" |
22 | 22 | ||
23 | SRC_URI[archive.sha256sum] = "ed783b5c80373cd058c02ea9e3e2a64e558599ca190a5abd598122e479967de5" | 23 | SRC_URI[archive.sha256sum] = "c3ee8728e4364b0397f435fa20f92f901ab139d2b264f4e059d67b3c0f43cd36" |
24 | 24 | ||
25 | PACKAGECONFIG ??= " \ | 25 | PACKAGECONFIG ??= " \ |
26 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | 26 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch index 7250fa3f62..3d685db774 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9d3b374e75692da3d1d05344a1693c85a3098f47 Mon Sep 17 00:00:00 2001 | 1 | From 4bfb696fd125f044e3df9f6983c4ad518d9552c7 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Thu, 26 Jan 2023 20:29:46 +0100 | 3 | Date: Thu, 26 Jan 2023 20:29:46 +0100 |
4 | Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile | 4 | Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile |
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
19 | 2 files changed, 9 insertions(+), 7 deletions(-) | 19 | 2 files changed, 9 insertions(+), 7 deletions(-) |
20 | 20 | ||
21 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
22 | index 8a16c8f..7c8b20f 100644 | 22 | index 78f3683..e0feaee 100644 |
23 | --- a/meson.build | 23 | --- a/meson.build |
24 | +++ b/meson.build | 24 | +++ b/meson.build |
25 | @@ -369,10 +369,10 @@ subdir('gdk-pixbuf') | 25 | @@ -390,10 +390,10 @@ subdir('gdk-pixbuf') |
26 | # i18n | 26 | # i18n |
27 | subdir('po') | 27 | subdir('po') |
28 | 28 | ||
@@ -37,7 +37,7 @@ index 8a16c8f..7c8b20f 100644 | |||
37 | endif | 37 | endif |
38 | 38 | ||
39 | diff --git a/tests/meson.build b/tests/meson.build | 39 | diff --git a/tests/meson.build b/tests/meson.build |
40 | index 28c2525..c45e765 100644 | 40 | index 78d0ad9..0c9e64e 100644 |
41 | --- a/tests/meson.build | 41 | --- a/tests/meson.build |
42 | +++ b/tests/meson.build | 42 | +++ b/tests/meson.build |
43 | @@ -4,7 +4,7 @@ | 43 | @@ -4,7 +4,7 @@ |
@@ -49,7 +49,7 @@ index 28c2525..c45e765 100644 | |||
49 | # Resources; we cannot use gnome.compile_resources() here, because we need to | 49 | # Resources; we cannot use gnome.compile_resources() here, because we need to |
50 | # override the environment in order to use the utilities we just built instead | 50 | # override the environment in order to use the utilities we just built instead |
51 | # of the system ones | 51 | # of the system ones |
52 | @@ -166,9 +166,11 @@ endif | 52 | @@ -172,9 +172,11 @@ endif |
53 | test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] | 53 | test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] |
54 | test_args = [ '-k' ] | 54 | test_args = [ '-k' ] |
55 | test_env = environment() | 55 | test_env = environment() |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch index 23c68a0923..80c93e2166 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b511bd1efb43ffc49c753e309717a242ec686ef1 Mon Sep 17 00:00:00 2001 | 1 | From 9b4f5738f8ac30f393b6163dcc84757976683d9b Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 | 3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 |
4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal | 4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal |
@@ -8,13 +8,12 @@ non-zero if the loader had errors (missing libraries, generally). | |||
8 | 8 | ||
9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/144] | 9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/144] |
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- | 12 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- |
14 | 1 file changed, 15 insertions(+), 4 deletions(-) | 13 | 1 file changed, 15 insertions(+), 4 deletions(-) |
15 | 14 | ||
16 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c | 15 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c |
17 | index 1d39b44..2b00815 100644 | 16 | index baa9a5c..9b6fa89 100644 |
18 | --- a/gdk-pixbuf/queryloaders.c | 17 | --- a/gdk-pixbuf/queryloaders.c |
19 | +++ b/gdk-pixbuf/queryloaders.c | 18 | +++ b/gdk-pixbuf/queryloaders.c |
20 | @@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) | 19 | @@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) |
@@ -77,7 +76,7 @@ index 1d39b44..2b00815 100644 | |||
77 | } | 76 | } |
78 | g_free (cwd); | 77 | g_free (cwd); |
79 | } | 78 | } |
80 | @@ -490,5 +498,8 @@ int main (int argc, char **argv) | 79 | @@ -492,5 +500,8 @@ int main (int argc, char **argv) |
81 | 80 | ||
82 | g_free (pixbuf_libdir); | 81 | g_free (pixbuf_libdir); |
83 | 82 | ||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb index cca89a9059..ef0f23f8f7 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ | 22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" | 25 | SRC_URI[sha256sum] = "49dcb402388708647e8c321d56b6fb30f21e51e515d0c5a942268d23052a2f00" |
26 | 26 | ||
27 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package | 27 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package |
28 | 28 | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index c9e1afffd0..510bc426d1 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From aeb5532f8be42d42f4e8725ca42e239b36983a4d Mon Sep 17 00:00:00 2001 | 1 | From 4e1aa0ddbc43403ff24f644b4c4912b737290c41 Mon Sep 17 00:00:00 2001 |
2 | From: Sascha Silbe <x-yo17@se-silbe.de> | 2 | From: Sascha Silbe <x-yo17@se-silbe.de> |
3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 | 3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 |
4 | Subject: [PATCH] Relocate the repository directory for native builds | 4 | Subject: [PATCH] Relocate the repository directory for native builds |
@@ -14,14 +14,13 @@ cache or sstate mirror). | |||
14 | 14 | ||
15 | Upstream-Status: Inappropriate | 15 | Upstream-Status: Inappropriate |
16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> | 16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> |
17 | |||
18 | --- | 17 | --- |
19 | girepository/girepository.c | 15 +++++++++++++-- | 18 | girepository/girepository.c | 15 +++++++++++++-- |
20 | girepository/meson.build | 2 +- | 19 | girepository/meson.build | 2 +- |
21 | 2 files changed, 14 insertions(+), 3 deletions(-) | 20 | 2 files changed, 14 insertions(+), 3 deletions(-) |
22 | 21 | ||
23 | diff --git a/girepository/girepository.c b/girepository/girepository.c | 22 | diff --git a/girepository/girepository.c b/girepository/girepository.c |
24 | index a0754f4..2d456f9 100644 | 23 | index 12eaf36..876382c 100644 |
25 | --- a/girepository/girepository.c | 24 | --- a/girepository/girepository.c |
26 | +++ b/girepository/girepository.c | 25 | +++ b/girepository/girepository.c |
27 | @@ -21,6 +21,8 @@ | 26 | @@ -21,6 +21,8 @@ |
@@ -42,7 +41,7 @@ index a0754f4..2d456f9 100644 | |||
42 | /** | 41 | /** |
43 | * SECTION:girepository | 42 | * SECTION:girepository |
44 | * @short_description: GObject Introspection repository manager | 43 | * @short_description: GObject Introspection repository manager |
45 | @@ -215,9 +219,16 @@ init_globals (void) | 44 | @@ -222,9 +226,16 @@ init_globals (void) |
46 | g_free (custom_dirs); | 45 | g_free (custom_dirs); |
47 | } | 46 | } |
48 | 47 | ||
@@ -62,10 +61,10 @@ index a0754f4..2d456f9 100644 | |||
62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); | 61 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); |
63 | 62 | ||
64 | diff --git a/girepository/meson.build b/girepository/meson.build | 63 | diff --git a/girepository/meson.build b/girepository/meson.build |
65 | index 786749a..15cf2a9 100644 | 64 | index 5ced59e..a580d9b 100644 |
66 | --- a/girepository/meson.build | 65 | --- a/girepository/meson.build |
67 | +++ b/girepository/meson.build | 66 | +++ b/girepository/meson.build |
68 | @@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', | 67 | @@ -47,7 +47,7 @@ girepo_internals_lib = static_library('girepository-internals', |
69 | ], | 68 | ], |
70 | c_args: gi_hidden_visibility_cflags + custom_c_args, | 69 | c_args: gi_hidden_visibility_cflags + custom_c_args, |
71 | include_directories : configinc, | 70 | include_directories : configinc, |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb index 05a08a50e0..582ac248fd 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ | |||
16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4" | 19 | SRC_URI[sha256sum] = "a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8" |
20 | 20 | ||
21 | SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 21 | SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
22 | 22 | ||
@@ -26,7 +26,9 @@ GTKDOC_MESON_OPTION = "gtk_doc" | |||
26 | 26 | ||
27 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" | 27 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" |
28 | 28 | ||
29 | DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native" | 29 | DEPENDS += " libffi zlib python3 flex-native bison-native" |
30 | DEPENDS:append:class-native = " glib-2.0" | ||
31 | DEPENDS:append:class-target = " glib-2.0-initial" | ||
30 | 32 | ||
31 | # target build needs qemu to run temporary introspection binaries created | 33 | # target build needs qemu to run temporary introspection binaries created |
32 | # on the fly by g-ir-scanner and a native version of itself to run | 34 | # on the fly by g-ir-scanner and a native version of itself to run |
@@ -189,6 +191,6 @@ FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" | |||
189 | FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" | 191 | FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" |
190 | 192 | ||
191 | # setuptools can be removed when upstream removes all uses of distutils | 193 | # setuptools can be removed when upstream removes all uses of distutils |
192 | RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" | 194 | RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0" |
193 | 195 | ||
194 | BBCLASSEXTEND = "native" | 196 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb b/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb index ce733769a5..cda0552f7c 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb | |||
@@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
37 | UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" | 37 | UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" |
38 | 38 | ||
39 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" | 39 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" |
40 | SRC_URI[sha256sum] = "fcefb3f132f8cc4711a9efa5b353c9ae9bb5eeff0246fa74dbc2f2f839b9e308" | 40 | SRC_URI[sha256sum] = "443518b97e8348f9f6430ac435b1010f9a6c5207f4dc6a7cd5d24e3820cee633" |
41 | 41 | ||
42 | S = "${WORKDIR}/gtk-${PV}" | 42 | S = "${WORKDIR}/gtk-${PV}" |
43 | 43 | ||
@@ -76,6 +76,10 @@ PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled | |||
76 | PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" | 76 | PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" |
77 | PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" | 77 | PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" |
78 | 78 | ||
79 | # Disable int-conversion warning as error until [1] is fixed | ||
80 | # [1] https://gitlab.gnome.org/GNOME/gtk/-/issues/6033 | ||
81 | CFLAGS:append = " -Wno-error=int-conversion" | ||
82 | |||
79 | LIBV = "4.0.0" | 83 | LIBV = "4.0.0" |
80 | 84 | ||
81 | FILES:${PN}:append = " \ | 85 | FILES:${PN}:append = " \ |
diff --git a/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch b/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch new file mode 100644 index 0000000000..fb015d3632 --- /dev/null +++ b/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 26f96a178f8a0afded00bdd7238728c0b6e42a6b Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 9 May 2024 18:44:41 +0000 | ||
4 | Subject: [PATCH] meson.build: fix build race when building GTK vapi files | ||
5 | |||
6 | There's a build race when building the GTK vapi files: | ||
7 | |||
8 | FAILED: libportal/libportal-gtk4.vapi | ||
9 | error: Package `libportal' not found in specified Vala API directories or GObject-Introspection GIR directories | ||
10 | |||
11 | This can be verified by adding "sleep 10;" to the command for the | ||
12 | libportal/libportal.vapi target in the generated build.ninja file. | ||
13 | |||
14 | The GTK vapi files need to have access to the generic libportal.vapi file, | ||
15 | but there is no explicit dependency. Switch the dependency name 'libportal' | ||
16 | to the dependency object libportal_vapi so that Meson generates the | ||
17 | dependency correctly. | ||
18 | |||
19 | Upstream-Status: Backport | ||
20 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
21 | --- | ||
22 | libportal/meson.build | 4 ++-- | ||
23 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/libportal/meson.build b/libportal/meson.build | ||
26 | index fff7603..4e67f40 100644 | ||
27 | --- a/libportal/meson.build | ||
28 | +++ b/libportal/meson.build | ||
29 | @@ -168,7 +168,7 @@ if gtk3_dep.found() | ||
30 | if vapi | ||
31 | libportal_gtk3_vapi = gnome.generate_vapi('libportal-gtk3', | ||
32 | sources: libportal_gtk3_gir[0], | ||
33 | - packages: ['gio-2.0', 'gtk+-3.0', 'libportal'], | ||
34 | + packages: ['gio-2.0', 'gtk+-3.0', libportal_vapi], | ||
35 | gir_dirs: [meson.current_build_dir()], | ||
36 | vapi_dirs: [meson.current_build_dir()], | ||
37 | install: true, | ||
38 | @@ -227,7 +227,7 @@ if gtk4_dep.found() | ||
39 | if vapi | ||
40 | libportal_gtk4_vapi = gnome.generate_vapi('libportal-gtk4', | ||
41 | sources: libportal_gtk4_gir[0], | ||
42 | - packages: ['gio-2.0', 'gtk4', 'libportal'], | ||
43 | + packages: ['gio-2.0', 'gtk4', libportal_vapi], | ||
44 | gir_dirs: [meson.current_build_dir()], | ||
45 | vapi_dirs: [meson.current_build_dir()], | ||
46 | install: true, | ||
47 | -- | ||
48 | 2.34.1 | ||
49 | |||
diff --git a/meta/recipes-gnome/libportal/libportal_0.7.1.bb b/meta/recipes-gnome/libportal/libportal_0.7.1.bb index 22e45559c9..6ddfef76d3 100644 --- a/meta/recipes-gnome/libportal/libportal_0.7.1.bb +++ b/meta/recipes-gnome/libportal/libportal_0.7.1.bb | |||
@@ -6,7 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues" | |||
6 | LICENSE = "LGPL-3.0-only" | 6 | LICENSE = "LGPL-3.0-only" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main" | 9 | SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main \ |
10 | file://0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch" | ||
10 | SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a" | 11 | SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a" |
11 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
12 | 13 | ||
diff --git a/meta/recipes-gnome/libxmlb/libxmlb_0.3.17.bb b/meta/recipes-gnome/libxmlb/libxmlb_0.3.18.bb index f403857fea..10ceab0721 100644 --- a/meta/recipes-gnome/libxmlb/libxmlb_0.3.17.bb +++ b/meta/recipes-gnome/libxmlb/libxmlb_0.3.18.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = " \ | |||
8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ | 8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | " | 10 | " |
11 | SRCREV = "db54f1b3254334e59b29b01b6cb666f444746594" | 11 | SRCREV = "59cf2e0bf3c4d0905a32e32828d6100784993621" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | DEPENDS = "glib-2.0 xz zstd" | 14 | DEPENDS = "glib-2.0 xz zstd" |
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.3.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb index fd4dcc2338..fc6951d9ed 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_8.3.1.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ | |||
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" | 11 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" |
12 | SRC_URI[sha256sum] = "f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c" | 12 | SRC_URI[sha256sum] = "af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e" |
13 | 13 | ||
14 | DEPENDS += "glib-2.0-native" | 14 | DEPENDS += "glib-2.0-native" |
15 | 15 | ||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb index 891e91190a..f9dacb288c 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" | |||
25 | 25 | ||
26 | S = "${WORKDIR}/SDL2-${PV}" | 26 | S = "${WORKDIR}/SDL2-${PV}" |
27 | 27 | ||
28 | SRC_URI[sha256sum] = "01215ffbc8cfc4ad165ba7573750f15ddda1f971d5a66e9dcaffd37c587f473a" | 28 | SRC_URI[sha256sum] = "891d66ac8cae51361d3229e3336ebec1c407a8a2a063b61df14f5fdf3ab5ac31" |
29 | 29 | ||
30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
31 | 31 | ||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb index 880d4ed666..c8b6f07ed0 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb | |||
@@ -34,5 +34,5 @@ EXTRA_OECONF = " --enable-startup-notification \ | |||
34 | --with-expat-includes=${STAGING_INCDIR}" | 34 | --with-expat-includes=${STAGING_INCDIR}" |
35 | 35 | ||
36 | do_install:prepend() { | 36 | do_install:prepend() { |
37 | install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig | 37 | install ${UNPACKDIR}/kbdconfig ${S}/data/kbdconfig |
38 | } | 38 | } |
diff --git a/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1c9fa66c72..77e9c80fcb 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
22 | file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ | 22 | file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe" | 25 | SRC_URI[sha256sum] = "38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018" |
26 | 26 | ||
27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
28 | 28 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_24.0.3.bb b/meta/recipes-graphics/mesa/mesa_24.0.5.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_24.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa_24.0.5.bb | |||
diff --git a/meta/recipes-graphics/pango/pango_1.52.1.bb b/meta/recipes-graphics/pango/pango_1.52.2.bb index a67c3791a2..4f748e6554 100644 --- a/meta/recipes-graphics/pango/pango_1.52.1.bb +++ b/meta/recipes-graphics/pango/pango_1.52.2.bb | |||
@@ -23,7 +23,7 @@ SRC_URI += "file://run-ptest \ | |||
23 | file://0001-Skip-running-test-layout-test.patch \ | 23 | file://0001-Skip-running-test-layout-test.patch \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[archive.sha256sum] = "58728a0a2d86f60761208df9493033d18ecb2497abac80ee1a274ad0c6e55f0f" | 26 | SRC_URI[archive.sha256sum] = "d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b" |
27 | 27 | ||
28 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" | 28 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" |
29 | 29 | ||
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb index b7fdc0d399..584a19a42a 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb | |||
@@ -26,7 +26,7 @@ do_install () { | |||
26 | done | 26 | done |
27 | 27 | ||
28 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 28 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
29 | install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ | 29 | install -m 0644 ${UNPACKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ |
30 | 30 | ||
31 | install -d ${D}${prefix}/share/doc/${BPN}/ | 31 | install -d ${D}${prefix}/share/doc/${BPN}/ |
32 | install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/ | 32 | install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/ |
diff --git a/meta/recipes-graphics/waffle/waffle_1.8.0.bb b/meta/recipes-graphics/waffle/waffle_1.8.0.bb index 12b31dcff1..ad8649b40e 100644 --- a/meta/recipes-graphics/waffle/waffle_1.8.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.8.0.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx | |||
37 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" | 37 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" |
38 | 38 | ||
39 | # wants gbm.pc egl.pc | 39 | # wants gbm.pc egl.pc |
40 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm udev" | 40 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm libdrm" |
41 | 41 | ||
42 | # wants egl.pc | 42 | # wants egl.pc |
43 | PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" | 43 | PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" |
diff --git a/meta/recipes-graphics/wayland/libinput_1.25.0.bb b/meta/recipes-graphics/wayland/libinput_1.25.0.bb index 517b247fed..894858e361 100644 --- a/meta/recipes-graphics/wayland/libinput_1.25.0.bb +++ b/meta/recipes-graphics/wayland/libinput_1.25.0.bb | |||
@@ -32,7 +32,7 @@ do_configure:append() { | |||
32 | 32 | ||
33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
34 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" | 34 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" |
35 | PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" | 35 | PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3 wayland-native" |
36 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" | 36 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" |
37 | 37 | ||
38 | UDEVDIR = "`pkg-config --variable=udevdir udev`" | 38 | UDEVDIR = "`pkg-config --variable=udevdir udev`" |
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.34.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.36.bb index 8c12985714..9b008ca534 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.34.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.36.bb | |||
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ | |||
10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" | 10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" |
11 | 11 | ||
12 | SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" | 12 | SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "c59b27cacd85f60baf4ee5f80df5c0d15760ead6a2432b00ab7e2e0574dcafeb" | 13 | SRC_URI[sha256sum] = "71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" | 15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" |
16 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)" | ||
16 | 17 | ||
17 | inherit meson pkgconfig allarch | 18 | inherit meson pkgconfig allarch |
18 | 19 | ||
diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb index 878c7a267e..59d414a0a6 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV} | |||
13 | SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" | 13 | SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" | 15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" |
16 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)" | ||
16 | 17 | ||
17 | inherit meson pkgconfig | 18 | inherit meson pkgconfig |
18 | 19 | ||
diff --git a/meta/recipes-graphics/wayland/wayland_1.22.0.bb b/meta/recipes-graphics/wayland/wayland_1.22.0.bb index 6aa76063ea..e7babc9ec6 100644 --- a/meta/recipes-graphics/wayland/wayland_1.22.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.22.0.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downl | |||
20 | SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" | 20 | SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" | 22 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" |
23 | UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 23 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
24 | 24 | ||
25 | inherit meson pkgconfig ptest | 25 | inherit meson pkgconfig ptest |
26 | 26 | ||
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 024e400665..ca3d1478dc 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb | |||
@@ -29,18 +29,18 @@ DEFAULTBACKEND:qemuall ?= "drm" | |||
29 | do_install() { | 29 | do_install() { |
30 | # Install weston-start script | 30 | # Install weston-start script |
31 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then | 31 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then |
32 | install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start | 32 | install -Dm755 ${S}/weston-start ${D}${bindir}/weston-start |
33 | sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start | 33 | sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start |
34 | sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start | 34 | sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start |
35 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston | 35 | install -Dm755 ${S}/init ${D}/${sysconfdir}/init.d/weston |
36 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston | 36 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston |
37 | fi | 37 | fi |
38 | 38 | ||
39 | # Install Weston systemd service | 39 | # Install Weston systemd service |
40 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 40 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
41 | install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service | 41 | install -D -p -m0644 ${S}/weston.service ${D}${systemd_system_unitdir}/weston.service |
42 | install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket | 42 | install -D -p -m0644 ${S}/weston.socket ${D}${systemd_system_unitdir}/weston.socket |
43 | install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh | 43 | install -D -p -m0644 ${S}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh |
44 | sed -i -e s:/etc:${sysconfdir}:g \ | 44 | sed -i -e s:/etc:${sysconfdir}:g \ |
45 | -e s:/usr/bin:${bindir}:g \ | 45 | -e s:/usr/bin:${bindir}:g \ |
46 | -e s:/var:${localstatedir}:g \ | 46 | -e s:/var:${localstatedir}:g \ |
@@ -48,11 +48,11 @@ do_install() { | |||
48 | fi | 48 | fi |
49 | 49 | ||
50 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 50 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
51 | install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin | 51 | install -D -p -m0644 ${S}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin |
52 | fi | 52 | fi |
53 | 53 | ||
54 | install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini | 54 | install -D -p -m0644 ${S}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini |
55 | install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston | 55 | install -Dm644 ${S}/weston.env ${D}${sysconfdir}/default/weston |
56 | 56 | ||
57 | if [ -n "${DEFAULTBACKEND}" ]; then | 57 | if [ -n "${DEFAULTBACKEND}" ]; then |
58 | sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini | 58 | sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini |
diff --git a/meta/recipes-graphics/wayland/weston_13.0.0.bb b/meta/recipes-graphics/wayland/weston_13.0.0.bb index b728bd0ef3..cb0024c5ca 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.0.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo | |||
17 | SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" | 17 | SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" | 19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" |
20 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 20 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
21 | 21 | ||
22 | inherit meson pkgconfig useradd | 22 | inherit meson pkgconfig useradd |
23 | 23 | ||
@@ -105,18 +105,18 @@ do_install:append() { | |||
105 | # If X11, ship a desktop file to launch it | 105 | # If X11, ship a desktop file to launch it |
106 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then | 106 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then |
107 | install -d ${D}${datadir}/applications | 107 | install -d ${D}${datadir}/applications |
108 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | 108 | install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications |
109 | 109 | ||
110 | install -d ${D}${datadir}/icons/hicolor/48x48/apps | 110 | install -d ${D}${datadir}/icons/hicolor/48x48/apps |
111 | install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps | 111 | install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps |
112 | fi | 112 | fi |
113 | 113 | ||
114 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then | 114 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then |
115 | install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland | 115 | install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland |
116 | fi | 116 | fi |
117 | 117 | ||
118 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then | 118 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then |
119 | install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify | 119 | install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify |
120 | fi | 120 | fi |
121 | 121 | ||
122 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then | 122 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then |
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 671c0a290e..4e38b4da34 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | |||
@@ -52,7 +52,7 @@ do_install() { | |||
52 | 52 | ||
53 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${WORKDIR}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service | 55 | install -m 0644 ${S}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service |
56 | sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service | 56 | sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service |
57 | fi | 57 | fi |
58 | 58 | ||
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch index 86982924a8..de0862599d 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Inactive-Upstream [last commits over a decade ago] |
2 | 2 | ||
3 | From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 | 3 | From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 |
4 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> | 4 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> |
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 7b49668f92..0516928a76 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | |||
@@ -27,7 +27,7 @@ do_install:append() { | |||
27 | install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh | 27 | install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh |
28 | 28 | ||
29 | install -d ${D}${sysconfdir}/X11/Xsession.d/ | 29 | install -d ${D}${sysconfdir}/X11/Xsession.d/ |
30 | install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ | 30 | install -m 0755 ${UNPACKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ |
31 | 31 | ||
32 | install -d ${D}${sysconfdir}/xdg/autostart | 32 | install -d ${D}${sysconfdir}/xdg/autostart |
33 | sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop | 33 | sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop |
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb index d97bc7a3dd..51faf170bf 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb | |||
@@ -27,4 +27,4 @@ FILES:libxmuu = "${libdir}/libXmuu.so.*" | |||
27 | 27 | ||
28 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
29 | 29 | ||
30 | SRC_URI[sha256sum] = "072026fe305889538e5b0c5f9cbcd623d2c27d2b85dcd37ca369ab21590b6963" | 30 | SRC_URI[sha256sum] = "fcb27793248a39e5fcc5b9c4aec40cc0734b3ca76aac3d7d1c264e7f7e14e8b2" |
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb index 67c1e8d97d..2a78a87e77 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \ | |||
15 | file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ | 15 | file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ |
16 | file://0001-Fix-install-conflict-when-enable-multilib.patch \ | 16 | file://0001-Fix-install-conflict-when-enable-multilib.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119" | 18 | SRC_URI[sha256sum] = "2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c" |
19 | 19 | ||
20 | inherit autotools pkgconfig python3native | 20 | inherit autotools pkgconfig python3native |
21 | 21 | ||
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.20.1.bb index cd4bc387a2..8a0e7bec41 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.20.1.bb | |||
@@ -11,7 +11,7 @@ PE = "1" | |||
11 | 11 | ||
12 | SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch" | 12 | SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74" | 14 | SRC_URI[sha256sum] = "b373f72887b1394ce2193180a60cb0d1fb8b17bc96ddd770cfd7a808cb489a15" |
15 | 15 | ||
16 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 16 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
17 | DEV_PKG_DEPENDENCY = "" | 17 | DEV_PKG_DEPENDENCY = "" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index 03f14cef2b..a3a4733785 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | |||
@@ -14,8 +14,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
14 | ALLOW_EMPTY:${PN} = "1" | 14 | ALLOW_EMPTY:${PN} = "1" |
15 | 15 | ||
16 | do_install () { | 16 | do_install () { |
17 | if test -s ${WORKDIR}/xorg.conf; then | 17 | if test -s ${S}/xorg.conf; then |
18 | install -d ${D}/${sysconfdir}/X11 | 18 | install -d ${D}/${sysconfdir}/X11 |
19 | install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ | 19 | install -m 0644 ${S}/xorg.conf ${D}/${sysconfdir}/X11/ |
20 | fi | 20 | fi |
21 | } | 21 | } |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb index 6506d775ca..570e08d5ae 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb | |||
@@ -3,7 +3,7 @@ require xserver-xorg.inc | |||
3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ | 3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ |
4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ | 4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ |
5 | " | 5 | " |
6 | SRC_URI[sha256sum] = "1d3dadbd57fb86b16a018e9f5f957aeeadf744f56c0553f55737628d06d326ef" | 6 | SRC_URI[sha256sum] = "1e016e2be1b5ccdd65eac3ea08e54bd13ce8f4f6c3fb32ad6fdac4e71729a90f" |
7 | 7 | ||
8 | # These extensions are now integrated into the server, so declare the migration | 8 | # These extensions are now integrated into the server, so declare the migration |
9 | # path for in-place upgrades. | 9 | # path for in-place upgrades. |
diff --git a/meta/recipes-graphics/xwayland/xwayland_23.2.5.bb b/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb index b934a873d1..f51429bc8c 100644 --- a/meta/recipes-graphics/xwayland/xwayland_23.2.5.bb +++ b/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "MIT" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" |
11 | 11 | ||
12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" | 12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90" | 13 | SRC_URI[sha256sum] = "1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" |
16 | 16 | ||
@@ -20,10 +20,11 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" | |||
20 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" | 20 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" |
21 | 21 | ||
22 | OPENGL_PKGCONFIGS = "glx glamor dri3" | 22 | OPENGL_PKGCONFIGS = "glx glamor dri3" |
23 | PACKAGECONFIG ??= "${XORG_CRYPTO} \ | 23 | PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
25 | " | 25 | " |
26 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" | 26 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" |
27 | PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor" | ||
27 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" | 28 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" |
28 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" | 29 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" |
29 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" | 30 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" |
@@ -34,6 +35,10 @@ XORG_CRYPTO ??= "openssl" | |||
34 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" | 35 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" |
35 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" | 36 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" |
36 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" | 37 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" |
38 | XWAYLAND_EI ??= "xwayland_ei_false" | ||
39 | PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false" | ||
40 | PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei" | ||
41 | PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei" | ||
37 | 42 | ||
38 | do_install:append() { | 43 | do_install:append() { |
39 | # remove files not needed and clashing with xserver-xorg | 44 | # remove files not needed and clashing with xserver-xorg |
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb index 974fcba876..332525f5c9 100644 --- a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb +++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb | |||
@@ -9,9 +9,9 @@ SRC_URI = "file://dt-doc-validate \ | |||
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -d ${D}${bindir}/ | 11 | install -d ${D}${bindir}/ |
12 | install -m 755 ${WORKDIR}/dt-doc-validate ${D}${bindir}/ | 12 | install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/ |
13 | install -m 755 ${WORKDIR}/dt-mk-schema ${D}${bindir}/ | 13 | install -m 755 ${UNPACKDIR}/dt-mk-schema ${D}${bindir}/ |
14 | install -m 755 ${WORKDIR}/dt-validate ${D}${bindir}/ | 14 | install -m 755 ${UNPACKDIR}/dt-validate ${D}${bindir}/ |
15 | } | 15 | } |
16 | 16 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 17 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb index dec821ea88..c39fff834d 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb | |||
@@ -44,15 +44,15 @@ do_compile:prepend() { | |||
44 | 44 | ||
45 | do_install:append () { | 45 | do_install:append () { |
46 | install -d ${D}${sysconfdir}/sysconfig | 46 | install -d ${D}${sysconfdir}/sysconfig |
47 | install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig | 47 | install -m 0644 ${UNPACKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig |
48 | 48 | ||
49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
50 | install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump | 50 | install -D -m 0755 ${UNPACKDIR}/kdump ${D}${sysconfdir}/init.d/kdump |
51 | fi | 51 | fi |
52 | 52 | ||
53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
54 | install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper | 54 | install -D -m 0755 ${UNPACKDIR}/kdump ${D}${libexecdir}/kdump-helper |
55 | install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service | 55 | install -D -m 0644 ${UNPACKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service |
56 | sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service | 56 | sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service |
57 | fi | 57 | fi |
58 | } | 58 | } |
diff --git a/meta/recipes-kernel/kmod/kmod_31.bb b/meta/recipes-kernel/kmod/kmod_31.bb index 6ae83a7c66..718a5565b4 100644 --- a/meta/recipes-kernel/kmod/kmod_31.bb +++ b/meta/recipes-kernel/kmod/kmod_31.bb | |||
@@ -63,7 +63,7 @@ do_install:append () { | |||
63 | install -dm755 ${D}${sysconfdir}/modprobe.d | 63 | install -dm755 ${D}${sysconfdir}/modprobe.d |
64 | 64 | ||
65 | # install depmod.d file for search/ dir | 65 | # install depmod.d file for search/ dir |
66 | install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" | 66 | install -Dm644 "${UNPACKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" |
67 | 67 | ||
68 | # Add .debug to the exclude path for depmod | 68 | # Add .debug to the exclude path for depmod |
69 | echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf | 69 | echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf |
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch index 0c21b2347a..c723c236c0 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch +++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | |||
@@ -6,7 +6,7 @@ Subject: [PATCH] Fixes for the Meson build of libtraceevent: | |||
6 | - Make the plugin directory the same as the Makefiles | 6 | - Make the plugin directory the same as the Makefiles |
7 | - Install the plugins as modules not static and versioned shared libraries | 7 | - Install the plugins as modules not static and versioned shared libraries |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de/T/#u] |
10 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
11 | --- | 11 | --- |
12 | meson.build | 2 +- | 12 | meson.build | 2 +- |
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb index ff79bb9b33..13538afede 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb | |||
@@ -322,7 +322,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ | |||
322 | ${PN}-cnm-license ${PN}-cnm \ | 322 | ${PN}-cnm-license ${PN}-cnm \ |
323 | ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ | 323 | ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ |
324 | ${PN}-carl9170 \ | 324 | ${PN}-carl9170 \ |
325 | ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ | 325 | ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-ath12k ${PN}-qca \ |
326 | \ | 326 | \ |
327 | ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ | 327 | ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ |
328 | \ | 328 | \ |
@@ -343,6 +343,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ | |||
343 | ${PN}-ibt-license ${PN}-ibt \ | 343 | ${PN}-ibt-license ${PN}-ibt \ |
344 | ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ | 344 | ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ |
345 | ${PN}-ibt-17 \ | 345 | ${PN}-ibt-17 \ |
346 | ${PN}-ibt-18 \ | ||
346 | ${PN}-ibt-20 \ | 347 | ${PN}-ibt-20 \ |
347 | ${PN}-ibt-misc \ | 348 | ${PN}-ibt-misc \ |
348 | ${PN}-i915-license ${PN}-i915 \ | 349 | ${PN}-i915-license ${PN}-i915 \ |
@@ -487,6 +488,10 @@ FILES:${PN}-ath11k = " \ | |||
487 | ${nonarch_base_libdir}/firmware/ath11k \ | 488 | ${nonarch_base_libdir}/firmware/ath11k \ |
488 | " | 489 | " |
489 | 490 | ||
491 | FILES:${PN}-ath12k = " \ | ||
492 | ${nonarch_base_libdir}/firmware/ath12k \ | ||
493 | " | ||
494 | |||
490 | FILES:${PN}-qca = " \ | 495 | FILES:${PN}-qca = " \ |
491 | ${nonarch_base_libdir}/firmware/qca \ | 496 | ${nonarch_base_libdir}/firmware/qca \ |
492 | " | 497 | " |
@@ -494,6 +499,7 @@ FILES:${PN}-qca = " \ | |||
494 | RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" | 499 | RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" |
495 | RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" | 500 | RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" |
496 | RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" | 501 | RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" |
502 | RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license" | ||
497 | RDEPENDS:${PN}-qca += "${PN}-ath10k-license" | 503 | RDEPENDS:${PN}-qca += "${PN}-ath10k-license" |
498 | 504 | ||
499 | # For ralink | 505 | # For ralink |
@@ -1272,6 +1278,7 @@ LICENSE:${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" | |||
1272 | LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware" | 1278 | LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware" |
1273 | LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware" | 1279 | LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware" |
1274 | LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware" | 1280 | LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware" |
1281 | LICENSE:${PN}-ibt-18 = "Firmware-ibt_firmware" | ||
1275 | LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware" | 1282 | LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware" |
1276 | LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware" | 1283 | LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware" |
1277 | 1284 | ||
@@ -1281,6 +1288,7 @@ FILES:${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bs | |||
1281 | FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" | 1288 | FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" |
1282 | FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" | 1289 | FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" |
1283 | FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" | 1290 | FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" |
1291 | FILES:${PN}-ibt-18 = "${nonarch_base_libdir}/firmware/intel/ibt-18-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-18-*.ddc" | ||
1284 | FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" | 1292 | FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" |
1285 | FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" | 1293 | FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" |
1286 | 1294 | ||
@@ -1289,6 +1297,7 @@ RDEPENDS:${PN}-ibt-hw-37.8 = "${PN}-ibt-license" | |||
1289 | RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license" | 1297 | RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license" |
1290 | RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license" | 1298 | RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license" |
1291 | RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license" | 1299 | RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license" |
1300 | RDEPENDS:${PN}-ibt-18 = "${PN}-ibt-license" | ||
1292 | RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license" | 1301 | RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license" |
1293 | RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license" | 1302 | RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license" |
1294 | 1303 | ||
diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.6.inc b/meta/recipes-kernel/linux/cve-exclusion_6.6.inc index bb9ba49c48..9f1f03ac53 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.6.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.6.inc | |||
@@ -1,9 +1,9 @@ | |||
1 | 1 | ||
2 | # Auto-generated CVE metadata, DO NOT EDIT BY HAND. | 2 | # Auto-generated CVE metadata, DO NOT EDIT BY HAND. |
3 | # Generated at 2024-03-28 16:40:04.102652+00:00 for version 6.6.23 | 3 | # Generated at 2024-05-02 12:41:43.351358+00:00 for version 6.6.29 |
4 | 4 | ||
5 | python check_kernel_cve_status_version() { | 5 | python check_kernel_cve_status_version() { |
6 | this_version = "6.6.23" | 6 | this_version = "6.6.29" |
7 | kernel_version = d.getVar("LINUX_VERSION") | 7 | kernel_version = d.getVar("LINUX_VERSION") |
8 | if kernel_version != this_version: | 8 | if kernel_version != this_version: |
9 | bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) | 9 | bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) |
@@ -2980,6 +2980,10 @@ CVE_STATUS[CVE-2019-25044] = "fixed-version: Fixed from version 5.2rc4" | |||
2980 | 2980 | ||
2981 | CVE_STATUS[CVE-2019-25045] = "fixed-version: Fixed from version 5.1" | 2981 | CVE_STATUS[CVE-2019-25045] = "fixed-version: Fixed from version 5.1" |
2982 | 2982 | ||
2983 | CVE_STATUS[CVE-2019-25160] = "fixed-version: Fixed from version 5.0" | ||
2984 | |||
2985 | CVE_STATUS[CVE-2019-25162] = "fixed-version: Fixed from version 6.0rc1" | ||
2986 | |||
2983 | CVE_STATUS[CVE-2019-3016] = "fixed-version: Fixed from version 5.6rc1" | 2987 | CVE_STATUS[CVE-2019-3016] = "fixed-version: Fixed from version 5.6rc1" |
2984 | 2988 | ||
2985 | CVE_STATUS[CVE-2019-3459] = "fixed-version: Fixed from version 5.1rc1" | 2989 | CVE_STATUS[CVE-2019-3459] = "fixed-version: Fixed from version 5.1rc1" |
@@ -3452,6 +3456,32 @@ CVE_STATUS[CVE-2020-36694] = "fixed-version: Fixed from version 5.10" | |||
3452 | 3456 | ||
3453 | CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1" | 3457 | CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1" |
3454 | 3458 | ||
3459 | CVE_STATUS[CVE-2020-36775] = "fixed-version: Fixed from version 5.7rc1" | ||
3460 | |||
3461 | CVE_STATUS[CVE-2020-36776] = "fixed-version: Fixed from version 5.13rc1" | ||
3462 | |||
3463 | CVE_STATUS[CVE-2020-36777] = "fixed-version: Fixed from version 5.13rc1" | ||
3464 | |||
3465 | CVE_STATUS[CVE-2020-36778] = "fixed-version: Fixed from version 5.13rc1" | ||
3466 | |||
3467 | CVE_STATUS[CVE-2020-36779] = "fixed-version: Fixed from version 5.13rc1" | ||
3468 | |||
3469 | CVE_STATUS[CVE-2020-36780] = "fixed-version: Fixed from version 5.13rc1" | ||
3470 | |||
3471 | CVE_STATUS[CVE-2020-36781] = "fixed-version: Fixed from version 5.13rc1" | ||
3472 | |||
3473 | CVE_STATUS[CVE-2020-36782] = "fixed-version: Fixed from version 5.13rc1" | ||
3474 | |||
3475 | CVE_STATUS[CVE-2020-36783] = "fixed-version: Fixed from version 5.13rc1" | ||
3476 | |||
3477 | CVE_STATUS[CVE-2020-36784] = "fixed-version: Fixed from version 5.13rc1" | ||
3478 | |||
3479 | CVE_STATUS[CVE-2020-36785] = "fixed-version: Fixed from version 5.13rc1" | ||
3480 | |||
3481 | CVE_STATUS[CVE-2020-36786] = "fixed-version: Fixed from version 5.13rc1" | ||
3482 | |||
3483 | CVE_STATUS[CVE-2020-36787] = "fixed-version: Fixed from version 5.13rc1" | ||
3484 | |||
3455 | CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" | 3485 | CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" |
3456 | 3486 | ||
3457 | CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" | 3487 | CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" |
@@ -3940,6 +3970,540 @@ CVE_STATUS[CVE-2021-45868] = "fixed-version: Fixed from version 5.16rc1" | |||
3940 | 3970 | ||
3941 | CVE_STATUS[CVE-2021-46283] = "fixed-version: Fixed from version 5.13rc7" | 3971 | CVE_STATUS[CVE-2021-46283] = "fixed-version: Fixed from version 5.13rc7" |
3942 | 3972 | ||
3973 | CVE_STATUS[CVE-2021-46904] = "fixed-version: Fixed from version 5.12rc7" | ||
3974 | |||
3975 | CVE_STATUS[CVE-2021-46905] = "fixed-version: Fixed from version 5.13rc1" | ||
3976 | |||
3977 | CVE_STATUS[CVE-2021-46906] = "fixed-version: Fixed from version 5.13rc5" | ||
3978 | |||
3979 | CVE_STATUS[CVE-2021-46908] = "fixed-version: Fixed from version 5.12rc8" | ||
3980 | |||
3981 | CVE_STATUS[CVE-2021-46909] = "fixed-version: Fixed from version 5.12rc8" | ||
3982 | |||
3983 | CVE_STATUS[CVE-2021-46910] = "fixed-version: Fixed from version 5.12rc8" | ||
3984 | |||
3985 | CVE_STATUS[CVE-2021-46911] = "fixed-version: Fixed from version 5.12rc8" | ||
3986 | |||
3987 | CVE_STATUS[CVE-2021-46912] = "fixed-version: Fixed from version 5.12rc8" | ||
3988 | |||
3989 | CVE_STATUS[CVE-2021-46913] = "fixed-version: Fixed from version 5.12rc8" | ||
3990 | |||
3991 | CVE_STATUS[CVE-2021-46914] = "fixed-version: Fixed from version 5.12rc8" | ||
3992 | |||
3993 | CVE_STATUS[CVE-2021-46915] = "fixed-version: Fixed from version 5.12rc8" | ||
3994 | |||
3995 | CVE_STATUS[CVE-2021-46916] = "fixed-version: Fixed from version 5.12rc8" | ||
3996 | |||
3997 | CVE_STATUS[CVE-2021-46917] = "fixed-version: Fixed from version 5.12rc8" | ||
3998 | |||
3999 | CVE_STATUS[CVE-2021-46918] = "fixed-version: Fixed from version 5.12rc8" | ||
4000 | |||
4001 | CVE_STATUS[CVE-2021-46919] = "fixed-version: Fixed from version 5.12rc8" | ||
4002 | |||
4003 | CVE_STATUS[CVE-2021-46920] = "fixed-version: Fixed from version 5.12rc8" | ||
4004 | |||
4005 | CVE_STATUS[CVE-2021-46921] = "fixed-version: Fixed from version 5.12" | ||
4006 | |||
4007 | CVE_STATUS[CVE-2021-46922] = "fixed-version: Fixed from version 5.12" | ||
4008 | |||
4009 | CVE_STATUS[CVE-2021-46923] = "fixed-version: Fixed from version 5.16rc8" | ||
4010 | |||
4011 | CVE_STATUS[CVE-2021-46924] = "fixed-version: Fixed from version 5.16rc8" | ||
4012 | |||
4013 | CVE_STATUS[CVE-2021-46925] = "fixed-version: Fixed from version 5.16rc8" | ||
4014 | |||
4015 | CVE_STATUS[CVE-2021-46926] = "fixed-version: Fixed from version 5.16rc7" | ||
4016 | |||
4017 | CVE_STATUS[CVE-2021-46927] = "fixed-version: Fixed from version 5.16rc8" | ||
4018 | |||
4019 | CVE_STATUS[CVE-2021-46928] = "fixed-version: Fixed from version 5.16rc7" | ||
4020 | |||
4021 | CVE_STATUS[CVE-2021-46929] = "fixed-version: Fixed from version 5.16rc8" | ||
4022 | |||
4023 | CVE_STATUS[CVE-2021-46930] = "fixed-version: Fixed from version 5.16rc8" | ||
4024 | |||
4025 | CVE_STATUS[CVE-2021-46931] = "fixed-version: Fixed from version 5.16rc8" | ||
4026 | |||
4027 | CVE_STATUS[CVE-2021-46932] = "fixed-version: Fixed from version 5.16rc8" | ||
4028 | |||
4029 | CVE_STATUS[CVE-2021-46933] = "fixed-version: Fixed from version 5.16rc8" | ||
4030 | |||
4031 | CVE_STATUS[CVE-2021-46934] = "fixed-version: Fixed from version 5.16rc8" | ||
4032 | |||
4033 | CVE_STATUS[CVE-2021-46935] = "fixed-version: Fixed from version 5.16rc8" | ||
4034 | |||
4035 | CVE_STATUS[CVE-2021-46936] = "fixed-version: Fixed from version 5.16rc8" | ||
4036 | |||
4037 | CVE_STATUS[CVE-2021-46937] = "fixed-version: Fixed from version 5.16rc8" | ||
4038 | |||
4039 | CVE_STATUS[CVE-2021-46938] = "fixed-version: Fixed from version 5.13rc1" | ||
4040 | |||
4041 | CVE_STATUS[CVE-2021-46939] = "fixed-version: Fixed from version 5.13rc1" | ||
4042 | |||
4043 | CVE_STATUS[CVE-2021-46940] = "fixed-version: Fixed from version 5.13rc1" | ||
4044 | |||
4045 | CVE_STATUS[CVE-2021-46941] = "fixed-version: Fixed from version 5.13rc1" | ||
4046 | |||
4047 | CVE_STATUS[CVE-2021-46942] = "fixed-version: Fixed from version 5.13rc1" | ||
4048 | |||
4049 | CVE_STATUS[CVE-2021-46943] = "fixed-version: Fixed from version 5.13rc1" | ||
4050 | |||
4051 | CVE_STATUS[CVE-2021-46944] = "fixed-version: Fixed from version 5.13rc1" | ||
4052 | |||
4053 | CVE_STATUS[CVE-2021-46945] = "fixed-version: Fixed from version 5.13rc1" | ||
4054 | |||
4055 | CVE_STATUS[CVE-2021-46947] = "fixed-version: Fixed from version 5.13rc1" | ||
4056 | |||
4057 | CVE_STATUS[CVE-2021-46948] = "fixed-version: Fixed from version 5.13rc1" | ||
4058 | |||
4059 | CVE_STATUS[CVE-2021-46949] = "fixed-version: Fixed from version 5.13rc1" | ||
4060 | |||
4061 | CVE_STATUS[CVE-2021-46950] = "fixed-version: Fixed from version 5.13rc1" | ||
4062 | |||
4063 | CVE_STATUS[CVE-2021-46951] = "fixed-version: Fixed from version 5.13rc1" | ||
4064 | |||
4065 | CVE_STATUS[CVE-2021-46952] = "fixed-version: Fixed from version 5.13rc1" | ||
4066 | |||
4067 | CVE_STATUS[CVE-2021-46953] = "fixed-version: Fixed from version 5.13rc1" | ||
4068 | |||
4069 | CVE_STATUS[CVE-2021-46954] = "fixed-version: Fixed from version 5.13rc1" | ||
4070 | |||
4071 | CVE_STATUS[CVE-2021-46955] = "fixed-version: Fixed from version 5.13rc1" | ||
4072 | |||
4073 | CVE_STATUS[CVE-2021-46956] = "fixed-version: Fixed from version 5.13rc1" | ||
4074 | |||
4075 | CVE_STATUS[CVE-2021-46957] = "fixed-version: Fixed from version 5.13rc1" | ||
4076 | |||
4077 | CVE_STATUS[CVE-2021-46958] = "fixed-version: Fixed from version 5.13rc1" | ||
4078 | |||
4079 | CVE_STATUS[CVE-2021-46959] = "fixed-version: Fixed from version 5.13rc1" | ||
4080 | |||
4081 | CVE_STATUS[CVE-2021-46960] = "fixed-version: Fixed from version 5.13rc1" | ||
4082 | |||
4083 | CVE_STATUS[CVE-2021-46961] = "fixed-version: Fixed from version 5.13rc1" | ||
4084 | |||
4085 | CVE_STATUS[CVE-2021-46962] = "fixed-version: Fixed from version 5.13rc1" | ||
4086 | |||
4087 | CVE_STATUS[CVE-2021-46963] = "fixed-version: Fixed from version 5.13rc1" | ||
4088 | |||
4089 | CVE_STATUS[CVE-2021-46964] = "fixed-version: Fixed from version 5.13rc1" | ||
4090 | |||
4091 | CVE_STATUS[CVE-2021-46965] = "fixed-version: Fixed from version 5.13rc1" | ||
4092 | |||
4093 | CVE_STATUS[CVE-2021-46966] = "fixed-version: Fixed from version 5.13rc1" | ||
4094 | |||
4095 | CVE_STATUS[CVE-2021-46967] = "fixed-version: Fixed from version 5.13rc1" | ||
4096 | |||
4097 | CVE_STATUS[CVE-2021-46968] = "fixed-version: Fixed from version 5.13rc1" | ||
4098 | |||
4099 | CVE_STATUS[CVE-2021-46969] = "fixed-version: Fixed from version 5.13rc1" | ||
4100 | |||
4101 | CVE_STATUS[CVE-2021-46970] = "fixed-version: Fixed from version 5.13rc1" | ||
4102 | |||
4103 | CVE_STATUS[CVE-2021-46971] = "fixed-version: Fixed from version 5.13rc1" | ||
4104 | |||
4105 | CVE_STATUS[CVE-2021-46972] = "fixed-version: Fixed from version 5.13rc1" | ||
4106 | |||
4107 | CVE_STATUS[CVE-2021-46973] = "fixed-version: Fixed from version 5.13rc1" | ||
4108 | |||
4109 | CVE_STATUS[CVE-2021-46974] = "fixed-version: Fixed from version 5.13rc1" | ||
4110 | |||
4111 | CVE_STATUS[CVE-2021-46976] = "fixed-version: Fixed from version 5.13rc2" | ||
4112 | |||
4113 | CVE_STATUS[CVE-2021-46977] = "fixed-version: Fixed from version 5.13rc2" | ||
4114 | |||
4115 | CVE_STATUS[CVE-2021-46978] = "fixed-version: Fixed from version 5.13rc2" | ||
4116 | |||
4117 | CVE_STATUS[CVE-2021-46979] = "fixed-version: Fixed from version 5.13rc2" | ||
4118 | |||
4119 | CVE_STATUS[CVE-2021-46980] = "fixed-version: Fixed from version 5.13rc2" | ||
4120 | |||
4121 | CVE_STATUS[CVE-2021-46981] = "fixed-version: Fixed from version 5.13rc2" | ||
4122 | |||
4123 | CVE_STATUS[CVE-2021-46982] = "fixed-version: Fixed from version 5.13rc2" | ||
4124 | |||
4125 | CVE_STATUS[CVE-2021-46983] = "fixed-version: Fixed from version 5.13rc2" | ||
4126 | |||
4127 | CVE_STATUS[CVE-2021-46984] = "fixed-version: Fixed from version 5.13rc2" | ||
4128 | |||
4129 | CVE_STATUS[CVE-2021-46985] = "fixed-version: Fixed from version 5.13rc2" | ||
4130 | |||
4131 | CVE_STATUS[CVE-2021-46986] = "fixed-version: Fixed from version 5.13rc2" | ||
4132 | |||
4133 | CVE_STATUS[CVE-2021-46987] = "fixed-version: Fixed from version 5.13rc2" | ||
4134 | |||
4135 | CVE_STATUS[CVE-2021-46988] = "fixed-version: Fixed from version 5.13rc2" | ||
4136 | |||
4137 | CVE_STATUS[CVE-2021-46989] = "fixed-version: Fixed from version 5.13rc2" | ||
4138 | |||
4139 | CVE_STATUS[CVE-2021-46990] = "fixed-version: Fixed from version 5.13rc2" | ||
4140 | |||
4141 | CVE_STATUS[CVE-2021-46991] = "fixed-version: Fixed from version 5.13rc1" | ||
4142 | |||
4143 | CVE_STATUS[CVE-2021-46992] = "fixed-version: Fixed from version 5.13rc1" | ||
4144 | |||
4145 | CVE_STATUS[CVE-2021-46993] = "fixed-version: Fixed from version 5.13rc1" | ||
4146 | |||
4147 | CVE_STATUS[CVE-2021-46994] = "fixed-version: Fixed from version 5.13rc1" | ||
4148 | |||
4149 | CVE_STATUS[CVE-2021-46995] = "fixed-version: Fixed from version 5.13rc1" | ||
4150 | |||
4151 | CVE_STATUS[CVE-2021-46996] = "fixed-version: Fixed from version 5.13rc1" | ||
4152 | |||
4153 | CVE_STATUS[CVE-2021-46997] = "fixed-version: Fixed from version 5.13rc1" | ||
4154 | |||
4155 | CVE_STATUS[CVE-2021-46998] = "fixed-version: Fixed from version 5.13rc1" | ||
4156 | |||
4157 | CVE_STATUS[CVE-2021-46999] = "fixed-version: Fixed from version 5.13rc1" | ||
4158 | |||
4159 | CVE_STATUS[CVE-2021-47000] = "fixed-version: Fixed from version 5.13rc1" | ||
4160 | |||
4161 | CVE_STATUS[CVE-2021-47001] = "fixed-version: Fixed from version 5.13rc1" | ||
4162 | |||
4163 | CVE_STATUS[CVE-2021-47002] = "fixed-version: Fixed from version 5.13rc1" | ||
4164 | |||
4165 | CVE_STATUS[CVE-2021-47003] = "fixed-version: Fixed from version 5.13rc1" | ||
4166 | |||
4167 | CVE_STATUS[CVE-2021-47004] = "fixed-version: Fixed from version 5.13rc1" | ||
4168 | |||
4169 | CVE_STATUS[CVE-2021-47005] = "fixed-version: Fixed from version 5.13rc1" | ||
4170 | |||
4171 | CVE_STATUS[CVE-2021-47006] = "fixed-version: Fixed from version 5.13rc1" | ||
4172 | |||
4173 | CVE_STATUS[CVE-2021-47007] = "fixed-version: Fixed from version 5.13rc1" | ||
4174 | |||
4175 | CVE_STATUS[CVE-2021-47008] = "fixed-version: Fixed from version 5.13rc1" | ||
4176 | |||
4177 | CVE_STATUS[CVE-2021-47009] = "fixed-version: Fixed from version 5.13rc2" | ||
4178 | |||
4179 | CVE_STATUS[CVE-2021-47010] = "fixed-version: Fixed from version 5.13rc1" | ||
4180 | |||
4181 | CVE_STATUS[CVE-2021-47011] = "fixed-version: Fixed from version 5.13rc1" | ||
4182 | |||
4183 | CVE_STATUS[CVE-2021-47012] = "fixed-version: Fixed from version 5.13rc1" | ||
4184 | |||
4185 | CVE_STATUS[CVE-2021-47013] = "fixed-version: Fixed from version 5.13rc1" | ||
4186 | |||
4187 | CVE_STATUS[CVE-2021-47014] = "fixed-version: Fixed from version 5.13rc1" | ||
4188 | |||
4189 | CVE_STATUS[CVE-2021-47015] = "fixed-version: Fixed from version 5.13rc1" | ||
4190 | |||
4191 | CVE_STATUS[CVE-2021-47016] = "fixed-version: Fixed from version 5.13rc1" | ||
4192 | |||
4193 | CVE_STATUS[CVE-2021-47017] = "fixed-version: Fixed from version 5.13rc1" | ||
4194 | |||
4195 | CVE_STATUS[CVE-2021-47018] = "fixed-version: Fixed from version 5.13rc1" | ||
4196 | |||
4197 | CVE_STATUS[CVE-2021-47019] = "fixed-version: Fixed from version 5.13rc1" | ||
4198 | |||
4199 | CVE_STATUS[CVE-2021-47020] = "fixed-version: Fixed from version 5.13rc1" | ||
4200 | |||
4201 | CVE_STATUS[CVE-2021-47021] = "fixed-version: Fixed from version 5.13rc1" | ||
4202 | |||
4203 | CVE_STATUS[CVE-2021-47022] = "fixed-version: Fixed from version 5.13rc1" | ||
4204 | |||
4205 | CVE_STATUS[CVE-2021-47023] = "fixed-version: Fixed from version 5.13rc1" | ||
4206 | |||
4207 | CVE_STATUS[CVE-2021-47024] = "fixed-version: Fixed from version 5.13rc1" | ||
4208 | |||
4209 | CVE_STATUS[CVE-2021-47025] = "fixed-version: Fixed from version 5.13rc1" | ||
4210 | |||
4211 | CVE_STATUS[CVE-2021-47026] = "fixed-version: Fixed from version 5.13rc1" | ||
4212 | |||
4213 | CVE_STATUS[CVE-2021-47027] = "fixed-version: Fixed from version 5.13rc1" | ||
4214 | |||
4215 | CVE_STATUS[CVE-2021-47028] = "fixed-version: Fixed from version 5.13rc1" | ||
4216 | |||
4217 | CVE_STATUS[CVE-2021-47029] = "fixed-version: Fixed from version 5.13rc1" | ||
4218 | |||
4219 | CVE_STATUS[CVE-2021-47030] = "fixed-version: Fixed from version 5.13rc1" | ||
4220 | |||
4221 | CVE_STATUS[CVE-2021-47031] = "fixed-version: Fixed from version 5.13rc1" | ||
4222 | |||
4223 | CVE_STATUS[CVE-2021-47032] = "fixed-version: Fixed from version 5.13rc1" | ||
4224 | |||
4225 | CVE_STATUS[CVE-2021-47033] = "fixed-version: Fixed from version 5.13rc1" | ||
4226 | |||
4227 | CVE_STATUS[CVE-2021-47034] = "fixed-version: Fixed from version 5.13rc1" | ||
4228 | |||
4229 | CVE_STATUS[CVE-2021-47035] = "fixed-version: Fixed from version 5.13rc1" | ||
4230 | |||
4231 | CVE_STATUS[CVE-2021-47036] = "fixed-version: Fixed from version 5.13rc1" | ||
4232 | |||
4233 | CVE_STATUS[CVE-2021-47037] = "fixed-version: Fixed from version 5.13rc1" | ||
4234 | |||
4235 | CVE_STATUS[CVE-2021-47038] = "fixed-version: Fixed from version 5.13rc1" | ||
4236 | |||
4237 | CVE_STATUS[CVE-2021-47039] = "fixed-version: Fixed from version 5.13rc1" | ||
4238 | |||
4239 | CVE_STATUS[CVE-2021-47040] = "fixed-version: Fixed from version 5.13rc1" | ||
4240 | |||
4241 | CVE_STATUS[CVE-2021-47041] = "fixed-version: Fixed from version 5.13rc1" | ||
4242 | |||
4243 | CVE_STATUS[CVE-2021-47042] = "fixed-version: Fixed from version 5.13rc1" | ||
4244 | |||
4245 | CVE_STATUS[CVE-2021-47043] = "fixed-version: Fixed from version 5.13rc1" | ||
4246 | |||
4247 | CVE_STATUS[CVE-2021-47044] = "fixed-version: Fixed from version 5.13rc1" | ||
4248 | |||
4249 | CVE_STATUS[CVE-2021-47045] = "fixed-version: Fixed from version 5.13rc1" | ||
4250 | |||
4251 | CVE_STATUS[CVE-2021-47046] = "fixed-version: Fixed from version 5.13rc1" | ||
4252 | |||
4253 | CVE_STATUS[CVE-2021-47047] = "fixed-version: Fixed from version 5.13rc1" | ||
4254 | |||
4255 | CVE_STATUS[CVE-2021-47048] = "fixed-version: Fixed from version 5.13rc1" | ||
4256 | |||
4257 | CVE_STATUS[CVE-2021-47049] = "fixed-version: Fixed from version 5.13rc1" | ||
4258 | |||
4259 | CVE_STATUS[CVE-2021-47050] = "fixed-version: Fixed from version 5.13rc1" | ||
4260 | |||
4261 | CVE_STATUS[CVE-2021-47051] = "fixed-version: Fixed from version 5.13rc1" | ||
4262 | |||
4263 | CVE_STATUS[CVE-2021-47052] = "fixed-version: Fixed from version 5.13rc1" | ||
4264 | |||
4265 | CVE_STATUS[CVE-2021-47053] = "fixed-version: Fixed from version 5.13rc1" | ||
4266 | |||
4267 | CVE_STATUS[CVE-2021-47054] = "fixed-version: Fixed from version 5.13rc1" | ||
4268 | |||
4269 | CVE_STATUS[CVE-2021-47055] = "fixed-version: Fixed from version 5.13rc1" | ||
4270 | |||
4271 | CVE_STATUS[CVE-2021-47056] = "fixed-version: Fixed from version 5.13rc1" | ||
4272 | |||
4273 | CVE_STATUS[CVE-2021-47057] = "fixed-version: Fixed from version 5.13rc1" | ||
4274 | |||
4275 | CVE_STATUS[CVE-2021-47058] = "fixed-version: Fixed from version 5.13rc1" | ||
4276 | |||
4277 | CVE_STATUS[CVE-2021-47059] = "fixed-version: Fixed from version 5.13rc1" | ||
4278 | |||
4279 | CVE_STATUS[CVE-2021-47060] = "fixed-version: Fixed from version 5.13rc1" | ||
4280 | |||
4281 | CVE_STATUS[CVE-2021-47061] = "fixed-version: Fixed from version 5.13rc1" | ||
4282 | |||
4283 | CVE_STATUS[CVE-2021-47062] = "fixed-version: Fixed from version 5.13rc1" | ||
4284 | |||
4285 | CVE_STATUS[CVE-2021-47063] = "fixed-version: Fixed from version 5.13rc1" | ||
4286 | |||
4287 | CVE_STATUS[CVE-2021-47064] = "fixed-version: Fixed from version 5.13rc1" | ||
4288 | |||
4289 | CVE_STATUS[CVE-2021-47065] = "fixed-version: Fixed from version 5.13rc1" | ||
4290 | |||
4291 | CVE_STATUS[CVE-2021-47066] = "fixed-version: Fixed from version 5.13rc1" | ||
4292 | |||
4293 | CVE_STATUS[CVE-2021-47067] = "fixed-version: Fixed from version 5.13rc1" | ||
4294 | |||
4295 | CVE_STATUS[CVE-2021-47068] = "fixed-version: Fixed from version 5.13rc1" | ||
4296 | |||
4297 | CVE_STATUS[CVE-2021-47069] = "fixed-version: Fixed from version 5.13rc3" | ||
4298 | |||
4299 | CVE_STATUS[CVE-2021-47070] = "fixed-version: Fixed from version 5.13rc3" | ||
4300 | |||
4301 | CVE_STATUS[CVE-2021-47071] = "fixed-version: Fixed from version 5.13rc3" | ||
4302 | |||
4303 | CVE_STATUS[CVE-2021-47072] = "fixed-version: Fixed from version 5.13rc3" | ||
4304 | |||
4305 | CVE_STATUS[CVE-2021-47073] = "fixed-version: Fixed from version 5.13rc3" | ||
4306 | |||
4307 | CVE_STATUS[CVE-2021-47074] = "fixed-version: Fixed from version 5.13rc3" | ||
4308 | |||
4309 | CVE_STATUS[CVE-2021-47075] = "fixed-version: Fixed from version 5.13rc3" | ||
4310 | |||
4311 | CVE_STATUS[CVE-2021-47076] = "fixed-version: Fixed from version 5.13rc3" | ||
4312 | |||
4313 | CVE_STATUS[CVE-2021-47077] = "fixed-version: Fixed from version 5.13rc3" | ||
4314 | |||
4315 | CVE_STATUS[CVE-2021-47078] = "fixed-version: Fixed from version 5.13rc3" | ||
4316 | |||
4317 | CVE_STATUS[CVE-2021-47079] = "fixed-version: Fixed from version 5.13rc3" | ||
4318 | |||
4319 | CVE_STATUS[CVE-2021-47080] = "fixed-version: Fixed from version 5.13rc3" | ||
4320 | |||
4321 | CVE_STATUS[CVE-2021-47081] = "fixed-version: Fixed from version 5.13rc3" | ||
4322 | |||
4323 | CVE_STATUS[CVE-2021-47082] = "fixed-version: Fixed from version 5.16rc7" | ||
4324 | |||
4325 | CVE_STATUS[CVE-2021-47083] = "fixed-version: Fixed from version 5.16rc7" | ||
4326 | |||
4327 | CVE_STATUS[CVE-2021-47086] = "fixed-version: Fixed from version 5.16rc7" | ||
4328 | |||
4329 | CVE_STATUS[CVE-2021-47087] = "fixed-version: Fixed from version 5.16rc7" | ||
4330 | |||
4331 | CVE_STATUS[CVE-2021-47088] = "fixed-version: Fixed from version 5.16rc7" | ||
4332 | |||
4333 | CVE_STATUS[CVE-2021-47089] = "fixed-version: Fixed from version 5.16rc7" | ||
4334 | |||
4335 | CVE_STATUS[CVE-2021-47090] = "fixed-version: Fixed from version 5.16rc7" | ||
4336 | |||
4337 | CVE_STATUS[CVE-2021-47091] = "fixed-version: Fixed from version 5.16rc7" | ||
4338 | |||
4339 | CVE_STATUS[CVE-2021-47092] = "fixed-version: Fixed from version 5.16rc7" | ||
4340 | |||
4341 | CVE_STATUS[CVE-2021-47093] = "fixed-version: Fixed from version 5.16rc7" | ||
4342 | |||
4343 | CVE_STATUS[CVE-2021-47094] = "fixed-version: Fixed from version 5.16rc7" | ||
4344 | |||
4345 | CVE_STATUS[CVE-2021-47095] = "fixed-version: Fixed from version 5.16rc7" | ||
4346 | |||
4347 | CVE_STATUS[CVE-2021-47096] = "fixed-version: Fixed from version 5.16rc7" | ||
4348 | |||
4349 | CVE_STATUS[CVE-2021-47097] = "fixed-version: Fixed from version 5.16rc7" | ||
4350 | |||
4351 | CVE_STATUS[CVE-2021-47098] = "fixed-version: Fixed from version 5.16rc7" | ||
4352 | |||
4353 | CVE_STATUS[CVE-2021-47099] = "fixed-version: Fixed from version 5.16rc7" | ||
4354 | |||
4355 | CVE_STATUS[CVE-2021-47100] = "fixed-version: Fixed from version 5.16rc7" | ||
4356 | |||
4357 | CVE_STATUS[CVE-2021-47101] = "fixed-version: Fixed from version 5.16rc7" | ||
4358 | |||
4359 | CVE_STATUS[CVE-2021-47102] = "fixed-version: Fixed from version 5.16rc7" | ||
4360 | |||
4361 | CVE_STATUS[CVE-2021-47103] = "fixed-version: Fixed from version 5.16rc7" | ||
4362 | |||
4363 | CVE_STATUS[CVE-2021-47104] = "fixed-version: Fixed from version 5.16rc7" | ||
4364 | |||
4365 | CVE_STATUS[CVE-2021-47105] = "fixed-version: Fixed from version 5.16rc7" | ||
4366 | |||
4367 | CVE_STATUS[CVE-2021-47106] = "fixed-version: Fixed from version 5.16rc7" | ||
4368 | |||
4369 | CVE_STATUS[CVE-2021-47107] = "fixed-version: Fixed from version 5.16rc7" | ||
4370 | |||
4371 | CVE_STATUS[CVE-2021-47108] = "fixed-version: Fixed from version 5.16rc7" | ||
4372 | |||
4373 | CVE_STATUS[CVE-2021-47109] = "fixed-version: Fixed from version 5.13rc7" | ||
4374 | |||
4375 | CVE_STATUS[CVE-2021-47110] = "fixed-version: Fixed from version 5.13rc2" | ||
4376 | |||
4377 | CVE_STATUS[CVE-2021-47111] = "fixed-version: Fixed from version 5.13rc6" | ||
4378 | |||
4379 | CVE_STATUS[CVE-2021-47112] = "fixed-version: Fixed from version 5.13rc2" | ||
4380 | |||
4381 | CVE_STATUS[CVE-2021-47113] = "fixed-version: Fixed from version 5.13rc5" | ||
4382 | |||
4383 | CVE_STATUS[CVE-2021-47114] = "fixed-version: Fixed from version 5.13rc5" | ||
4384 | |||
4385 | CVE_STATUS[CVE-2021-47116] = "fixed-version: Fixed from version 5.13rc5" | ||
4386 | |||
4387 | CVE_STATUS[CVE-2021-47117] = "fixed-version: Fixed from version 5.13rc5" | ||
4388 | |||
4389 | CVE_STATUS[CVE-2021-47118] = "fixed-version: Fixed from version 5.13rc5" | ||
4390 | |||
4391 | CVE_STATUS[CVE-2021-47119] = "fixed-version: Fixed from version 5.13rc5" | ||
4392 | |||
4393 | CVE_STATUS[CVE-2021-47120] = "fixed-version: Fixed from version 5.13rc5" | ||
4394 | |||
4395 | CVE_STATUS[CVE-2021-47121] = "fixed-version: Fixed from version 5.13rc5" | ||
4396 | |||
4397 | CVE_STATUS[CVE-2021-47122] = "fixed-version: Fixed from version 5.13rc5" | ||
4398 | |||
4399 | CVE_STATUS[CVE-2021-47123] = "fixed-version: Fixed from version 5.13rc2" | ||
4400 | |||
4401 | CVE_STATUS[CVE-2021-47124] = "fixed-version: Fixed from version 5.13rc2" | ||
4402 | |||
4403 | CVE_STATUS[CVE-2021-47125] = "fixed-version: Fixed from version 5.13rc5" | ||
4404 | |||
4405 | CVE_STATUS[CVE-2021-47126] = "fixed-version: Fixed from version 5.13rc5" | ||
4406 | |||
4407 | CVE_STATUS[CVE-2021-47127] = "fixed-version: Fixed from version 5.13rc5" | ||
4408 | |||
4409 | CVE_STATUS[CVE-2021-47128] = "fixed-version: Fixed from version 5.13rc5" | ||
4410 | |||
4411 | CVE_STATUS[CVE-2021-47129] = "fixed-version: Fixed from version 5.13rc5" | ||
4412 | |||
4413 | CVE_STATUS[CVE-2021-47130] = "fixed-version: Fixed from version 5.13rc5" | ||
4414 | |||
4415 | CVE_STATUS[CVE-2021-47131] = "fixed-version: Fixed from version 5.13rc5" | ||
4416 | |||
4417 | CVE_STATUS[CVE-2021-47132] = "fixed-version: Fixed from version 5.13rc5" | ||
4418 | |||
4419 | CVE_STATUS[CVE-2021-47133] = "fixed-version: Fixed from version 5.13rc5" | ||
4420 | |||
4421 | CVE_STATUS[CVE-2021-47134] = "fixed-version: Fixed from version 5.13rc5" | ||
4422 | |||
4423 | CVE_STATUS[CVE-2021-47135] = "fixed-version: Fixed from version 5.13rc5" | ||
4424 | |||
4425 | CVE_STATUS[CVE-2021-47136] = "fixed-version: Fixed from version 5.13rc4" | ||
4426 | |||
4427 | CVE_STATUS[CVE-2021-47137] = "fixed-version: Fixed from version 5.13rc4" | ||
4428 | |||
4429 | CVE_STATUS[CVE-2021-47138] = "fixed-version: Fixed from version 5.13rc4" | ||
4430 | |||
4431 | CVE_STATUS[CVE-2021-47139] = "fixed-version: Fixed from version 5.13rc4" | ||
4432 | |||
4433 | CVE_STATUS[CVE-2021-47140] = "fixed-version: Fixed from version 5.13rc4" | ||
4434 | |||
4435 | CVE_STATUS[CVE-2021-47141] = "fixed-version: Fixed from version 5.13rc4" | ||
4436 | |||
4437 | CVE_STATUS[CVE-2021-47142] = "fixed-version: Fixed from version 5.13rc3" | ||
4438 | |||
4439 | CVE_STATUS[CVE-2021-47143] = "fixed-version: Fixed from version 5.13rc4" | ||
4440 | |||
4441 | CVE_STATUS[CVE-2021-47144] = "fixed-version: Fixed from version 5.13rc3" | ||
4442 | |||
4443 | CVE_STATUS[CVE-2021-47145] = "fixed-version: Fixed from version 5.13rc3" | ||
4444 | |||
4445 | CVE_STATUS[CVE-2021-47146] = "fixed-version: Fixed from version 5.13rc4" | ||
4446 | |||
4447 | CVE_STATUS[CVE-2021-47147] = "fixed-version: Fixed from version 5.13rc4" | ||
4448 | |||
4449 | CVE_STATUS[CVE-2021-47148] = "fixed-version: Fixed from version 5.13rc4" | ||
4450 | |||
4451 | CVE_STATUS[CVE-2021-47149] = "fixed-version: Fixed from version 5.13rc3" | ||
4452 | |||
4453 | CVE_STATUS[CVE-2021-47150] = "fixed-version: Fixed from version 5.13rc4" | ||
4454 | |||
4455 | CVE_STATUS[CVE-2021-47151] = "fixed-version: Fixed from version 5.13rc4" | ||
4456 | |||
4457 | CVE_STATUS[CVE-2021-47152] = "fixed-version: Fixed from version 5.13rc4" | ||
4458 | |||
4459 | CVE_STATUS[CVE-2021-47153] = "fixed-version: Fixed from version 5.13rc4" | ||
4460 | |||
4461 | CVE_STATUS[CVE-2021-47158] = "fixed-version: Fixed from version 5.13rc4" | ||
4462 | |||
4463 | CVE_STATUS[CVE-2021-47159] = "fixed-version: Fixed from version 5.13rc4" | ||
4464 | |||
4465 | CVE_STATUS[CVE-2021-47160] = "fixed-version: Fixed from version 5.13rc4" | ||
4466 | |||
4467 | CVE_STATUS[CVE-2021-47161] = "fixed-version: Fixed from version 5.13rc4" | ||
4468 | |||
4469 | CVE_STATUS[CVE-2021-47162] = "fixed-version: Fixed from version 5.13rc4" | ||
4470 | |||
4471 | CVE_STATUS[CVE-2021-47163] = "fixed-version: Fixed from version 5.13rc4" | ||
4472 | |||
4473 | CVE_STATUS[CVE-2021-47164] = "fixed-version: Fixed from version 5.13rc4" | ||
4474 | |||
4475 | CVE_STATUS[CVE-2021-47165] = "fixed-version: Fixed from version 5.13rc4" | ||
4476 | |||
4477 | CVE_STATUS[CVE-2021-47166] = "fixed-version: Fixed from version 5.13rc4" | ||
4478 | |||
4479 | CVE_STATUS[CVE-2021-47167] = "fixed-version: Fixed from version 5.13rc4" | ||
4480 | |||
4481 | CVE_STATUS[CVE-2021-47168] = "fixed-version: Fixed from version 5.13rc4" | ||
4482 | |||
4483 | CVE_STATUS[CVE-2021-47169] = "fixed-version: Fixed from version 5.13rc4" | ||
4484 | |||
4485 | CVE_STATUS[CVE-2021-47170] = "fixed-version: Fixed from version 5.13rc4" | ||
4486 | |||
4487 | CVE_STATUS[CVE-2021-47171] = "fixed-version: Fixed from version 5.13rc4" | ||
4488 | |||
4489 | CVE_STATUS[CVE-2021-47172] = "fixed-version: Fixed from version 5.13rc4" | ||
4490 | |||
4491 | CVE_STATUS[CVE-2021-47173] = "fixed-version: Fixed from version 5.13rc4" | ||
4492 | |||
4493 | CVE_STATUS[CVE-2021-47174] = "fixed-version: Fixed from version 5.13rc4" | ||
4494 | |||
4495 | CVE_STATUS[CVE-2021-47175] = "fixed-version: Fixed from version 5.13rc4" | ||
4496 | |||
4497 | CVE_STATUS[CVE-2021-47176] = "fixed-version: Fixed from version 5.13rc4" | ||
4498 | |||
4499 | CVE_STATUS[CVE-2021-47177] = "fixed-version: Fixed from version 5.13rc4" | ||
4500 | |||
4501 | CVE_STATUS[CVE-2021-47178] = "fixed-version: Fixed from version 5.13rc4" | ||
4502 | |||
4503 | CVE_STATUS[CVE-2021-47179] = "fixed-version: Fixed from version 5.13rc4" | ||
4504 | |||
4505 | CVE_STATUS[CVE-2021-47180] = "fixed-version: Fixed from version 5.13rc4" | ||
4506 | |||
3943 | CVE_STATUS[CVE-2022-0001] = "fixed-version: Fixed from version 5.17rc8" | 4507 | CVE_STATUS[CVE-2022-0001] = "fixed-version: Fixed from version 5.17rc8" |
3944 | 4508 | ||
3945 | CVE_STATUS[CVE-2022-0002] = "fixed-version: Fixed from version 5.17rc8" | 4509 | CVE_STATUS[CVE-2022-0002] = "fixed-version: Fixed from version 5.17rc8" |
@@ -4590,6 +5154,16 @@ CVE_STATUS[CVE-2022-48502] = "fixed-version: Fixed from version 6.2rc1" | |||
4590 | 5154 | ||
4591 | CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1" | 5155 | CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1" |
4592 | 5156 | ||
5157 | CVE_STATUS[CVE-2022-48626] = "fixed-version: Fixed from version 5.17rc4" | ||
5158 | |||
5159 | CVE_STATUS[CVE-2022-48627] = "fixed-version: Fixed from version 5.19rc7" | ||
5160 | |||
5161 | CVE_STATUS[CVE-2022-48628] = "fixed-version: Fixed from version 6.6rc1" | ||
5162 | |||
5163 | CVE_STATUS[CVE-2022-48629] = "fixed-version: Fixed from version 5.17" | ||
5164 | |||
5165 | CVE_STATUS[CVE-2022-48630] = "fixed-version: Fixed from version 5.18" | ||
5166 | |||
4593 | CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1" | 5167 | CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1" |
4594 | 5168 | ||
4595 | CVE_STATUS[CVE-2023-0045] = "fixed-version: Fixed from version 6.2rc3" | 5169 | CVE_STATUS[CVE-2023-0045] = "fixed-version: Fixed from version 6.2rc3" |
@@ -4834,6 +5408,8 @@ CVE_STATUS[CVE-2023-28466] = "fixed-version: Fixed from version 6.3rc2" | |||
4834 | 5408 | ||
4835 | CVE_STATUS[CVE-2023-2860] = "fixed-version: Fixed from version 6.0rc5" | 5409 | CVE_STATUS[CVE-2023-2860] = "fixed-version: Fixed from version 6.0rc5" |
4836 | 5410 | ||
5411 | CVE_STATUS[CVE-2023-28746] = "cpe-stable-backport: Backported in 6.6.22" | ||
5412 | |||
4837 | CVE_STATUS[CVE-2023-28772] = "fixed-version: Fixed from version 5.14rc1" | 5413 | CVE_STATUS[CVE-2023-28772] = "fixed-version: Fixed from version 5.14rc1" |
4838 | 5414 | ||
4839 | CVE_STATUS[CVE-2023-28866] = "fixed-version: Fixed from version 6.3rc4" | 5415 | CVE_STATUS[CVE-2023-28866] = "fixed-version: Fixed from version 6.3rc4" |
@@ -5112,7 +5688,7 @@ CVE_STATUS[CVE-2023-46838] = "cpe-stable-backport: Backported in 6.6.14" | |||
5112 | 5688 | ||
5113 | CVE_STATUS[CVE-2023-46862] = "fixed-version: Fixed from version 6.6" | 5689 | CVE_STATUS[CVE-2023-46862] = "fixed-version: Fixed from version 6.6" |
5114 | 5690 | ||
5115 | # CVE-2023-47233 has no known resolution | 5691 | CVE_STATUS[CVE-2023-47233] = "cpe-stable-backport: Backported in 6.6.24" |
5116 | 5692 | ||
5117 | CVE_STATUS[CVE-2023-4732] = "fixed-version: Fixed from version 5.14rc1" | 5693 | CVE_STATUS[CVE-2023-4732] = "fixed-version: Fixed from version 5.14rc1" |
5118 | 5694 | ||
@@ -5208,6 +5784,294 @@ CVE_STATUS[CVE-2023-52463] = "cpe-stable-backport: Backported in 6.6.14" | |||
5208 | 5784 | ||
5209 | CVE_STATUS[CVE-2023-52464] = "cpe-stable-backport: Backported in 6.6.14" | 5785 | CVE_STATUS[CVE-2023-52464] = "cpe-stable-backport: Backported in 6.6.14" |
5210 | 5786 | ||
5787 | CVE_STATUS[CVE-2023-52465] = "cpe-stable-backport: Backported in 6.6.14" | ||
5788 | |||
5789 | CVE_STATUS[CVE-2023-52467] = "cpe-stable-backport: Backported in 6.6.14" | ||
5790 | |||
5791 | CVE_STATUS[CVE-2023-52468] = "cpe-stable-backport: Backported in 6.6.14" | ||
5792 | |||
5793 | CVE_STATUS[CVE-2023-52469] = "cpe-stable-backport: Backported in 6.6.14" | ||
5794 | |||
5795 | CVE_STATUS[CVE-2023-52470] = "cpe-stable-backport: Backported in 6.6.14" | ||
5796 | |||
5797 | CVE_STATUS[CVE-2023-52471] = "fixed-version: only affects 6.7rc1 onwards" | ||
5798 | |||
5799 | CVE_STATUS[CVE-2023-52472] = "cpe-stable-backport: Backported in 6.6.14" | ||
5800 | |||
5801 | CVE_STATUS[CVE-2023-52473] = "cpe-stable-backport: Backported in 6.6.14" | ||
5802 | |||
5803 | CVE_STATUS[CVE-2023-52474] = "fixed-version: Fixed from version 6.4rc1" | ||
5804 | |||
5805 | CVE_STATUS[CVE-2023-52475] = "fixed-version: Fixed from version 6.6rc6" | ||
5806 | |||
5807 | CVE_STATUS[CVE-2023-52476] = "fixed-version: Fixed from version 6.6rc6" | ||
5808 | |||
5809 | CVE_STATUS[CVE-2023-52477] = "fixed-version: Fixed from version 6.6rc6" | ||
5810 | |||
5811 | CVE_STATUS[CVE-2023-52478] = "fixed-version: Fixed from version 6.6rc6" | ||
5812 | |||
5813 | CVE_STATUS[CVE-2023-52479] = "fixed-version: Fixed from version 6.6rc5" | ||
5814 | |||
5815 | CVE_STATUS[CVE-2023-52480] = "fixed-version: Fixed from version 6.6rc5" | ||
5816 | |||
5817 | CVE_STATUS[CVE-2023-52481] = "fixed-version: Fixed from version 6.6rc5" | ||
5818 | |||
5819 | CVE_STATUS[CVE-2023-52482] = "fixed-version: Fixed from version 6.6rc4" | ||
5820 | |||
5821 | CVE_STATUS[CVE-2023-52483] = "fixed-version: Fixed from version 6.6rc6" | ||
5822 | |||
5823 | CVE_STATUS[CVE-2023-52484] = "fixed-version: Fixed from version 6.6rc5" | ||
5824 | |||
5825 | # CVE-2023-52485 needs backporting (fixed from 6.8rc1) | ||
5826 | |||
5827 | CVE_STATUS[CVE-2023-52486] = "cpe-stable-backport: Backported in 6.6.15" | ||
5828 | |||
5829 | CVE_STATUS[CVE-2023-52487] = "cpe-stable-backport: Backported in 6.6.15" | ||
5830 | |||
5831 | CVE_STATUS[CVE-2023-52488] = "cpe-stable-backport: Backported in 6.6.15" | ||
5832 | |||
5833 | CVE_STATUS[CVE-2023-52489] = "cpe-stable-backport: Backported in 6.6.15" | ||
5834 | |||
5835 | CVE_STATUS[CVE-2023-52490] = "cpe-stable-backport: Backported in 6.6.15" | ||
5836 | |||
5837 | CVE_STATUS[CVE-2023-52491] = "cpe-stable-backport: Backported in 6.6.15" | ||
5838 | |||
5839 | CVE_STATUS[CVE-2023-52492] = "cpe-stable-backport: Backported in 6.6.15" | ||
5840 | |||
5841 | CVE_STATUS[CVE-2023-52493] = "cpe-stable-backport: Backported in 6.6.15" | ||
5842 | |||
5843 | CVE_STATUS[CVE-2023-52494] = "cpe-stable-backport: Backported in 6.6.15" | ||
5844 | |||
5845 | CVE_STATUS[CVE-2023-52495] = "cpe-stable-backport: Backported in 6.6.15" | ||
5846 | |||
5847 | CVE_STATUS[CVE-2023-52497] = "cpe-stable-backport: Backported in 6.6.15" | ||
5848 | |||
5849 | CVE_STATUS[CVE-2023-52498] = "cpe-stable-backport: Backported in 6.6.15" | ||
5850 | |||
5851 | CVE_STATUS[CVE-2023-52499] = "fixed-version: Fixed from version 6.6rc6" | ||
5852 | |||
5853 | CVE_STATUS[CVE-2023-52500] = "fixed-version: Fixed from version 6.6rc2" | ||
5854 | |||
5855 | CVE_STATUS[CVE-2023-52501] = "fixed-version: Fixed from version 6.6rc2" | ||
5856 | |||
5857 | CVE_STATUS[CVE-2023-52502] = "fixed-version: Fixed from version 6.6rc6" | ||
5858 | |||
5859 | CVE_STATUS[CVE-2023-52503] = "fixed-version: Fixed from version 6.6rc6" | ||
5860 | |||
5861 | CVE_STATUS[CVE-2023-52504] = "fixed-version: Fixed from version 6.6rc6" | ||
5862 | |||
5863 | CVE_STATUS[CVE-2023-52505] = "fixed-version: Fixed from version 6.6rc6" | ||
5864 | |||
5865 | CVE_STATUS[CVE-2023-52506] = "fixed-version: Fixed from version 6.6rc3" | ||
5866 | |||
5867 | CVE_STATUS[CVE-2023-52507] = "fixed-version: Fixed from version 6.6rc6" | ||
5868 | |||
5869 | CVE_STATUS[CVE-2023-52508] = "fixed-version: Fixed from version 6.6rc2" | ||
5870 | |||
5871 | CVE_STATUS[CVE-2023-52509] = "fixed-version: Fixed from version 6.6rc6" | ||
5872 | |||
5873 | CVE_STATUS[CVE-2023-52510] = "fixed-version: Fixed from version 6.6rc6" | ||
5874 | |||
5875 | CVE_STATUS[CVE-2023-52511] = "fixed-version: Fixed from version 6.6rc1" | ||
5876 | |||
5877 | CVE_STATUS[CVE-2023-52512] = "fixed-version: Fixed from version 6.6rc6" | ||
5878 | |||
5879 | CVE_STATUS[CVE-2023-52513] = "fixed-version: Fixed from version 6.6rc5" | ||
5880 | |||
5881 | CVE_STATUS[CVE-2023-52515] = "fixed-version: Fixed from version 6.6rc5" | ||
5882 | |||
5883 | CVE_STATUS[CVE-2023-52516] = "fixed-version: Fixed from version 6.6rc1" | ||
5884 | |||
5885 | CVE_STATUS[CVE-2023-52517] = "fixed-version: Fixed from version 6.6rc1" | ||
5886 | |||
5887 | CVE_STATUS[CVE-2023-52518] = "fixed-version: Fixed from version 6.6rc5" | ||
5888 | |||
5889 | CVE_STATUS[CVE-2023-52519] = "fixed-version: Fixed from version 6.6rc5" | ||
5890 | |||
5891 | CVE_STATUS[CVE-2023-52520] = "fixed-version: Fixed from version 6.6rc5" | ||
5892 | |||
5893 | CVE_STATUS[CVE-2023-52522] = "fixed-version: Fixed from version 6.6rc5" | ||
5894 | |||
5895 | CVE_STATUS[CVE-2023-52523] = "fixed-version: Fixed from version 6.6rc5" | ||
5896 | |||
5897 | CVE_STATUS[CVE-2023-52524] = "fixed-version: Fixed from version 6.6rc5" | ||
5898 | |||
5899 | CVE_STATUS[CVE-2023-52525] = "fixed-version: Fixed from version 6.6rc5" | ||
5900 | |||
5901 | CVE_STATUS[CVE-2023-52526] = "fixed-version: Fixed from version 6.6rc5" | ||
5902 | |||
5903 | CVE_STATUS[CVE-2023-52527] = "fixed-version: Fixed from version 6.6rc5" | ||
5904 | |||
5905 | CVE_STATUS[CVE-2023-52528] = "fixed-version: Fixed from version 6.6rc5" | ||
5906 | |||
5907 | CVE_STATUS[CVE-2023-52529] = "fixed-version: Fixed from version 6.6rc5" | ||
5908 | |||
5909 | CVE_STATUS[CVE-2023-52530] = "fixed-version: Fixed from version 6.6rc5" | ||
5910 | |||
5911 | CVE_STATUS[CVE-2023-52531] = "fixed-version: Fixed from version 6.6rc5" | ||
5912 | |||
5913 | CVE_STATUS[CVE-2023-52532] = "fixed-version: Fixed from version 6.6rc5" | ||
5914 | |||
5915 | CVE_STATUS[CVE-2023-52559] = "fixed-version: Fixed from version 6.6rc5" | ||
5916 | |||
5917 | CVE_STATUS[CVE-2023-52560] = "fixed-version: Fixed from version 6.6rc4" | ||
5918 | |||
5919 | CVE_STATUS[CVE-2023-52561] = "fixed-version: Fixed from version 6.6rc1" | ||
5920 | |||
5921 | CVE_STATUS[CVE-2023-52562] = "fixed-version: Fixed from version 6.6rc4" | ||
5922 | |||
5923 | CVE_STATUS[CVE-2023-52563] = "fixed-version: Fixed from version 6.6rc3" | ||
5924 | |||
5925 | CVE_STATUS[CVE-2023-52564] = "fixed-version: Fixed from version 6.6rc4" | ||
5926 | |||
5927 | CVE_STATUS[CVE-2023-52565] = "fixed-version: Fixed from version 6.6rc3" | ||
5928 | |||
5929 | CVE_STATUS[CVE-2023-52566] = "fixed-version: Fixed from version 6.6rc4" | ||
5930 | |||
5931 | CVE_STATUS[CVE-2023-52567] = "fixed-version: Fixed from version 6.6rc4" | ||
5932 | |||
5933 | CVE_STATUS[CVE-2023-52568] = "fixed-version: Fixed from version 6.6rc4" | ||
5934 | |||
5935 | CVE_STATUS[CVE-2023-52569] = "fixed-version: Fixed from version 6.6rc2" | ||
5936 | |||
5937 | CVE_STATUS[CVE-2023-52570] = "fixed-version: Fixed from version 6.6rc4" | ||
5938 | |||
5939 | CVE_STATUS[CVE-2023-52571] = "fixed-version: Fixed from version 6.6rc4" | ||
5940 | |||
5941 | CVE_STATUS[CVE-2023-52572] = "fixed-version: Fixed from version 6.6rc3" | ||
5942 | |||
5943 | CVE_STATUS[CVE-2023-52573] = "fixed-version: Fixed from version 6.6rc3" | ||
5944 | |||
5945 | CVE_STATUS[CVE-2023-52574] = "fixed-version: Fixed from version 6.6rc3" | ||
5946 | |||
5947 | CVE_STATUS[CVE-2023-52575] = "fixed-version: Fixed from version 6.6rc3" | ||
5948 | |||
5949 | CVE_STATUS[CVE-2023-52576] = "fixed-version: Fixed from version 6.6rc3" | ||
5950 | |||
5951 | CVE_STATUS[CVE-2023-52577] = "fixed-version: Fixed from version 6.6rc3" | ||
5952 | |||
5953 | CVE_STATUS[CVE-2023-52578] = "fixed-version: Fixed from version 6.6rc3" | ||
5954 | |||
5955 | CVE_STATUS[CVE-2023-52580] = "fixed-version: Fixed from version 6.6rc3" | ||
5956 | |||
5957 | CVE_STATUS[CVE-2023-52581] = "fixed-version: Fixed from version 6.6rc3" | ||
5958 | |||
5959 | CVE_STATUS[CVE-2023-52582] = "fixed-version: Fixed from version 6.6rc3" | ||
5960 | |||
5961 | CVE_STATUS[CVE-2023-52583] = "cpe-stable-backport: Backported in 6.6.16" | ||
5962 | |||
5963 | CVE_STATUS[CVE-2023-52584] = "cpe-stable-backport: Backported in 6.6.16" | ||
5964 | |||
5965 | # CVE-2023-52585 needs backporting (fixed from 6.8rc1) | ||
5966 | |||
5967 | # CVE-2023-52586 needs backporting (fixed from 6.8rc1) | ||
5968 | |||
5969 | CVE_STATUS[CVE-2023-52587] = "cpe-stable-backport: Backported in 6.6.16" | ||
5970 | |||
5971 | CVE_STATUS[CVE-2023-52588] = "cpe-stable-backport: Backported in 6.6.16" | ||
5972 | |||
5973 | CVE_STATUS[CVE-2023-52589] = "cpe-stable-backport: Backported in 6.6.16" | ||
5974 | |||
5975 | # CVE-2023-52590 needs backporting (fixed from 6.8rc1) | ||
5976 | |||
5977 | CVE_STATUS[CVE-2023-52591] = "cpe-stable-backport: Backported in 6.6.16" | ||
5978 | |||
5979 | CVE_STATUS[CVE-2023-52593] = "cpe-stable-backport: Backported in 6.6.16" | ||
5980 | |||
5981 | CVE_STATUS[CVE-2023-52594] = "cpe-stable-backport: Backported in 6.6.16" | ||
5982 | |||
5983 | CVE_STATUS[CVE-2023-52595] = "cpe-stable-backport: Backported in 6.6.16" | ||
5984 | |||
5985 | CVE_STATUS[CVE-2023-52596] = "cpe-stable-backport: Backported in 6.6.16" | ||
5986 | |||
5987 | CVE_STATUS[CVE-2023-52597] = "cpe-stable-backport: Backported in 6.6.16" | ||
5988 | |||
5989 | CVE_STATUS[CVE-2023-52598] = "cpe-stable-backport: Backported in 6.6.16" | ||
5990 | |||
5991 | CVE_STATUS[CVE-2023-52599] = "cpe-stable-backport: Backported in 6.6.16" | ||
5992 | |||
5993 | CVE_STATUS[CVE-2023-52600] = "cpe-stable-backport: Backported in 6.6.16" | ||
5994 | |||
5995 | CVE_STATUS[CVE-2023-52601] = "cpe-stable-backport: Backported in 6.6.16" | ||
5996 | |||
5997 | CVE_STATUS[CVE-2023-52602] = "cpe-stable-backport: Backported in 6.6.16" | ||
5998 | |||
5999 | CVE_STATUS[CVE-2023-52603] = "cpe-stable-backport: Backported in 6.6.16" | ||
6000 | |||
6001 | CVE_STATUS[CVE-2023-52604] = "cpe-stable-backport: Backported in 6.6.16" | ||
6002 | |||
6003 | CVE_STATUS[CVE-2023-52606] = "cpe-stable-backport: Backported in 6.6.16" | ||
6004 | |||
6005 | CVE_STATUS[CVE-2023-52607] = "cpe-stable-backport: Backported in 6.6.16" | ||
6006 | |||
6007 | CVE_STATUS[CVE-2023-52608] = "cpe-stable-backport: Backported in 6.6.15" | ||
6008 | |||
6009 | CVE_STATUS[CVE-2023-52609] = "cpe-stable-backport: Backported in 6.6.14" | ||
6010 | |||
6011 | CVE_STATUS[CVE-2023-52610] = "cpe-stable-backport: Backported in 6.6.14" | ||
6012 | |||
6013 | CVE_STATUS[CVE-2023-52611] = "cpe-stable-backport: Backported in 6.6.14" | ||
6014 | |||
6015 | CVE_STATUS[CVE-2023-52612] = "cpe-stable-backport: Backported in 6.6.14" | ||
6016 | |||
6017 | CVE_STATUS[CVE-2023-52613] = "cpe-stable-backport: Backported in 6.6.14" | ||
6018 | |||
6019 | CVE_STATUS[CVE-2023-52614] = "cpe-stable-backport: Backported in 6.6.15" | ||
6020 | |||
6021 | CVE_STATUS[CVE-2023-52615] = "cpe-stable-backport: Backported in 6.6.15" | ||
6022 | |||
6023 | CVE_STATUS[CVE-2023-52616] = "cpe-stable-backport: Backported in 6.6.15" | ||
6024 | |||
6025 | CVE_STATUS[CVE-2023-52617] = "cpe-stable-backport: Backported in 6.6.16" | ||
6026 | |||
6027 | CVE_STATUS[CVE-2023-52618] = "cpe-stable-backport: Backported in 6.6.16" | ||
6028 | |||
6029 | CVE_STATUS[CVE-2023-52619] = "cpe-stable-backport: Backported in 6.6.16" | ||
6030 | |||
6031 | CVE_STATUS[CVE-2023-52620] = "fixed-version: Fixed from version 6.4" | ||
6032 | |||
6033 | CVE_STATUS[CVE-2023-52621] = "cpe-stable-backport: Backported in 6.6.16" | ||
6034 | |||
6035 | CVE_STATUS[CVE-2023-52622] = "cpe-stable-backport: Backported in 6.6.16" | ||
6036 | |||
6037 | CVE_STATUS[CVE-2023-52623] = "cpe-stable-backport: Backported in 6.6.16" | ||
6038 | |||
6039 | # CVE-2023-52624 needs backporting (fixed from 6.8rc1) | ||
6040 | |||
6041 | # CVE-2023-52625 needs backporting (fixed from 6.8rc1) | ||
6042 | |||
6043 | CVE_STATUS[CVE-2023-52626] = "fixed-version: only affects 6.7rc2 onwards" | ||
6044 | |||
6045 | CVE_STATUS[CVE-2023-52627] = "cpe-stable-backport: Backported in 6.6.15" | ||
6046 | |||
6047 | CVE_STATUS[CVE-2023-52628] = "fixed-version: Fixed from version 6.6rc1" | ||
6048 | |||
6049 | CVE_STATUS[CVE-2023-52629] = "fixed-version: Fixed from version 6.6rc1" | ||
6050 | |||
6051 | CVE_STATUS[CVE-2023-52630] = "cpe-stable-backport: Backported in 6.6.17" | ||
6052 | |||
6053 | CVE_STATUS[CVE-2023-52631] = "cpe-stable-backport: Backported in 6.6.17" | ||
6054 | |||
6055 | CVE_STATUS[CVE-2023-52632] = "cpe-stable-backport: Backported in 6.6.16" | ||
6056 | |||
6057 | CVE_STATUS[CVE-2023-52633] = "cpe-stable-backport: Backported in 6.6.16" | ||
6058 | |||
6059 | # CVE-2023-52634 needs backporting (fixed from 6.8rc1) | ||
6060 | |||
6061 | CVE_STATUS[CVE-2023-52635] = "cpe-stable-backport: Backported in 6.6.16" | ||
6062 | |||
6063 | CVE_STATUS[CVE-2023-52636] = "cpe-stable-backport: Backported in 6.6.17" | ||
6064 | |||
6065 | CVE_STATUS[CVE-2023-52637] = "cpe-stable-backport: Backported in 6.6.18" | ||
6066 | |||
6067 | CVE_STATUS[CVE-2023-52638] = "cpe-stable-backport: Backported in 6.6.18" | ||
6068 | |||
6069 | CVE_STATUS[CVE-2023-52639] = "cpe-stable-backport: Backported in 6.6.22" | ||
6070 | |||
6071 | CVE_STATUS[CVE-2023-52640] = "cpe-stable-backport: Backported in 6.6.19" | ||
6072 | |||
6073 | CVE_STATUS[CVE-2023-52641] = "cpe-stable-backport: Backported in 6.6.19" | ||
6074 | |||
5211 | CVE_STATUS[CVE-2023-5345] = "fixed-version: Fixed from version 6.6rc4" | 6075 | CVE_STATUS[CVE-2023-5345] = "fixed-version: Fixed from version 6.6rc4" |
5212 | 6076 | ||
5213 | CVE_STATUS[CVE-2023-5633] = "fixed-version: Fixed from version 6.6rc6" | 6077 | CVE_STATUS[CVE-2023-5633] = "fixed-version: Fixed from version 6.6rc6" |
@@ -5232,15 +6096,15 @@ CVE_STATUS[CVE-2023-6200] = "cpe-stable-backport: Backported in 6.6.9" | |||
5232 | 6096 | ||
5233 | # CVE-2023-6240 has no known resolution | 6097 | # CVE-2023-6240 has no known resolution |
5234 | 6098 | ||
5235 | # CVE-2023-6270 has no known resolution | 6099 | CVE_STATUS[CVE-2023-6270] = "cpe-stable-backport: Backported in 6.6.23" |
5236 | 6100 | ||
5237 | # CVE-2023-6356 has no known resolution | 6101 | CVE_STATUS[CVE-2023-6356] = "cpe-stable-backport: Backported in 6.6.14" |
5238 | 6102 | ||
5239 | CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.6.7" | 6103 | CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.6.7" |
5240 | 6104 | ||
5241 | # CVE-2023-6535 has no known resolution | 6105 | # CVE-2023-6535 has no known resolution |
5242 | 6106 | ||
5243 | # CVE-2023-6536 has no known resolution | 6107 | CVE_STATUS[CVE-2023-6536] = "cpe-stable-backport: Backported in 6.6.14" |
5244 | 6108 | ||
5245 | CVE_STATUS[CVE-2023-6546] = "fixed-version: Fixed from version 6.5rc7" | 6109 | CVE_STATUS[CVE-2023-6546] = "fixed-version: Fixed from version 6.5rc7" |
5246 | 6110 | ||
@@ -5262,7 +6126,7 @@ CVE_STATUS[CVE-2023-6931] = "cpe-stable-backport: Backported in 6.6.7" | |||
5262 | 6126 | ||
5263 | CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.6.5" | 6127 | CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.6.5" |
5264 | 6128 | ||
5265 | # CVE-2023-7042 has no known resolution | 6129 | CVE_STATUS[CVE-2023-7042] = "cpe-stable-backport: Backported in 6.6.23" |
5266 | 6130 | ||
5267 | CVE_STATUS[CVE-2023-7192] = "fixed-version: Fixed from version 6.3rc1" | 6131 | CVE_STATUS[CVE-2023-7192] = "fixed-version: Fixed from version 6.3rc1" |
5268 | 6132 | ||
@@ -5292,7 +6156,7 @@ CVE_STATUS[CVE-2024-0646] = "cpe-stable-backport: Backported in 6.6.7" | |||
5292 | 6156 | ||
5293 | CVE_STATUS[CVE-2024-0775] = "fixed-version: Fixed from version 6.4rc2" | 6157 | CVE_STATUS[CVE-2024-0775] = "fixed-version: Fixed from version 6.4rc2" |
5294 | 6158 | ||
5295 | # CVE-2024-0841 has no known resolution | 6159 | CVE_STATUS[CVE-2024-0841] = "cpe-stable-backport: Backported in 6.6.18" |
5296 | 6160 | ||
5297 | CVE_STATUS[CVE-2024-1085] = "cpe-stable-backport: Backported in 6.6.14" | 6161 | CVE_STATUS[CVE-2024-1085] = "cpe-stable-backport: Backported in 6.6.14" |
5298 | 6162 | ||
@@ -5304,15 +6168,17 @@ CVE_STATUS[CVE-2024-1312] = "fixed-version: Fixed from version 6.5rc4" | |||
5304 | 6168 | ||
5305 | # CVE-2024-21803 has no known resolution | 6169 | # CVE-2024-21803 has no known resolution |
5306 | 6170 | ||
5307 | # CVE-2024-22099 has no known resolution | 6171 | # CVE-2024-2193 has no known resolution |
6172 | |||
6173 | CVE_STATUS[CVE-2024-22099] = "cpe-stable-backport: Backported in 6.6.23" | ||
5308 | 6174 | ||
5309 | # CVE-2024-22386 has no known resolution | 6175 | # CVE-2024-22386 has no known resolution |
5310 | 6176 | ||
5311 | CVE_STATUS[CVE-2024-22705] = "cpe-stable-backport: Backported in 6.6.10" | 6177 | CVE_STATUS[CVE-2024-22705] = "cpe-stable-backport: Backported in 6.6.10" |
5312 | 6178 | ||
5313 | # CVE-2024-23196 has no known resolution | 6179 | CVE_STATUS[CVE-2024-23196] = "fixed-version: Fixed from version 6.5rc1" |
5314 | 6180 | ||
5315 | # CVE-2024-23307 has no known resolution | 6181 | CVE_STATUS[CVE-2024-23307] = "cpe-stable-backport: Backported in 6.6.24" |
5316 | 6182 | ||
5317 | # CVE-2024-23848 has no known resolution | 6183 | # CVE-2024-23848 has no known resolution |
5318 | 6184 | ||
@@ -5332,7 +6198,7 @@ CVE_STATUS[CVE-2024-24855] = "fixed-version: Fixed from version 6.5rc2" | |||
5332 | 6198 | ||
5333 | CVE_STATUS[CVE-2024-24860] = "cpe-stable-backport: Backported in 6.6.14" | 6199 | CVE_STATUS[CVE-2024-24860] = "cpe-stable-backport: Backported in 6.6.14" |
5334 | 6200 | ||
5335 | # CVE-2024-24861 has no known resolution | 6201 | CVE_STATUS[CVE-2024-24861] = "cpe-stable-backport: Backported in 6.6.24" |
5336 | 6202 | ||
5337 | # CVE-2024-24864 has no known resolution | 6203 | # CVE-2024-24864 has no known resolution |
5338 | 6204 | ||
@@ -5382,3 +6248,413 @@ CVE_STATUS[CVE-2024-26598] = "cpe-stable-backport: Backported in 6.6.14" | |||
5382 | 6248 | ||
5383 | CVE_STATUS[CVE-2024-26599] = "cpe-stable-backport: Backported in 6.6.14" | 6249 | CVE_STATUS[CVE-2024-26599] = "cpe-stable-backport: Backported in 6.6.14" |
5384 | 6250 | ||
6251 | CVE_STATUS[CVE-2024-26600] = "cpe-stable-backport: Backported in 6.6.17" | ||
6252 | |||
6253 | CVE_STATUS[CVE-2024-26601] = "cpe-stable-backport: Backported in 6.6.17" | ||
6254 | |||
6255 | CVE_STATUS[CVE-2024-26602] = "cpe-stable-backport: Backported in 6.6.18" | ||
6256 | |||
6257 | CVE_STATUS[CVE-2024-26603] = "cpe-stable-backport: Backported in 6.6.18" | ||
6258 | |||
6259 | CVE_STATUS[CVE-2024-26604] = "cpe-stable-backport: Backported in 6.6.18" | ||
6260 | |||
6261 | CVE_STATUS[CVE-2024-26605] = "fixed-version: only affects 6.7 onwards" | ||
6262 | |||
6263 | CVE_STATUS[CVE-2024-26606] = "cpe-stable-backport: Backported in 6.6.18" | ||
6264 | |||
6265 | CVE_STATUS[CVE-2024-26607] = "cpe-stable-backport: Backported in 6.6.15" | ||
6266 | |||
6267 | CVE_STATUS[CVE-2024-26608] = "cpe-stable-backport: Backported in 6.6.15" | ||
6268 | |||
6269 | CVE_STATUS[CVE-2024-26610] = "cpe-stable-backport: Backported in 6.6.15" | ||
6270 | |||
6271 | CVE_STATUS[CVE-2024-26611] = "cpe-stable-backport: Backported in 6.6.15" | ||
6272 | |||
6273 | CVE_STATUS[CVE-2024-26612] = "cpe-stable-backport: Backported in 6.6.15" | ||
6274 | |||
6275 | CVE_STATUS[CVE-2024-26614] = "cpe-stable-backport: Backported in 6.6.15" | ||
6276 | |||
6277 | CVE_STATUS[CVE-2024-26615] = "cpe-stable-backport: Backported in 6.6.15" | ||
6278 | |||
6279 | CVE_STATUS[CVE-2024-26616] = "cpe-stable-backport: Backported in 6.6.15" | ||
6280 | |||
6281 | CVE_STATUS[CVE-2024-26617] = "fixed-version: only affects 6.7rc1 onwards" | ||
6282 | |||
6283 | CVE_STATUS[CVE-2024-26618] = "cpe-stable-backport: Backported in 6.6.15" | ||
6284 | |||
6285 | CVE_STATUS[CVE-2024-26619] = "fixed-version: only affects 6.7rc5 onwards" | ||
6286 | |||
6287 | CVE_STATUS[CVE-2024-26620] = "cpe-stable-backport: Backported in 6.6.15" | ||
6288 | |||
6289 | CVE_STATUS[CVE-2024-26621] = "fixed-version: only affects 6.7 onwards" | ||
6290 | |||
6291 | CVE_STATUS[CVE-2024-26622] = "cpe-stable-backport: Backported in 6.6.21" | ||
6292 | |||
6293 | CVE_STATUS[CVE-2024-26623] = "cpe-stable-backport: Backported in 6.6.16" | ||
6294 | |||
6295 | CVE_STATUS[CVE-2024-26625] = "cpe-stable-backport: Backported in 6.6.16" | ||
6296 | |||
6297 | CVE_STATUS[CVE-2024-26626] = "fixed-version: only affects 6.8rc1 onwards" | ||
6298 | |||
6299 | CVE_STATUS[CVE-2024-26627] = "cpe-stable-backport: Backported in 6.6.16" | ||
6300 | |||
6301 | CVE_STATUS[CVE-2024-26629] = "cpe-stable-backport: Backported in 6.6.15" | ||
6302 | |||
6303 | CVE_STATUS[CVE-2024-26630] = "cpe-stable-backport: Backported in 6.6.21" | ||
6304 | |||
6305 | CVE_STATUS[CVE-2024-26631] = "cpe-stable-backport: Backported in 6.6.14" | ||
6306 | |||
6307 | CVE_STATUS[CVE-2024-26632] = "cpe-stable-backport: Backported in 6.6.14" | ||
6308 | |||
6309 | CVE_STATUS[CVE-2024-26633] = "cpe-stable-backport: Backported in 6.6.14" | ||
6310 | |||
6311 | CVE_STATUS[CVE-2024-26634] = "cpe-stable-backport: Backported in 6.6.15" | ||
6312 | |||
6313 | CVE_STATUS[CVE-2024-26635] = "cpe-stable-backport: Backported in 6.6.15" | ||
6314 | |||
6315 | CVE_STATUS[CVE-2024-26636] = "cpe-stable-backport: Backported in 6.6.15" | ||
6316 | |||
6317 | CVE_STATUS[CVE-2024-26637] = "fixed-version: only affects 6.7 onwards" | ||
6318 | |||
6319 | CVE_STATUS[CVE-2024-26638] = "cpe-stable-backport: Backported in 6.6.15" | ||
6320 | |||
6321 | CVE_STATUS[CVE-2024-26639] = "fixed-version: only affects 6.8rc1 onwards" | ||
6322 | |||
6323 | CVE_STATUS[CVE-2024-26640] = "cpe-stable-backport: Backported in 6.6.16" | ||
6324 | |||
6325 | CVE_STATUS[CVE-2024-26641] = "cpe-stable-backport: Backported in 6.6.16" | ||
6326 | |||
6327 | CVE_STATUS[CVE-2024-26642] = "cpe-stable-backport: Backported in 6.6.24" | ||
6328 | |||
6329 | CVE_STATUS[CVE-2024-26643] = "cpe-stable-backport: Backported in 6.6.24" | ||
6330 | |||
6331 | CVE_STATUS[CVE-2024-26644] = "cpe-stable-backport: Backported in 6.6.15" | ||
6332 | |||
6333 | CVE_STATUS[CVE-2024-26645] = "cpe-stable-backport: Backported in 6.6.15" | ||
6334 | |||
6335 | CVE_STATUS[CVE-2024-26646] = "cpe-stable-backport: Backported in 6.6.15" | ||
6336 | |||
6337 | CVE_STATUS[CVE-2024-26647] = "cpe-stable-backport: Backported in 6.6.15" | ||
6338 | |||
6339 | CVE_STATUS[CVE-2024-26648] = "cpe-stable-backport: Backported in 6.6.15" | ||
6340 | |||
6341 | CVE_STATUS[CVE-2024-26649] = "cpe-stable-backport: Backported in 6.6.15" | ||
6342 | |||
6343 | CVE_STATUS[CVE-2024-26650] = "cpe-stable-backport: Backported in 6.6.15" | ||
6344 | |||
6345 | CVE_STATUS[CVE-2024-26651] = "cpe-stable-backport: Backported in 6.6.23" | ||
6346 | |||
6347 | CVE_STATUS[CVE-2024-26652] = "cpe-stable-backport: Backported in 6.6.22" | ||
6348 | |||
6349 | CVE_STATUS[CVE-2024-26653] = "fixed-version: only affects 6.7rc1 onwards" | ||
6350 | |||
6351 | CVE_STATUS[CVE-2024-26654] = "cpe-stable-backport: Backported in 6.6.24" | ||
6352 | |||
6353 | # CVE-2024-26655 needs backporting (fixed from 6.9rc2) | ||
6354 | |||
6355 | CVE_STATUS[CVE-2024-26656] = "cpe-stable-backport: Backported in 6.6.24" | ||
6356 | |||
6357 | CVE_STATUS[CVE-2024-26657] = "fixed-version: only affects 6.7rc1 onwards" | ||
6358 | |||
6359 | # CVE-2024-26658 needs backporting (fixed from 6.8rc1) | ||
6360 | |||
6361 | CVE_STATUS[CVE-2024-26659] = "cpe-stable-backport: Backported in 6.6.17" | ||
6362 | |||
6363 | CVE_STATUS[CVE-2024-26660] = "cpe-stable-backport: Backported in 6.6.17" | ||
6364 | |||
6365 | CVE_STATUS[CVE-2024-26661] = "cpe-stable-backport: Backported in 6.6.17" | ||
6366 | |||
6367 | CVE_STATUS[CVE-2024-26662] = "cpe-stable-backport: Backported in 6.6.17" | ||
6368 | |||
6369 | CVE_STATUS[CVE-2024-26663] = "cpe-stable-backport: Backported in 6.6.17" | ||
6370 | |||
6371 | CVE_STATUS[CVE-2024-26664] = "cpe-stable-backport: Backported in 6.6.17" | ||
6372 | |||
6373 | CVE_STATUS[CVE-2024-26665] = "cpe-stable-backport: Backported in 6.6.17" | ||
6374 | |||
6375 | CVE_STATUS[CVE-2024-26666] = "cpe-stable-backport: Backported in 6.6.17" | ||
6376 | |||
6377 | CVE_STATUS[CVE-2024-26667] = "cpe-stable-backport: Backported in 6.6.17" | ||
6378 | |||
6379 | CVE_STATUS[CVE-2024-26668] = "cpe-stable-backport: Backported in 6.6.15" | ||
6380 | |||
6381 | CVE_STATUS[CVE-2024-26669] = "cpe-stable-backport: Backported in 6.6.15" | ||
6382 | |||
6383 | CVE_STATUS[CVE-2024-26670] = "cpe-stable-backport: Backported in 6.6.15" | ||
6384 | |||
6385 | CVE_STATUS[CVE-2024-26671] = "cpe-stable-backport: Backported in 6.6.16" | ||
6386 | |||
6387 | # CVE-2024-26672 needs backporting (fixed from 6.8rc1) | ||
6388 | |||
6389 | CVE_STATUS[CVE-2024-26673] = "cpe-stable-backport: Backported in 6.6.16" | ||
6390 | |||
6391 | CVE_STATUS[CVE-2024-26674] = "cpe-stable-backport: Backported in 6.6.17" | ||
6392 | |||
6393 | CVE_STATUS[CVE-2024-26675] = "cpe-stable-backport: Backported in 6.6.17" | ||
6394 | |||
6395 | CVE_STATUS[CVE-2024-26676] = "cpe-stable-backport: Backported in 6.6.17" | ||
6396 | |||
6397 | CVE_STATUS[CVE-2024-26677] = "cpe-stable-backport: Backported in 6.6.17" | ||
6398 | |||
6399 | CVE_STATUS[CVE-2024-26678] = "fixed-version: only affects 6.7rc1 onwards" | ||
6400 | |||
6401 | CVE_STATUS[CVE-2024-26679] = "cpe-stable-backport: Backported in 6.6.17" | ||
6402 | |||
6403 | CVE_STATUS[CVE-2024-26680] = "cpe-stable-backport: Backported in 6.6.17" | ||
6404 | |||
6405 | CVE_STATUS[CVE-2024-26681] = "cpe-stable-backport: Backported in 6.6.17" | ||
6406 | |||
6407 | CVE_STATUS[CVE-2024-26682] = "fixed-version: only affects 6.7rc1 onwards" | ||
6408 | |||
6409 | CVE_STATUS[CVE-2024-26683] = "fixed-version: only affects 6.7rc1 onwards" | ||
6410 | |||
6411 | CVE_STATUS[CVE-2024-26684] = "cpe-stable-backport: Backported in 6.6.17" | ||
6412 | |||
6413 | CVE_STATUS[CVE-2024-26685] = "cpe-stable-backport: Backported in 6.6.18" | ||
6414 | |||
6415 | # CVE-2024-26686 needs backporting (fixed from 6.8rc4) | ||
6416 | |||
6417 | CVE_STATUS[CVE-2024-26687] = "cpe-stable-backport: Backported in 6.6.19" | ||
6418 | |||
6419 | CVE_STATUS[CVE-2024-26688] = "cpe-stable-backport: Backported in 6.6.18" | ||
6420 | |||
6421 | CVE_STATUS[CVE-2024-26689] = "cpe-stable-backport: Backported in 6.6.18" | ||
6422 | |||
6423 | CVE_STATUS[CVE-2024-26690] = "cpe-stable-backport: Backported in 6.6.18" | ||
6424 | |||
6425 | CVE_STATUS[CVE-2024-26691] = "cpe-stable-backport: Backported in 6.6.18" | ||
6426 | |||
6427 | CVE_STATUS[CVE-2024-26692] = "cpe-stable-backport: Backported in 6.6.18" | ||
6428 | |||
6429 | CVE_STATUS[CVE-2024-26693] = "cpe-stable-backport: Backported in 6.6.18" | ||
6430 | |||
6431 | CVE_STATUS[CVE-2024-26694] = "cpe-stable-backport: Backported in 6.6.18" | ||
6432 | |||
6433 | CVE_STATUS[CVE-2024-26695] = "cpe-stable-backport: Backported in 6.6.18" | ||
6434 | |||
6435 | CVE_STATUS[CVE-2024-26696] = "cpe-stable-backport: Backported in 6.6.18" | ||
6436 | |||
6437 | CVE_STATUS[CVE-2024-26697] = "cpe-stable-backport: Backported in 6.6.18" | ||
6438 | |||
6439 | CVE_STATUS[CVE-2024-26698] = "cpe-stable-backport: Backported in 6.6.18" | ||
6440 | |||
6441 | # CVE-2024-26699 needs backporting (fixed from 6.8rc5) | ||
6442 | |||
6443 | CVE_STATUS[CVE-2024-26700] = "cpe-stable-backport: Backported in 6.6.18" | ||
6444 | |||
6445 | CVE_STATUS[CVE-2024-26702] = "cpe-stable-backport: Backported in 6.6.18" | ||
6446 | |||
6447 | CVE_STATUS[CVE-2024-26703] = "cpe-stable-backport: Backported in 6.6.18" | ||
6448 | |||
6449 | CVE_STATUS[CVE-2024-26704] = "cpe-stable-backport: Backported in 6.6.18" | ||
6450 | |||
6451 | CVE_STATUS[CVE-2024-26705] = "cpe-stable-backport: Backported in 6.6.18" | ||
6452 | |||
6453 | CVE_STATUS[CVE-2024-26706] = "cpe-stable-backport: Backported in 6.6.18" | ||
6454 | |||
6455 | CVE_STATUS[CVE-2024-26707] = "cpe-stable-backport: Backported in 6.6.18" | ||
6456 | |||
6457 | CVE_STATUS[CVE-2024-26708] = "cpe-stable-backport: Backported in 6.6.18" | ||
6458 | |||
6459 | CVE_STATUS[CVE-2024-26709] = "fixed-version: only affects 6.7rc1 onwards" | ||
6460 | |||
6461 | CVE_STATUS[CVE-2024-26710] = "fixed-version: only affects 6.8rc1 onwards" | ||
6462 | |||
6463 | CVE_STATUS[CVE-2024-26711] = "cpe-stable-backport: Backported in 6.6.18" | ||
6464 | |||
6465 | CVE_STATUS[CVE-2024-26712] = "cpe-stable-backport: Backported in 6.6.18" | ||
6466 | |||
6467 | CVE_STATUS[CVE-2024-26713] = "cpe-stable-backport: Backported in 6.6.18" | ||
6468 | |||
6469 | CVE_STATUS[CVE-2024-26714] = "cpe-stable-backport: Backported in 6.6.18" | ||
6470 | |||
6471 | CVE_STATUS[CVE-2024-26715] = "cpe-stable-backport: Backported in 6.6.18" | ||
6472 | |||
6473 | CVE_STATUS[CVE-2024-26716] = "cpe-stable-backport: Backported in 6.6.18" | ||
6474 | |||
6475 | CVE_STATUS[CVE-2024-26717] = "cpe-stable-backport: Backported in 6.6.18" | ||
6476 | |||
6477 | CVE_STATUS[CVE-2024-26718] = "cpe-stable-backport: Backported in 6.6.18" | ||
6478 | |||
6479 | CVE_STATUS[CVE-2024-26719] = "cpe-stable-backport: Backported in 6.6.18" | ||
6480 | |||
6481 | CVE_STATUS[CVE-2024-26720] = "cpe-stable-backport: Backported in 6.6.18" | ||
6482 | |||
6483 | CVE_STATUS[CVE-2024-26721] = "fixed-version: only affects 6.7rc1 onwards" | ||
6484 | |||
6485 | CVE_STATUS[CVE-2024-26722] = "fixed-version: only affects 6.7rc5 onwards" | ||
6486 | |||
6487 | CVE_STATUS[CVE-2024-26723] = "cpe-stable-backport: Backported in 6.6.18" | ||
6488 | |||
6489 | CVE_STATUS[CVE-2024-26724] = "fixed-version: only affects 6.7rc1 onwards" | ||
6490 | |||
6491 | CVE_STATUS[CVE-2024-26725] = "fixed-version: only affects 6.7rc1 onwards" | ||
6492 | |||
6493 | CVE_STATUS[CVE-2024-26726] = "cpe-stable-backport: Backported in 6.6.18" | ||
6494 | |||
6495 | CVE_STATUS[CVE-2024-26727] = "cpe-stable-backport: Backported in 6.6.18" | ||
6496 | |||
6497 | CVE_STATUS[CVE-2024-26728] = "fixed-version: only affects 6.7rc1 onwards" | ||
6498 | |||
6499 | CVE_STATUS[CVE-2024-26729] = "fixed-version: only affects 6.7rc1 onwards" | ||
6500 | |||
6501 | CVE_STATUS[CVE-2024-26730] = "cpe-stable-backport: Backported in 6.6.19" | ||
6502 | |||
6503 | CVE_STATUS[CVE-2024-26731] = "cpe-stable-backport: Backported in 6.6.19" | ||
6504 | |||
6505 | CVE_STATUS[CVE-2024-26732] = "fixed-version: only affects 6.7rc1 onwards" | ||
6506 | |||
6507 | CVE_STATUS[CVE-2024-26733] = "cpe-stable-backport: Backported in 6.6.19" | ||
6508 | |||
6509 | CVE_STATUS[CVE-2024-26734] = "cpe-stable-backport: Backported in 6.6.19" | ||
6510 | |||
6511 | CVE_STATUS[CVE-2024-26735] = "cpe-stable-backport: Backported in 6.6.19" | ||
6512 | |||
6513 | CVE_STATUS[CVE-2024-26736] = "cpe-stable-backport: Backported in 6.6.19" | ||
6514 | |||
6515 | CVE_STATUS[CVE-2024-26737] = "cpe-stable-backport: Backported in 6.6.19" | ||
6516 | |||
6517 | CVE_STATUS[CVE-2024-26738] = "cpe-stable-backport: Backported in 6.6.19" | ||
6518 | |||
6519 | CVE_STATUS[CVE-2024-26739] = "cpe-stable-backport: Backported in 6.6.19" | ||
6520 | |||
6521 | CVE_STATUS[CVE-2024-26740] = "cpe-stable-backport: Backported in 6.6.19" | ||
6522 | |||
6523 | CVE_STATUS[CVE-2024-26741] = "cpe-stable-backport: Backported in 6.6.19" | ||
6524 | |||
6525 | CVE_STATUS[CVE-2024-26742] = "cpe-stable-backport: Backported in 6.6.19" | ||
6526 | |||
6527 | CVE_STATUS[CVE-2024-26743] = "cpe-stable-backport: Backported in 6.6.19" | ||
6528 | |||
6529 | CVE_STATUS[CVE-2024-26744] = "cpe-stable-backport: Backported in 6.6.19" | ||
6530 | |||
6531 | CVE_STATUS[CVE-2024-26745] = "cpe-stable-backport: Backported in 6.6.21" | ||
6532 | |||
6533 | CVE_STATUS[CVE-2024-26746] = "cpe-stable-backport: Backported in 6.6.21" | ||
6534 | |||
6535 | CVE_STATUS[CVE-2024-26747] = "cpe-stable-backport: Backported in 6.6.19" | ||
6536 | |||
6537 | CVE_STATUS[CVE-2024-26748] = "cpe-stable-backport: Backported in 6.6.19" | ||
6538 | |||
6539 | CVE_STATUS[CVE-2024-26749] = "cpe-stable-backport: Backported in 6.6.19" | ||
6540 | |||
6541 | CVE_STATUS[CVE-2024-26750] = "fixed-version: only affects 6.8rc5 onwards" | ||
6542 | |||
6543 | CVE_STATUS[CVE-2024-26751] = "cpe-stable-backport: Backported in 6.6.19" | ||
6544 | |||
6545 | CVE_STATUS[CVE-2024-26752] = "cpe-stable-backport: Backported in 6.6.19" | ||
6546 | |||
6547 | CVE_STATUS[CVE-2024-26753] = "cpe-stable-backport: Backported in 6.6.19" | ||
6548 | |||
6549 | CVE_STATUS[CVE-2024-26754] = "cpe-stable-backport: Backported in 6.6.19" | ||
6550 | |||
6551 | CVE_STATUS[CVE-2024-26755] = "fixed-version: only affects 6.7rc1 onwards" | ||
6552 | |||
6553 | # CVE-2024-26756 needs backporting (fixed from 6.8rc6) | ||
6554 | |||
6555 | # CVE-2024-26757 needs backporting (fixed from 6.8rc6) | ||
6556 | |||
6557 | # CVE-2024-26758 needs backporting (fixed from 6.8rc6) | ||
6558 | |||
6559 | CVE_STATUS[CVE-2024-26759] = "cpe-stable-backport: Backported in 6.6.19" | ||
6560 | |||
6561 | CVE_STATUS[CVE-2024-26760] = "cpe-stable-backport: Backported in 6.6.19" | ||
6562 | |||
6563 | CVE_STATUS[CVE-2024-26761] = "cpe-stable-backport: Backported in 6.6.19" | ||
6564 | |||
6565 | CVE_STATUS[CVE-2024-26762] = "fixed-version: only affects 6.7rc1 onwards" | ||
6566 | |||
6567 | CVE_STATUS[CVE-2024-26763] = "cpe-stable-backport: Backported in 6.6.19" | ||
6568 | |||
6569 | CVE_STATUS[CVE-2024-26764] = "cpe-stable-backport: Backported in 6.6.19" | ||
6570 | |||
6571 | CVE_STATUS[CVE-2024-26765] = "cpe-stable-backport: Backported in 6.6.19" | ||
6572 | |||
6573 | CVE_STATUS[CVE-2024-26766] = "cpe-stable-backport: Backported in 6.6.19" | ||
6574 | |||
6575 | CVE_STATUS[CVE-2024-26767] = "cpe-stable-backport: Backported in 6.6.19" | ||
6576 | |||
6577 | CVE_STATUS[CVE-2024-26768] = "cpe-stable-backport: Backported in 6.6.19" | ||
6578 | |||
6579 | CVE_STATUS[CVE-2024-26769] = "cpe-stable-backport: Backported in 6.6.19" | ||
6580 | |||
6581 | CVE_STATUS[CVE-2024-26770] = "cpe-stable-backport: Backported in 6.6.19" | ||
6582 | |||
6583 | CVE_STATUS[CVE-2024-26771] = "cpe-stable-backport: Backported in 6.6.19" | ||
6584 | |||
6585 | CVE_STATUS[CVE-2024-26772] = "cpe-stable-backport: Backported in 6.6.19" | ||
6586 | |||
6587 | CVE_STATUS[CVE-2024-26773] = "cpe-stable-backport: Backported in 6.6.19" | ||
6588 | |||
6589 | CVE_STATUS[CVE-2024-26774] = "cpe-stable-backport: Backported in 6.6.19" | ||
6590 | |||
6591 | CVE_STATUS[CVE-2024-26775] = "cpe-stable-backport: Backported in 6.6.19" | ||
6592 | |||
6593 | CVE_STATUS[CVE-2024-26776] = "cpe-stable-backport: Backported in 6.6.19" | ||
6594 | |||
6595 | CVE_STATUS[CVE-2024-26777] = "cpe-stable-backport: Backported in 6.6.19" | ||
6596 | |||
6597 | CVE_STATUS[CVE-2024-26778] = "cpe-stable-backport: Backported in 6.6.19" | ||
6598 | |||
6599 | CVE_STATUS[CVE-2024-26779] = "cpe-stable-backport: Backported in 6.6.19" | ||
6600 | |||
6601 | CVE_STATUS[CVE-2024-26780] = "fixed-version: only affects 6.8rc4 onwards" | ||
6602 | |||
6603 | CVE_STATUS[CVE-2024-26781] = "fixed-version: only affects 6.8rc6 onwards" | ||
6604 | |||
6605 | CVE_STATUS[CVE-2024-26782] = "cpe-stable-backport: Backported in 6.6.21" | ||
6606 | |||
6607 | CVE_STATUS[CVE-2024-26783] = "cpe-stable-backport: Backported in 6.6.22" | ||
6608 | |||
6609 | # CVE-2024-26784 needs backporting (fixed from 6.8rc7) | ||
6610 | |||
6611 | # CVE-2024-26785 needs backporting (fixed from 6.8rc7) | ||
6612 | |||
6613 | CVE_STATUS[CVE-2024-26786] = "cpe-stable-backport: Backported in 6.6.21" | ||
6614 | |||
6615 | CVE_STATUS[CVE-2024-26787] = "cpe-stable-backport: Backported in 6.6.21" | ||
6616 | |||
6617 | CVE_STATUS[CVE-2024-26788] = "cpe-stable-backport: Backported in 6.6.21" | ||
6618 | |||
6619 | CVE_STATUS[CVE-2024-26789] = "cpe-stable-backport: Backported in 6.6.21" | ||
6620 | |||
6621 | CVE_STATUS[CVE-2024-26790] = "cpe-stable-backport: Backported in 6.6.21" | ||
6622 | |||
6623 | CVE_STATUS[CVE-2024-26791] = "cpe-stable-backport: Backported in 6.6.21" | ||
6624 | |||
6625 | CVE_STATUS[CVE-2024-26792] = "fixed-version: only affects 6.8rc4 onwards" | ||
6626 | |||
6627 | CVE_STATUS[CVE-2024-26793] = "cpe-stable-backport: Backported in 6.6.21" | ||
6628 | |||
6629 | CVE_STATUS[CVE-2024-26794] = "fixed-version: only affects 6.8rc6 onwards" | ||
6630 | |||
6631 | CVE_STATUS[CVE-2024-26795] = "cpe-stable-backport: Backported in 6.6.21" | ||
6632 | |||
6633 | CVE_STATUS[CVE-2024-26796] = "cpe-stable-backport: Backported in 6.6.21" | ||
6634 | |||
6635 | # CVE-2024-26797 needs backporting (fixed from 6.8rc7) | ||
6636 | |||
6637 | CVE_STATUS[CVE-2024-26798] = "cpe-stable-backport: Backported in 6.6.21" | ||
6638 | |||
6639 | CVE_STATUS[CVE-2024-26799] = "cpe-stable-backport: Backported in 6.6.21" | ||
6640 | |||
6641 | CVE_STATUS[CVE-2024-26800] = "fixed-version: only affects 6.8rc5 onwards" | ||
6642 | |||
6643 | CVE_STATUS[CVE-2024-26801] = "cpe-stable-backport: Backported in 6.6.21" | ||
6644 | |||
6645 | CVE_STATUS[CVE-2024-26802] = "cpe-stable-backport: Backported in 6.6.21" | ||
6646 | |||
6647 | CVE_STATUS[CVE-2024-26803] = "cpe-stable-backport: Backported in 6.6.21" | ||
6648 | |||
6649 | CVE_STATUS[CVE-2024-26804] = "cpe-stable-backport: Backported in 6.6.21" | ||
6650 | |||
6651 | CVE_STATUS[CVE-2024-26805] = "cpe-stable-backport: Backported in 6.6.21" | ||
6652 | |||
6653 | # CVE-2024-26806 needs backporting (fixed from 6.8rc7) | ||
6654 | |||
6655 | CVE_STATUS[CVE-2024-26807] = "cpe-stable-backport: Backported in 6.6.21" | ||
6656 | |||
6657 | CVE_STATUS[CVE-2024-26808] = "cpe-stable-backport: Backported in 6.6.15" | ||
6658 | |||
6659 | CVE_STATUS[CVE-2024-26809] = "cpe-stable-backport: Backported in 6.6.23" | ||
6660 | |||
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb index a44a08451a..53f413407d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb | |||
@@ -14,13 +14,13 @@ python () { | |||
14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "19813826de57a6425518c7b3daf8dd6a04d2321f" | 17 | SRCREV_machine ?= "9bdb085cb6fcfd49586b980ba27cb81e5c76689e" |
18 | SRCREV_meta ?= "f7f00b22efcfcae6489e9ec7db7002685fbc078b" | 18 | SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" |
22 | 22 | ||
23 | LINUX_VERSION ?= "6.6.23" | 23 | LINUX_VERSION ?= "6.6.29" |
24 | 24 | ||
25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
26 | 26 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb index db9e252572..44c9a7b1e0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | |||
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
8 | # CVE exclusions | 8 | # CVE exclusions |
9 | include recipes-kernel/linux/cve-exclusion_6.6.inc | 9 | include recipes-kernel/linux/cve-exclusion_6.6.inc |
10 | 10 | ||
11 | LINUX_VERSION ?= "6.6.23" | 11 | LINUX_VERSION ?= "6.6.29" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
13 | 13 | ||
14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | 14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" |
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 20 | SRCREV_machine ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
21 | SRCREV_meta ?= "f7f00b22efcfcae6489e9ec7db7002685fbc078b" | 21 | SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb index 43696db59b..fbeb5c2500 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb | |||
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base" | |||
18 | KBRANCH:qemuloongarch64 ?= "v6.6/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.6/standard/base" |
19 | KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64" |
20 | 20 | ||
21 | SRCREV_machine:qemuarm ?= "ceb94a85299b59d8840ed7ed392b1d3e4c727678" | 21 | SRCREV_machine:qemuarm ?= "0b90bbe1359b3fd590780119f19dbd0a01e58560" |
22 | SRCREV_machine:qemuarm64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 22 | SRCREV_machine:qemuarm64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
23 | SRCREV_machine:qemuloongarch64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 23 | SRCREV_machine:qemuloongarch64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
24 | SRCREV_machine:qemumips ?= "c79ffc89f8909f60de52005ef258db9752634eda" | 24 | SRCREV_machine:qemumips ?= "ab44de80a320e30a49150ea74554a937affaf78d" |
25 | SRCREV_machine:qemuppc ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 25 | SRCREV_machine:qemuppc ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
26 | SRCREV_machine:qemuriscv64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 26 | SRCREV_machine:qemuriscv64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
27 | SRCREV_machine:qemuriscv32 ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 27 | SRCREV_machine:qemuriscv32 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
28 | SRCREV_machine:qemux86 ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 28 | SRCREV_machine:qemux86 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
29 | SRCREV_machine:qemux86-64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 29 | SRCREV_machine:qemux86-64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
30 | SRCREV_machine:qemumips64 ?= "b0a73fa83073c8d7d7bc917bcbeac88d296ebe38" | 30 | SRCREV_machine:qemumips64 ?= "75da5d44c2e54a85a1221ea7d0c04be9aefb7fa1" |
31 | SRCREV_machine ?= "2d01bc1d4eeade12518371139dd24a21438f523c" | 31 | SRCREV_machine ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
32 | SRCREV_meta ?= "f7f00b22efcfcae6489e9ec7db7002685fbc078b" | 32 | SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3" |
33 | 33 | ||
34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |
36 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the | 36 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the |
37 | # normal PREFERRED_VERSION settings. | 37 | # normal PREFERRED_VERSION settings. |
38 | BBCLASSEXTEND = "devupstream:target" | 38 | BBCLASSEXTEND = "devupstream:target" |
39 | SRCREV_machine:class-devupstream ?= "5c7587f69194bc9fc714953ab4c7203e6e68885b" | 39 | SRCREV_machine:class-devupstream ?= "a3463f08104612fc979c41fa54733e925205d3d7" |
40 | PN:class-devupstream = "linux-yocto-upstream" | 40 | PN:class-devupstream = "linux-yocto-upstream" |
41 | KBRANCH:class-devupstream = "v6.6/base" | 41 | KBRANCH:class-devupstream = "v6.6/base" |
42 | 42 | ||
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA | |||
44 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" | 44 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" |
45 | 45 | ||
46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
47 | LINUX_VERSION ?= "6.6.23" | 47 | LINUX_VERSION ?= "6.6.29" |
48 | 48 | ||
49 | PV = "${LINUX_VERSION}+git" | 49 | PV = "${LINUX_VERSION}+git" |
50 | 50 | ||
@@ -64,6 +64,8 @@ KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | |||
64 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 64 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
65 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc features/nf_tables/nft_test.scc", "", d)}" | 65 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc features/nf_tables/nft_test.scc", "", d)}" |
66 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}" | 66 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}" |
67 | # libteam ptests from meta-oe needs it | ||
68 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/net/team/team.scc", "", d)}" | ||
67 | KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" | 69 | KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" |
68 | KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" | 70 | KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" |
69 | KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc" | 71 | KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc" |
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb index 174dec036e..e73dd4801a 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb | |||
@@ -69,7 +69,7 @@ PRIVATE_LIBS:${PN}-ptest = "libfoo.so" | |||
69 | do_install:append () { | 69 | do_install:append () { |
70 | # install systemd unit file | 70 | # install systemd unit file |
71 | install -d ${D}${systemd_system_unitdir} | 71 | install -d ${D}${systemd_system_unitdir} |
72 | install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir} | 72 | install -m 0644 ${UNPACKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir} |
73 | } | 73 | } |
74 | 74 | ||
75 | do_install_ptest () { | 75 | do_install_ptest () { |
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb index 9509185bad..dddd3a5004 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb | |||
@@ -34,7 +34,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ | |||
34 | file://0001-Makefile.am-update-rpath-link.patch \ | 34 | file://0001-Makefile.am-update-rpath-link.patch \ |
35 | " | 35 | " |
36 | 36 | ||
37 | SRC_URI[sha256sum] = "5fb4f17c307c8c1b79c68561e89be9562d07e7425bf40e728c4d66755342a5eb" | 37 | SRC_URI[sha256sum] = "d4ef98dab9a37ad4f524ccafdfd50af4f266039b528dd5afabce78e49024d937" |
38 | 38 | ||
39 | CVE_PRODUCT = "ust" | 39 | CVE_PRODUCT = "ust" |
40 | 40 | ||
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index b630a402ff..0a05770408 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | |||
@@ -17,7 +17,7 @@ do_compile () { | |||
17 | 17 | ||
18 | do_install () { | 18 | do_install () { |
19 | install -d ${D}${sysconfdir}/init.d/ | 19 | install -d ${D}${sysconfdir}/init.d/ |
20 | install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/ | 20 | install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/ |
21 | } | 21 | } |
22 | 22 | ||
23 | PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 23 | PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch new file mode 100644 index 0000000000..bfc894563c --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | From cafb4c554845332eeb33284cf6498049997dc67e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Thompson <sw@jkqxz.net> | ||
3 | Date: Wed, 20 Mar 2024 20:35:28 +0000 | ||
4 | Subject: [PATCH] lavc/cbs_av1: Save more frame ordering information | ||
5 | |||
6 | This is wanted by the Vulkan decoder. | ||
7 | |||
8 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
9 | Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295] | ||
10 | --- | ||
11 | libavcodec/cbs_av1.h | 5 +++++ | ||
12 | libavcodec/cbs_av1_syntax_template.c | 25 +++++++++++++++++++++---- | ||
13 | 2 files changed, 26 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h | ||
16 | index a5402f069d..a027013bc7 100644 | ||
17 | --- a/libavcodec/cbs_av1.h | ||
18 | +++ b/libavcodec/cbs_av1.h | ||
19 | @@ -427,6 +427,8 @@ typedef struct AV1ReferenceFrameState { | ||
20 | int bit_depth; // RefBitDepth | ||
21 | int order_hint; // RefOrderHint | ||
22 | |||
23 | + int saved_order_hints[AV1_TOTAL_REFS_PER_FRAME]; // SavedOrderHints[ref] | ||
24 | + | ||
25 | int8_t loop_filter_ref_deltas[AV1_TOTAL_REFS_PER_FRAME]; | ||
26 | int8_t loop_filter_mode_deltas[2]; | ||
27 | uint8_t feature_enabled[AV1_MAX_SEGMENTS][AV1_SEG_LVL_MAX]; | ||
28 | @@ -464,6 +466,9 @@ typedef struct CodedBitstreamAV1Context { | ||
29 | int tile_rows; | ||
30 | int tile_num; | ||
31 | |||
32 | + int order_hints[AV1_TOTAL_REFS_PER_FRAME]; // OrderHints | ||
33 | + int ref_frame_sign_bias[AV1_TOTAL_REFS_PER_FRAME]; // RefFrameSignBias | ||
34 | + | ||
35 | AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES]; | ||
36 | |||
37 | // AVOptions | ||
38 | diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c | ||
39 | index 3be1f2d30f..2979c5d98f 100644 | ||
40 | --- a/libavcodec/cbs_av1_syntax_template.c | ||
41 | +++ b/libavcodec/cbs_av1_syntax_template.c | ||
42 | @@ -1414,6 +1414,8 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, | ||
43 | priv->ref[i].valid = 0; | ||
44 | priv->ref[i].order_hint = 0; | ||
45 | } | ||
46 | + for (i = 0; i < AV1_REFS_PER_FRAME; i++) | ||
47 | + priv->order_hints[i + AV1_REF_FRAME_LAST] = 0; | ||
48 | } | ||
49 | |||
50 | flag(disable_cdf_update); | ||
51 | @@ -1568,11 +1570,20 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, | ||
52 | else | ||
53 | flag(use_ref_frame_mvs); | ||
54 | |||
55 | - infer(allow_intrabc, 0); | ||
56 | - } | ||
57 | + for (i = 0; i < AV1_REFS_PER_FRAME; i++) { | ||
58 | + int ref_frame = AV1_REF_FRAME_LAST + i; | ||
59 | + int hint = priv->ref[current->ref_frame_idx[i]].order_hint; | ||
60 | + priv->order_hints[ref_frame] = hint; | ||
61 | + if (!seq->enable_order_hint) { | ||
62 | + priv->ref_frame_sign_bias[ref_frame] = 0; | ||
63 | + } else { | ||
64 | + priv->ref_frame_sign_bias[ref_frame] = | ||
65 | + cbs_av1_get_relative_dist(seq, hint, | ||
66 | + current->order_hint) > 0; | ||
67 | + } | ||
68 | + } | ||
69 | |||
70 | - if (!frame_is_intra) { | ||
71 | - // Derive reference frame sign biases. | ||
72 | + infer(allow_intrabc, 0); | ||
73 | } | ||
74 | |||
75 | if (seq->reduced_still_picture_header || current->disable_cdf_update) | ||
76 | @@ -1674,6 +1685,12 @@ update_refs: | ||
77 | .bit_depth = priv->bit_depth, | ||
78 | .order_hint = priv->order_hint, | ||
79 | }; | ||
80 | + | ||
81 | + for (int j = 0; j < AV1_REFS_PER_FRAME; j++) { | ||
82 | + priv->ref[i].saved_order_hints[j + AV1_REF_FRAME_LAST] = | ||
83 | + priv->order_hints[j + AV1_REF_FRAME_LAST]; | ||
84 | + } | ||
85 | + | ||
86 | memcpy(priv->ref[i].loop_filter_ref_deltas, current->loop_filter_ref_deltas, | ||
87 | sizeof(current->loop_filter_ref_deltas)); | ||
88 | memcpy(priv->ref[i].loop_filter_mode_deltas, current->loop_filter_mode_deltas, | ||
89 | -- | ||
90 | 2.25.1 | ||
91 | |||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch new file mode 100644 index 0000000000..74db148b3b --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch | |||
@@ -0,0 +1,1382 @@ | |||
1 | From ecdc94b97f809d5f2b88640842fd0541951ad295 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lynne <dev@lynne.ee> | ||
3 | Date: Fri, 19 Jan 2024 10:49:02 +1000 | ||
4 | Subject: [PATCH] vulkan_av1: port to the new stable API | ||
5 | |||
6 | Co-Authored-by: Dave Airlie <airlied@redhat.com> | ||
7 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
8 | Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295] | ||
9 | --- | ||
10 | configure | 4 +- | ||
11 | libavcodec/Makefile | 5 +- | ||
12 | libavcodec/vulkan_av1.c | 514 ++++++++++-------- | ||
13 | libavcodec/vulkan_decode.c | 31 +- | ||
14 | libavcodec/vulkan_decode.h | 2 +- | ||
15 | libavcodec/vulkan_video.h | 2 - | ||
16 | .../vulkan_video_codec_av1std_decode_mesa.h | 36 -- | ||
17 | libavcodec/vulkan_video_codec_av1std_mesa.h | 403 -------------- | ||
18 | libavutil/hwcontext_vulkan.c | 2 +- | ||
19 | libavutil/vulkan_functions.h | 2 +- | ||
20 | libavutil/vulkan_loader.h | 2 +- | ||
21 | 11 files changed, 306 insertions(+), 697 deletions(-) | ||
22 | delete mode 100644 libavcodec/vulkan_video_codec_av1std_decode_mesa.h | ||
23 | delete mode 100644 libavcodec/vulkan_video_codec_av1std_mesa.h | ||
24 | |||
25 | diff --git a/configure b/configure | ||
26 | index e853deb51d..9fa639fca6 100755 | ||
27 | --- a/configure | ||
28 | +++ b/configure | ||
29 | @@ -7300,8 +7300,8 @@ enabled vdpau && | ||
30 | "in maintaining it." | ||
31 | |||
32 | if enabled vulkan; then | ||
33 | - check_pkg_config_header_only vulkan "vulkan >= 1.3.255" "vulkan/vulkan.h" "defined VK_VERSION_1_3" || | ||
34 | - check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 255)" | ||
35 | + check_pkg_config_header_only vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" || | ||
36 | + check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)" | ||
37 | fi | ||
38 | |||
39 | if disabled vulkan; then | ||
40 | diff --git a/libavcodec/Makefile b/libavcodec/Makefile | ||
41 | index 7ef2e03ca6..9ce6d445c1 100644 | ||
42 | --- a/libavcodec/Makefile | ||
43 | +++ b/libavcodec/Makefile | ||
44 | @@ -1258,8 +1258,7 @@ SKIPHEADERS += %_tablegen.h \ | ||
45 | aacenc_quantization.h \ | ||
46 | aacenc_quantization_misc.h \ | ||
47 | bitstream_template.h \ | ||
48 | - vulkan_video_codec_av1std.h \ | ||
49 | - $(ARCH)/vpx_arith.h \ | ||
50 | + $(ARCH)/vpx_arith.h \ | ||
51 | |||
52 | SKIPHEADERS-$(CONFIG_AMF) += amfenc.h | ||
53 | SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h | ||
54 | @@ -1280,7 +1279,7 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h | ||
55 | SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h | ||
56 | SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h | ||
57 | SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h | ||
58 | -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h | ||
59 | +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h | ||
60 | SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h | ||
61 | SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h | ||
62 | |||
63 | diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c | ||
64 | index 5afd5353cc..c9e398eaec 100644 | ||
65 | --- a/libavcodec/vulkan_av1.c | ||
66 | +++ b/libavcodec/vulkan_av1.c | ||
67 | @@ -36,33 +36,47 @@ const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc = { | ||
68 | typedef struct AV1VulkanDecodePicture { | ||
69 | FFVulkanDecodePicture vp; | ||
70 | |||
71 | - /* Workaround for a spec issue. | ||
72 | - *Can be removed once no longer needed, and threading can be enabled. */ | ||
73 | + /* TODO: investigate if this can be removed to make decoding completely | ||
74 | + * independent. */ | ||
75 | FFVulkanDecodeContext *dec; | ||
76 | |||
77 | - StdVideoAV1MESATile tiles[MAX_TILES]; | ||
78 | - StdVideoAV1MESATileList tile_list; | ||
79 | - const uint32_t *tile_offsets; | ||
80 | + uint32_t tile_sizes[MAX_TILES]; | ||
81 | |||
82 | /* Current picture */ | ||
83 | - VkVideoDecodeAV1DpbSlotInfoMESA vkav1_ref; | ||
84 | - StdVideoAV1MESAFrameHeader av1_frame_header; | ||
85 | - VkVideoDecodeAV1PictureInfoMESA av1_pic_info; | ||
86 | + StdVideoDecodeAV1ReferenceInfo std_ref; | ||
87 | + VkVideoDecodeAV1DpbSlotInfoKHR vkav1_ref; | ||
88 | + uint16_t width_in_sbs_minus1[64]; | ||
89 | + uint16_t height_in_sbs_minus1[64]; | ||
90 | + uint16_t mi_col_starts[64]; | ||
91 | + uint16_t mi_row_starts[64]; | ||
92 | + StdVideoAV1TileInfo tile_info; | ||
93 | + StdVideoAV1Quantization quantization; | ||
94 | + StdVideoAV1Segmentation segmentation; | ||
95 | + StdVideoAV1LoopFilter loop_filter; | ||
96 | + StdVideoAV1CDEF cdef; | ||
97 | + StdVideoAV1LoopRestoration loop_restoration; | ||
98 | + StdVideoAV1GlobalMotion global_motion; | ||
99 | + StdVideoAV1FilmGrain film_grain; | ||
100 | + StdVideoDecodeAV1PictureInfo std_pic_info; | ||
101 | + VkVideoDecodeAV1PictureInfoKHR av1_pic_info; | ||
102 | |||
103 | /* Picture refs */ | ||
104 | const AV1Frame *ref_src [AV1_NUM_REF_FRAMES]; | ||
105 | - VkVideoDecodeAV1DpbSlotInfoMESA vkav1_refs[AV1_NUM_REF_FRAMES]; | ||
106 | + StdVideoDecodeAV1ReferenceInfo std_refs [AV1_NUM_REF_FRAMES]; | ||
107 | + VkVideoDecodeAV1DpbSlotInfoKHR vkav1_refs[AV1_NUM_REF_FRAMES]; | ||
108 | |||
109 | uint8_t frame_id_set; | ||
110 | uint8_t frame_id; | ||
111 | + uint8_t ref_frame_sign_bias_mask; | ||
112 | } AV1VulkanDecodePicture; | ||
113 | |||
114 | static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src, | ||
115 | VkVideoReferenceSlotInfoKHR *ref_slot, /* Main structure */ | ||
116 | VkVideoPictureResourceInfoKHR *ref, /* Goes in ^ */ | ||
117 | - VkVideoDecodeAV1DpbSlotInfoMESA *vkav1_ref, /* Goes in ^ */ | ||
118 | + StdVideoDecodeAV1ReferenceInfo *vkav1_std_ref, | ||
119 | + VkVideoDecodeAV1DpbSlotInfoKHR *vkav1_ref, /* Goes in ^ */ | ||
120 | const AV1Frame *pic, int is_current, int has_grain, | ||
121 | - int dpb_slot_index) | ||
122 | + int *saved_order_hints) | ||
123 | { | ||
124 | FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data; | ||
125 | AV1VulkanDecodePicture *hp = pic->hwaccel_picture_private; | ||
126 | @@ -73,31 +87,42 @@ static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src, | ||
127 | if (err < 0) | ||
128 | return err; | ||
129 | |||
130 | - *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoMESA) { | ||
131 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA, | ||
132 | - .frameIdx = hp->frame_id, | ||
133 | + *vkav1_std_ref = (StdVideoDecodeAV1ReferenceInfo) { | ||
134 | + .flags = (StdVideoDecodeAV1ReferenceInfoFlags) { | ||
135 | + .disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf, | ||
136 | + .segmentation_enabled = pic->raw_frame_header->segmentation_enabled, | ||
137 | + }, | ||
138 | + .frame_type = pic->raw_frame_header->frame_type, | ||
139 | + .OrderHint = pic->raw_frame_header->order_hint, | ||
140 | + .RefFrameSignBias = hp->ref_frame_sign_bias_mask, | ||
141 | }; | ||
142 | |||
143 | - for (unsigned i = 0; i < 7; i++) { | ||
144 | - const int idx = pic->raw_frame_header->ref_frame_idx[i]; | ||
145 | - vkav1_ref->ref_order_hint[i] = pic->raw_frame_header->ref_order_hint[idx]; | ||
146 | - } | ||
147 | + if (saved_order_hints) | ||
148 | + for (int i = 0; i < AV1_TOTAL_REFS_PER_FRAME; i++) | ||
149 | + vkav1_std_ref->SavedOrderHints[i] = saved_order_hints[i]; | ||
150 | + | ||
151 | + *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoKHR) { | ||
152 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR, | ||
153 | + .pStdReferenceInfo = vkav1_std_ref, | ||
154 | + }; | ||
155 | |||
156 | - vkav1_ref->disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf; | ||
157 | + vkav1_std_ref->flags.disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf; | ||
158 | + vkav1_std_ref->flags.segmentation_enabled = pic->raw_frame_header->segmentation_enabled; | ||
159 | + vkav1_std_ref->frame_type = pic->raw_frame_header->frame_type; | ||
160 | |||
161 | *ref = (VkVideoPictureResourceInfoKHR) { | ||
162 | .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR, | ||
163 | .codedOffset = (VkOffset2D){ 0, 0 }, | ||
164 | .codedExtent = (VkExtent2D){ pic->f->width, pic->f->height }, | ||
165 | .baseArrayLayer = ((has_grain || dec->dedicated_dpb) && dec->layered_dpb) ? | ||
166 | - dpb_slot_index : 0, | ||
167 | + hp->frame_id : 0, | ||
168 | .imageViewBinding = vkpic->img_view_ref, | ||
169 | }; | ||
170 | |||
171 | *ref_slot = (VkVideoReferenceSlotInfoKHR) { | ||
172 | .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR, | ||
173 | .pNext = vkav1_ref, | ||
174 | - .slotIndex = dpb_slot_index, | ||
175 | + .slotIndex = hp->frame_id, | ||
176 | .pPictureResource = ref, | ||
177 | }; | ||
178 | |||
179 | @@ -115,15 +140,40 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
180 | |||
181 | const AV1RawSequenceHeader *seq = s->raw_seq; | ||
182 | |||
183 | - StdVideoAV1MESASequenceHeader av1_sequence_header; | ||
184 | - VkVideoDecodeAV1SessionParametersAddInfoMESA av1_params_info; | ||
185 | - VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params; | ||
186 | + StdVideoAV1SequenceHeader av1_sequence_header; | ||
187 | + StdVideoAV1TimingInfo av1_timing_info; | ||
188 | + StdVideoAV1ColorConfig av1_color_config; | ||
189 | + VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params; | ||
190 | VkVideoSessionParametersCreateInfoKHR session_params_create; | ||
191 | |||
192 | int err; | ||
193 | |||
194 | - av1_sequence_header = (StdVideoAV1MESASequenceHeader) { | ||
195 | - .flags = (StdVideoAV1MESASequenceHeaderFlags) { | ||
196 | + av1_timing_info = (StdVideoAV1TimingInfo) { | ||
197 | + .flags = (StdVideoAV1TimingInfoFlags) { | ||
198 | + .equal_picture_interval = seq->timing_info.equal_picture_interval, | ||
199 | + }, | ||
200 | + .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick, | ||
201 | + .time_scale = seq->timing_info.time_scale, | ||
202 | + .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1, | ||
203 | + }; | ||
204 | + | ||
205 | + av1_color_config = (StdVideoAV1ColorConfig) { | ||
206 | + .flags = (StdVideoAV1ColorConfigFlags) { | ||
207 | + .mono_chrome = seq->color_config.mono_chrome, | ||
208 | + .color_range = seq->color_config.color_range, | ||
209 | + .separate_uv_delta_q = seq->color_config.separate_uv_delta_q, | ||
210 | + }, | ||
211 | + .BitDepth = seq->color_config.twelve_bit ? 12 : | ||
212 | + seq->color_config.high_bitdepth ? 10 : 8, | ||
213 | + .subsampling_x = seq->color_config.subsampling_x, | ||
214 | + .subsampling_y = seq->color_config.subsampling_y, | ||
215 | + .color_primaries = seq->color_config.color_primaries, | ||
216 | + .transfer_characteristics = seq->color_config.transfer_characteristics, | ||
217 | + .matrix_coefficients = seq->color_config.matrix_coefficients, | ||
218 | + }; | ||
219 | + | ||
220 | + av1_sequence_header = (StdVideoAV1SequenceHeader) { | ||
221 | + .flags = (StdVideoAV1SequenceHeaderFlags) { | ||
222 | .still_picture = seq->still_picture, | ||
223 | .reduced_still_picture_header = seq->reduced_still_picture_header, | ||
224 | .use_128x128_superblock = seq->use_128x128_superblock, | ||
225 | @@ -152,34 +202,15 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
226 | .delta_frame_id_length_minus_2 = seq->delta_frame_id_length_minus_2, | ||
227 | .additional_frame_id_length_minus_1 = seq->additional_frame_id_length_minus_1, | ||
228 | .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1, | ||
229 | - .timing_info = (StdVideoAV1MESATimingInfo) { | ||
230 | - .flags = (StdVideoAV1MESATimingInfoFlags) { | ||
231 | - .equal_picture_interval = seq->timing_info.equal_picture_interval, | ||
232 | - }, | ||
233 | - .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick, | ||
234 | - .time_scale = seq->timing_info.time_scale, | ||
235 | - .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1, | ||
236 | - }, | ||
237 | - .color_config = (StdVideoAV1MESAColorConfig) { | ||
238 | - .flags = (StdVideoAV1MESAColorConfigFlags) { | ||
239 | - .mono_chrome = seq->color_config.mono_chrome, | ||
240 | - .color_range = seq->color_config.color_range, | ||
241 | - .separate_uv_delta_q = seq->color_config.separate_uv_delta_q, | ||
242 | - }, | ||
243 | - .bit_depth = seq->color_config.twelve_bit ? 12 : | ||
244 | - seq->color_config.high_bitdepth ? 10 : 8, | ||
245 | - .subsampling_x = seq->color_config.subsampling_x, | ||
246 | - .subsampling_y = seq->color_config.subsampling_y, | ||
247 | - }, | ||
248 | + .seq_force_integer_mv = seq->seq_force_integer_mv, | ||
249 | + .seq_force_screen_content_tools = seq->seq_force_screen_content_tools, | ||
250 | + .pTimingInfo = &av1_timing_info, | ||
251 | + .pColorConfig = &av1_color_config, | ||
252 | }; | ||
253 | |||
254 | - av1_params_info = (VkVideoDecodeAV1SessionParametersAddInfoMESA) { | ||
255 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA, | ||
256 | - .sequence_header = &av1_sequence_header, | ||
257 | - }; | ||
258 | - av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoMESA) { | ||
259 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA, | ||
260 | - .pParametersAddInfo = &av1_params_info, | ||
261 | + av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoKHR) { | ||
262 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
263 | + .pStdSequenceHeader = &av1_sequence_header, | ||
264 | }; | ||
265 | session_params_create = (VkVideoSessionParametersCreateInfoKHR) { | ||
266 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
267 | @@ -211,8 +242,14 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
268 | |||
269 | const AV1RawFrameHeader *frame_header = s->raw_frame_header; | ||
270 | const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain; | ||
271 | + CodedBitstreamAV1Context *cbs_ctx = (CodedBitstreamAV1Context *)(s->cbc->priv_data); | ||
272 | + | ||
273 | const int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && | ||
274 | film_grain->apply_grain; | ||
275 | + StdVideoAV1FrameRestorationType remap_lr_type[4] = { STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_NONE, | ||
276 | + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SWITCHABLE, | ||
277 | + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_WIENER, | ||
278 | + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SGRPROJ }; | ||
279 | |||
280 | if (!dec->session_params) { | ||
281 | err = vk_av1_create_params(avctx, &dec->session_params); | ||
282 | @@ -233,15 +270,31 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
283 | dec->frame_id_alloc_mask |= (1 << slot_idx); | ||
284 | } | ||
285 | |||
286 | - /* Fill in references */ | ||
287 | - for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) { | ||
288 | - const AV1Frame *ref_frame = &s->ref[i]; | ||
289 | - if (s->ref[i].f->pict_type == AV_PICTURE_TYPE_NONE) | ||
290 | + ap->ref_frame_sign_bias_mask = 0x0; | ||
291 | + for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++) | ||
292 | + ap->ref_frame_sign_bias_mask |= cbs_ctx->ref_frame_sign_bias[i] << i; | ||
293 | + | ||
294 | + for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) { | ||
295 | + const int idx = pic->raw_frame_header->ref_frame_idx[i]; | ||
296 | + const AV1Frame *ref_frame = &s->ref[idx]; | ||
297 | + AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private; | ||
298 | + int found = 0; | ||
299 | + | ||
300 | + if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE) | ||
301 | + continue; | ||
302 | + | ||
303 | + for (int j = 0; j < ref_count; j++) { | ||
304 | + if (vp->ref_slots[j].slotIndex == hp->frame_id) { | ||
305 | + found = 1; | ||
306 | + break; | ||
307 | + } | ||
308 | + } | ||
309 | + if (found) | ||
310 | continue; | ||
311 | |||
312 | - err = vk_av1_fill_pict(avctx, &ap->ref_src[i], &vp->ref_slots[i], | ||
313 | - &vp->refs[i], &ap->vkav1_refs[i], | ||
314 | - ref_frame, 0, 0, i); | ||
315 | + err = vk_av1_fill_pict(avctx, &ap->ref_src[ref_count], &vp->ref_slots[ref_count], | ||
316 | + &vp->refs[ref_count], &ap->std_refs[ref_count], &ap->vkav1_refs[ref_count], | ||
317 | + ref_frame, 0, 0, cbs_ctx->ref[idx].saved_order_hints); | ||
318 | if (err < 0) | ||
319 | return err; | ||
320 | |||
321 | @@ -249,20 +302,32 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
322 | } | ||
323 | |||
324 | err = vk_av1_fill_pict(avctx, NULL, &vp->ref_slot, &vp->ref, | ||
325 | + &ap->std_ref, | ||
326 | &ap->vkav1_ref, | ||
327 | - pic, 1, apply_grain, 8); | ||
328 | + pic, 1, apply_grain, NULL); | ||
329 | if (err < 0) | ||
330 | return err; | ||
331 | |||
332 | - ap->tile_list.nb_tiles = 0; | ||
333 | - ap->tile_list.tile_list = ap->tiles; | ||
334 | - | ||
335 | - ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoMESA) { | ||
336 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA, | ||
337 | - .frame_header = &ap->av1_frame_header, | ||
338 | - .tile_list = &ap->tile_list, | ||
339 | + ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoKHR) { | ||
340 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR, | ||
341 | + .pStdPictureInfo = &ap->std_pic_info, | ||
342 | + .frameHeaderOffset = 0, | ||
343 | + .tileCount = 0, | ||
344 | + .pTileOffsets = NULL, | ||
345 | + .pTileSizes = ap->tile_sizes, | ||
346 | }; | ||
347 | |||
348 | + for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) { | ||
349 | + const int idx = pic->raw_frame_header->ref_frame_idx[i]; | ||
350 | + const AV1Frame *ref_frame = &s->ref[idx]; | ||
351 | + AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private; | ||
352 | + | ||
353 | + if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE) | ||
354 | + ap->av1_pic_info.referenceNameSlotIndices[i] = -1; | ||
355 | + else | ||
356 | + ap->av1_pic_info.referenceNameSlotIndices[i] = hp->frame_id; | ||
357 | + } | ||
358 | + | ||
359 | vp->decode_info = (VkVideoDecodeInfoKHR) { | ||
360 | .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR, | ||
361 | .pNext = &ap->av1_pic_info, | ||
362 | @@ -279,9 +344,87 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
363 | }, | ||
364 | }; | ||
365 | |||
366 | + ap->tile_info = (StdVideoAV1TileInfo) { | ||
367 | + .flags = (StdVideoAV1TileInfoFlags) { | ||
368 | + .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag, | ||
369 | + }, | ||
370 | + .TileCols = frame_header->tile_cols, | ||
371 | + .TileRows = frame_header->tile_rows, | ||
372 | + .context_update_tile_id = frame_header->context_update_tile_id, | ||
373 | + .tile_size_bytes_minus_1 = frame_header->tile_size_bytes_minus1, | ||
374 | + .pWidthInSbsMinus1 = ap->width_in_sbs_minus1, | ||
375 | + .pHeightInSbsMinus1 = ap->height_in_sbs_minus1, | ||
376 | + .pMiColStarts = ap->mi_col_starts, | ||
377 | + .pMiRowStarts = ap->mi_row_starts, | ||
378 | + }; | ||
379 | + | ||
380 | + ap->quantization = (StdVideoAV1Quantization) { | ||
381 | + .flags.using_qmatrix = frame_header->using_qmatrix, | ||
382 | + .flags.diff_uv_delta = frame_header->diff_uv_delta, | ||
383 | + .base_q_idx = frame_header->base_q_idx, | ||
384 | + .DeltaQYDc = frame_header->delta_q_y_dc, | ||
385 | + .DeltaQUDc = frame_header->delta_q_u_dc, | ||
386 | + .DeltaQUAc = frame_header->delta_q_u_ac, | ||
387 | + .DeltaQVDc = frame_header->delta_q_v_dc, | ||
388 | + .DeltaQVAc = frame_header->delta_q_v_ac, | ||
389 | + .qm_y = frame_header->qm_y, | ||
390 | + .qm_u = frame_header->qm_u, | ||
391 | + .qm_v = frame_header->qm_v, | ||
392 | + }; | ||
393 | + | ||
394 | + ap->loop_filter = (StdVideoAV1LoopFilter) { | ||
395 | + .flags = (StdVideoAV1LoopFilterFlags) { | ||
396 | + .loop_filter_delta_enabled = frame_header->loop_filter_delta_enabled, | ||
397 | + .loop_filter_delta_update = frame_header->loop_filter_delta_update, | ||
398 | + }, | ||
399 | + .loop_filter_sharpness = frame_header->loop_filter_sharpness, | ||
400 | + }; | ||
401 | + | ||
402 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS; i++) | ||
403 | + ap->loop_filter.loop_filter_level[i] = frame_header->loop_filter_level[i]; | ||
404 | + for (int i = 0; i < STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS; i++) | ||
405 | + ap->loop_filter.loop_filter_mode_deltas[i] = frame_header->loop_filter_mode_deltas[i]; | ||
406 | + | ||
407 | + ap->cdef = (StdVideoAV1CDEF) { | ||
408 | + .cdef_damping_minus_3 = frame_header->cdef_damping_minus_3, | ||
409 | + .cdef_bits = frame_header->cdef_bits, | ||
410 | + }; | ||
411 | + | ||
412 | + ap->loop_restoration = (StdVideoAV1LoopRestoration) { | ||
413 | + .FrameRestorationType[0] = remap_lr_type[frame_header->lr_type[0]], | ||
414 | + .FrameRestorationType[1] = remap_lr_type[frame_header->lr_type[1]], | ||
415 | + .FrameRestorationType[2] = remap_lr_type[frame_header->lr_type[2]], | ||
416 | + .LoopRestorationSize[0] = 1 + frame_header->lr_unit_shift, | ||
417 | + .LoopRestorationSize[1] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift, | ||
418 | + .LoopRestorationSize[2] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift, | ||
419 | + }; | ||
420 | + | ||
421 | + ap->film_grain = (StdVideoAV1FilmGrain) { | ||
422 | + .flags = (StdVideoAV1FilmGrainFlags) { | ||
423 | + .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma, | ||
424 | + .overlap_flag = film_grain->overlap_flag, | ||
425 | + .clip_to_restricted_range = film_grain->clip_to_restricted_range, | ||
426 | + }, | ||
427 | + .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8, | ||
428 | + .ar_coeff_lag = film_grain->ar_coeff_lag, | ||
429 | + .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6, | ||
430 | + .grain_scale_shift = film_grain->grain_scale_shift, | ||
431 | + .grain_seed = film_grain->grain_seed, | ||
432 | + .film_grain_params_ref_idx = film_grain->film_grain_params_ref_idx, | ||
433 | + .num_y_points = film_grain->num_y_points, | ||
434 | + .num_cb_points = film_grain->num_cb_points, | ||
435 | + .num_cr_points = film_grain->num_cr_points, | ||
436 | + .cb_mult = film_grain->cb_mult, | ||
437 | + .cb_luma_mult = film_grain->cb_luma_mult, | ||
438 | + .cb_offset = film_grain->cb_offset, | ||
439 | + .cr_mult = film_grain->cr_mult, | ||
440 | + .cr_luma_mult = film_grain->cr_luma_mult, | ||
441 | + .cr_offset = film_grain->cr_offset, | ||
442 | + }; | ||
443 | + | ||
444 | /* Setup frame header */ | ||
445 | - ap->av1_frame_header = (StdVideoAV1MESAFrameHeader) { | ||
446 | - .flags = (StdVideoAV1MESAFrameHeaderFlags) { | ||
447 | + ap->std_pic_info = (StdVideoDecodeAV1PictureInfo) { | ||
448 | + .flags = (StdVideoDecodeAV1PictureInfoFlags) { | ||
449 | .error_resilient_mode = frame_header->error_resilient_mode, | ||
450 | .disable_cdf_update = frame_header->disable_cdf_update, | ||
451 | .use_superres = frame_header->use_superres, | ||
452 | @@ -302,174 +445,92 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
453 | .reference_select = frame_header->reference_select, | ||
454 | .skip_mode_present = frame_header->skip_mode_present, | ||
455 | .delta_q_present = frame_header->delta_q_present, | ||
456 | + .delta_lf_present = frame_header->delta_lf_present, | ||
457 | + .delta_lf_multi = frame_header->delta_lf_multi, | ||
458 | + .segmentation_enabled = frame_header->segmentation_enabled, | ||
459 | + .segmentation_update_map = frame_header->segmentation_update_map, | ||
460 | + .segmentation_temporal_update = frame_header->segmentation_temporal_update, | ||
461 | + .segmentation_update_data = frame_header->segmentation_update_data, | ||
462 | + .UsesLr = frame_header->lr_type[0] || frame_header->lr_type[1] || frame_header->lr_type[2], | ||
463 | + .apply_grain = apply_grain, | ||
464 | }, | ||
465 | - .frame_to_show_map_idx = frame_header->frame_to_show_map_idx, | ||
466 | - .frame_presentation_time = frame_header->frame_presentation_time, | ||
467 | - .display_frame_id = frame_header->display_frame_id, | ||
468 | .frame_type = frame_header->frame_type, | ||
469 | .current_frame_id = frame_header->current_frame_id, | ||
470 | - .order_hint = frame_header->order_hint, | ||
471 | + .OrderHint = frame_header->order_hint, | ||
472 | .primary_ref_frame = frame_header->primary_ref_frame, | ||
473 | - .frame_width_minus_1 = frame_header->frame_width_minus_1, | ||
474 | - .frame_height_minus_1 = frame_header->frame_height_minus_1, | ||
475 | - .coded_denom = frame_header->coded_denom, | ||
476 | - .render_width_minus_1 = frame_header->render_width_minus_1, | ||
477 | - .render_height_minus_1 = frame_header->render_height_minus_1, | ||
478 | .refresh_frame_flags = frame_header->refresh_frame_flags, | ||
479 | .interpolation_filter = frame_header->interpolation_filter, | ||
480 | - .tx_mode = frame_header->tx_mode, | ||
481 | - .tiling = (StdVideoAV1MESATileInfo) { | ||
482 | - .flags = (StdVideoAV1MESATileInfoFlags) { | ||
483 | - .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag, | ||
484 | - }, | ||
485 | - .tile_cols = frame_header->tile_cols, | ||
486 | - .tile_rows = frame_header->tile_rows, | ||
487 | - .context_update_tile_id = frame_header->context_update_tile_id, | ||
488 | - .tile_size_bytes_minus1 = frame_header->tile_size_bytes_minus1, | ||
489 | - }, | ||
490 | - .quantization = (StdVideoAV1MESAQuantization) { | ||
491 | - .flags.using_qmatrix = frame_header->using_qmatrix, | ||
492 | - .base_q_idx = frame_header->base_q_idx, | ||
493 | - .delta_q_y_dc = frame_header->delta_q_y_dc, | ||
494 | - .diff_uv_delta = frame_header->diff_uv_delta, | ||
495 | - .delta_q_u_dc = frame_header->delta_q_u_dc, | ||
496 | - .delta_q_u_ac = frame_header->delta_q_u_ac, | ||
497 | - .delta_q_v_dc = frame_header->delta_q_v_dc, | ||
498 | - .delta_q_v_ac = frame_header->delta_q_v_ac, | ||
499 | - .qm_y = frame_header->qm_y, | ||
500 | - .qm_u = frame_header->qm_u, | ||
501 | - .qm_v = frame_header->qm_v, | ||
502 | - }, | ||
503 | - .delta_q = (StdVideoAV1MESADeltaQ) { | ||
504 | - .flags = (StdVideoAV1MESADeltaQFlags) { | ||
505 | - .delta_lf_present = frame_header->delta_lf_present, | ||
506 | - .delta_lf_multi = frame_header->delta_lf_multi, | ||
507 | - }, | ||
508 | - .delta_q_res = frame_header->delta_q_res, | ||
509 | - .delta_lf_res = frame_header->delta_lf_res, | ||
510 | - }, | ||
511 | - .loop_filter = (StdVideoAV1MESALoopFilter) { | ||
512 | - .flags = (StdVideoAV1MESALoopFilterFlags) { | ||
513 | - .delta_enabled = frame_header->loop_filter_delta_enabled, | ||
514 | - .delta_update = frame_header->loop_filter_delta_update, | ||
515 | - }, | ||
516 | - .level = { | ||
517 | - frame_header->loop_filter_level[0], frame_header->loop_filter_level[1], | ||
518 | - frame_header->loop_filter_level[2], frame_header->loop_filter_level[3], | ||
519 | - }, | ||
520 | - .sharpness = frame_header->loop_filter_sharpness, | ||
521 | - .mode_deltas = { | ||
522 | - frame_header->loop_filter_mode_deltas[0], frame_header->loop_filter_mode_deltas[1], | ||
523 | - }, | ||
524 | - }, | ||
525 | - .cdef = (StdVideoAV1MESACDEF) { | ||
526 | - .damping_minus_3 = frame_header->cdef_damping_minus_3, | ||
527 | - .bits = frame_header->cdef_bits, | ||
528 | - }, | ||
529 | - .lr = (StdVideoAV1MESALoopRestoration) { | ||
530 | - .lr_unit_shift = frame_header->lr_unit_shift, | ||
531 | - .lr_uv_shift = frame_header->lr_uv_shift, | ||
532 | - .lr_type = { frame_header->lr_type[0], frame_header->lr_type[1], frame_header->lr_type[2] }, | ||
533 | - }, | ||
534 | - .segmentation = (StdVideoAV1MESASegmentation) { | ||
535 | - .flags = (StdVideoAV1MESASegmentationFlags) { | ||
536 | - .enabled = frame_header->segmentation_enabled, | ||
537 | - .update_map = frame_header->segmentation_update_map, | ||
538 | - .temporal_update = frame_header->segmentation_temporal_update, | ||
539 | - .update_data = frame_header->segmentation_update_data, | ||
540 | - }, | ||
541 | - }, | ||
542 | - .film_grain = (StdVideoAV1MESAFilmGrainParameters) { | ||
543 | - .flags = (StdVideoAV1MESAFilmGrainFlags) { | ||
544 | - .apply_grain = apply_grain, | ||
545 | - .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma, | ||
546 | - .overlap_flag = film_grain->overlap_flag, | ||
547 | - .clip_to_restricted_range = film_grain->clip_to_restricted_range, | ||
548 | - }, | ||
549 | - .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8, | ||
550 | - .ar_coeff_lag = film_grain->ar_coeff_lag, | ||
551 | - .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6, | ||
552 | - .grain_scale_shift = film_grain->grain_scale_shift, | ||
553 | - .grain_seed = film_grain->grain_seed, | ||
554 | - .num_y_points = film_grain->num_y_points, | ||
555 | - .num_cb_points = film_grain->num_cb_points, | ||
556 | - .num_cr_points = film_grain->num_cr_points, | ||
557 | - .cb_mult = film_grain->cb_mult, | ||
558 | - .cb_luma_mult = film_grain->cb_luma_mult, | ||
559 | - .cb_offset = film_grain->cb_offset, | ||
560 | - .cr_mult = film_grain->cr_mult, | ||
561 | - .cr_luma_mult = film_grain->cr_luma_mult, | ||
562 | - .cr_offset = film_grain->cr_offset, | ||
563 | - }, | ||
564 | + .TxMode = frame_header->tx_mode, | ||
565 | + .delta_q_res = frame_header->delta_q_res, | ||
566 | + .delta_lf_res = frame_header->delta_lf_res, | ||
567 | + .SkipModeFrame[0] = s->cur_frame.skip_mode_frame_idx[0], | ||
568 | + .SkipModeFrame[1] = s->cur_frame.skip_mode_frame_idx[1], | ||
569 | + .coded_denom = frame_header->coded_denom, | ||
570 | + .pTileInfo = &ap->tile_info, | ||
571 | + .pQuantization = &ap->quantization, | ||
572 | + .pSegmentation = &ap->segmentation, | ||
573 | + .pLoopFilter = &ap->loop_filter, | ||
574 | + .pCDEF = &ap->cdef, | ||
575 | + .pLoopRestoration = &ap->loop_restoration, | ||
576 | + .pGlobalMotion = &ap->global_motion, | ||
577 | + .pFilmGrain = apply_grain ? &ap->film_grain : NULL, | ||
578 | }; | ||
579 | |||
580 | for (int i = 0; i < 64; i++) { | ||
581 | - ap->av1_frame_header.tiling.width_in_sbs_minus_1[i] = frame_header->width_in_sbs_minus_1[i]; | ||
582 | - ap->av1_frame_header.tiling.height_in_sbs_minus_1[i] = frame_header->height_in_sbs_minus_1[i]; | ||
583 | - ap->av1_frame_header.tiling.tile_start_col_sb[i] = frame_header->tile_start_col_sb[i]; | ||
584 | - ap->av1_frame_header.tiling.tile_start_row_sb[i] = frame_header->tile_start_row_sb[i]; | ||
585 | + ap->width_in_sbs_minus1[i] = frame_header->width_in_sbs_minus_1[i]; | ||
586 | + ap->height_in_sbs_minus1[i] = frame_header->height_in_sbs_minus_1[i]; | ||
587 | + ap->mi_col_starts[i] = frame_header->tile_start_col_sb[i]; | ||
588 | + ap->mi_row_starts[i] = frame_header->tile_start_row_sb[i]; | ||
589 | } | ||
590 | |||
591 | - for (int i = 0; i < 8; i++) { | ||
592 | - ap->av1_frame_header.segmentation.feature_enabled_bits[i] = 0; | ||
593 | - for (int j = 0; j < 8; j++) { | ||
594 | - ap->av1_frame_header.segmentation.feature_enabled_bits[i] |= (frame_header->feature_enabled[i][j] << j); | ||
595 | - ap->av1_frame_header.segmentation.feature_data[i][j] = frame_header->feature_value[i][j]; | ||
596 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_SEGMENTS; i++) { | ||
597 | + ap->segmentation.FeatureEnabled[i] = 0x0; | ||
598 | + for (int j = 0; j < STD_VIDEO_AV1_SEG_LVL_MAX; j++) { | ||
599 | + ap->segmentation.FeatureEnabled[i] |= (frame_header->feature_enabled[i][j] << j); | ||
600 | + ap->segmentation.FeatureData[i][j] = frame_header->feature_value[i][j]; | ||
601 | } | ||
602 | - | ||
603 | - ap->av1_frame_header.loop_filter.ref_deltas[i] = frame_header->loop_filter_ref_deltas[i]; | ||
604 | - | ||
605 | - ap->av1_frame_header.cdef.y_pri_strength[i] = frame_header->cdef_y_pri_strength[i]; | ||
606 | - ap->av1_frame_header.cdef.y_sec_strength[i] = frame_header->cdef_y_sec_strength[i]; | ||
607 | - ap->av1_frame_header.cdef.uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i]; | ||
608 | - ap->av1_frame_header.cdef.uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i]; | ||
609 | - | ||
610 | - ap->av1_frame_header.ref_order_hint[i] = frame_header->ref_order_hint[i]; | ||
611 | - ap->av1_frame_header.global_motion[i] = (StdVideoAV1MESAGlobalMotion) { | ||
612 | - .flags = (StdVideoAV1MESAGlobalMotionFlags) { | ||
613 | - .gm_invalid = s->cur_frame.gm_invalid[i], | ||
614 | - }, | ||
615 | - .gm_type = s->cur_frame.gm_type[i], | ||
616 | - .gm_params = { | ||
617 | - s->cur_frame.gm_params[i][0], s->cur_frame.gm_params[i][1], | ||
618 | - s->cur_frame.gm_params[i][2], s->cur_frame.gm_params[i][3], | ||
619 | - s->cur_frame.gm_params[i][4], s->cur_frame.gm_params[i][5], | ||
620 | - }, | ||
621 | - }; | ||
622 | } | ||
623 | |||
624 | - for (int i = 0; i < 7; i++) { | ||
625 | - ap->av1_frame_header.ref_frame_idx[i] = frame_header->ref_frame_idx[i]; | ||
626 | - ap->av1_frame_header.delta_frame_id_minus1[i] = frame_header->delta_frame_id_minus1[i]; | ||
627 | + for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++) | ||
628 | + ap->loop_filter.loop_filter_ref_deltas[i] = frame_header->loop_filter_ref_deltas[i]; | ||
629 | + | ||
630 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS; i++) { | ||
631 | + ap->cdef.cdef_y_pri_strength[i] = frame_header->cdef_y_pri_strength[i]; | ||
632 | + ap->cdef.cdef_y_sec_strength[i] = frame_header->cdef_y_sec_strength[i]; | ||
633 | + ap->cdef.cdef_uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i]; | ||
634 | + ap->cdef.cdef_uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i]; | ||
635 | } | ||
636 | |||
637 | - ap->av1_pic_info.skip_mode_frame_idx[0] = s->cur_frame.skip_mode_frame_idx[0]; | ||
638 | - ap->av1_pic_info.skip_mode_frame_idx[1] = s->cur_frame.skip_mode_frame_idx[1]; | ||
639 | + for (int i = 0; i < STD_VIDEO_AV1_NUM_REF_FRAMES; i++) { | ||
640 | + ap->std_pic_info.OrderHints[i] = frame_header->ref_order_hint[i]; | ||
641 | + ap->global_motion.GmType[i] = s->cur_frame.gm_type[i]; | ||
642 | + for (int j = 0; j < STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS; j++) { | ||
643 | + ap->global_motion.gm_params[i][j] = s->cur_frame.gm_params[i][j]; | ||
644 | + } | ||
645 | + } | ||
646 | |||
647 | if (apply_grain) { | ||
648 | - for (int i = 0; i < 14; i++) { | ||
649 | - ap->av1_frame_header.film_grain.point_y_value[i] = film_grain->point_y_value[i]; | ||
650 | - ap->av1_frame_header.film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i]; | ||
651 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_Y_POINTS; i++) { | ||
652 | + ap->film_grain.point_y_value[i] = film_grain->point_y_value[i]; | ||
653 | + ap->film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i]; | ||
654 | } | ||
655 | |||
656 | - for (int i = 0; i < 10; i++) { | ||
657 | - ap->av1_frame_header.film_grain.point_cb_value[i] = film_grain->point_cb_value[i]; | ||
658 | - ap->av1_frame_header.film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i]; | ||
659 | - ap->av1_frame_header.film_grain.point_cr_value[i] = film_grain->point_cr_value[i]; | ||
660 | - ap->av1_frame_header.film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i]; | ||
661 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_CB_POINTS; i++) { | ||
662 | + ap->film_grain.point_cb_value[i] = film_grain->point_cb_value[i]; | ||
663 | + ap->film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i]; | ||
664 | + ap->film_grain.point_cr_value[i] = film_grain->point_cr_value[i]; | ||
665 | + ap->film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i]; | ||
666 | } | ||
667 | |||
668 | - for (int i = 0; i < 24; i++) { | ||
669 | - ap->av1_frame_header.film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i]; | ||
670 | - ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i]; | ||
671 | - ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i]; | ||
672 | - } | ||
673 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_POS_LUMA; i++) | ||
674 | + ap->film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i]; | ||
675 | |||
676 | - ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[24] = film_grain->ar_coeffs_cb_plus_128[24]; | ||
677 | - ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[24] = film_grain->ar_coeffs_cr_plus_128[24]; | ||
678 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_POS_CHROMA; i++) { | ||
679 | + ap->film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i]; | ||
680 | + ap->film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i]; | ||
681 | + } | ||
682 | } | ||
683 | |||
684 | - /* Workaround for a spec issue. */ | ||
685 | ap->dec = dec; | ||
686 | |||
687 | return 0; | ||
688 | @@ -484,25 +545,20 @@ static int vk_av1_decode_slice(AVCodecContext *avctx, | ||
689 | AV1VulkanDecodePicture *ap = s->cur_frame.hwaccel_picture_private; | ||
690 | FFVulkanDecodePicture *vp = &ap->vp; | ||
691 | |||
692 | + /* Too many tiles, exceeding all defined levels in the AV1 spec */ | ||
693 | + if (ap->av1_pic_info.tileCount > MAX_TILES) | ||
694 | + return AVERROR(ENOSYS); | ||
695 | + | ||
696 | for (int i = s->tg_start; i <= s->tg_end; i++) { | ||
697 | - ap->tiles[ap->tile_list.nb_tiles] = (StdVideoAV1MESATile) { | ||
698 | - .size = s->tile_group_info[i].tile_size, | ||
699 | - .offset = s->tile_group_info[i].tile_offset, | ||
700 | - .row = s->tile_group_info[i].tile_row, | ||
701 | - .column = s->tile_group_info[i].tile_column, | ||
702 | - .tg_start = s->tg_start, | ||
703 | - .tg_end = s->tg_end, | ||
704 | - }; | ||
705 | + ap->tile_sizes[ap->av1_pic_info.tileCount] = s->tile_group_info[i].tile_size; | ||
706 | |||
707 | err = ff_vk_decode_add_slice(avctx, vp, | ||
708 | data + s->tile_group_info[i].tile_offset, | ||
709 | s->tile_group_info[i].tile_size, 0, | ||
710 | - &ap->tile_list.nb_tiles, | ||
711 | - &ap->tile_offsets); | ||
712 | + &ap->av1_pic_info.tileCount, | ||
713 | + &ap->av1_pic_info.pTileOffsets); | ||
714 | if (err < 0) | ||
715 | return err; | ||
716 | - | ||
717 | - ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; | ||
718 | } | ||
719 | |||
720 | return 0; | ||
721 | @@ -518,7 +574,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx) | ||
722 | FFVulkanDecodePicture *rvp[AV1_NUM_REF_FRAMES] = { 0 }; | ||
723 | AVFrame *rav[AV1_NUM_REF_FRAMES] = { 0 }; | ||
724 | |||
725 | - if (!ap->tile_list.nb_tiles) | ||
726 | + if (!ap->av1_pic_info.tileCount) | ||
727 | return 0; | ||
728 | |||
729 | if (!dec->session_params) { | ||
730 | @@ -536,7 +592,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx) | ||
731 | } | ||
732 | |||
733 | av_log(avctx, AV_LOG_VERBOSE, "Decoding frame, %"SIZE_SPECIFIER" bytes, %i tiles\n", | ||
734 | - vp->slices_size, ap->tile_list.nb_tiles); | ||
735 | + vp->slices_size, ap->av1_pic_info.tileCount); | ||
736 | |||
737 | return ff_vk_decode_frame(avctx, pic->f, vp, rav, rvp); | ||
738 | } | ||
739 | @@ -580,8 +636,6 @@ const FFHWAccel ff_av1_vulkan_hwaccel = { | ||
740 | * flexibility, this index cannot be present anywhere. | ||
741 | * The current implementation tracks the index for the driver and submits it | ||
742 | * as necessary information. Due to needing to modify the decoding context, | ||
743 | - * which is not thread-safe, on frame free, threading is disabled. | ||
744 | - * In the future, once this is fixed in the spec, the workarounds may be removed | ||
745 | - * and threading enabled. */ | ||
746 | + * which is not thread-safe, on frame free, threading is disabled. */ | ||
747 | .caps_internal = HWACCEL_CAP_ASYNC_SAFE, | ||
748 | }; | ||
749 | diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c | ||
750 | index 91929d165f..4561f26b62 100644 | ||
751 | --- a/libavcodec/vulkan_decode.c | ||
752 | +++ b/libavcodec/vulkan_decode.c | ||
753 | @@ -61,7 +61,7 @@ static const VkVideoProfileInfoKHR *get_video_profile(FFVulkanDecodeShared *ctx, | ||
754 | VkStructureType profile_struct_type = | ||
755 | codec_id == AV_CODEC_ID_H264 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR : | ||
756 | codec_id == AV_CODEC_ID_HEVC ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR : | ||
757 | - codec_id == AV_CODEC_ID_AV1 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA : | ||
758 | + codec_id == AV_CODEC_ID_AV1 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR : | ||
759 | 0; | ||
760 | |||
761 | profile_list = ff_vk_find_struct(ctx->s.hwfc->create_pnext, | ||
762 | @@ -674,7 +674,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, | ||
763 | const struct FFVkCodecMap *vk_codec, | ||
764 | VkVideoDecodeH264CapabilitiesKHR *h264_caps, | ||
765 | VkVideoDecodeH265CapabilitiesKHR *h265_caps, | ||
766 | - VkVideoDecodeAV1CapabilitiesMESA *av1_caps, | ||
767 | + VkVideoDecodeAV1CapabilitiesKHR *av1_caps, | ||
768 | VkVideoCapabilitiesKHR *caps, | ||
769 | VkVideoDecodeCapabilitiesKHR *dec_caps, | ||
770 | int cur_profile) | ||
771 | @@ -685,7 +685,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, | ||
772 | |||
773 | VkVideoDecodeH264ProfileInfoKHR *h264_profile = &prof->h264_profile; | ||
774 | VkVideoDecodeH265ProfileInfoKHR *h265_profile = &prof->h265_profile; | ||
775 | - VkVideoDecodeAV1ProfileInfoMESA *av1_profile = &prof->av1_profile; | ||
776 | + VkVideoDecodeAV1ProfileInfoKHR *av1_profile = &prof->av1_profile; | ||
777 | |||
778 | const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt); | ||
779 | if (!desc) | ||
780 | @@ -713,8 +713,9 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, | ||
781 | } else if (avctx->codec_id == AV_CODEC_ID_AV1) { | ||
782 | dec_caps->pNext = av1_caps; | ||
783 | usage->pNext = av1_profile; | ||
784 | - av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA; | ||
785 | - av1_profile->stdProfileIdc = cur_profile; | ||
786 | + av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR; | ||
787 | + av1_profile->stdProfile = cur_profile; | ||
788 | + av1_profile->filmGrainSupport = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN); | ||
789 | } | ||
790 | |||
791 | usage->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR; | ||
792 | @@ -769,8 +770,8 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
793 | VkVideoDecodeH265CapabilitiesKHR h265_caps = { | ||
794 | .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR, | ||
795 | }; | ||
796 | - VkVideoDecodeAV1CapabilitiesMESA av1_caps = { | ||
797 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA, | ||
798 | + VkVideoDecodeAV1CapabilitiesKHR av1_caps = { | ||
799 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR, | ||
800 | }; | ||
801 | |||
802 | VkPhysicalDeviceVideoFormatInfoKHR fmt_info = { | ||
803 | @@ -789,7 +790,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
804 | cur_profile = avctx->profile; | ||
805 | base_profile = avctx->codec_id == AV_CODEC_ID_H264 ? AV_PROFILE_H264_CONSTRAINED_BASELINE : | ||
806 | avctx->codec_id == AV_CODEC_ID_H265 ? AV_PROFILE_HEVC_MAIN : | ||
807 | - avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_MESA_PROFILE_MAIN : | ||
808 | + avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_PROFILE_MAIN : | ||
809 | 0; | ||
810 | |||
811 | ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_codec, | ||
812 | @@ -837,7 +838,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
813 | |||
814 | max_level = avctx->codec_id == AV_CODEC_ID_H264 ? ff_vk_h264_level_to_av(h264_caps.maxLevelIdc) : | ||
815 | avctx->codec_id == AV_CODEC_ID_H265 ? ff_vk_h265_level_to_av(h265_caps.maxLevelIdc) : | ||
816 | - avctx->codec_id == AV_CODEC_ID_AV1 ? av1_caps.maxLevelIdc : | ||
817 | + avctx->codec_id == AV_CODEC_ID_AV1 ? av1_caps.maxLevel : | ||
818 | 0; | ||
819 | |||
820 | av_log(avctx, AV_LOG_VERBOSE, "Decoder capabilities for %s profile \"%s\":\n", | ||
821 | @@ -908,17 +909,11 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
822 | "VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR set " | ||
823 | "but VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR is unset!\n"); | ||
824 | return AVERROR_EXTERNAL; | ||
825 | - } else if (!(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR) && | ||
826 | - avctx->codec_id == AV_CODEC_ID_AV1) { | ||
827 | - av_log(avctx, AV_LOG_ERROR, "Cannot initialize Vulkan decoding session, buggy driver: " | ||
828 | - "codec is AV1, but VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR isn't set!\n"); | ||
829 | - return AVERROR_EXTERNAL; | ||
830 | } | ||
831 | |||
832 | /* TODO: make dedicated_dpb tunable */ | ||
833 | dec->dedicated_dpb = !(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR); | ||
834 | dec->layered_dpb = !(caps->flags & VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR); | ||
835 | - dec->external_fg = av1_caps.flags & VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA; | ||
836 | |||
837 | if (dec->dedicated_dpb) { | ||
838 | fmt_info.imageUsage = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR; | ||
839 | @@ -1126,8 +1121,10 @@ int ff_vk_decode_init(AVCodecContext *avctx) | ||
840 | VkVideoDecodeH265SessionParametersCreateInfoKHR h265_params = { | ||
841 | .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
842 | }; | ||
843 | - VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params = { | ||
844 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA, | ||
845 | + StdVideoAV1SequenceHeader av1_empty_seq = { 0 }; | ||
846 | + VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params = { | ||
847 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
848 | + .pStdSequenceHeader = &av1_empty_seq, | ||
849 | }; | ||
850 | VkVideoSessionParametersCreateInfoKHR session_params_create = { | ||
851 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
852 | diff --git a/libavcodec/vulkan_decode.h b/libavcodec/vulkan_decode.h | ||
853 | index a43e328d73..7ba8b239cb 100644 | ||
854 | --- a/libavcodec/vulkan_decode.h | ||
855 | +++ b/libavcodec/vulkan_decode.h | ||
856 | @@ -37,7 +37,7 @@ typedef struct FFVulkanDecodeDescriptor { | ||
857 | typedef struct FFVulkanDecodeProfileData { | ||
858 | VkVideoDecodeH264ProfileInfoKHR h264_profile; | ||
859 | VkVideoDecodeH265ProfileInfoKHR h265_profile; | ||
860 | - VkVideoDecodeAV1ProfileInfoMESA av1_profile; | ||
861 | + VkVideoDecodeAV1ProfileInfoKHR av1_profile; | ||
862 | VkVideoDecodeUsageInfoKHR usage; | ||
863 | VkVideoProfileInfoKHR profile; | ||
864 | VkVideoProfileListInfoKHR profile_list; | ||
865 | diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h | ||
866 | index bb69e920bb..01a1de7d9d 100644 | ||
867 | --- a/libavcodec/vulkan_video.h | ||
868 | +++ b/libavcodec/vulkan_video.h | ||
869 | @@ -22,8 +22,6 @@ | ||
870 | #include "vulkan.h" | ||
871 | |||
872 | #include <vk_video/vulkan_video_codecs_common.h> | ||
873 | -#include "vulkan_video_codec_av1std.h" | ||
874 | -#include "vulkan_video_codec_av1std_decode.h" | ||
875 | |||
876 | #define CODEC_VER_MAJ(ver) (ver >> 22) | ||
877 | #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1)) | ||
878 | diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode.h | ||
879 | deleted file mode 100644 | ||
880 | index e2f37b4e6e..0000000000 | ||
881 | --- a/libavcodec/vulkan_video_codec_av1std_decode.h | ||
882 | +++ /dev/null | ||
883 | @@ -1,36 +0,0 @@ | ||
884 | -/* Copyright 2023 Lynne | ||
885 | - * Copyright 2023 Dave Airlie | ||
886 | - * | ||
887 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
888 | - * you may not use this file except in compliance with the License. | ||
889 | - * You may obtain a copy of the License at | ||
890 | - * | ||
891 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
892 | - * | ||
893 | - * Unless required by applicable law or agreed to in writing, software | ||
894 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
895 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
896 | - * See the License for the specific language governing permissions and | ||
897 | - * limitations under the License. | ||
898 | - */ | ||
899 | - | ||
900 | -#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ | ||
901 | -#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1 | ||
902 | - | ||
903 | -/* | ||
904 | -** This header is NOT YET generated from the Khronos Vulkan XML API Registry. | ||
905 | -** | ||
906 | -*/ | ||
907 | - | ||
908 | -#ifdef __cplusplus | ||
909 | -extern "C" { | ||
910 | -#endif | ||
911 | -#define vulkan_video_codec_av1std_decode 1 | ||
912 | - | ||
913 | - | ||
914 | - | ||
915 | -#ifdef __cplusplus | ||
916 | -} | ||
917 | -#endif | ||
918 | - | ||
919 | -#endif | ||
920 | diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std.h | ||
921 | deleted file mode 100644 | ||
922 | index c91589eee2..0000000000 | ||
923 | --- a/libavcodec/vulkan_video_codec_av1std.h | ||
924 | +++ /dev/null | ||
925 | @@ -1,403 +0,0 @@ | ||
926 | -/* Copyright 2023 Lynne | ||
927 | - * Copyright 2023 Dave Airlie | ||
928 | - * | ||
929 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
930 | - * you may not use this file except in compliance with the License. | ||
931 | - * You may obtain a copy of the License at | ||
932 | - * | ||
933 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
934 | - * | ||
935 | - * Unless required by applicable law or agreed to in writing, software | ||
936 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
937 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
938 | - * See the License for the specific language governing permissions and | ||
939 | - * limitations under the License. | ||
940 | - */ | ||
941 | - | ||
942 | -#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_ | ||
943 | -#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1 | ||
944 | - | ||
945 | -/* | ||
946 | -** This header is NOT YET generated from the Khronos Vulkan XML API Registry. | ||
947 | -** | ||
948 | -*/ | ||
949 | - | ||
950 | -#ifdef __cplusplus | ||
951 | -extern "C" { | ||
952 | -#endif | ||
953 | -#define vulkan_video_codec_av1std 1 | ||
954 | - | ||
955 | -#define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \ | ||
956 | - ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) | ||
957 | -#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0 VK_MAKE_VIDEO_STD_VERSION(0, 1, 0) | ||
958 | -#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0 | ||
959 | -#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_decode" | ||
960 | - | ||
961 | -typedef enum StdVideoAV1MESAProfile { | ||
962 | - STD_VIDEO_AV1_MESA_PROFILE_MAIN = 0, | ||
963 | - STD_VIDEO_AV1_MESA_PROFILE_HIGH = 1, | ||
964 | - STD_VIDEO_AV1_MESA_PROFILE_PROFESSIONAL = 2, | ||
965 | -} StdVideoAV1MESAProfile; | ||
966 | - | ||
967 | -typedef enum StdVideoAV1MESALevel { | ||
968 | - STD_VIDEO_AV1_MESA_LEVEL_2_0 = 0, | ||
969 | - STD_VIDEO_AV1_MESA_LEVEL_2_1 = 1, | ||
970 | - STD_VIDEO_AV1_MESA_LEVEL_2_2 = 2, | ||
971 | - STD_VIDEO_AV1_MESA_LEVEL_2_3 = 3, | ||
972 | - STD_VIDEO_AV1_MESA_LEVEL_3_0 = 4, | ||
973 | - STD_VIDEO_AV1_MESA_LEVEL_3_1 = 5, | ||
974 | - STD_VIDEO_AV1_MESA_LEVEL_3_2 = 6, | ||
975 | - STD_VIDEO_AV1_MESA_LEVEL_3_3 = 7, | ||
976 | - STD_VIDEO_AV1_MESA_LEVEL_4_0 = 8, | ||
977 | - STD_VIDEO_AV1_MESA_LEVEL_4_1 = 9, | ||
978 | - STD_VIDEO_AV1_MESA_LEVEL_4_2 = 10, | ||
979 | - STD_VIDEO_AV1_MESA_LEVEL_4_3 = 11, | ||
980 | - STD_VIDEO_AV1_MESA_LEVEL_5_0 = 12, | ||
981 | - STD_VIDEO_AV1_MESA_LEVEL_5_1 = 13, | ||
982 | - STD_VIDEO_AV1_MESA_LEVEL_5_2 = 14, | ||
983 | - STD_VIDEO_AV1_MESA_LEVEL_5_3 = 15, | ||
984 | - STD_VIDEO_AV1_MESA_LEVEL_6_0 = 16, | ||
985 | - STD_VIDEO_AV1_MESA_LEVEL_6_1 = 17, | ||
986 | - STD_VIDEO_AV1_MESA_LEVEL_6_2 = 18, | ||
987 | - STD_VIDEO_AV1_MESA_LEVEL_6_3 = 19, | ||
988 | - STD_VIDEO_AV1_MESA_LEVEL_7_0 = 20, | ||
989 | - STD_VIDEO_AV1_MESA_LEVEL_7_1 = 21, | ||
990 | - STD_VIDEO_AV1_MESA_LEVEL_7_2 = 22, | ||
991 | - STD_VIDEO_AV1_MESA_LEVEL_7_3 = 23, | ||
992 | - STD_VIDEO_AV1_MESA_LEVEL_MAX = 31, | ||
993 | -} StdVideoAV1MESALevel; | ||
994 | - | ||
995 | -typedef struct StdVideoAV1MESAFilmGrainFlags { | ||
996 | - uint8_t apply_grain; | ||
997 | - uint8_t chroma_scaling_from_luma; | ||
998 | - uint8_t overlap_flag; | ||
999 | - uint8_t clip_to_restricted_range; | ||
1000 | -} StdVideoAV1MESAFilmGrainFlags; | ||
1001 | - | ||
1002 | -typedef struct StdVideoAV1MESAFilmGrainParameters { | ||
1003 | - StdVideoAV1MESAFilmGrainFlags flags; | ||
1004 | - uint32_t grain_scaling_minus_8; | ||
1005 | - uint32_t ar_coeff_lag; | ||
1006 | - uint32_t ar_coeff_shift_minus_6; | ||
1007 | - uint32_t grain_scale_shift; | ||
1008 | - | ||
1009 | - uint16_t grain_seed; | ||
1010 | - uint8_t num_y_points; | ||
1011 | - uint8_t point_y_value[14]; | ||
1012 | - uint8_t point_y_scaling[14]; | ||
1013 | - | ||
1014 | - uint8_t num_cb_points; | ||
1015 | - uint8_t point_cb_value[10]; | ||
1016 | - uint8_t point_cb_scaling[10]; | ||
1017 | - | ||
1018 | - uint8_t num_cr_points; | ||
1019 | - uint8_t point_cr_value[10]; | ||
1020 | - uint8_t point_cr_scaling[10]; | ||
1021 | - | ||
1022 | - int8_t ar_coeffs_y_plus_128[24]; | ||
1023 | - int8_t ar_coeffs_cb_plus_128[25]; | ||
1024 | - int8_t ar_coeffs_cr_plus_128[25]; | ||
1025 | - uint8_t cb_mult; | ||
1026 | - uint8_t cb_luma_mult; | ||
1027 | - uint16_t cb_offset; | ||
1028 | - uint8_t cr_mult; | ||
1029 | - uint8_t cr_luma_mult; | ||
1030 | - uint16_t cr_offset; | ||
1031 | -} StdVideoAV1MESAFilmGrainParameters; | ||
1032 | - | ||
1033 | -typedef struct StdVideoAV1MESAGlobalMotionFlags { | ||
1034 | - uint8_t gm_invalid; | ||
1035 | -} StdVideoAV1MESAGlobalMotionFlags; | ||
1036 | - | ||
1037 | -typedef struct StdVideoAV1MESAGlobalMotion { | ||
1038 | - StdVideoAV1MESAGlobalMotionFlags flags; | ||
1039 | - uint8_t gm_type; | ||
1040 | - uint32_t gm_params[6]; | ||
1041 | -} StdVideoAV1MESAGlobalMotion; | ||
1042 | - | ||
1043 | -typedef struct StdVideoAV1MESALoopRestoration { | ||
1044 | - uint8_t lr_type[3]; | ||
1045 | - uint8_t lr_unit_shift; | ||
1046 | - uint8_t lr_uv_shift; | ||
1047 | -} StdVideoAV1MESALoopRestoration; | ||
1048 | - | ||
1049 | -typedef struct StdVideoAV1MESATileInfoFlags { | ||
1050 | - uint8_t uniform_tile_spacing_flag; | ||
1051 | -} StdVideoAV1MESATileInfoFlags; | ||
1052 | - | ||
1053 | -typedef struct StdVideoAV1MESATileInfo { | ||
1054 | - StdVideoAV1MESATileInfoFlags flags; | ||
1055 | - uint8_t tile_cols; | ||
1056 | - uint8_t tile_rows; | ||
1057 | - uint8_t tile_start_col_sb[64]; | ||
1058 | - uint8_t tile_start_row_sb[64]; | ||
1059 | - uint8_t width_in_sbs_minus_1[64]; | ||
1060 | - uint8_t height_in_sbs_minus_1[64]; | ||
1061 | - uint16_t context_update_tile_id; | ||
1062 | - uint8_t tile_size_bytes_minus1; | ||
1063 | -} StdVideoAV1MESATileInfo; | ||
1064 | - | ||
1065 | -typedef struct StdVideoAV1MESAQuantizationFlags { | ||
1066 | - uint8_t using_qmatrix; | ||
1067 | -} StdVideoAV1MESAQuantizationFlags; | ||
1068 | - | ||
1069 | -typedef struct StdVideoAV1MESAQuantization { | ||
1070 | - StdVideoAV1MESAQuantizationFlags flags; | ||
1071 | - uint8_t base_q_idx; | ||
1072 | - int8_t delta_q_y_dc; | ||
1073 | - uint8_t diff_uv_delta; | ||
1074 | - int8_t delta_q_u_dc; | ||
1075 | - int8_t delta_q_u_ac; | ||
1076 | - int8_t delta_q_v_dc; | ||
1077 | - int8_t delta_q_v_ac; | ||
1078 | - uint8_t qm_y; | ||
1079 | - uint8_t qm_u; | ||
1080 | - uint8_t qm_v; | ||
1081 | -} StdVideoAV1MESAQuantization; | ||
1082 | - | ||
1083 | -typedef struct StdVideoAV1MESACDEF { | ||
1084 | - uint8_t damping_minus_3; | ||
1085 | - uint8_t bits; | ||
1086 | - uint8_t y_pri_strength[8]; | ||
1087 | - uint8_t y_sec_strength[8]; | ||
1088 | - uint8_t uv_pri_strength[8]; | ||
1089 | - uint8_t uv_sec_strength[8]; | ||
1090 | -} StdVideoAV1MESACDEF; | ||
1091 | - | ||
1092 | -typedef struct StdVideoAV1MESADeltaQFlags { | ||
1093 | - uint8_t delta_lf_present; | ||
1094 | - uint8_t delta_lf_multi; | ||
1095 | -} StdVideoAV1MESADeltaQFlags; | ||
1096 | - | ||
1097 | -typedef struct StdVideoAV1MESADeltaQ { | ||
1098 | - StdVideoAV1MESADeltaQFlags flags; | ||
1099 | - uint8_t delta_q_res; | ||
1100 | - uint8_t delta_lf_res; | ||
1101 | -} StdVideoAV1MESADeltaQ; | ||
1102 | - | ||
1103 | -typedef struct StdVideoAV1MESASegmentationFlags { | ||
1104 | - uint8_t enabled; | ||
1105 | - uint8_t update_map; | ||
1106 | - uint8_t temporal_update; | ||
1107 | - uint8_t update_data; | ||
1108 | -} StdVideoAV1MESASegmentationFlags; | ||
1109 | - | ||
1110 | -typedef struct StdVideoAV1MESASegmentation { | ||
1111 | - StdVideoAV1MESASegmentationFlags flags; | ||
1112 | - uint8_t feature_enabled_bits[8]; | ||
1113 | - int16_t feature_data[8][8]; | ||
1114 | -} StdVideoAV1MESASegmentation; | ||
1115 | - | ||
1116 | -typedef struct StdVideoAV1MESALoopFilterFlags { | ||
1117 | - uint8_t delta_enabled; | ||
1118 | - uint8_t delta_update; | ||
1119 | -} StdVideoAV1MESALoopFilterFlags; | ||
1120 | - | ||
1121 | -typedef struct StdVideoAV1MESALoopFilter { | ||
1122 | - StdVideoAV1MESALoopFilterFlags flags; | ||
1123 | - uint8_t level[4]; | ||
1124 | - uint8_t sharpness; | ||
1125 | - int8_t ref_deltas[8]; | ||
1126 | - int8_t mode_deltas[2]; | ||
1127 | -} StdVideoAV1MESALoopFilter; | ||
1128 | - | ||
1129 | -typedef struct StdVideoAV1MESAFrameHeaderFlags { | ||
1130 | - uint8_t error_resilient_mode; | ||
1131 | - uint8_t disable_cdf_update; | ||
1132 | - uint8_t use_superres; | ||
1133 | - uint8_t render_and_frame_size_different; | ||
1134 | - uint8_t allow_screen_content_tools; | ||
1135 | - uint8_t is_filter_switchable; | ||
1136 | - uint8_t force_integer_mv; | ||
1137 | - uint8_t frame_size_override_flag; | ||
1138 | - uint8_t buffer_removal_time_present_flag; | ||
1139 | - uint8_t allow_intrabc; | ||
1140 | - uint8_t frame_refs_short_signaling; | ||
1141 | - uint8_t allow_high_precision_mv; | ||
1142 | - uint8_t is_motion_mode_switchable; | ||
1143 | - uint8_t use_ref_frame_mvs; | ||
1144 | - uint8_t disable_frame_end_update_cdf; | ||
1145 | - uint8_t allow_warped_motion; | ||
1146 | - uint8_t reduced_tx_set; | ||
1147 | - uint8_t reference_select; | ||
1148 | - uint8_t skip_mode_present; | ||
1149 | - uint8_t delta_q_present; | ||
1150 | - uint8_t UsesLr; | ||
1151 | -} StdVideoAV1MESAFrameHeaderFlags; | ||
1152 | - | ||
1153 | -typedef struct StdVideoAV1MESAFrameHeader { | ||
1154 | - StdVideoAV1MESAFrameHeaderFlags flags; | ||
1155 | - | ||
1156 | - uint32_t frame_presentation_time; | ||
1157 | - uint32_t display_frame_id; | ||
1158 | - uint32_t current_frame_id; | ||
1159 | - uint8_t frame_to_show_map_idx; | ||
1160 | - uint8_t frame_type; | ||
1161 | - uint8_t order_hint; | ||
1162 | - uint8_t primary_ref_frame; | ||
1163 | - uint16_t frame_width_minus_1; | ||
1164 | - uint16_t frame_height_minus_1; | ||
1165 | - uint16_t render_width_minus_1; | ||
1166 | - uint16_t render_height_minus_1; | ||
1167 | - uint8_t coded_denom; | ||
1168 | - | ||
1169 | - uint8_t refresh_frame_flags; | ||
1170 | - uint8_t ref_order_hint[8]; | ||
1171 | - int8_t ref_frame_idx[7]; | ||
1172 | - uint32_t delta_frame_id_minus1[7]; | ||
1173 | - | ||
1174 | - uint8_t interpolation_filter; | ||
1175 | - uint8_t tx_mode; | ||
1176 | - | ||
1177 | - StdVideoAV1MESATileInfo tiling; | ||
1178 | - StdVideoAV1MESAQuantization quantization; | ||
1179 | - StdVideoAV1MESASegmentation segmentation; | ||
1180 | - StdVideoAV1MESADeltaQ delta_q; | ||
1181 | - StdVideoAV1MESALoopFilter loop_filter; | ||
1182 | - StdVideoAV1MESACDEF cdef; | ||
1183 | - StdVideoAV1MESALoopRestoration lr; | ||
1184 | - StdVideoAV1MESAGlobalMotion global_motion[8]; // One per ref frame | ||
1185 | - StdVideoAV1MESAFilmGrainParameters film_grain; | ||
1186 | -} StdVideoAV1MESAFrameHeader; | ||
1187 | - | ||
1188 | -typedef struct StdVideoAV1MESAScreenCoding { | ||
1189 | - uint8_t seq_force_screen_content_tools; | ||
1190 | -} StdVideoAV1MESAScreenCoding; | ||
1191 | - | ||
1192 | -typedef struct StdVideoAV1MESATimingInfoFlags { | ||
1193 | - uint8_t equal_picture_interval; | ||
1194 | -} StdVideoAV1MESATimingInfoFlags; | ||
1195 | - | ||
1196 | -typedef struct StdVideoAV1MESATimingInfo { | ||
1197 | - StdVideoAV1MESATimingInfoFlags flags; | ||
1198 | - uint32_t num_units_in_display_tick; | ||
1199 | - uint32_t time_scale; | ||
1200 | - uint32_t num_ticks_per_picture_minus_1; | ||
1201 | -} StdVideoAV1MESATimingInfo; | ||
1202 | - | ||
1203 | -typedef struct StdVideoAV1MESAColorConfigFlags { | ||
1204 | - uint8_t mono_chrome; | ||
1205 | - uint8_t color_range; | ||
1206 | - uint8_t separate_uv_delta_q; | ||
1207 | -} StdVideoAV1MESAColorConfigFlags; | ||
1208 | - | ||
1209 | -typedef struct StdVideoAV1MESAColorConfig { | ||
1210 | - StdVideoAV1MESAColorConfigFlags flags; | ||
1211 | - uint8_t bit_depth; | ||
1212 | - uint8_t subsampling_x; | ||
1213 | - uint8_t subsampling_y; | ||
1214 | -} StdVideoAV1MESAColorConfig; | ||
1215 | - | ||
1216 | -typedef struct StdVideoAV1MESASequenceHeaderFlags { | ||
1217 | - uint8_t still_picture; | ||
1218 | - uint8_t reduced_still_picture_header; | ||
1219 | - uint8_t use_128x128_superblock; | ||
1220 | - uint8_t enable_filter_intra; | ||
1221 | - uint8_t enable_intra_edge_filter; | ||
1222 | - uint8_t enable_interintra_compound; | ||
1223 | - uint8_t enable_masked_compound; | ||
1224 | - uint8_t enable_warped_motion; | ||
1225 | - uint8_t enable_dual_filter; | ||
1226 | - uint8_t enable_order_hint; | ||
1227 | - uint8_t enable_jnt_comp; | ||
1228 | - uint8_t enable_ref_frame_mvs; | ||
1229 | - uint8_t frame_id_numbers_present_flag; | ||
1230 | - uint8_t enable_superres; | ||
1231 | - uint8_t enable_cdef; | ||
1232 | - uint8_t enable_restoration; | ||
1233 | - uint8_t film_grain_params_present; | ||
1234 | - uint8_t timing_info_present_flag; | ||
1235 | - uint8_t initial_display_delay_present_flag; | ||
1236 | -} StdVideoAV1MESASequenceHeaderFlags; | ||
1237 | - | ||
1238 | -typedef struct StdVideoAV1MESASequenceHeader { | ||
1239 | - StdVideoAV1MESASequenceHeaderFlags flags; | ||
1240 | - | ||
1241 | - StdVideoAV1MESAProfile seq_profile; | ||
1242 | - uint8_t frame_width_bits_minus_1; | ||
1243 | - uint8_t frame_height_bits_minus_1; | ||
1244 | - uint16_t max_frame_width_minus_1; | ||
1245 | - uint16_t max_frame_height_minus_1; | ||
1246 | - uint8_t delta_frame_id_length_minus_2; | ||
1247 | - uint8_t additional_frame_id_length_minus_1; | ||
1248 | - uint8_t order_hint_bits_minus_1; | ||
1249 | - uint8_t seq_choose_integer_mv; | ||
1250 | - uint8_t seq_force_integer_mv; | ||
1251 | - | ||
1252 | - StdVideoAV1MESATimingInfo timing_info; | ||
1253 | - StdVideoAV1MESAColorConfig color_config; | ||
1254 | -} StdVideoAV1MESASequenceHeader; | ||
1255 | - | ||
1256 | -typedef struct StdVideoAV1MESATile { | ||
1257 | - uint16_t tg_start; | ||
1258 | - uint16_t tg_end; | ||
1259 | - uint16_t row; | ||
1260 | - uint16_t column; | ||
1261 | - uint32_t size; | ||
1262 | - uint32_t offset; | ||
1263 | -} StdVideoAV1MESATile; | ||
1264 | - | ||
1265 | -typedef struct StdVideoAV1MESATileList { | ||
1266 | - StdVideoAV1MESATile *tile_list; | ||
1267 | - uint32_t nb_tiles; | ||
1268 | -} StdVideoAV1MESATileList; | ||
1269 | - | ||
1270 | -typedef struct VkVideoDecodeAV1PictureInfoMESA { | ||
1271 | - VkStructureType sType; | ||
1272 | - const void *pNext; | ||
1273 | - StdVideoAV1MESAFrameHeader *frame_header; | ||
1274 | - StdVideoAV1MESATileList *tile_list; | ||
1275 | - uint8_t skip_mode_frame_idx[2]; | ||
1276 | -} VkVideoDecodeAV1PictureInfoMESA; | ||
1277 | - | ||
1278 | -typedef struct VkVideoDecodeAV1DpbSlotInfoMESA { | ||
1279 | - VkStructureType sType; | ||
1280 | - const void *pNext; | ||
1281 | - uint8_t frameIdx; | ||
1282 | - uint8_t ref_order_hint[7]; | ||
1283 | - uint8_t disable_frame_end_update_cdf; | ||
1284 | -} VkVideoDecodeAV1DpbSlotInfoMESA; | ||
1285 | - | ||
1286 | -typedef struct VkVideoDecodeAV1SessionParametersAddInfoMESA { | ||
1287 | - VkStructureType sType; | ||
1288 | - const void *pNext; | ||
1289 | - StdVideoAV1MESASequenceHeader *sequence_header; | ||
1290 | -} VkVideoDecodeAV1SessionParametersAddInfoMESA; | ||
1291 | - | ||
1292 | -typedef struct VkVideoDecodeAV1SessionParametersCreateInfoMESA { | ||
1293 | - VkStructureType sType; | ||
1294 | - const void *pNext; | ||
1295 | - const VkVideoDecodeAV1SessionParametersAddInfoMESA *pParametersAddInfo; | ||
1296 | -} VkVideoDecodeAV1SessionParametersCreateInfoMESA; | ||
1297 | - | ||
1298 | -typedef struct VkVideoDecodeAV1ProfileInfoMESA { | ||
1299 | - VkStructureType sType; | ||
1300 | - const void *pNext; | ||
1301 | - StdVideoAV1MESAProfile stdProfileIdc; | ||
1302 | -} VkVideoDecodeAV1ProfileInfoMESA; | ||
1303 | - | ||
1304 | -typedef enum VkVideoDecodeAV1CapabilityFlagBitsMESA { | ||
1305 | - VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA = 0x00000001, | ||
1306 | - VK_VIDEO_DECODE_AV1_CAPABILITY_FLAG_BITS_MAX_ENUM_MESA = 0x7FFFFFFF | ||
1307 | -} VkVideoDecodeAV1CapabilityFlagBitsMESA; | ||
1308 | -typedef VkFlags VkVideoDecodeAV1CapabilityFlagsMESA; | ||
1309 | - | ||
1310 | -typedef struct VkVideoDecodeAV1CapabilitiesMESA { | ||
1311 | - VkStructureType sType; | ||
1312 | - const void *pNext; | ||
1313 | - VkVideoDecodeAV1CapabilityFlagsMESA flags; | ||
1314 | - StdVideoAV1MESALevel maxLevelIdc; | ||
1315 | -} VkVideoDecodeAV1CapabilitiesMESA; | ||
1316 | - | ||
1317 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA 1000509000 | ||
1318 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA 1000509001 | ||
1319 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA 1000509002 | ||
1320 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA 1000509003 | ||
1321 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA 1000509004 | ||
1322 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA 1000509005 | ||
1323 | - | ||
1324 | -#ifdef __cplusplus | ||
1325 | -} | ||
1326 | -#endif | ||
1327 | - | ||
1328 | -#endif | ||
1329 | diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c | ||
1330 | index 91b9f96ccf..6e3b96b73a 100644 | ||
1331 | --- a/libavutil/hwcontext_vulkan.c | ||
1332 | +++ b/libavutil/hwcontext_vulkan.c | ||
1333 | @@ -446,7 +446,7 @@ static const VulkanOptExtension optional_device_exts[] = { | ||
1334 | { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_QUEUE }, | ||
1335 | { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H264 }, | ||
1336 | { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 }, | ||
1337 | - { "VK_MESA_video_decode_av1", FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1338 | + { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1339 | }; | ||
1340 | |||
1341 | static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity, | ||
1342 | diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h | ||
1343 | index 65021b04b1..6b379acf93 100644 | ||
1344 | --- a/libavutil/vulkan_functions.h | ||
1345 | +++ b/libavutil/vulkan_functions.h | ||
1346 | @@ -43,7 +43,7 @@ typedef enum FFVulkanExtensions { | ||
1347 | FF_VK_EXT_VIDEO_DECODE_QUEUE = 1ULL << 11, /* VK_KHR_video_decode_queue */ | ||
1348 | FF_VK_EXT_VIDEO_DECODE_H264 = 1ULL << 12, /* VK_EXT_video_decode_h264 */ | ||
1349 | FF_VK_EXT_VIDEO_DECODE_H265 = 1ULL << 13, /* VK_EXT_video_decode_h265 */ | ||
1350 | - FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_MESA_video_decode_av1 */ | ||
1351 | + FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_KHR_video_decode_av1 */ | ||
1352 | FF_VK_EXT_ATOMIC_FLOAT = 1ULL << 15, /* VK_EXT_shader_atomic_float */ | ||
1353 | FF_VK_EXT_COOP_MATRIX = 1ULL << 16, /* VK_KHR_cooperative_matrix */ | ||
1354 | |||
1355 | diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h | ||
1356 | index f9e739e1e3..73cf03935d 100644 | ||
1357 | --- a/libavutil/vulkan_loader.h | ||
1358 | +++ b/libavutil/vulkan_loader.h | ||
1359 | @@ -58,7 +58,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, | ||
1360 | { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_QUEUE }, | ||
1361 | { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H264 }, | ||
1362 | { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 }, | ||
1363 | - { "VK_MESA_video_decode_av1", FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1364 | + { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1365 | }; | ||
1366 | |||
1367 | FFVulkanExtensions mask = 0x0; | ||
1368 | diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c | ||
1369 | --- ffmpeg-6.1.1.orig/libavcodec/vulkan_video.c | ||
1370 | +++ ffmpeg-6.1.1/libavcodec/vulkan_video.c | ||
1371 | @@ -37,7 +37,7 @@ const FFVkCodecMap ff_vk_codec_map[AV_CO | ||
1372 | 0, | ||
1373 | 0, | ||
1374 | FF_VK_EXT_VIDEO_DECODE_AV1, | ||
1375 | - 0x01000000 /* TODO fix this */ | ||
1376 | + VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR | ||
1377 | }, | ||
1378 | }; | ||
1379 | |||
1380 | -- | ||
1381 | 2.25.1 | ||
1382 | |||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb index aa59755034..c0bce2db7a 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | |||
@@ -22,7 +22,11 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
22 | file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ | 22 | file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ |
23 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" | 23 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" |
24 | 24 | ||
25 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" | 25 | SRC_URI = " \ |
26 | https://www.ffmpeg.org/releases/${BP}.tar.xz \ | ||
27 | file://av1_ordering_info.patch \ | ||
28 | file://vulkan_av1_stable_API.patch \ | ||
29 | " | ||
26 | 30 | ||
27 | SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" | 31 | SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" |
28 | 32 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb index 02282ac5d9..70b72fd7fb 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb | |||
@@ -23,7 +23,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" | |||
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
24 | 24 | ||
25 | do_install:append() { | 25 | do_install:append() { |
26 | install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop | 26 | install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop |
27 | } | 27 | } |
28 | 28 | ||
29 | RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" | 29 | RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch deleted file mode 100644 index 9703a3a889..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 31 Mar 2020 21:23:28 -0700 | ||
4 | Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h | ||
5 | |||
6 | gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to | ||
7 | prefer qt headers definitions for GLsync | ||
8 | |||
9 | This helps in fixing build errors like below | ||
10 | |||
11 | /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: error: conflicting declaration 'typedef struct __GLsync* GLsync' | ||
12 | 24 | typedef struct __GLsync *GLsync; | ||
13 | | ^~~~~~ | ||
14 | In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:84, | ||
15 | from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30: | ||
16 | /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: note: previous declaration as 'typedef void* GLsync | ||
17 | ' | ||
18 | 40 | typedef gpointer GLsync; | ||
19 | | ^~~~~~ | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | |||
24 | --- | ||
25 | ext/qt/gstqsgtexture.cc | 2 +- | ||
26 | ext/qt/qtwindow.cc | 2 +- | ||
27 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
28 | |||
29 | diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc | ||
30 | index 663696b..36b17d4 100644 | ||
31 | --- a/ext/qt/gstqsgtexture.cc | ||
32 | +++ b/ext/qt/gstqsgtexture.cc | ||
33 | @@ -27,7 +27,7 @@ | ||
34 | |||
35 | #include <gst/video/video.h> | ||
36 | #include <gst/gl/gl.h> | ||
37 | -#include <gst/gl/gstglfuncs.h> | ||
38 | +#include <ext/qt/gstqtgl.h> | ||
39 | #include "gstqsgtexture.h" | ||
40 | |||
41 | #define GST_CAT_DEFAULT gst_qsg_texture_debug | ||
42 | diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc | ||
43 | index 2872cb5..5a36be9 100644 | ||
44 | --- a/ext/qt/qtwindow.cc | ||
45 | +++ b/ext/qt/qtwindow.cc | ||
46 | @@ -25,7 +25,7 @@ | ||
47 | #include <stdio.h> | ||
48 | |||
49 | #include <gst/video/video.h> | ||
50 | -#include <gst/gl/gstglfuncs.h> | ||
51 | +#include <ext/qt/gstqtgl.h> | ||
52 | #include "qtwindow.h" | ||
53 | #include "gstqsgtexture.h" | ||
54 | #include "gstqtglutility.h" | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb index edd8609b7c..9ce3f73f7c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb | |||
@@ -5,7 +5,6 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/" | |||
5 | BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" | 5 | BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" |
6 | 6 | ||
7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ | 7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ |
8 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ | ||
9 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" | 8 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" |
10 | 9 | ||
11 | SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" | 10 | SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" |
@@ -52,7 +51,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng" | |||
52 | PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" | 51 | PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" |
53 | PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" | 52 | PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" |
54 | PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" | 53 | PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" |
55 | PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}" | 54 | PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native qttools-native ${QT5WAYLANDDEPENDS}" |
56 | PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3" | 55 | PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3" |
57 | PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2" | 56 | PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2" |
58 | PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" | 57 | PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb index 61f46fbf7e..99f41d4f3d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb | |||
@@ -25,7 +25,6 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" | |||
25 | 25 | ||
26 | PACKAGECONFIG ??= " \ | 26 | PACKAGECONFIG ??= " \ |
27 | ${GSTREAMER_ORC} \ | 27 | ${GSTREAMER_ORC} \ |
28 | a52dec mpeg2dec \ | ||
29 | " | 28 | " |
30 | 29 | ||
31 | PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" | 30 | PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest index 7d0312005f..ab2df80dcc 100755 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest | |||
@@ -1,11 +1,13 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | 2 | ||
3 | # Multiply all timeouts by ten so they're more likely to work | 3 | # Multiply all timeouts by five so they're more likely to work |
4 | # on a loaded system. | 4 | # on a loaded system. The default timeout is 20s so this makes it |
5 | # one minute. | ||
5 | export CK_TIMEOUT_MULTIPLIER=5 | 6 | export CK_TIMEOUT_MULTIPLIER=5 |
6 | 7 | ||
7 | # Skip some tests that we know are problematic | 8 | # Skip some tests that we know are problematic |
8 | export GST_CHECKS_IGNORE="" | 9 | export GST_CHECKS_IGNORE="" |
10 | |||
9 | # gstnetclientclock.c:test_functioning is very sensitive to load | 11 | # gstnetclientclock.c:test_functioning is very sensitive to load |
10 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" | 12 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" |
11 | 13 | ||
@@ -13,4 +15,7 @@ GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" | |||
13 | # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410 | 15 | # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410 |
14 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live" | 16 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live" |
15 | 17 | ||
18 | # Known unreliable tests as per subprojects/gst-devtools/validate/launcher/testsuites/check.py: | ||
19 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE:parser_pull_short_read" | ||
20 | |||
16 | gnome-desktop-testing-runner gstreamer | 21 | gnome-desktop-testing-runner gstreamer |
diff --git a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch deleted file mode 100644 index 5168100f3a..0000000000 --- a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | It makes much more sense to control our own CFLAGS and avoiding fPIC breaks | ||
2 | some arches too. Assume we know what we're doing and remove all the messing | ||
3 | around. | ||
4 | |||
5 | RP 23/2/10 | ||
6 | |||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Index: a52dec-0.7.4/configure.in | ||
10 | =================================================================== | ||
11 | --- a52dec-0.7.4.orig/configure.in 2010-02-23 14:51:50.000000000 +0000 | ||
12 | +++ a52dec-0.7.4/configure.in 2010-02-23 14:52:36.000000000 +0000 | ||
13 | @@ -14,62 +14,6 @@ | ||
14 | AC_PROG_CC | ||
15 | AC_PROG_GCC_TRADITIONAL | ||
16 | |||
17 | -if test x"$GCC" = x"yes"; then | ||
18 | - | ||
19 | - dnl GCC-specific flags - try to optimize them sometime | ||
20 | - dnl -Wall -Werror moved to the end to not disturb the configure script | ||
21 | - | ||
22 | - dnl -O3 | ||
23 | - changequote(<<,>>) | ||
24 | - OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"` | ||
25 | - changequote([,]) | ||
26 | - OPT_CFLAGS="$OPT_CFLAGS -O3" | ||
27 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) | ||
28 | - | ||
29 | - dnl -fomit-frame-pointer | ||
30 | - OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" | ||
31 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) | ||
32 | - | ||
33 | - dnl arch-specific flags | ||
34 | - case "$host" in | ||
35 | - i?86-* | k?-*) | ||
36 | - case "$host" in | ||
37 | - i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; | ||
38 | - i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; | ||
39 | - i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; | ||
40 | - i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; | ||
41 | - k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; | ||
42 | - esac | ||
43 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
44 | - sparc-* | sparc64-*) | ||
45 | - OPT_CFLAGS="$CFLAGS -mtune=ultrasparc" | ||
46 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
47 | - mips-sgi-irix6.*) dnl do we need to be that specific ? | ||
48 | - OPT_CFLAGS="$CFLAGS -mabi=64" | ||
49 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
50 | - esac | ||
51 | -elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then | ||
52 | - dnl TenDRA portability checking compiler | ||
53 | - TENDRA=yes | ||
54 | - CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE" | ||
55 | - enable_mlib=no | ||
56 | - enable_oss=no | ||
57 | - enable_solaris_audio=no | ||
58 | -elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then | ||
59 | - dnl Intel C++ compiler | ||
60 | - CFLAGS="-g -O3 -unroll -ip" | ||
61 | -else | ||
62 | - dnl non-gcc flags - we probably need exact configuration triplets here. | ||
63 | - case "$host" in | ||
64 | - mips-sgi-irix6.*) | ||
65 | - OPT_CFLAGS="$CFLAGS -64" | ||
66 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
67 | - sparc-sun-solaris*) | ||
68 | - OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" | ||
69 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
70 | - esac | ||
71 | -fi | ||
72 | - | ||
73 | dnl Checks for libtool - this must be done after we set cflags | ||
74 | AC_DISABLE_SHARED | ||
75 | AC_LIBTOOL_WIN32_DLL | ||
76 | Index: a52dec-0.7.4/liba52/configure.incl | ||
77 | =================================================================== | ||
78 | --- a52dec-0.7.4.orig/liba52/configure.incl 2010-02-23 14:51:44.000000000 +0000 | ||
79 | +++ a52dec-0.7.4/liba52/configure.incl 2010-02-23 14:51:59.000000000 +0000 | ||
80 | @@ -1,9 +1,6 @@ | ||
81 | AC_SUBST([LIBA52_CFLAGS]) | ||
82 | AC_SUBST([LIBA52_LIBS]) | ||
83 | |||
84 | -dnl avoid -fPIC when possible | ||
85 | -LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" | ||
86 | - | ||
87 | AC_ARG_ENABLE([double], | ||
88 | [ --enable-double use double-precision samples]) | ||
89 | if test x"$enable_double" = x"yes"; then | ||
diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb deleted file mode 100644 index 7a3b4a43c8..0000000000 --- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | SUMMARY = "ATSC A/52 surround sound stream decoder" | ||
2 | DESCRIPTION = "Library for decoding ATSC A/52 streams. The A/52 standard \ | ||
3 | is used in a variety of applications, including digital television \ | ||
4 | and DVD. It is also known as AC-3." | ||
5 | HOMEPAGE = "http://liba52.sourceforge.net/" | ||
6 | LICENSE = "GPL-2.0-or-later" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | ||
8 | file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1" | ||
9 | SECTION = "libs" | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \ | ||
14 | file://buildcleanup.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "caa9f5bc44232dc8aeea773fea56be80" | ||
17 | SRC_URI[sha256sum] = "a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33" | ||
18 | |||
19 | UPSTREAM_CHECK_URI = "http://liba52.sourceforge.net/downloads.html" | ||
20 | |||
21 | S = "${WORKDIR}/a52dec-${PV}" | ||
22 | |||
23 | EXTRA_OECONF = " --enable-shared " | ||
24 | |||
25 | PACKAGES =+ "a52dec a52dec-doc" | ||
26 | |||
27 | FILES:a52dec = " ${bindir}/* " | ||
28 | FILES:a52dec-doc = " ${mandir}/man1/* " | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch deleted file mode 100644 index b2544cb44d..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch +++ /dev/null | |||
@@ -1,156 +0,0 @@ | |||
1 | From 0cafb99b57f43cf6ac2c6208718e49ad2dbe462d Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Schmidt <thaytan@noraisin.net> | ||
3 | Date: Sun, 10 Nov 2013 00:49:52 +1100 | ||
4 | Subject: [PATCH] Import revision 1206 from upstream to fix PIE build. | ||
5 | |||
6 | Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm | ||
7 | in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad | ||
8 | for shared libraries. Some environments demand that .text actually be | ||
9 | read-only all the time, yet MC_put_o_16_arm etc require that the addresses | ||
10 | be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.) | ||
11 | Even in those environments which permit the dynamic linker to modify the | ||
12 | .text segment, the runtime cost of doing the relocation can be noticeable. | ||
13 | |||
14 | This commit rewrites the linkage, discarding the tables of addresses | ||
15 | in favor of tables of offsets. All transfers are local within each individual | ||
16 | function, so there can be no interference by processing that occurs | ||
17 | after assembly, such as link-time re-ordering (even of individual functions.) | ||
18 | |||
19 | Patch by John Reiser <jreiser@bitwagon.com> | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | Upstream-Status: Backport [https://code.videolan.org/videolan/libmpeg2/commit/946bf4b518aacc224f845e73708f99e394744499] | ||
22 | --- | ||
23 | libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++------------------- | ||
24 | 1 file changed, 33 insertions(+), 37 deletions(-) | ||
25 | |||
26 | diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S | ||
27 | index c921f7c..82143f8 100644 | ||
28 | --- a/libmpeg2/motion_comp_arm_s.S | ||
29 | +++ b/libmpeg2/motion_comp_arm_s.S | ||
30 | @@ -30,9 +30,13 @@ MC_put_o_16_arm: | ||
31 | pld [r1] | ||
32 | stmfd sp!, {r4-r11, lr} @ R14 is also called LR | ||
33 | and r4, r1, #3 | ||
34 | - adr r5, MC_put_o_16_arm_align_jt | ||
35 | - add r5, r5, r4, lsl #2 | ||
36 | - ldr pc, [r5] | ||
37 | + ldrb r4, [pc, r4] | ||
38 | + add pc, pc, r4, lsl #2 | ||
39 | + .byte (MC_put_o_16_arm_align0 - 0f)>>2 | ||
40 | + .byte (MC_put_o_16_arm_align1 - 0f)>>2 | ||
41 | + .byte (MC_put_o_16_arm_align2 - 0f)>>2 | ||
42 | + .byte (MC_put_o_16_arm_align3 - 0f)>>2 | ||
43 | +0: | ||
44 | |||
45 | MC_put_o_16_arm_align0: | ||
46 | ldmia r1, {r4-r7} | ||
47 | @@ -76,11 +80,6 @@ MC_put_o_16_arm_align3: | ||
48 | 1: PROC(24) | ||
49 | bne 1b | ||
50 | ldmfd sp!, {r4-r11, pc} @@ update PC with LR content. | ||
51 | -MC_put_o_16_arm_align_jt: | ||
52 | - .word MC_put_o_16_arm_align0 | ||
53 | - .word MC_put_o_16_arm_align1 | ||
54 | - .word MC_put_o_16_arm_align2 | ||
55 | - .word MC_put_o_16_arm_align3 | ||
56 | |||
57 | @ ---------------------------------------------------------------- | ||
58 | .align | ||
59 | @@ -91,9 +90,14 @@ MC_put_o_8_arm: | ||
60 | pld [r1] | ||
61 | stmfd sp!, {r4-r10, lr} @ R14 is also called LR | ||
62 | and r4, r1, #3 | ||
63 | - adr r5, MC_put_o_8_arm_align_jt | ||
64 | - add r5, r5, r4, lsl #2 | ||
65 | - ldr pc, [r5] | ||
66 | + ldrb r4, [pc, r4] | ||
67 | + add pc, pc, r4, lsl #2 | ||
68 | + .byte (MC_put_o_8_arm_align0 - 0f)>>2 | ||
69 | + .byte (MC_put_o_8_arm_align1 - 0f)>>2 | ||
70 | + .byte (MC_put_o_8_arm_align2 - 0f)>>2 | ||
71 | + .byte (MC_put_o_8_arm_align3 - 0f)>>2 | ||
72 | +0: | ||
73 | + | ||
74 | MC_put_o_8_arm_align0: | ||
75 | ldmia r1, {r4-r5} | ||
76 | add r1, r1, r2 | ||
77 | @@ -135,12 +139,6 @@ MC_put_o_8_arm_align3: | ||
78 | bne 1b | ||
79 | ldmfd sp!, {r4-r10, pc} @@ update PC with LR content. | ||
80 | |||
81 | -MC_put_o_8_arm_align_jt: | ||
82 | - .word MC_put_o_8_arm_align0 | ||
83 | - .word MC_put_o_8_arm_align1 | ||
84 | - .word MC_put_o_8_arm_align2 | ||
85 | - .word MC_put_o_8_arm_align3 | ||
86 | - | ||
87 | @ ---------------------------------------------------------------- | ||
88 | .macro AVG_PW rW1, rW2 | ||
89 | mov \rW2, \rW2, lsl #24 | ||
90 | @@ -160,12 +158,17 @@ MC_put_x_16_arm: | ||
91 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
92 | pld [r1] | ||
93 | stmfd sp!, {r4-r11,lr} @ R14 is also called LR | ||
94 | + ldr r11, 0f | ||
95 | and r4, r1, #3 | ||
96 | - adr r5, MC_put_x_16_arm_align_jt | ||
97 | - ldr r11, [r5] | ||
98 | mvn r12, r11 | ||
99 | - add r5, r5, r4, lsl #2 | ||
100 | - ldr pc, [r5, #4] | ||
101 | + ldrb r4, [pc, r4] | ||
102 | + add pc, pc, r4, lsl #2 | ||
103 | + .byte (MC_put_x_16_arm_align0 - 0f)>>2 | ||
104 | + .byte (MC_put_x_16_arm_align1 - 0f)>>2 | ||
105 | + .byte (MC_put_x_16_arm_align2 - 0f)>>2 | ||
106 | + .byte (MC_put_x_16_arm_align3 - 0f)>>2 | ||
107 | +0: | ||
108 | + .word 0x01010101 | ||
109 | |||
110 | .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4 | ||
111 | mov \R0, \R0, lsr #(\shift) | ||
112 | @@ -238,12 +241,6 @@ MC_put_x_16_arm_align3: | ||
113 | add r0, r0, r2 | ||
114 | bne 1b | ||
115 | ldmfd sp!, {r4-r11,pc} @@ update PC with LR content. | ||
116 | -MC_put_x_16_arm_align_jt: | ||
117 | - .word 0x01010101 | ||
118 | - .word MC_put_x_16_arm_align0 | ||
119 | - .word MC_put_x_16_arm_align1 | ||
120 | - .word MC_put_x_16_arm_align2 | ||
121 | - .word MC_put_x_16_arm_align3 | ||
122 | |||
123 | @ ---------------------------------------------------------------- | ||
124 | .align | ||
125 | @@ -253,12 +250,17 @@ MC_put_x_8_arm: | ||
126 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
127 | pld [r1] | ||
128 | stmfd sp!, {r4-r11,lr} @ R14 is also called LR | ||
129 | + ldr r11, 0f | ||
130 | and r4, r1, #3 | ||
131 | - adr r5, MC_put_x_8_arm_align_jt | ||
132 | - ldr r11, [r5] | ||
133 | mvn r12, r11 | ||
134 | - add r5, r5, r4, lsl #2 | ||
135 | - ldr pc, [r5, #4] | ||
136 | + ldrb r4, [pc, r4] | ||
137 | + add pc, pc, r4, lsl #2 | ||
138 | + .byte (MC_put_x_8_arm_align0 - 0f)>>2 | ||
139 | + .byte (MC_put_x_8_arm_align1 - 0f)>>2 | ||
140 | + .byte (MC_put_x_8_arm_align2 - 0f)>>2 | ||
141 | + .byte (MC_put_x_8_arm_align3 - 0f)>>2 | ||
142 | +0: | ||
143 | + .word 0x01010101 | ||
144 | |||
145 | .macro ADJ_ALIGN_DW shift, R0, R1, R2 | ||
146 | mov \R0, \R0, lsr #(\shift) | ||
147 | @@ -319,9 +321,3 @@ MC_put_x_8_arm_align3: | ||
148 | add r0, r0, r2 | ||
149 | bne 1b | ||
150 | ldmfd sp!, {r4-r11,pc} @@ update PC with LR content. | ||
151 | -MC_put_x_8_arm_align_jt: | ||
152 | - .word 0x01010101 | ||
153 | - .word MC_put_x_8_arm_align0 | ||
154 | - .word MC_put_x_8_arm_align1 | ||
155 | - .word MC_put_x_8_arm_align2 | ||
156 | - .word MC_put_x_8_arm_align3 | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch deleted file mode 100644 index 5bf68b39ee..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From cbcff58ed670c8edc0be1004384cbe0fd07d8d26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 18:49:21 -0700 | ||
4 | Subject: [PATCH 1/2] check for available arm optimizations | ||
5 | |||
6 | Taken From | ||
7 | http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/65_arm-test-with-compiler.patch/ | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 12 ++++++++---- | ||
14 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index acdcb1e..2c0a721 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -59,7 +59,7 @@ elif test x"$GCC" = x"yes"; then | ||
21 | AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]) | ||
22 | |||
23 | dnl arch-specific flags | ||
24 | - arm_conditional=false | ||
25 | + build_arm_opt=false | ||
26 | case "$host" in | ||
27 | i?86-* | k?-* | x86_64-* | amd64-*) | ||
28 | AC_DEFINE([ARCH_X86],,[x86 architecture]) | ||
29 | @@ -102,8 +102,12 @@ elif test x"$GCC" = x"yes"; then | ||
30 | alpha*) | ||
31 | AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; | ||
32 | arm*) | ||
33 | - arm_conditional=: | ||
34 | - AC_DEFINE([ARCH_ARM],,[ARM architecture]);; | ||
35 | + AC_LANG(C) | ||
36 | + AC_COMPILE_IFELSE( | ||
37 | + [AC_LANG_SOURCE([[ | ||
38 | + void foo(void) { __asm__ volatile("pld [r1]"); }]])], | ||
39 | + build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]), | ||
40 | + build_arm_opt=false);; | ||
41 | esac | ||
42 | elif test x"$CC" = x"tendracc"; then | ||
43 | dnl TenDRA portability checking compiler | ||
44 | @@ -123,7 +127,7 @@ else | ||
45 | esac | ||
46 | fi | ||
47 | |||
48 | -AM_CONDITIONAL(ARCH_ARM, ${arm_conditional}) | ||
49 | +AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue) | ||
50 | |||
51 | dnl Checks for libtool - this must be done after we set cflags | ||
52 | AC_LIBTOOL_WIN32_DLL | ||
53 | -- | ||
54 | 2.13.2 | ||
55 | |||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch deleted file mode 100644 index 8301692368..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From f9d9dc92d75f8910e3cd5fdcbea72e505cdf3493 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 19:03:36 -0700 | ||
4 | Subject: [PATCH 2/2] Set visibility of global symbols used in ARM specific | ||
5 | assembly file to internal | ||
6 | |||
7 | Taken from | ||
8 | http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/60_arm-private-symbols.patch/ | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | libmpeg2/motion_comp_arm_s.S | 12 ++++++++---- | ||
15 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S | ||
18 | index f6c3d7d..c921f7c 100644 | ||
19 | --- a/libmpeg2/motion_comp_arm_s.S | ||
20 | +++ b/libmpeg2/motion_comp_arm_s.S | ||
21 | @@ -23,7 +23,8 @@ | ||
22 | |||
23 | @ ---------------------------------------------------------------- | ||
24 | .align | ||
25 | - .global MC_put_o_16_arm | ||
26 | + .global MC_put_o_16_arm | ||
27 | + .internal MC_put_o_16_arm | ||
28 | MC_put_o_16_arm: | ||
29 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
30 | pld [r1] | ||
31 | @@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt: | ||
32 | |||
33 | @ ---------------------------------------------------------------- | ||
34 | .align | ||
35 | - .global MC_put_o_8_arm | ||
36 | + .global MC_put_o_8_arm | ||
37 | + .internal MC_put_o_8_arm | ||
38 | MC_put_o_8_arm: | ||
39 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
40 | pld [r1] | ||
41 | @@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt: | ||
42 | .endm | ||
43 | |||
44 | .align | ||
45 | - .global MC_put_x_16_arm | ||
46 | + .global MC_put_x_16_arm | ||
47 | + .internal MC_put_x_16_arm | ||
48 | MC_put_x_16_arm: | ||
49 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
50 | pld [r1] | ||
51 | @@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt: | ||
52 | |||
53 | @ ---------------------------------------------------------------- | ||
54 | .align | ||
55 | - .global MC_put_x_8_arm | ||
56 | + .global MC_put_x_8_arm | ||
57 | + .internal MC_put_x_8_arm | ||
58 | MC_put_x_8_arm: | ||
59 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
60 | pld [r1] | ||
61 | -- | ||
62 | 2.13.2 | ||
63 | |||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch deleted file mode 100644 index 00b667d336..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | Rewrite the public symbol check to verify the shared libraries, to check for | ||
2 | more things, and to avoid duplication; fixes make check on ARM | ||
3 | |||
4 | Taken From | ||
5 | https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/ | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | test/globals | 42 +++++++++++++++++++++++++++--------------- | ||
12 | 1 file changed, 27 insertions(+), 15 deletions(-) | ||
13 | |||
14 | --- mpeg2dec.orig/test/globals | ||
15 | +++ mpeg2dec/test/globals | ||
16 | @@ -1,4 +1,8 @@ | ||
17 | #!/bin/sh | ||
18 | +# TODO | ||
19 | +# - fix checking of .a libs; problem is that "nm -g --defined-only" lists | ||
20 | +# internal symbols; this can be solved by using objdump, but it's probably | ||
21 | +# good enough to just run the tests on the shared lib | ||
22 | |||
23 | if test x"$srcdir" != x""; then | ||
24 | builddir="." # running from make check, but it does not define that | ||
25 | @@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd` | ||
26 | |||
27 | error=0 | ||
28 | |||
29 | -bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\ | ||
30 | - awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'` | ||
31 | - | ||
32 | -if test x"$bad_globals" != x""; then | ||
33 | - echo BAD GLOBAL SYMBOLS: | ||
34 | - for s in $bad_globals; do echo $s; done | ||
35 | +# check_bad_public_symbols <symbol prefix> <lib file> [<lib file>...] | ||
36 | +# | ||
37 | +# checks public symbols in shared libs: | ||
38 | +# - allow prefix_anything | ||
39 | +# - reject _prefixanything | ||
40 | +# - allow _anything | ||
41 | +# - reject anything else | ||
42 | +# | ||
43 | +# NB: skips missing files | ||
44 | +check_bad_public_symbols() { | ||
45 | + symbols_prefix="$1" | ||
46 | + shift | ||
47 | + lib_files=`ls "$@" 2>/dev/null` | ||
48 | + [ -z "$lib_files" ] && return | ||
49 | + bad_globals=`nm -g --defined-only $lib_files | | ||
50 | + awk '{if ($3) print $3}' | | ||
51 | + sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"` | ||
52 | + [ -z "$bad_globals" ] && return | ||
53 | error=1 | ||
54 | -fi | ||
55 | - | ||
56 | -bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\ | ||
57 | - awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'` | ||
58 | + echo BAD GLOBAL SYMBOLS in $lib_files: | ||
59 | + echo "$bad_globals" | ||
60 | +} | ||
61 | |||
62 | -if test x"$bad_globals" != x""; then | ||
63 | - echo BAD GLOBAL SYMBOLS: | ||
64 | - for s in $bad_globals; do echo $s; done | ||
65 | - error=1 | ||
66 | -fi | ||
67 | +check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so | ||
68 | +check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so | ||
69 | |||
70 | exit $error | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch deleted file mode 100644 index 5113ad44fe..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Add new method to judge whether <altivec.h> is needed | ||
2 | |||
3 | The original logic will use "typedef vector int t;" to judge | ||
4 | whether <altivec.h> is needed. altivec.h contains the following | ||
5 | statement: | ||
6 | |||
7 | #if !defined(__APPLE_ALTIVEC__) | ||
8 | #define vector __vector | ||
9 | #define pixel __pixel | ||
10 | #define bool | ||
11 | #endif | ||
12 | |||
13 | In gcc-4.3.3, __APPLE_ALTIVEC__ is not defined by compiler, neither | ||
14 | as vector, pixel, and bool. In order to make "typedef vector int t;" | ||
15 | pass the compilation, we need to include altivec.h. | ||
16 | |||
17 | However in gcc-4.5.0, __APPLE_ALTIVEC__ is defined by compiler, | ||
18 | so as vector, pixel, and bool. We could not judge whether | ||
19 | altivec.h is needed by "typedef vector int t;". | ||
20 | Here we include another statement "int tmp = __CR6_EQ;", in | ||
21 | which __CR6_EQ is defined in altivec.h. | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | |||
25 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
26 | |||
27 | diff -ruN a/configure.in b/configure.in | ||
28 | --- a/configure.ac 2010-09-14 20:55:42.399687663 +0800 | ||
29 | +++ b/configure.ac 2010-09-14 20:56:43.403204648 +0800 | ||
30 | @@ -79,11 +79,11 @@ | ||
31 | CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS" | ||
32 | AC_MSG_CHECKING([if <altivec.h> is needed]) | ||
33 | AC_TRY_COMPILE([], | ||
34 | - [typedef vector int t; | ||
35 | + [typedef vector int t; int tmp = __CR6_EQ; | ||
36 | vec_ld(0, (unsigned char *)0);], | ||
37 | [have_altivec=yes; AC_MSG_RESULT(no)], | ||
38 | [AC_TRY_COMPILE([#include <altivec.h>], | ||
39 | - [typedef vector int t; vec_ld(0, (unsigned char *)0);], | ||
40 | + [typedef vector int t; int tmp = __CR6_EQ; vec_ld(0, (unsigned char *)0);], | ||
41 | [AC_DEFINE([HAVE_ALTIVEC_H],, | ||
42 | [Define to 1 if you have the <altivec.h> header.]) | ||
43 | have_altivec=yes; AC_MSG_RESULT(yes)], | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb deleted file mode 100644 index fd8b561657..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams" | ||
2 | DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \ | ||
3 | mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \ | ||
4 | for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \ | ||
5 | is to have a simple test bed for libmpeg2." | ||
6 | HOMEPAGE = "https://libmpeg2.sourceforge.io/" | ||
7 | SECTION = "libs" | ||
8 | LICENSE = "GPL-2.0-or-later" | ||
9 | LICENSE_FLAGS = "commercial" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
11 | file://include/mpeg2.h;beginline=1;endline=22;md5=7766f4fcb58f0f8413c49a746f2ab89b" | ||
12 | |||
13 | SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \ | ||
14 | file://altivec_h_needed.patch \ | ||
15 | file://0001-check-for-available-arm-optimizations.patch \ | ||
16 | file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \ | ||
17 | file://61_global-symbol-test.patch \ | ||
18 | file://0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch \ | ||
19 | " | ||
20 | |||
21 | S = "${WORKDIR}/libmpeg2-${PV}" | ||
22 | |||
23 | SRC_URI[md5sum] = "0f92c7454e58379b4a5a378485bbd8ef" | ||
24 | SRC_URI[sha256sum] = "dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4" | ||
25 | |||
26 | UPSTREAM_CHECK_URI = "http://libmpeg2.sourceforge.net/downloads.html" | ||
27 | |||
28 | inherit autotools pkgconfig | ||
29 | |||
30 | EXTRA_OECONF = "--enable-shared --disable-sdl" | ||
31 | |||
32 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
33 | PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv" | ||
34 | |||
35 | PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" | ||
36 | |||
37 | FILES:${PN} = "${bindir}/*" | ||
38 | FILES:libmpeg2 = "${libdir}/libmpeg2.so.*" | ||
39 | FILES:libmpeg2convert = "${libdir}/libmpeg2convert.so.*" | ||
40 | FILES:libmpeg2-dev = "${libdir}/libmpeg2.so \ | ||
41 | ${libdir}/libmpeg2.la \ | ||
42 | ${libdir}/libmpeg2arch.la \ | ||
43 | ${libdir}/pkgconfig/libmpeg2.pc \ | ||
44 | ${includedir}/mpeg2dec/mpeg2.h" | ||
45 | FILES:libmpeg2-staticdev = "${libdir}/libmpeg2.a" | ||
46 | FILES:libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \ | ||
47 | ${libdir}/libmpeg2convert.la \ | ||
48 | ${libdir}/libmpeg2convertarch.la \ | ||
49 | ${libdir}/pkgconfig/libmpeg2convert.pc \ | ||
50 | ${includedir}/mpeg2dec/mpeg2convert.h" | ||
51 | FILES:libmpeg2convert-staticdev = "${libdir}/libmpeg2convert.a" | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ae16056d24..9fb5c81757 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -142,7 +142,7 @@ do_compile:append () { | |||
142 | 142 | ||
143 | do_install:append() { | 143 | do_install:append() { |
144 | install -d ${D}${sysconfdir}/default/volatiles | 144 | install -d ${D}${sysconfdir}/default/volatiles |
145 | install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse | 145 | install -m 0644 ${UNPACKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse |
146 | } | 146 | } |
147 | 147 | ||
148 | USERADD_PACKAGES = "pulseaudio-server" | 148 | USERADD_PACKAGES = "pulseaudio-server" |
diff --git a/meta/recipes-multimedia/webp/libwebp_1.3.2.bb b/meta/recipes-multimedia/webp/libwebp_1.4.0.bb index 63b0fd9a6c..d922970479 100644 --- a/meta/recipes-multimedia/webp/libwebp_1.3.2.bb +++ b/meta/recipes-multimedia/webp/libwebp_1.4.0.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ | |||
14 | file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" | 14 | file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" |
15 | 15 | ||
16 | SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" | 16 | SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" |
17 | SRC_URI[sha256sum] = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4" | 17 | SRC_URI[sha256sum] = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" | 19 | UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" |
20 | 20 | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb index 3777f05b5a..ab178f97e6 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb | |||
@@ -27,7 +27,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
27 | 27 | ||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -d ${D}${datadir}/matchbox/vfolders/ | 29 | install -d ${D}${datadir}/matchbox/vfolders/ |
30 | install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ | 30 | install -m 0644 ${UNPACKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ |
31 | } | 31 | } |
32 | 32 | ||
33 | FILES:${PN} += "${datadir}/matchbox/vfolders/" | 33 | FILES:${PN} += "${datadir}/matchbox/vfolders/" |
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index 6b70948f16..a1f7862efa 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb | |||
@@ -47,7 +47,7 @@ FILES:${PN}-applet = "${libdir}/matchbox-panel/*.so" | |||
47 | 47 | ||
48 | do_install:append () { | 48 | do_install:append () { |
49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | 49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ |
50 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 50 | install -m 755 ${UNPACKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
51 | 51 | ||
52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la | 52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la |
53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la | 53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la |
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb index 0c5ed5e55e..2e463cd7b3 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb | |||
@@ -27,12 +27,14 @@ inherit autotools pkgconfig features_check mime-xdg | |||
27 | REQUIRED_DISTRO_FEATURES = "x11" | 27 | REQUIRED_DISTRO_FEATURES = "x11" |
28 | 28 | ||
29 | EXTRA_OECONF = "--with-gtk=3" | 29 | EXTRA_OECONF = "--with-gtk=3" |
30 | # GCC 14 finds extra incompatible pointer type warnings which are treated as errors | ||
31 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
30 | 32 | ||
31 | do_install:append () { | 33 | do_install:append () { |
32 | install -d ${D}/${datadir} | 34 | install -d ${D}/${datadir} |
33 | install -d ${D}/${datadir}/pixmaps/ | 35 | install -d ${D}/${datadir}/pixmaps/ |
34 | 36 | ||
35 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps | 37 | install -m 0644 ${UNPACKDIR}/*.png ${D}/${datadir}/pixmaps |
36 | } | 38 | } |
37 | 39 | ||
38 | FILES:${PN} += "${libdir}/pcmanfm" | 40 | FILES:${PN} += "${libdir}/pcmanfm" |
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 016614b19c..95cc140e9e 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | |||
@@ -51,8 +51,8 @@ do_install:append () { | |||
51 | install -d ${D}/${datadir}/applications | 51 | install -d ${D}/${datadir}/applications |
52 | install -d ${D}/${datadir}/pixmaps/ | 52 | install -d ${D}/${datadir}/pixmaps/ |
53 | 53 | ||
54 | install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps | 54 | install -m 0644 ${UNPACKDIR}/rxvt.png ${D}/${datadir}/pixmaps |
55 | install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications | 55 | install -m 0644 ${UNPACKDIR}/rxvt.desktop ${D}/${datadir}/applications |
56 | 56 | ||
57 | ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ | 57 | ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ |
58 | ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo | 58 | ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo |
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index 4bdbefcb75..fb00de9bc9 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | |||
@@ -26,5 +26,5 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
26 | 26 | ||
27 | do_install:append () { | 27 | do_install:append () { |
28 | install -d ${D}/${sysconfdir}/X11/Xsession.d | 28 | install -d ${D}/${sysconfdir}/X11/Xsession.d |
29 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 29 | install -m 755 ${UNPACKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
30 | } | 30 | } |
diff --git a/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch b/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch deleted file mode 100644 index 3067500447..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
3 | Date: Mon, 18 Mar 2024 11:14:54 -0700 | ||
4 | Subject: [PATCH] REGRESSION(274077@main): failure to build on i586 (and likely | ||
5 | other 32bit arches): static assertion failed: Timer should stay small | ||
6 | https://bugs.webkit.org/show_bug.cgi?id=271108 | ||
7 | |||
8 | Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches | ||
9 | the size of Timer on 32-bit platforms. | ||
10 | |||
11 | * Source/WebCore/platform/Timer.cpp: | ||
12 | |||
13 | Canonical link: https://commits.webkit.org/276282@main | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4] | ||
16 | |||
17 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
18 | --- | ||
19 | Source/WebCore/platform/Timer.cpp | 6 +++++- | ||
20 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp | ||
23 | index 4f7c0f5c39ca9..0f3734cca2474 100644 | ||
24 | --- a/Source/WebCore/platform/Timer.cpp | ||
25 | +++ b/Source/WebCore/platform/Timer.cpp | ||
26 | @@ -263,7 +263,11 @@ struct SameSizeAsTimer { | ||
27 | |||
28 | WeakPtr<TimerAlignment> timerAlignment; | ||
29 | double times[2]; | ||
30 | - void* pointers[3]; | ||
31 | + void* pointers[2]; | ||
32 | +#if CPU(ADDRESS32) | ||
33 | + uint8_t bitfields; | ||
34 | +#endif | ||
35 | + void* pointer; | ||
36 | }; | ||
37 | |||
38 | static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small"); | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb index 0819f6de0d..29e12bb8c5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.44.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | |||
@@ -16,9 +16,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
16 | file://no-musttail-arm.patch \ | 16 | file://no-musttail-arm.patch \ |
17 | file://t6-not-declared.patch \ | 17 | file://t6-not-declared.patch \ |
18 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ | 18 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ |
19 | file://2922af379dc70b4b1a63b01d67179eb431f03ac4.patch \ | ||
20 | " | 19 | " |
21 | SRC_URI[sha256sum] = "c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87" | 20 | SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" |
22 | 21 | ||
23 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
24 | 23 | ||
diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index a274f3a16e..b46dc76a86 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | |||
@@ -7,7 +7,7 @@ The disabled tests rely on timing to pass correctly. On a virtualized | |||
7 | system under heavy load, these tests randomly fail because they miss | 7 | system under heavy load, these tests randomly fail because they miss |
8 | a timer or other timing related issues. | 8 | a timer or other timing related issues. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] |
11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | 11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> |
12 | 12 | ||
13 | --- | 13 | --- |
diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch deleted file mode 100644 index 8760b0140c..0000000000 --- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 3 Mar 2017 22:24:17 +0100 | ||
4 | Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy | ||
5 | on test | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' | ||
11 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' | ||
12 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' | ||
13 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' | ||
14 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' | ||
15 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' | ||
16 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' | ||
17 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' | ||
18 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' | ||
19 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' | ||
20 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' | ||
21 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' | ||
22 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' | ||
23 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' | ||
24 | | collect2: error: ld returned 1 exit status | ||
25 | | Makefile:114: recipe for target 'globalmutexchild' failed | ||
26 | | make[1]: *** [globalmutexchild] Error 1 | ||
27 | | make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' | ||
28 | |||
29 | Upstream-Status: Pending | ||
30 | |||
31 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
32 | --- | ||
33 | configure.in | 1 + | ||
34 | 1 file changed, 1 insertion(+) | ||
35 | |||
36 | diff --git a/configure.in b/configure.in | ||
37 | index a227e72..cbc0f90 100644 | ||
38 | --- a/configure.in | ||
39 | +++ b/configure.in | ||
40 | @@ -784,6 +784,7 @@ else | ||
41 | APR_PTHREADS_CHECK_RESTORE ] ) | ||
42 | fi | ||
43 | if test "$pthreadh" = "1"; then | ||
44 | + APR_ADDTO(LIBS,[-lpthread]) | ||
45 | APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS | ||
46 | APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG | ||
47 | APR_CHECK_PTHREAD_RECURSIVE_MUTEX | ||
48 | -- | ||
49 | 1.8.3.1 | ||
50 | |||
diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.4.bb index d322629b66..4df741c766 100644 --- a/meta/recipes-support/apr/apr_1.7.4.bb +++ b/meta/recipes-support/apr/apr_1.7.4.bb | |||
@@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ | 18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ |
19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ | 19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ |
20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ | 20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ |
21 | file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ | ||
22 | file://libtoolize_check.patch \ | 21 | file://libtoolize_check.patch \ |
23 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ | 22 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ |
24 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ | 23 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ |
diff --git a/meta/recipes-support/atk/at-spi2-core_2.52.0.bb b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb index cf221e0389..913b408403 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.52.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb | |||
@@ -7,6 +7,8 @@ BUGTRACKER = "http://bugzilla.gnome.org/" | |||
7 | LICENSE = "LGPL-2.1-or-later" | 7 | LICENSE = "LGPL-2.1-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
9 | 9 | ||
10 | CVE_PRODUCT += "at-spi2-atk" | ||
11 | |||
10 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
11 | 13 | ||
12 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" | 14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" |
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 346bd60e4d..0f2153d493 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb | |||
@@ -31,6 +31,9 @@ PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/s | |||
31 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" | 31 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" |
32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir=" | 32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir=" |
33 | 33 | ||
34 | # Fails to build with GCC14 with incompatible pointer error warning being treated as error | ||
35 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
36 | |||
34 | FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ | 37 | FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ |
35 | ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ | 38 | ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ |
36 | ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" | 39 | ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" |
diff --git a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch new file mode 100644 index 0000000000..98f7db93e8 --- /dev/null +++ b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stefan Eissing <stefan@eissing.org> | ||
3 | Date: Mon, 1 Apr 2024 15:41:18 +0200 | ||
4 | Subject: [PATCH] http: with chunked POST forced, disable length check on read | ||
5 | callback | ||
6 | |||
7 | - when an application forces HTTP/1.1 chunked transfer encoding | ||
8 | by setting the corresponding header and instructs curl to use | ||
9 | the CURLOPT_READFUNCTION, disregard any POST length information. | ||
10 | - this establishes backward compatibility with previous curl versions | ||
11 | |||
12 | Applications are encouraged to not force "chunked", but rather | ||
13 | set length information for a POST. By setting -1, curl will | ||
14 | auto-select chunked on HTTP/1.1 and work properly on other HTTP | ||
15 | versions. | ||
16 | |||
17 | Reported-by: Jeff King | ||
18 | Fixes #13229 | ||
19 | Closes #13257 | ||
20 | Upstream-Status: Backport | ||
21 | --- | ||
22 | lib/http.c | 22 ++++++++++++++++++++-- | ||
23 | 1 file changed, 20 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/lib/http.c b/lib/http.c | ||
26 | index 92c04e69cd8373..a764d3c4403c39 100644 | ||
27 | --- a/lib/http.c | ||
28 | +++ b/lib/http.c | ||
29 | @@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) | ||
30 | else | ||
31 | result = Curl_creader_set_null(data); | ||
32 | } | ||
33 | - else { /* we read the bytes from the callback */ | ||
34 | - result = Curl_creader_set_fread(data, postsize); | ||
35 | + else { | ||
36 | + /* we read the bytes from the callback. In case "chunked" encoding | ||
37 | + * is forced by the application, we disregard `postsize`. This is | ||
38 | + * a backward compatibility decision to earlier versions where | ||
39 | + * chunking disregarded this. See issue #13229. */ | ||
40 | + bool chunked = FALSE; | ||
41 | + char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); | ||
42 | + if(ptr) { | ||
43 | + /* Some kind of TE is requested, check if 'chunked' is chosen */ | ||
44 | + chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), | ||
45 | + STRCONST("chunked")); | ||
46 | + } | ||
47 | + result = Curl_creader_set_fread(data, chunked? -1 : postsize); | ||
48 | } | ||
49 | return result; | ||
50 | |||
51 | @@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, | ||
52 | data->req.upload_chunky = | ||
53 | Curl_compareheader(ptr, | ||
54 | STRCONST("Transfer-Encoding:"), STRCONST("chunked")); | ||
55 | + if(data->req.upload_chunky && | ||
56 | + Curl_use_http_1_1plus(data, data->conn) && | ||
57 | + (data->conn->httpversion >= 20)) { | ||
58 | + infof(data, "suppressing chunked transfer encoding on connection " | ||
59 | + "using HTTP version 2 or higher"); | ||
60 | + data->req.upload_chunky = FALSE; | ||
61 | + } | ||
62 | } | ||
63 | else { | ||
64 | curl_off_t req_clen = Curl_creader_total_length(data); | ||
diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb index c6654bbad6..3fdad6a4cf 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75" | |||
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | https://curl.se/download/${BP}.tar.xz \ | 13 | https://curl.se/download/${BP}.tar.xz \ |
14 | file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \ | ||
14 | file://run-ptest \ | 15 | file://run-ptest \ |
15 | file://disable-tests \ | 16 | file://disable-tests \ |
16 | file://no-test-timeout.patch \ | 17 | file://no-test-timeout.patch \ |
@@ -119,6 +120,7 @@ do_install_ptest() { | |||
119 | 120 | ||
120 | RDEPENDS:${PN}-ptest += " \ | 121 | RDEPENDS:${PN}-ptest += " \ |
121 | bash \ | 122 | bash \ |
123 | locale-base-en-us \ | ||
122 | perl-module-b \ | 124 | perl-module-b \ |
123 | perl-module-base \ | 125 | perl-module-base \ |
124 | perl-module-cwd \ | 126 | perl-module-cwd \ |
@@ -134,7 +136,6 @@ RDEPENDS:${PN}-ptest += " \ | |||
134 | perl-module-storable \ | 136 | perl-module-storable \ |
135 | perl-module-time-hires \ | 137 | perl-module-time-hires \ |
136 | " | 138 | " |
137 | RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" | ||
138 | 139 | ||
139 | PACKAGES =+ "lib${BPN}" | 140 | PACKAGES =+ "lib${BPN}" |
140 | 141 | ||
diff --git a/meta/recipes-support/diffoscope/diffoscope_260.bb b/meta/recipes-support/diffoscope/diffoscope_265.bb index 297a53fb53..6af5abc974 100644 --- a/meta/recipes-support/diffoscope/diffoscope_260.bb +++ b/meta/recipes-support/diffoscope/diffoscope_265.bb | |||
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" | |||
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "405a55502c8b2c988e46c0800d6a93e8e4e7632c1542b0a540dda50aeea41dac" | 15 | SRC_URI[sha256sum] = "7bdcbd7fc5bc4c821bf6ab5ffbbeb265103b04e6908ea4bb12144d7e5ca002ff" |
16 | 16 | ||
17 | RDEPENDS:${PN} += "\ | 17 | RDEPENDS:${PN} += "\ |
18 | binutils \ | 18 | binutils \ |
diff --git a/meta/recipes-support/enchant/enchant2_2.6.9.bb b/meta/recipes-support/enchant/enchant2_2.7.3.bb index aaf3525ad8..d5073b6f31 100644 --- a/meta/recipes-support/enchant/enchant2_2.6.9.bb +++ b/meta/recipes-support/enchant/enchant2_2.7.3.bb | |||
@@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 groff-native" | |||
12 | inherit autotools pkgconfig github-releases | 12 | inherit autotools pkgconfig github-releases |
13 | 13 | ||
14 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" | 14 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" |
15 | SRC_URI[sha256sum] = "d9a5a10dc9b38a43b3a0fa22c76ed6ebb7e09eb535aff62954afcdbd40efff6b" | 15 | SRC_URI[sha256sum] = "fe6ad4cbe8c71b9384ffdef962be52d4d2bd5ebfb6351435bb390543d4f78b1e" |
16 | 16 | ||
17 | GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" | 17 | GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" |
18 | 18 | ||
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch new file mode 100644 index 0000000000..cc39f5c9a5 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch | |||
@@ -0,0 +1,269 @@ | |||
1 | From 2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Zoltan Fridrich <zfridric@redhat.com> | ||
3 | Date: Wed, 10 Apr 2024 12:51:33 +0200 | ||
4 | Subject: [PATCH] Fix RSAES-PKCS1-v1_5 system-wide configuration | ||
5 | |||
6 | Upstream-Status: Backport [expected for 3.8.6 https://gitlab.com/gnutls/gnutls/-/merge_requests/1830?commit_id=2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d] | ||
7 | |||
8 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | ||
9 | Signed-off-by: Zoltan Fridrich <zfridric@redhat.com> | ||
10 | --- | ||
11 | lib/priority.c | 125 +++++++++++------- | ||
12 | ...system-override-allow-rsa-pkcs1-encrypt.sh | 27 +++- | ||
13 | 2 files changed, 96 insertions(+), 56 deletions(-) | ||
14 | |||
15 | diff --git a/lib/priority.c b/lib/priority.c | ||
16 | index 8abe00d1ff..3434619aad 100644 | ||
17 | --- a/lib/priority.c | ||
18 | +++ b/lib/priority.c | ||
19 | @@ -1018,6 +1018,12 @@ struct cfg { | ||
20 | bool force_ext_master_secret_set; | ||
21 | }; | ||
22 | |||
23 | +static inline void cfg_init(struct cfg *cfg) | ||
24 | +{ | ||
25 | + memset(cfg, 0, sizeof(*cfg)); | ||
26 | + cfg->allow_rsa_pkcs1_encrypt = true; | ||
27 | +} | ||
28 | + | ||
29 | static inline void cfg_deinit(struct cfg *cfg) | ||
30 | { | ||
31 | if (cfg->priority_strings) { | ||
32 | @@ -1095,6 +1101,12 @@ struct ini_ctx { | ||
33 | size_t curves_size; | ||
34 | }; | ||
35 | |||
36 | +static inline void ini_ctx_init(struct ini_ctx *ctx) | ||
37 | +{ | ||
38 | + memset(ctx, 0, sizeof(*ctx)); | ||
39 | + cfg_init(&ctx->cfg); | ||
40 | +} | ||
41 | + | ||
42 | static inline void ini_ctx_deinit(struct ini_ctx *ctx) | ||
43 | { | ||
44 | cfg_deinit(&ctx->cfg); | ||
45 | @@ -1423,9 +1435,6 @@ static inline int cfg_apply(struct cfg *cfg, struct ini_ctx *ctx) | ||
46 | _gnutls_default_priority_string = cfg->default_priority_string; | ||
47 | } | ||
48 | |||
49 | - /* enable RSA-PKCS1-V1_5 by default */ | ||
50 | - cfg->allow_rsa_pkcs1_encrypt = true; | ||
51 | - | ||
52 | if (cfg->allowlisting) { | ||
53 | /* also updates `flags` of global `hash_algorithms[]` */ | ||
54 | ret = cfg_hashes_set_array(cfg, ctx->hashes, ctx->hashes_size); | ||
55 | @@ -2217,22 +2226,73 @@ update_system_wide_priority_string(void) | ||
56 | return 0; | ||
57 | } | ||
58 | |||
59 | +/* Returns false on parse error, otherwise true. | ||
60 | + * The system_wide_config must be locked for writing. | ||
61 | + */ | ||
62 | +static inline bool load_system_priority_file(void) | ||
63 | +{ | ||
64 | + int err; | ||
65 | + FILE *fp; | ||
66 | + struct ini_ctx ctx; | ||
67 | + | ||
68 | + cfg_init(&system_wide_config); | ||
69 | + | ||
70 | + fp = fopen(system_priority_file, "re"); | ||
71 | + if (fp == NULL) { | ||
72 | + _gnutls_debug_log("cfg: unable to open: %s: %d\n", | ||
73 | + system_priority_file, errno); | ||
74 | + return true; | ||
75 | + } | ||
76 | + | ||
77 | + /* Parsing the configuration file needs to be done in 2 phases: | ||
78 | + * first parsing the [global] section | ||
79 | + * and then the other sections, | ||
80 | + * because the [global] section modifies the parsing behavior. | ||
81 | + */ | ||
82 | + ini_ctx_init(&ctx); | ||
83 | + err = ini_parse_file(fp, global_ini_handler, &ctx); | ||
84 | + if (!err) { | ||
85 | + if (fseek(fp, 0L, SEEK_SET) < 0) { | ||
86 | + _gnutls_debug_log("cfg: unable to rewind: %s\n", | ||
87 | + system_priority_file); | ||
88 | + if (fail_on_invalid_config) | ||
89 | + exit(1); | ||
90 | + } | ||
91 | + err = ini_parse_file(fp, cfg_ini_handler, &ctx); | ||
92 | + } | ||
93 | + fclose(fp); | ||
94 | + if (err) { | ||
95 | + ini_ctx_deinit(&ctx); | ||
96 | + _gnutls_debug_log("cfg: unable to parse: %s: %d\n", | ||
97 | + system_priority_file, err); | ||
98 | + return false; | ||
99 | + } | ||
100 | + cfg_apply(&system_wide_config, &ctx); | ||
101 | + ini_ctx_deinit(&ctx); | ||
102 | + return true; | ||
103 | +} | ||
104 | + | ||
105 | static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
106 | { | ||
107 | - int ret, err = 0; | ||
108 | + int ret; | ||
109 | + bool config_parse_error = false; | ||
110 | struct stat sb; | ||
111 | - FILE *fp; | ||
112 | gnutls_buffer_st buf; | ||
113 | - struct ini_ctx ctx; | ||
114 | |||
115 | ret = gnutls_rwlock_rdlock(&system_wide_config_rwlock); | ||
116 | - if (ret < 0) { | ||
117 | + if (ret < 0) | ||
118 | return gnutls_assert_val(ret); | ||
119 | - } | ||
120 | |||
121 | if (stat(system_priority_file, &sb) < 0) { | ||
122 | _gnutls_debug_log("cfg: unable to access: %s: %d\n", | ||
123 | system_priority_file, errno); | ||
124 | + | ||
125 | + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
126 | + ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); | ||
127 | + if (ret < 0) | ||
128 | + goto out; | ||
129 | + /* If system-wide config is unavailable, apply the defaults */ | ||
130 | + cfg_init(&system_wide_config); | ||
131 | goto out; | ||
132 | } | ||
133 | |||
134 | @@ -2240,63 +2300,27 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
135 | system_priority_last_mod == sb.st_mtime) { | ||
136 | _gnutls_debug_log("cfg: system priority %s has not changed\n", | ||
137 | system_priority_file); | ||
138 | - if (system_wide_config.priority_string) { | ||
139 | + if (system_wide_config.priority_string) | ||
140 | goto out; /* nothing to do */ | ||
141 | - } | ||
142 | } | ||
143 | |||
144 | (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
145 | |||
146 | ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); | ||
147 | - if (ret < 0) { | ||
148 | + if (ret < 0) | ||
149 | return gnutls_assert_val(ret); | ||
150 | - } | ||
151 | |||
152 | /* Another thread could have successfully re-read system-wide config, | ||
153 | * skip re-reading if the mtime it has used is exactly the same. | ||
154 | */ | ||
155 | - if (system_priority_file_loaded) { | ||
156 | + if (system_priority_file_loaded) | ||
157 | system_priority_file_loaded = | ||
158 | (system_priority_last_mod == sb.st_mtime); | ||
159 | - } | ||
160 | |||
161 | if (!system_priority_file_loaded) { | ||
162 | - _name_val_array_clear(&system_wide_config.priority_strings); | ||
163 | - | ||
164 | - gnutls_free(system_wide_config.priority_string); | ||
165 | - system_wide_config.priority_string = NULL; | ||
166 | - | ||
167 | - fp = fopen(system_priority_file, "re"); | ||
168 | - if (fp == NULL) { | ||
169 | - _gnutls_debug_log("cfg: unable to open: %s: %d\n", | ||
170 | - system_priority_file, errno); | ||
171 | + config_parse_error = !load_system_priority_file(); | ||
172 | + if (config_parse_error) | ||
173 | goto out; | ||
174 | - } | ||
175 | - /* Parsing the configuration file needs to be done in 2 phases: | ||
176 | - * first parsing the [global] section | ||
177 | - * and then the other sections, | ||
178 | - * because the [global] section modifies the parsing behavior. | ||
179 | - */ | ||
180 | - memset(&ctx, 0, sizeof(ctx)); | ||
181 | - err = ini_parse_file(fp, global_ini_handler, &ctx); | ||
182 | - if (!err) { | ||
183 | - if (fseek(fp, 0L, SEEK_SET) < 0) { | ||
184 | - _gnutls_debug_log("cfg: unable to rewind: %s\n", | ||
185 | - system_priority_file); | ||
186 | - if (fail_on_invalid_config) | ||
187 | - exit(1); | ||
188 | - } | ||
189 | - err = ini_parse_file(fp, cfg_ini_handler, &ctx); | ||
190 | - } | ||
191 | - fclose(fp); | ||
192 | - if (err) { | ||
193 | - ini_ctx_deinit(&ctx); | ||
194 | - _gnutls_debug_log("cfg: unable to parse: %s: %d\n", | ||
195 | - system_priority_file, err); | ||
196 | - goto out; | ||
197 | - } | ||
198 | - cfg_apply(&system_wide_config, &ctx); | ||
199 | - ini_ctx_deinit(&ctx); | ||
200 | _gnutls_debug_log("cfg: loaded system config %s mtime %lld\n", | ||
201 | system_priority_file, | ||
202 | (unsigned long long)sb.st_mtime); | ||
203 | @@ -2332,9 +2356,8 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
204 | out: | ||
205 | (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
206 | |||
207 | - if (err && fail_on_invalid_config) { | ||
208 | + if (config_parse_error && fail_on_invalid_config) | ||
209 | exit(1); | ||
210 | - } | ||
211 | |||
212 | return ret; | ||
213 | } | ||
214 | diff --git a/tests/system-override-allow-rsa-pkcs1-encrypt.sh b/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
215 | index b7d477c96e..714d0af946 100755 | ||
216 | --- a/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
217 | +++ b/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
218 | @@ -19,9 +19,8 @@ | ||
219 | # You should have received a copy of the GNU Lesser General Public License | ||
220 | # along with this program. If not, see <https://www.gnu.org/licenses/> | ||
221 | |||
222 | -: ${srcdir=.} | ||
223 | -TEST=${srcdir}/rsaes-pkcs1-v1_5 | ||
224 | -CONF=${srcdir}/config.$$.tmp | ||
225 | +TEST=${builddir}/rsaes-pkcs1-v1_5 | ||
226 | +CONF=config.$$.tmp | ||
227 | export GNUTLS_SYSTEM_PRIORITY_FILE=${CONF} | ||
228 | export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 | ||
229 | |||
230 | @@ -38,15 +37,33 @@ cat <<_EOF_ > ${CONF} | ||
231 | allow-rsa-pkcs1-encrypt = true | ||
232 | _EOF_ | ||
233 | |||
234 | -${TEST} && fail "RSAES-PKCS1-v1_5 expected to succeed" | ||
235 | +${TEST} | ||
236 | +if [ $? != 0 ]; then | ||
237 | + echo "${TEST} expected to succeed" | ||
238 | + exit 1 | ||
239 | +fi | ||
240 | +echo "RSAES-PKCS1-v1_5 successfully enabled" | ||
241 | |||
242 | cat <<_EOF_ > ${CONF} | ||
243 | [overrides] | ||
244 | allow-rsa-pkcs1-encrypt = false | ||
245 | _EOF_ | ||
246 | |||
247 | -${TEST} || fail "RSAES-PKCS1-v1_5 expected to fail" | ||
248 | +${TEST} | ||
249 | +if [ $? = 0 ]; then | ||
250 | + echo "${TEST} expected to fail" | ||
251 | + exit 1 | ||
252 | +fi | ||
253 | +echo "RSAES-PKCS1-v1_5 successfully disabled" | ||
254 | |||
255 | unset GNUTLS_SYSTEM_PRIORITY_FILE | ||
256 | unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID | ||
257 | + | ||
258 | +${TEST} | ||
259 | +if [ $? != 0 ]; then | ||
260 | + echo "${TEST} expected to succeed by default" | ||
261 | + exit 1 | ||
262 | +fi | ||
263 | +echo "RSAES-PKCS1-v1_5 successfully enabled by default" | ||
264 | + | ||
265 | exit 0 | ||
266 | -- | ||
267 | GitLab | ||
268 | |||
269 | |||
diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch index 1152d3797f..8edd31d6b9 100644 --- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch +++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ff6a345235b2585c261752e47a749228672b07dc Mon Sep 17 00:00:00 2001 | 1 | From bfa70adcbda4e505cf2e597907852e78e0439ee2 Mon Sep 17 00:00:00 2001 |
2 | From: Ravineet Singh <ravineet.a.singh@est.tech> | 2 | From: Ravineet Singh <ravineet.a.singh@est.tech> |
3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 | 3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 |
4 | Subject: [PATCH] gnutls: add ptest support | 4 | Subject: [PATCH] gnutls: add ptest support |
@@ -26,7 +26,7 @@ index 843193f..816b09f 100644 | |||
26 | 26 | ||
27 | include $(top_srcdir)/cligen/cligen.mk | 27 | include $(top_srcdir)/cligen/cligen.mk |
28 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
29 | index d6e03cf..e3f15fb 100644 | 29 | index 934377e..4406eae 100644 |
30 | --- a/configure.ac | 30 | --- a/configure.ac |
31 | +++ b/configure.ac | 31 | +++ b/configure.ac |
32 | @@ -1213,6 +1213,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) | 32 | @@ -1213,6 +1213,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) |
@@ -39,10 +39,10 @@ index d6e03cf..e3f15fb 100644 | |||
39 | 39 | ||
40 | hw_features= | 40 | hw_features= |
41 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 41 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
42 | index fb9e55a..c2d226a 100644 | 42 | index e39a3b3..861dd63 100644 |
43 | --- a/tests/Makefile.am | 43 | --- a/tests/Makefile.am |
44 | +++ b/tests/Makefile.am | 44 | +++ b/tests/Makefile.am |
45 | @@ -658,6 +658,12 @@ SH_LOG_COMPILER = $(SHELL) | 45 | @@ -663,6 +663,12 @@ SH_LOG_COMPILER = $(SHELL) |
46 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind | 46 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind |
47 | LOG_COMPILER = $(LOG_VALGRIND) | 47 | LOG_COMPILER = $(LOG_VALGRIND) |
48 | 48 | ||
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.5.bb index 20139b4dd4..52a1c00c4a 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.5.bb | |||
@@ -21,11 +21,12 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | |||
21 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ | 21 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ |
22 | file://arm_eabi.patch \ | 22 | file://arm_eabi.patch \ |
23 | file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ | 23 | file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ |
24 | file://0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch \ | ||
24 | file://run-ptest \ | 25 | file://run-ptest \ |
25 | file://Add-ptest-support.patch \ | 26 | file://Add-ptest-support.patch \ |
26 | " | 27 | " |
27 | 28 | ||
28 | SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b" | 29 | SRC_URI[sha256sum] = "66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc" |
29 | 30 | ||
30 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest | 31 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest |
31 | 32 | ||
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index 7526bde370..16cabc8264 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch | |||
@@ -11,7 +11,9 @@ and one process tries to chown a file that the other process has just deleted. | |||
11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? | 11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? |
12 | in the install command. | 12 | in the install command. |
13 | 13 | ||
14 | Upstream-Status: Pending | 14 | Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172 |
15 | |||
16 | Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966] | ||
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 17 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
16 | --- | 18 | --- |
17 | Makefile.in | 8 ++++---- | 19 | Makefile.in | 8 ++++---- |
diff --git a/meta/recipes-support/libfm/libfm_1.3.2.bb b/meta/recipes-support/libfm/libfm_1.3.2.bb index 057c737029..1d7609165b 100644 --- a/meta/recipes-support/libfm/libfm_1.3.2.bb +++ b/meta/recipes-support/libfm/libfm_1.3.2.bb | |||
@@ -53,3 +53,7 @@ do_install:append () { | |||
53 | rm -f ${D}${libdir}/libfm-extra.a | 53 | rm -f ${D}${libdir}/libfm-extra.a |
54 | rm -f ${D}${libdir}/libfm-extra.la | 54 | rm -f ${D}${libdir}/libfm-extra.la |
55 | } | 55 | } |
56 | |||
57 | # http://errors.yoctoproject.org/Errors/Details/766924/ | ||
58 | # libfm-1.3.2/src/actions/action.c:2050:25: error: assignment to 'gchar **' {aka 'char **'} from incompatible pointer type 'const gchar * const*' {aka 'const char * const*'} [-Wincompatible-pointer-types] | ||
59 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/libical/libical_3.0.18.bb b/meta/recipes-support/libical/libical_3.0.18.bb index 040d23b69d..052ca57cfb 100644 --- a/meta/recipes-support/libical/libical_3.0.18.bb +++ b/meta/recipes-support/libical/libical_3.0.18.bb | |||
@@ -37,7 +37,8 @@ EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" | |||
37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" | 37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" |
38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" | 38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" |
39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" | 39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" |
40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF', d)}" | 40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" |
41 | EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" | ||
41 | 42 | ||
42 | # Tell the cross-libical where the tool it needs to build is | 43 | # Tell the cross-libical where the tool it needs to build is |
43 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" | 44 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" |
diff --git a/meta/recipes-support/libproxy/libproxy_0.5.4.bb b/meta/recipes-support/libproxy/libproxy_0.5.6.bb index b4f4c6d254..6a705b305f 100644 --- a/meta/recipes-support/libproxy/libproxy_0.5.4.bb +++ b/meta/recipes-support/libproxy/libproxy_0.5.6.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
14 | DEPENDS = "glib-2.0" | 14 | DEPENDS = "glib-2.0" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" | 16 | SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" |
17 | SRCREV = "dff9a603d823dcc740ec966cd27960daa6b891b1" | 17 | SRCREV = "e7d18806575e21f94cf2f6024659386b129ca189" |
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit meson pkgconfig gobject-introspection vala gi-docgen | 20 | inherit meson pkgconfig gobject-introspection vala gi-docgen |
diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index 3208785124..c7b1604b61 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb | |||
@@ -40,3 +40,11 @@ do_install:append () { | |||
40 | } | 40 | } |
41 | 41 | ||
42 | BBCLASSEXTEND = "native" | 42 | BBCLASSEXTEND = "native" |
43 | |||
44 | # http://errors.yoctoproject.org/Errors/Build/183144/ | ||
45 | # libunwind-1.6.2/include/tdep-aarch64/libunwind_i.h:123:47: error: passing argument 1 of '_ULaarch64_uc_addr' from incompatible pointer type [-Wincompatible-pointer-types] | ||
46 | # libunwind-1.6.2/src/aarch64/Ginit.c:348:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
47 | # libunwind-1.6.2/src/aarch64/Ginit.c:377:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
48 | # libunwind-1.6.2/src/aarch64/Ginit_local.c:51:9: error: assignment to 'ucontext_t *' from incompatible pointer type 'unw_context_t *' {aka 'unw_tdep_context_t *'} [-Wincompatible-pointer-types] | ||
49 | # libunwind-1.6.2/src/aarch64/Gresume.c:37:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
50 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch deleted file mode 100644 index e736921b43..0000000000 --- a/meta/recipes-support/npth/npth/pkgconfig.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Mon, 10 Nov 2014 13:59:03 -0800 | ||
4 | Subject: [PATCH] Added npth pkgconfig file | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
9 | --- | ||
10 | configure.ac | 1 + | ||
11 | src/Makefile.am | 4 +++- | ||
12 | src/npth.pc.in | 10 ++++++++++ | ||
13 | 3 files changed, 14 insertions(+), 1 deletion(-) | ||
14 | create mode 100644 src/npth.pc.in | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 10f3629..65b76a1 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -476,6 +476,7 @@ src/Makefile | ||
21 | w32/Makefile | ||
22 | tests/Makefile]) | ||
23 | AC_CONFIG_FILES(npth-config, chmod +x npth-config) | ||
24 | +AC_CONFIG_FILES([src/npth.pc]) | ||
25 | AC_OUTPUT | ||
26 | |||
27 | echo " | ||
28 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
29 | index 7070118..6f01c64 100644 | ||
30 | --- a/src/Makefile.am | ||
31 | +++ b/src/Makefile.am | ||
32 | @@ -17,8 +17,10 @@ | ||
33 | # License along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
34 | |||
35 | ## Process this file with automake to produce Makefile.in | ||
36 | +pkgconfigdir = $(libdir)/pkgconfig | ||
37 | +pkgconfig_DATA = npth.pc | ||
38 | |||
39 | -EXTRA_DIST = libnpth.vers | ||
40 | +EXTRA_DIST = libnpth.vers npth.pc | ||
41 | # versioninfo.rc.in | ||
42 | nodist_include_HEADERS = npth.h | ||
43 | |||
44 | diff --git a/src/npth.pc.in b/src/npth.pc.in | ||
45 | new file mode 100644 | ||
46 | index 0000000..db091e8 | ||
47 | --- /dev/null | ||
48 | +++ b/src/npth.pc.in | ||
49 | @@ -0,0 +1,10 @@ | ||
50 | +prefix=@prefix@ | ||
51 | +exec_prefix=@exec_prefix@ | ||
52 | +libdir=@libdir@ | ||
53 | +includedir=@includedir@ | ||
54 | + | ||
55 | +Name: npth | ||
56 | +Description: a new portable posix threading library | ||
57 | +Version: @VERSION@ | ||
58 | +Libs: -L${libdir} -lnpth -lpthread | ||
59 | +Cflags: -I${includedir} | ||
diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb index f02a731f85..0cf35565a3 100644 --- a/meta/recipes-support/npth/npth_1.7.bb +++ b/meta/recipes-support/npth/npth_1.7.bb | |||
@@ -1,22 +1,18 @@ | |||
1 | SUMMARY = "New GNU Portable Threads library" | 1 | SUMMARY = "New GNU Portable Threads library" |
2 | DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " | 2 | DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " |
3 | HOMEPAGE = "https://www.gnu.org/software/pth/" | 3 | HOMEPAGE = "https://gnupg.org/software/npth/" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "LGPL-2.0-or-later" | 5 | LICENSE = "LGPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "\ | 6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" |
7 | file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\ | ||
8 | " | ||
9 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | 7 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" |
8 | |||
10 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ | 9 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ |
11 | file://pkgconfig.patch \ | ||
12 | file://musl-fix.patch \ | 10 | file://musl-fix.patch \ |
13 | " | 11 | " |
14 | 12 | ||
15 | SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" | 13 | SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" |
16 | 14 | ||
17 | inherit autotools binconfig-disabled multilib_header | 15 | inherit autotools multilib_header |
18 | |||
19 | FILES:${PN} = "${libdir}/libnpth.so.*" | ||
20 | 16 | ||
21 | do_install:append() { | 17 | do_install:append() { |
22 | oe_multilib_header npth.h | 18 | oe_multilib_header npth.h |
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb index b7ebd44abc..2ede38deba 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb | |||
@@ -32,3 +32,13 @@ FILES:${PN} += " \ | |||
32 | INSANE_SKIP:${PN} = "dev-so" | 32 | INSANE_SKIP:${PN} = "dev-so" |
33 | 33 | ||
34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
35 | |||
36 | # # This one is reproducible only on 32bit MACHINEs | ||
37 | # http://errors.yoctoproject.org/Errors/Details/766969/ | ||
38 | # git/p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
39 | # git/p11-kit/import-object.c:229:70: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
40 | # git/p11-kit/import-object.c:264:78: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
41 | # git/p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
42 | # git/p11-kit/import-object.c:229:70: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
43 | # git/p11-kit/import-object.c:264:78: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
44 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.16.bb b/meta/recipes-support/rng-tools/rng-tools_6.16.bb index f0aa3ff93f..ed755ae705 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.16.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.16.bb | |||
@@ -50,9 +50,9 @@ do_configure:prepend() { | |||
50 | } | 50 | } |
51 | 51 | ||
52 | do_install:append() { | 52 | do_install:append() { |
53 | install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools | 53 | install -Dm 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/rng-tools |
54 | install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools | 54 | install -Dm 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rng-tools |
55 | install -Dm 0644 ${WORKDIR}/rng-tools.service \ | 55 | install -Dm 0644 ${UNPACKDIR}/rng-tools.service \ |
56 | ${D}${systemd_system_unitdir}/rng-tools.service | 56 | ${D}${systemd_system_unitdir}/rng-tools.service |
57 | sed -i \ | 57 | sed -i \ |
58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
@@ -67,3 +67,7 @@ do_install:append() { | |||
67 | ${D}${systemd_system_unitdir}/rng-tools.service | 67 | ${D}${systemd_system_unitdir}/rng-tools.service |
68 | fi | 68 | fi |
69 | } | 69 | } |
70 | |||
71 | # libargp detection fails | ||
72 | # http://errors.yoctoproject.org/Errors/Details/766951/ | ||
73 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 91640d6044..c8e6eddfec 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch | |||
@@ -31,7 +31,7 @@ ERROR: scons install execution failed. | |||
31 | and the installed paths (including the paths inside libserf*.pc) | 31 | and the installed paths (including the paths inside libserf*.pc) |
32 | look correct | 32 | look correct |
33 | 33 | ||
34 | Upstream-Status: Pending | 34 | Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] |
35 | 35 | ||
36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
37 | 37 | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb b/meta/recipes-support/sqlite/sqlite3_3.45.3.bb index 50612feb25..03d70bbd38 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.45.3.bb | |||
@@ -4,5 +4,5 @@ LICENSE = "PD" | |||
4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" | 4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" |
5 | 5 | ||
6 | SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" | 6 | SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" |
7 | SRC_URI[sha256sum] = "cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a" | 7 | SRC_URI[sha256sum] = "b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531" |
8 | 8 | ||
diff --git a/meta/recipes-support/taglib/taglib_2.0.bb b/meta/recipes-support/taglib/taglib_2.0.1.bb index 4bf9be15ae..14f99aabbc 100644 --- a/meta/recipes-support/taglib/taglib_2.0.bb +++ b/meta/recipes-support/taglib/taglib_2.0.1.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "zlib utfcpp" | |||
11 | 11 | ||
12 | SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" | 12 | SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "e36ea877a6370810b97d84cf8f72b1e4ed205149ab3ac8232d44c850f38a2859" | 14 | SRC_URI[sha256sum] = "08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://taglib.org/" | 16 | UPSTREAM_CHECK_URI = "https://taglib.org/" |
17 | UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" | 17 | UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" |
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb index 639b01f6eb..2bd3699e74 100644 --- a/meta/recipes-support/user-creation/xuser-account_0.1.bb +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb | |||
@@ -15,7 +15,7 @@ do_compile() { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf | 18 | install -D -m 0644 ${UNPACKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf |
19 | } | 19 | } |
20 | 20 | ||
21 | FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" | 21 | FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" |