diff options
168 files changed, 1117 insertions, 1198 deletions
diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 505c2e234d..fe706a19a3 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md | |||
@@ -41,6 +41,7 @@ Component/Subsystem Maintainers | |||
41 | * devtool: Saul Wold | 41 | * devtool: Saul Wold |
42 | * eSDK: Saul Wold | 42 | * eSDK: Saul Wold |
43 | * overlayfs: Vyacheslav Yurkov | 43 | * overlayfs: Vyacheslav Yurkov |
44 | * Patchtest: Trevor Gamblin | ||
44 | 45 | ||
45 | Maintainers needed | 46 | Maintainers needed |
46 | ------------------ | 47 | ------------------ |
@@ -52,7 +53,6 @@ Maintainers needed | |||
52 | * error reporting system/web UI | 53 | * error reporting system/web UI |
53 | * wic | 54 | * wic |
54 | * Patchwork | 55 | * Patchwork |
55 | * Patchtest | ||
56 | * Matchbox | 56 | * Matchbox |
57 | * Sato | 57 | * Sato |
58 | * Autobuilder | 58 | * Autobuilder |
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 18d5574a31..4a96f5b313 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -441,7 +441,7 @@ class Cache(object): | |||
441 | else: | 441 | else: |
442 | symlink = os.path.join(self.cachedir, "bb_cache.dat") | 442 | symlink = os.path.join(self.cachedir, "bb_cache.dat") |
443 | 443 | ||
444 | if os.path.exists(symlink): | 444 | if os.path.exists(symlink) or os.path.islink(symlink): |
445 | bb.utils.remove(symlink) | 445 | bb.utils.remove(symlink) |
446 | try: | 446 | try: |
447 | os.symlink(os.path.basename(self.cachefile), symlink) | 447 | os.symlink(os.path.basename(self.cachefile), symlink) |
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 89b70fb6a4..8f24535528 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -704,8 +704,12 @@ class SignatureGeneratorUniHashMixIn(object): | |||
704 | query_tids.append(tid) | 704 | query_tids.append(tid) |
705 | 705 | ||
706 | if query_tids: | 706 | if query_tids: |
707 | with self.client() as client: | 707 | unihashes = [] |
708 | unihashes = client.get_unihash_batch((self._get_method(tid), self.taskhash[tid]) for tid in query_tids) | 708 | try: |
709 | with self.client() as client: | ||
710 | unihashes = client.get_unihash_batch((self._get_method(tid), self.taskhash[tid]) for tid in query_tids) | ||
711 | except (ConnectionError, FileNotFoundError) as e: | ||
712 | bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) | ||
709 | 713 | ||
710 | for idx, tid in enumerate(query_tids): | 714 | for idx, tid in enumerate(query_tids): |
711 | # In the absence of being able to discover a unique hash from the | 715 | # In the absence of being able to discover a unique hash from the |
@@ -722,9 +726,9 @@ class SignatureGeneratorUniHashMixIn(object): | |||
722 | # to the server, there is a better chance that they will agree on | 726 | # to the server, there is a better chance that they will agree on |
723 | # the unique hash. | 727 | # the unique hash. |
724 | taskhash = self.taskhash[tid] | 728 | taskhash = self.taskhash[tid] |
725 | unihash = unihashes[idx] | ||
726 | 729 | ||
727 | if unihash: | 730 | if unihashes and unihashes[idx]: |
731 | unihash = unihashes[idx] | ||
728 | # A unique hash equal to the taskhash is not very interesting, | 732 | # A unique hash equal to the taskhash is not very interesting, |
729 | # so it is reported it at debug level 2. If they differ, that | 733 | # so it is reported it at debug level 2. If they differ, that |
730 | # is much more interesting, so it is reported at debug level 1 | 734 | # is much more interesting, so it is reported at debug level 1 |
@@ -733,7 +737,6 @@ class SignatureGeneratorUniHashMixIn(object): | |||
733 | hashequiv_logger.debug2('No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) | 737 | hashequiv_logger.debug2('No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) |
734 | unihash = taskhash | 738 | unihash = taskhash |
735 | 739 | ||
736 | |||
737 | self.set_unihash(tid, unihash) | 740 | self.set_unihash(tid, unihash) |
738 | self.unihash[tid] = unihash | 741 | self.unihash[tid] = unihash |
739 | result[tid] = unihash | 742 | result[tid] = unihash |
@@ -814,7 +817,7 @@ class SignatureGeneratorUniHashMixIn(object): | |||
814 | d.setVar('BB_UNIHASH', new_unihash) | 817 | d.setVar('BB_UNIHASH', new_unihash) |
815 | else: | 818 | else: |
816 | hashequiv_logger.debug('Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) | 819 | hashequiv_logger.debug('Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) |
817 | except ConnectionError as e: | 820 | except (ConnectionError, FileNotFoundError) as e: |
818 | bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) | 821 | bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) |
819 | finally: | 822 | finally: |
820 | if sigfile: | 823 | if sigfile: |
@@ -856,7 +859,7 @@ class SignatureGeneratorUniHashMixIn(object): | |||
856 | # TODO: What to do here? | 859 | # TODO: What to do here? |
857 | hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) | 860 | hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) |
858 | 861 | ||
859 | except ConnectionError as e: | 862 | except (ConnectionError, FileNotFoundError) as e: |
860 | bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) | 863 | bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) |
861 | 864 | ||
862 | return False | 865 | return False |
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 88c3602e66..16b449d6b7 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -7086,6 +7086,13 @@ system and gives an overview of their function and contents. | |||
7086 | The default value is ``"${WORKDIR}/recipe-sysroot-native"``. | 7086 | The default value is ``"${WORKDIR}/recipe-sysroot-native"``. |
7087 | Do not modify it. | 7087 | Do not modify it. |
7088 | 7088 | ||
7089 | :term:`RECIPE_UPDATE_EXTRA_TASKS` | ||
7090 | For some recipes, after the new source has been unpacked, additional tasks | ||
7091 | may need to be run during an upgrade. A good example of this is recipes | ||
7092 | which inherit :ref:`ref-classes-cargo-update-recipe-crates`, where the | ||
7093 | `do_update_crates` task needs to be run whenever Cargo.toml/Cargo.lock have | ||
7094 | changed in the source. | ||
7095 | |||
7089 | :term:`REPODIR` | 7096 | :term:`REPODIR` |
7090 | See :term:`bitbake:REPODIR` in the BitBake manual. | 7097 | See :term:`bitbake:REPODIR` in the BitBake manual. |
7091 | 7098 | ||
diff --git a/meta/classes-global/mirrors.bbclass b/meta/classes-global/mirrors.bbclass index 862648eec5..d68d30b0f2 100644 --- a/meta/classes-global/mirrors.bbclass +++ b/meta/classes-global/mirrors.bbclass | |||
@@ -88,7 +88,7 @@ git://.*/.* git://HOST/git/PATH;protocol=https \ | |||
88 | BB_GIT_SHALLOW:pn-binutils = "1" | 88 | BB_GIT_SHALLOW:pn-binutils = "1" |
89 | BB_GIT_SHALLOW:pn-binutils-cross-${TARGET_ARCH} = "1" | 89 | BB_GIT_SHALLOW:pn-binutils-cross-${TARGET_ARCH} = "1" |
90 | BB_GIT_SHALLOW:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "1" | 90 | BB_GIT_SHALLOW:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "1" |
91 | BB_GIT_SHALLOW:pn-binutils-cross-testsuite = "1" | 91 | BB_GIT_SHALLOW:pn-binutils-testsuite = "1" |
92 | BB_GIT_SHALLOW:pn-binutils-crosssdk-${SDK_SYS} = "1" | 92 | BB_GIT_SHALLOW:pn-binutils-crosssdk-${SDK_SYS} = "1" |
93 | BB_GIT_SHALLOW:pn-binutils-native = "1" | 93 | BB_GIT_SHALLOW:pn-binutils-native = "1" |
94 | BB_GIT_SHALLOW:pn-nativesdk-binutils = "1" | 94 | BB_GIT_SHALLOW:pn-nativesdk-binutils = "1" |
diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass index 78440c810b..2386cc3d77 100644 --- a/meta/classes-recipe/cargo_common.bbclass +++ b/meta/classes-recipe/cargo_common.bbclass | |||
@@ -41,7 +41,7 @@ CARGO_SRC_DIR ??= "" | |||
41 | CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml" | 41 | CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml" |
42 | 42 | ||
43 | # Path to Cargo.lock | 43 | # Path to Cargo.lock |
44 | CARGO_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH', True)), 'Cargo.lock')}" | 44 | CARGO_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH')), 'Cargo.lock')}" |
45 | 45 | ||
46 | CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}" | 46 | CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}" |
47 | cargo_common_do_configure () { | 47 | cargo_common_do_configure () { |
@@ -171,7 +171,7 @@ python cargo_common_do_patch_paths() { | |||
171 | # here is better than letting cargo tell (in case the file is missing) | 171 | # here is better than letting cargo tell (in case the file is missing) |
172 | # "Cargo.lock should be modified but --frozen was given" | 172 | # "Cargo.lock should be modified but --frozen was given" |
173 | 173 | ||
174 | lockfile = d.getVar("CARGO_LOCK_PATH", True) | 174 | lockfile = d.getVar("CARGO_LOCK_PATH") |
175 | if not os.path.exists(lockfile): | 175 | if not os.path.exists(lockfile): |
176 | bb.fatal(f"{lockfile} file doesn't exist") | 176 | bb.fatal(f"{lockfile} file doesn't exist") |
177 | 177 | ||
diff --git a/meta/classes-recipe/devicetree.bbclass b/meta/classes-recipe/devicetree.bbclass index bd50d7fa1d..1806cb62cb 100644 --- a/meta/classes-recipe/devicetree.bbclass +++ b/meta/classes-recipe/devicetree.bbclass | |||
@@ -40,7 +40,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
40 | SYSROOT_DIRS += "/boot/devicetree" | 40 | SYSROOT_DIRS += "/boot/devicetree" |
41 | FILES:${PN} = "/boot/devicetree/*.dtb /boot/devicetree/*.dtbo" | 41 | FILES:${PN} = "/boot/devicetree/*.dtb /boot/devicetree/*.dtbo" |
42 | 42 | ||
43 | S = "${WORKDIR}" | 43 | S = "${WORKDIR}/sources" |
44 | UNPACKDIR = "${S}" | ||
44 | B = "${WORKDIR}/build" | 45 | B = "${WORKDIR}/build" |
45 | 46 | ||
46 | # Default kernel includes, these represent what are normally used for in-kernel | 47 | # Default kernel includes, these represent what are normally used for in-kernel |
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index d6eedf942c..89badd90f1 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass | |||
@@ -115,7 +115,9 @@ python __anonymous () { | |||
115 | 115 | ||
116 | d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) | 116 | d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) |
117 | d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1') | 117 | d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1') |
118 | d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e | 118 | |
119 | if d.getVar('KERNEL_IMAGETYPE_SYMLINK') == '1': | ||
120 | d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e | ||
119 | if [ -n "$D" ]; then | 121 | if [ -n "$D" ]; then |
120 | ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 | 122 | ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 |
121 | else | 123 | else |
@@ -127,7 +129,7 @@ else | |||
127 | fi | 129 | fi |
128 | set -e | 130 | set -e |
129 | """ % (type, type, type, type, type, type, type)) | 131 | """ % (type, type, type, type, type, type, type)) |
130 | d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e | 132 | d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e |
131 | if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then | 133 | if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then |
132 | rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 | 134 | rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 |
133 | fi | 135 | fi |
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 81896d808f..8d79d88ebe 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass | |||
@@ -75,7 +75,8 @@ SDK_ARCHIVE_TYPE ?= "tar.xz" | |||
75 | SDK_XZ_COMPRESSION_LEVEL ?= "-9" | 75 | SDK_XZ_COMPRESSION_LEVEL ?= "-9" |
76 | SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" | 76 | SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" |
77 | SDK_ZIP_OPTIONS ?= "-y" | 77 | SDK_ZIP_OPTIONS ?= "-y" |
78 | 78 | SDK_7ZIP_OPTIONS ?= "-mx=9 -mm=BZip2" | |
79 | SDK_7ZIP_TYPE ?= "7z" | ||
79 | 80 | ||
80 | # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz | 81 | # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz |
81 | python () { | 82 | python () { |
@@ -84,6 +85,9 @@ python () { | |||
84 | # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} | 85 | # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} |
85 | # recommand to cd into input dir first to avoid archive with buildpath | 86 | # recommand to cd into input dir first to avoid archive with buildpath |
86 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') | 87 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') |
88 | elif d.getVar('SDK_ARCHIVE_TYPE') == '7zip': | ||
89 | d.setVar('SDK_ARCHIVE_DEPENDS', 'p7zip-native') | ||
90 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; 7za a -r ${SDK_7ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_7ZIP_TYPE} .') | ||
87 | else: | 91 | else: |
88 | d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') | 92 | d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') |
89 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') | 93 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') |
diff --git a/meta/classes-recipe/ptest-cargo.bbclass b/meta/classes-recipe/ptest-cargo.bbclass index c46df362bf..fd1df9d7c9 100644 --- a/meta/classes-recipe/ptest-cargo.bbclass +++ b/meta/classes-recipe/ptest-cargo.bbclass | |||
@@ -12,10 +12,10 @@ python do_compile_ptest_cargo() { | |||
12 | import subprocess | 12 | import subprocess |
13 | import json | 13 | import json |
14 | 14 | ||
15 | cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO", True)) | 15 | cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO")) |
16 | cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS", True) | 16 | cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS") |
17 | rust_flags = d.getVar("RUSTFLAGS", True) | 17 | rust_flags = d.getVar("RUSTFLAGS") |
18 | manifest_path = d.getVar("CARGO_MANIFEST_PATH", True) | 18 | manifest_path = d.getVar("CARGO_MANIFEST_PATH") |
19 | project_manifest_path = os.path.normpath(manifest_path) | 19 | project_manifest_path = os.path.normpath(manifest_path) |
20 | manifest_dir = os.path.dirname(manifest_path) | 20 | manifest_dir = os.path.dirname(manifest_path) |
21 | 21 | ||
@@ -66,7 +66,7 @@ python do_compile_ptest_cargo() { | |||
66 | if not test_bins: | 66 | if not test_bins: |
67 | bb.fatal("Unable to find any test binaries") | 67 | bb.fatal("Unable to find any test binaries") |
68 | 68 | ||
69 | cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES', True) | 69 | cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES') |
70 | bb.note(f"Found {len(test_bins)} tests, write their paths into {cargo_test_binaries_file}") | 70 | bb.note(f"Found {len(test_bins)} tests, write their paths into {cargo_test_binaries_file}") |
71 | with open(cargo_test_binaries_file, "w") as f: | 71 | with open(cargo_test_binaries_file, "w") as f: |
72 | for test_bin in test_bins: | 72 | for test_bin in test_bins: |
@@ -77,10 +77,10 @@ python do_compile_ptest_cargo() { | |||
77 | python do_install_ptest_cargo() { | 77 | python do_install_ptest_cargo() { |
78 | import shutil | 78 | import shutil |
79 | 79 | ||
80 | dest_dir = d.getVar("D", True) | 80 | dest_dir = d.getVar("D") |
81 | pn = d.getVar("PN", True) | 81 | pn = d.getVar("PN") |
82 | ptest_path = d.getVar("PTEST_PATH", True) | 82 | ptest_path = d.getVar("PTEST_PATH") |
83 | cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES', True) | 83 | cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES') |
84 | rust_test_args = d.getVar('RUST_TEST_ARGS') or "" | 84 | rust_test_args = d.getVar('RUST_TEST_ARGS') or "" |
85 | 85 | ||
86 | ptest_dir = os.path.join(dest_dir, ptest_path.lstrip('/')) | 86 | ptest_dir = os.path.join(dest_dir, ptest_path.lstrip('/')) |
diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 330ad8a3f5..334f2e7d5f 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass | |||
@@ -130,7 +130,7 @@ def llvm_features(d): | |||
130 | llvm_features[vardepvalue] = "${@llvm_features(d)}" | 130 | llvm_features[vardepvalue] = "${@llvm_features(d)}" |
131 | 131 | ||
132 | ## arm-unknown-linux-gnueabihf | 132 | ## arm-unknown-linux-gnueabihf |
133 | DATA_LAYOUT[arm-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" | 133 | DATA_LAYOUT[arm-eabi] = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" |
134 | TARGET_ENDIAN[arm-eabi] = "little" | 134 | TARGET_ENDIAN[arm-eabi] = "little" |
135 | TARGET_POINTER_WIDTH[arm-eabi] = "32" | 135 | TARGET_POINTER_WIDTH[arm-eabi] = "32" |
136 | TARGET_C_INT_WIDTH[arm-eabi] = "32" | 136 | TARGET_C_INT_WIDTH[arm-eabi] = "32" |
@@ -138,7 +138,7 @@ MAX_ATOMIC_WIDTH[arm-eabi] = "64" | |||
138 | FEATURES[arm-eabi] = "+v6,+vfp2" | 138 | FEATURES[arm-eabi] = "+v6,+vfp2" |
139 | 139 | ||
140 | ## armv7-unknown-linux-gnueabihf | 140 | ## armv7-unknown-linux-gnueabihf |
141 | DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" | 141 | DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" |
142 | TARGET_ENDIAN[armv7-eabi] = "little" | 142 | TARGET_ENDIAN[armv7-eabi] = "little" |
143 | TARGET_POINTER_WIDTH[armv7-eabi] = "32" | 143 | TARGET_POINTER_WIDTH[armv7-eabi] = "32" |
144 | TARGET_C_INT_WIDTH[armv7-eabi] = "32" | 144 | TARGET_C_INT_WIDTH[armv7-eabi] = "32" |
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 2d0bbfbd42..9d286224d6 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -473,7 +473,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): | |||
473 | 473 | ||
474 | def is_work_shared(d): | 474 | def is_work_shared(d): |
475 | sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared') | 475 | sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared') |
476 | return d.getVar('S').startswith(sharedworkdir) | 476 | sourcedir = os.path.realpath(d.getVar('S')) |
477 | return sourcedir.startswith(sharedworkdir) | ||
477 | 478 | ||
478 | # Run do_unpack and do_patch | 479 | # Run do_unpack and do_patch |
479 | python do_unpack_and_patch() { | 480 | python do_unpack_and_patch() { |
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 3ebf92b5e1..99061320e5 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass | |||
@@ -8,6 +8,14 @@ inherit spdx-common | |||
8 | 8 | ||
9 | SPDX_VERSION = "2.2" | 9 | SPDX_VERSION = "2.2" |
10 | 10 | ||
11 | SPDX_ORG ??= "OpenEmbedded ()" | ||
12 | SPDX_SUPPLIER ??= "Organization: ${SPDX_ORG}" | ||
13 | SPDX_SUPPLIER[doc] = "The SPDX PackageSupplier field for SPDX packages created from \ | ||
14 | this recipe. For SPDX documents create using this class during the build, this \ | ||
15 | is the contact information for the person or organization who is doing the \ | ||
16 | build." | ||
17 | |||
18 | |||
11 | def get_namespace(d, name): | 19 | def get_namespace(d, name): |
12 | import uuid | 20 | import uuid |
13 | namespace_uuid = uuid.uuid5(uuid.NAMESPACE_DNS, d.getVar("SPDX_UUID_NAMESPACE")) | 21 | namespace_uuid = uuid.uuid5(uuid.NAMESPACE_DNS, d.getVar("SPDX_UUID_NAMESPACE")) |
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 56ba8bceef..93a2a1413d 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass | |||
@@ -49,7 +49,8 @@ CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" | |||
49 | CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" | 49 | CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" |
50 | CVE_CHECK_RECIPE_FILE_JSON ?= "${CVE_CHECK_DIR}/${PN}_cve.json" | 50 | CVE_CHECK_RECIPE_FILE_JSON ?= "${CVE_CHECK_DIR}/${PN}_cve.json" |
51 | CVE_CHECK_MANIFEST ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.cve" | 51 | CVE_CHECK_MANIFEST ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.cve" |
52 | CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.json" | 52 | CVE_CHECK_MANIFEST_JSON_SUFFIX ?= "json" |
53 | CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.${CVE_CHECK_MANIFEST_JSON_SUFFIX}" | ||
53 | CVE_CHECK_COPY_FILES ??= "1" | 54 | CVE_CHECK_COPY_FILES ??= "1" |
54 | CVE_CHECK_CREATE_MANIFEST ??= "1" | 55 | CVE_CHECK_CREATE_MANIFEST ??= "1" |
55 | 56 | ||
@@ -278,7 +279,8 @@ python cve_check_write_rootfs_manifest () { | |||
278 | bb.plain("Image CVE report stored in: %s" % manifest_name) | 279 | bb.plain("Image CVE report stored in: %s" % manifest_name) |
279 | 280 | ||
280 | if enable_json: | 281 | if enable_json: |
281 | link_path = os.path.join(deploy_dir, "%s.json" % link_name) | 282 | manifest_name_suffix = d.getVar("CVE_CHECK_MANIFEST_JSON_SUFFIX") |
283 | link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) | ||
282 | manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") | 284 | manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") |
283 | 285 | ||
284 | with open(manifest_name, "w") as f: | 286 | with open(manifest_name, "w") as f: |
diff --git a/meta/classes/spdx-common.bbclass b/meta/classes/spdx-common.bbclass index 03f1d0cc27..18254c36aa 100644 --- a/meta/classes/spdx-common.bbclass +++ b/meta/classes/spdx-common.bbclass | |||
@@ -36,13 +36,6 @@ SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json" | |||
36 | 36 | ||
37 | SPDX_CUSTOM_ANNOTATION_VARS ??= "" | 37 | SPDX_CUSTOM_ANNOTATION_VARS ??= "" |
38 | 38 | ||
39 | SPDX_ORG ??= "OpenEmbedded ()" | ||
40 | SPDX_SUPPLIER ??= "Organization: ${SPDX_ORG}" | ||
41 | SPDX_SUPPLIER[doc] = "The SPDX PackageSupplier field for SPDX packages created from \ | ||
42 | this recipe. For SPDX documents create using this class during the build, this \ | ||
43 | is the contact information for the person or organization who is doing the \ | ||
44 | build." | ||
45 | |||
46 | def extract_licenses(filename): | 39 | def extract_licenses(filename): |
47 | import re | 40 | import re |
48 | 41 | ||
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index ccbc1d1969..58163a9f7a 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -147,8 +147,6 @@ DISTRO_PN_ALIAS:pn-libjson = "Ubuntu=libjson0-dev Debian=libjson0-dev" | |||
147 | DISTRO_PN_ALIAS:pn-libksba = "Fedora=libksba Debian=libksba8 Ubuntu=libksba" | 147 | DISTRO_PN_ALIAS:pn-libksba = "Fedora=libksba Debian=libksba8 Ubuntu=libksba" |
148 | DISTRO_PN_ALIAS:pn-libmatchbox = "Ubuntu=libmatchbox Fedora=libmatchbox" | 148 | DISTRO_PN_ALIAS:pn-libmatchbox = "Ubuntu=libmatchbox Fedora=libmatchbox" |
149 | DISTRO_PN_ALIAS:pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2" | 149 | DISTRO_PN_ALIAS:pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2" |
150 | DISTRO_PN_ALIAS:pn-libnewt = "Debian=libnewt0.52 Fedora=newt" | ||
151 | DISTRO_PN_ALIAS:pn-libnewt-python = "Ubuntu=python-newt Fedora=newt-python" | ||
152 | DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" | 150 | DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" |
153 | DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" | 151 | DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" |
154 | DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" | 152 | DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 42599267c1..37ad293e32 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -64,7 +64,7 @@ RECIPE_MAINTAINER:pn-bind = "Unassigned <unassigned@yoctoproject.org>" | |||
64 | RECIPE_MAINTAINER:pn-binutils = "Khem Raj <raj.khem@gmail.com>" | 64 | RECIPE_MAINTAINER:pn-binutils = "Khem Raj <raj.khem@gmail.com>" |
65 | RECIPE_MAINTAINER:pn-binutils-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" | 65 | RECIPE_MAINTAINER:pn-binutils-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" |
66 | RECIPE_MAINTAINER:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" | 66 | RECIPE_MAINTAINER:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" |
67 | RECIPE_MAINTAINER:pn-binutils-cross-testsuite = "Khem Raj <raj.khem@gmail.com>" | 67 | RECIPE_MAINTAINER:pn-binutils-testsuite = "Khem Raj <raj.khem@gmail.com>" |
68 | RECIPE_MAINTAINER:pn-binutils-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" | 68 | RECIPE_MAINTAINER:pn-binutils-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" |
69 | RECIPE_MAINTAINER:pn-bison = "Chen Qi <Qi.Chen@windriver.com>" | 69 | RECIPE_MAINTAINER:pn-bison = "Chen Qi <Qi.Chen@windriver.com>" |
70 | RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" | 70 | RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" |
@@ -227,7 +227,6 @@ RECIPE_MAINTAINER:pn-go-cross-${TUNE_PKGARCH} = "Khem Raj <raj.khem@gmail.com>" | |||
227 | RECIPE_MAINTAINER:pn-go-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" | 227 | RECIPE_MAINTAINER:pn-go-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" |
228 | RECIPE_MAINTAINER:pn-go-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" | 228 | RECIPE_MAINTAINER:pn-go-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" |
229 | RECIPE_MAINTAINER:pn-go-helloworld = "Khem Raj <raj.khem@gmail.com>" | 229 | RECIPE_MAINTAINER:pn-go-helloworld = "Khem Raj <raj.khem@gmail.com>" |
230 | RECIPE_MAINTAINER:pn-go-native = "Khem Raj <raj.khem@gmail.com>" | ||
231 | RECIPE_MAINTAINER:pn-go-runtime = "Khem Raj <raj.khem@gmail.com>" | 230 | RECIPE_MAINTAINER:pn-go-runtime = "Khem Raj <raj.khem@gmail.com>" |
232 | RECIPE_MAINTAINER:pn-gobject-introspection = "Alexander Kanavin <alex.kanavin@gmail.com>" | 231 | RECIPE_MAINTAINER:pn-gobject-introspection = "Alexander Kanavin <alex.kanavin@gmail.com>" |
233 | RECIPE_MAINTAINER:pn-gperf = "Alexander Kanavin <alex.kanavin@gmail.com>" | 232 | RECIPE_MAINTAINER:pn-gperf = "Alexander Kanavin <alex.kanavin@gmail.com>" |
@@ -359,7 +358,6 @@ RECIPE_MAINTAINER:pn-libmnl = "Khem Raj <raj.khem@gmail.com>" | |||
359 | RECIPE_MAINTAINER:pn-libmpc = "Khem Raj <raj.khem@gmail.com>" | 358 | RECIPE_MAINTAINER:pn-libmpc = "Khem Raj <raj.khem@gmail.com>" |
360 | RECIPE_MAINTAINER:pn-libmodule-build-perl = "Tim Orling <tim.orling@konsulko.com>" | 359 | RECIPE_MAINTAINER:pn-libmodule-build-perl = "Tim Orling <tim.orling@konsulko.com>" |
361 | RECIPE_MAINTAINER:pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>" | 360 | RECIPE_MAINTAINER:pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>" |
362 | RECIPE_MAINTAINER:pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>" | ||
363 | RECIPE_MAINTAINER:pn-libnl = "Alexander Kanavin <alex.kanavin@gmail.com>" | 361 | RECIPE_MAINTAINER:pn-libnl = "Alexander Kanavin <alex.kanavin@gmail.com>" |
364 | RECIPE_MAINTAINER:pn-libnotify = "Anuj Mittal <anuj.mittal@intel.com>" | 362 | RECIPE_MAINTAINER:pn-libnotify = "Anuj Mittal <anuj.mittal@intel.com>" |
365 | RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj <raj.khem@gmail.com>" | 363 | RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj <raj.khem@gmail.com>" |
@@ -696,12 +694,12 @@ RECIPE_MAINTAINER:pn-python3-rpds-py = "Tim Orling <tim.orling@konsulko.com>" | |||
696 | RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <bruce.ashfield@gmail.com>" | 694 | RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <bruce.ashfield@gmail.com>" |
697 | RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <tim.orling@konsulko.com>" | 695 | RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <tim.orling@konsulko.com>" |
698 | RECIPE_MAINTAINER:pn-python3-semantic-version = "Tim Orling <tim.orling@konsulko.com>" | 696 | RECIPE_MAINTAINER:pn-python3-semantic-version = "Tim Orling <tim.orling@konsulko.com>" |
699 | RECIPE_MAINTAINER:pn-python3-setuptools = "Unassigned <unassigned@yoctoproject.org>" | 697 | RECIPE_MAINTAINER:pn-python3-setuptools = "Trevor Gamblin <tgamblin@baylibre.com>" |
700 | RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling <tim.orling@konsulko.com>" | 698 | RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling <tim.orling@konsulko.com>" |
701 | RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Trevor Gamblin <tgamblin@baylibre.com>" | 699 | RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Trevor Gamblin <tgamblin@baylibre.com>" |
702 | RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <zangruochen@loongson.cn>" | 700 | RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <zangruochen@loongson.cn>" |
703 | RECIPE_MAINTAINER:pn-python3-smartypants = "Alexander Kanavin <alex.kanavin@gmail.com>" | 701 | RECIPE_MAINTAINER:pn-python3-smartypants = "Alexander Kanavin <alex.kanavin@gmail.com>" |
704 | RECIPE_MAINTAINER:pn-python3-smmap = "Unassigned <unassigned@yoctoproject.org>" | 702 | RECIPE_MAINTAINER:pn-python3-smmap = "Trevor Gamblin <tgamblin@baylibre.com>" |
705 | RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling <tim.orling@konsulko.com>" | 703 | RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling <tim.orling@konsulko.com>" |
706 | RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling <tim.orling@konsulko.com>" | 704 | RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling <tim.orling@konsulko.com>" |
707 | RECIPE_MAINTAINER:pn-python3-spdx-tools = "Marta Rybczynska <mrybczynska@syslinbit.com>" | 705 | RECIPE_MAINTAINER:pn-python3-spdx-tools = "Marta Rybczynska <mrybczynska@syslinbit.com>" |
@@ -714,8 +712,8 @@ RECIPE_MAINTAINER:pn-python3-sphinxcontrib-jquery = "Tim Orling <tim.orling@kons | |||
714 | RECIPE_MAINTAINER:pn-python3-sphinxcontrib-qthelp = "Tim Orling <tim.orling@konsulko.com>" | 712 | RECIPE_MAINTAINER:pn-python3-sphinxcontrib-qthelp = "Tim Orling <tim.orling@konsulko.com>" |
715 | RECIPE_MAINTAINER:pn-python3-sphinxcontrib-serializinghtml = "Tim Orling <tim.orling@konsulko.com>" | 713 | RECIPE_MAINTAINER:pn-python3-sphinxcontrib-serializinghtml = "Tim Orling <tim.orling@konsulko.com>" |
716 | RECIPE_MAINTAINER:pn-python3-sphinx-rtd-theme = "Tim Orling <tim.orling@konsulko.com>" | 714 | RECIPE_MAINTAINER:pn-python3-sphinx-rtd-theme = "Tim Orling <tim.orling@konsulko.com>" |
717 | RECIPE_MAINTAINER:pn-python3-subunit = "Unassigned <unassigned@yoctoproject.org>" | 715 | RECIPE_MAINTAINER:pn-python3-subunit = "Trevor Gamblin <tgamblin@baylibre.com>" |
718 | RECIPE_MAINTAINER:pn-python3-testtools = "Unassigned <unassigned@yoctoproject.org>" | 716 | RECIPE_MAINTAINER:pn-python3-testtools = "Trevor Gamblin <tgamblin@baylibre.com>" |
719 | RECIPE_MAINTAINER:pn-python3-toml = "Tim Orling <tim.orling@konsulko.com>" | 717 | RECIPE_MAINTAINER:pn-python3-toml = "Tim Orling <tim.orling@konsulko.com>" |
720 | RECIPE_MAINTAINER:pn-python3-tomli = "Tim Orling <tim.orling@konsulko.com>" | 718 | RECIPE_MAINTAINER:pn-python3-tomli = "Tim Orling <tim.orling@konsulko.com>" |
721 | RECIPE_MAINTAINER:pn-python3-trove-classifiers = "Trevor Gamblin <tgamblin@baylibre.com>" | 719 | RECIPE_MAINTAINER:pn-python3-trove-classifiers = "Trevor Gamblin <tgamblin@baylibre.com>" |
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index da6fa6ee97..d7d711383c 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
@@ -63,6 +63,7 @@ PTESTS_FAST = "\ | |||
63 | python3-jinja2 \ | 63 | python3-jinja2 \ |
64 | python3-jsonpointer \ | 64 | python3-jsonpointer \ |
65 | python3-license-expression \ | 65 | python3-license-expression \ |
66 | python3-mako \ | ||
66 | python3-markupsafe \ | 67 | python3-markupsafe \ |
67 | python3-more-itertools \ | 68 | python3-more-itertools \ |
68 | python3-pluggy \ | 69 | python3-pluggy \ |
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index d1303f32bf..e6b46a0dc5 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py | |||
@@ -1853,7 +1853,7 @@ def process_pkgconfig(pkgfiles, d): | |||
1853 | if m: | 1853 | if m: |
1854 | hdr = m.group(1) | 1854 | hdr = m.group(1) |
1855 | exp = pd.expand(m.group(2)) | 1855 | exp = pd.expand(m.group(2)) |
1856 | if hdr == 'Requires': | 1856 | if hdr == 'Requires' or hdr == 'Requires.private': |
1857 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() | 1857 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() |
1858 | continue | 1858 | continue |
1859 | m = var_re.match(l) | 1859 | m = var_re.match(l) |
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 6966923c94..47c77fccd5 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py | |||
@@ -34,7 +34,7 @@ class ParseLogsTest(OERuntimeTestCase): | |||
34 | log_locations = ["/var/log/", "/var/log/dmesg", "/tmp/dmesg_output.log"] | 34 | log_locations = ["/var/log/", "/var/log/dmesg", "/tmp/dmesg_output.log"] |
35 | 35 | ||
36 | # The keywords that identify error messages in the log files | 36 | # The keywords that identify error messages in the log files |
37 | errors = ["error", "cannot", "can't", "failed"] | 37 | errors = ["error", "cannot", "can't", "failed", "---[ cut here ]---", "No irq handler for vector"] |
38 | 38 | ||
39 | # A list of error messages that should be ignored | 39 | # A list of error messages that should be ignored |
40 | ignore_errors = [] | 40 | ignore_errors = [] |
diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py index 80fdae240a..640f28abe9 100644 --- a/meta/lib/oeqa/runtime/cases/systemd.py +++ b/meta/lib/oeqa/runtime/cases/systemd.py | |||
@@ -150,12 +150,21 @@ class SystemdServiceTests(SystemdTest): | |||
150 | t_thread.start() | 150 | t_thread.start() |
151 | time.sleep(1) | 151 | time.sleep(1) |
152 | 152 | ||
153 | status, output = self.target.run('pidof sleep') | 153 | status, sleep_pid = self.target.run('pidof sleep') |
154 | # cause segfault on purpose | 154 | # cause segfault on purpose |
155 | self.target.run('kill -SEGV %s' % output) | 155 | self.target.run('kill -SEGV %s' % sleep_pid) |
156 | self.assertEqual(status, 0, msg = 'Not able to find process that runs sleep, output : %s' % output) | 156 | self.assertEqual(status, 0, msg = 'Not able to find process that runs sleep, output : %s' % sleep_pid) |
157 | 157 | ||
158 | (status, output) = self.target.run('coredumpctl info') | 158 | # Give some time to systemd-coredump@.service to process the coredump |
159 | for x in range(20): | ||
160 | status, output = self.target.run('coredumpctl list %s' % sleep_pid) | ||
161 | if status == 0: | ||
162 | break | ||
163 | time.sleep(1) | ||
164 | else: | ||
165 | self.fail("Timed out waiting for coredump creation") | ||
166 | |||
167 | (status, output) = self.target.run('coredumpctl info %s' % sleep_pid) | ||
159 | self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % output) | 168 | self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % output) |
160 | self.assertEqual('sleep_for_duration (busybox.nosuid' in output or 'xnanosleep (sleep.coreutils' in output, | 169 | self.assertEqual('sleep_for_duration (busybox.nosuid' in output or 'xnanosleep (sleep.coreutils' in output, |
161 | True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) | 170 | True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) |
diff --git a/meta/lib/oeqa/selftest/cases/binutils.py b/meta/lib/oeqa/selftest/cases/binutils.py index 1688eabe4e..5ff263d342 100644 --- a/meta/lib/oeqa/selftest/cases/binutils.py +++ b/meta/lib/oeqa/selftest/cases/binutils.py | |||
@@ -33,7 +33,7 @@ class BinutilsCrossSelfTest(OESelftestTestCase, OEPTestResultTestCase): | |||
33 | features.append('CHECK_TARGETS = "{0}"'.format(suite)) | 33 | features.append('CHECK_TARGETS = "{0}"'.format(suite)) |
34 | self.write_config("\n".join(features)) | 34 | self.write_config("\n".join(features)) |
35 | 35 | ||
36 | recipe = "binutils-cross-testsuite" | 36 | recipe = "binutils-testsuite" |
37 | bb_vars = get_bb_vars(["B", "TARGET_SYS", "T"], recipe) | 37 | bb_vars = get_bb_vars(["B", "TARGET_SYS", "T"], recipe) |
38 | builddir, target_sys, tdir = bb_vars["B"], bb_vars["TARGET_SYS"], bb_vars["T"] | 38 | builddir, target_sys, tdir = bb_vars["B"], bb_vars["TARGET_SYS"], bb_vars["T"] |
39 | 39 | ||
diff --git a/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch b/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch index 32808fb92a..e8ff78082c 100644 --- a/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch +++ b/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch | |||
@@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> | |||
3 | Date: Wed, 5 Aug 2020 12:06:01 -0700 | 3 | Date: Wed, 5 Aug 2020 12:06:01 -0700 |
4 | Subject: [PATCH] libacpi: Fix build witth -fno-commom | 4 | Subject: [PATCH] libacpi: Fix build witth -fno-commom |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 9 | --- |
diff --git a/meta/recipes-bsp/libacpi/files/ldflags.patch b/meta/recipes-bsp/libacpi/files/ldflags.patch index a7424c39da..db0974104b 100644 --- a/meta/recipes-bsp/libacpi/files/ldflags.patch +++ b/meta/recipes-bsp/libacpi/files/ldflags.patch | |||
@@ -1,7 +1,6 @@ | |||
1 | libacpi: Remove QA warning: No GNU_HASH in the elf binary | 1 | libacpi: Remove QA warning: No GNU_HASH in the elf binary |
2 | 2 | ||
3 | Upstream-Status: Inappropriate [other] | 3 | Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] |
4 | Useful within bitbake environment only. | ||
5 | 4 | ||
6 | Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | 5 | Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> |
7 | 6 | ||
diff --git a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch index 06f20e5a78..955a175c96 100644 --- a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch +++ b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] |
2 | 2 | ||
3 | Fix libacpi for x32 | 3 | Fix libacpi for x32 |
4 | 4 | ||
diff --git a/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/meta/recipes-bsp/libacpi/files/makefile-fix.patch index c34ef34e09..3b91bfaee1 100644 --- a/meta/recipes-bsp/libacpi/files/makefile-fix.patch +++ b/meta/recipes-bsp/libacpi/files/makefile-fix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] |
2 | 2 | ||
3 | --- | 3 | --- |
4 | Makefile | 6 +++--- | 4 | Makefile | 6 +++--- |
diff --git a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch b/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch index ef376aa316..901e5fa3b4 100644 --- a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch +++ b/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] |
2 | 2 | ||
3 | Used the cross strip instead of host strip to avoid this build error: | 3 | Used the cross strip instead of host strip to avoid this build error: |
4 | 4 | ||
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.13.0.bb index 2db0895bf4..0b876c7070 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.13.0.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | |||
12 | DEPENDS = "make-native" | 12 | DEPENDS = "make-native" |
13 | 13 | ||
14 | SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz" | 14 | SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz" |
15 | SRC_URI[sha256sum] = "f185d116d5ff99b797497efce8f19f1ee8ccc5a668b97a159e3d13472f674154" | 15 | SRC_URI[sha256sum] = "77f11f78298502634d1af50308f15a5788629f6cf45cba376f5009aea4cb4926" |
16 | 16 | ||
17 | inherit multilib_header pkgconfig update-alternatives | 17 | inherit multilib_header pkgconfig update-alternatives |
18 | 18 | ||
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb index fd193b2cff..43de279cfd 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma | |||
17 | file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ | 17 | file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "1c8ae59836fa87b4c63c598087f0460ec20ed862" | 20 | SRCREV = "a15ba1987c264eaa06c2655ddd0891aa5ac48c09" |
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit pkgconfig autotools-brokensep systemd useradd | 23 | inherit pkgconfig autotools-brokensep systemd useradd |
diff --git a/meta/recipes-connectivity/ofono/ofono_2.7.bb b/meta/recipes-connectivity/ofono/ofono_2.8.bb index bc1f3efd04..809485d421 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.7.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.8.bb | |||
@@ -4,14 +4,14 @@ HOMEPAGE = "http://www.ofono.org" | |||
4 | BUGTRACKER = "https://01.org/jira/browse/OF" | 4 | BUGTRACKER = "https://01.org/jira/browse/OF" |
5 | LICENSE = "GPL-2.0-only" | 5 | LICENSE = "GPL-2.0-only" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ |
7 | file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" | 7 | file://src/ofono.h;beginline=1;endline=6;md5=13e42133935ceecfc9bcb547f256e277" |
8 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" | 8 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" |
9 | 9 | ||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | 11 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ |
12 | file://ofono \ | 12 | file://ofono \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "dabf6ef06b94beaad65253200abe3887046a4e722f4fe373c4264f357ae47ad3" | 14 | SRC_URI[sha256sum] = "b5aef455b3a374ce43bad43c2ade9d0430d9c0d28952385c44ac7d0dc933bbb8" |
15 | 15 | ||
16 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data | 16 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data |
17 | 17 | ||
diff --git a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch b/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch deleted file mode 100644 index b8402a4dee..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | Adjust test cases to work with busybox. | ||
2 | |||
3 | - Replace dd parameter "obs" with "bs". | ||
4 | - Replace "head -<num>" with "head -n <num>". | ||
5 | |||
6 | Signed-off-by: Maxin B. John <maxin.john@enea.com> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: openssh-7.6p1/regress/cipher-speed.sh | ||
10 | =================================================================== | ||
11 | --- openssh-7.6p1.orig/regress/cipher-speed.sh | ||
12 | +++ openssh-7.6p1/regress/cipher-speed.sh | ||
13 | @@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for | ||
14 | printf "%-60s" "$c/$m:" | ||
15 | ( ${SSH} -o 'compression no' \ | ||
16 | -F $OBJ/ssh_proxy -m $m -c $c somehost \ | ||
17 | - exec sh -c \'"dd of=/dev/null obs=32k"\' \ | ||
18 | + exec sh -c \'"dd of=/dev/null bs=32k"\' \ | ||
19 | < ${DATA} ) 2>&1 | getbytes | ||
20 | |||
21 | if [ $? -ne 0 ]; then | ||
22 | Index: openssh-7.6p1/regress/transfer.sh | ||
23 | =================================================================== | ||
24 | --- openssh-7.6p1.orig/regress/transfer.sh | ||
25 | +++ openssh-7.6p1/regress/transfer.sh | ||
26 | @@ -13,7 +13,7 @@ cmp ${DATA} ${COPY} || fail "corrupted | ||
27 | for s in 10 100 1k 32k 64k 128k 256k; do | ||
28 | trace "dd-size ${s}" | ||
29 | rm -f ${COPY} | ||
30 | - dd if=$DATA obs=${s} 2> /dev/null | \ | ||
31 | + dd if=$DATA bs=${s} 2> /dev/null | \ | ||
32 | ${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}" | ||
33 | if [ $? -ne 0 ]; then | ||
34 | fail "ssh cat $DATA failed" | ||
35 | Index: openssh-7.6p1/regress/key-options.sh | ||
36 | =================================================================== | ||
37 | --- openssh-7.6p1.orig/regress/key-options.sh | ||
38 | +++ openssh-7.6p1/regress/key-options.sh | ||
39 | @@ -47,7 +47,7 @@ for f in 127.0.0.1 '127.0.0.0\/8'; do | ||
40 | fi | ||
41 | |||
42 | sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys | ||
43 | - from=`head -1 $authkeys | cut -f1 -d ' '` | ||
44 | + from=`head -n 1 $authkeys | cut -f1 -d ' '` | ||
45 | verbose "key option $from" | ||
46 | r=`${SSH} -q -F $OBJ/ssh_proxy somehost 'echo true'` | ||
47 | if [ "$r" = "true" ]; then | ||
diff --git a/meta/recipes-connectivity/openssh/openssh_9.7p1.bb b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb index 82da92f63f..ab453f7bbe 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.7p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb | |||
@@ -24,7 +24,6 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar | |||
24 | file://run-ptest \ | 24 | file://run-ptest \ |
25 | file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ | 25 | file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ |
26 | file://sshd_check_keys \ | 26 | file://sshd_check_keys \ |
27 | file://add-test-support-for-busybox.patch \ | ||
28 | file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ | 27 | file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ |
29 | file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \ | 28 | file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \ |
30 | " | 29 | " |
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Implement-riscv_vlen_asm-for-riscv32.patch b/meta/recipes-connectivity/openssl/openssl/0001-Implement-riscv_vlen_asm-for-riscv32.patch deleted file mode 100644 index e398d1074a..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/0001-Implement-riscv_vlen_asm-for-riscv32.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 725b1530456545e8511adc9cbdd265309dffad53 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongren Zheng <i@zenithal.me> | ||
3 | Date: Fri, 26 Apr 2024 06:03:43 +0000 | ||
4 | Subject: [PATCH] Implement riscv_vlen_asm for riscv32 | ||
5 | |||
6 | riscvcap.c: undefined reference to 'riscv_vlen_asm' | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/openssl/openssl/pull/24270] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | crypto/riscv32cpuid.pl | 17 +++++++++++++++++ | ||
12 | 1 file changed, 17 insertions(+) | ||
13 | |||
14 | diff --git a/crypto/riscv32cpuid.pl b/crypto/riscv32cpuid.pl | ||
15 | index 20694e7..ac1c043 100644 | ||
16 | --- a/crypto/riscv32cpuid.pl | ||
17 | +++ b/crypto/riscv32cpuid.pl | ||
18 | @@ -84,5 +84,22 @@ OPENSSL_cleanse: | ||
19 | ___ | ||
20 | } | ||
21 | |||
22 | +{ | ||
23 | +my ($ret) = ('a0'); | ||
24 | +$code .= <<___; | ||
25 | +################################################################################ | ||
26 | +# size_t riscv_vlen_asm(void) | ||
27 | +# Return VLEN (i.e. the length of a vector register in bits). | ||
28 | +.p2align 3 | ||
29 | +.globl riscv_vlen_asm | ||
30 | +.type riscv_vlen_asm,\@function | ||
31 | +riscv_vlen_asm: | ||
32 | + csrr $ret, vlenb | ||
33 | + slli $ret, $ret, 3 | ||
34 | + ret | ||
35 | +.size riscv_vlen_asm,.-riscv_vlen_asm | ||
36 | +___ | ||
37 | +} | ||
38 | + | ||
39 | print $code; | ||
40 | close STDOUT or die "error closing STDOUT: $!"; | ||
41 | -- | ||
42 | 2.45.0 | ||
43 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.3.1.bb b/meta/recipes-connectivity/openssl/openssl_3.3.1.bb index a8746842b2..0ad84951e6 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.3.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.3.1.bb | |||
@@ -12,7 +12,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
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://0001-Implement-riscv_vlen_asm-for-riscv32.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | SRC_URI:append:class-nativesdk = " \ | 17 | SRC_URI:append:class-nativesdk = " \ |
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch index 6c2e3c634b..98ff476071 100644 --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch | |||
@@ -12,7 +12,7 @@ FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) | |||
12 | 12 | ||
13 | The test should probably retry in this situation so test a patch which does this. | 13 | The test should probably retry in this situation so test a patch which does this. |
14 | 14 | ||
15 | Upstream-Status: Pending [testing to see if patch resolves the issue] | 15 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/253] |
16 | 16 | ||
17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
18 | --- | 18 | --- |
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 0c5e3b4c3d..3352f3e2f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -39,7 +39,7 @@ FILES:sln = "${base_sbindir}/sln" | |||
39 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | 39 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" |
40 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" | 40 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" |
41 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | 41 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" |
42 | FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 42 | FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal ${libdir}/gcc/${TARGET_SYS}/*/finclude" |
43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" | 43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" |
44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" |
45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \ | 45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \ |
@@ -169,6 +169,12 @@ do_install_armmultilib () { | |||
169 | oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h | 169 | oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h |
170 | } | 170 | } |
171 | 171 | ||
172 | do_install_armmultilib:append:class-target() { | ||
173 | gcc_version=$($CC -dumpversion) | ||
174 | mkdir -p ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude | ||
175 | mv ${D}${includedir}/finclude/math-vector-fortran.h ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude/ | ||
176 | rmdir --ignore-fail-on-non-empty ${D}${includedir}/finclude | ||
177 | } | ||
172 | 178 | ||
173 | LOCALESTASH = "${WORKDIR}/stashed-locale" | 179 | LOCALESTASH = "${WORKDIR}/stashed-locale" |
174 | bashscripts = "mtrace sotruss xtrace" | 180 | bashscripts = "mtrace sotruss xtrace" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/meta/recipes-core/initrdscripts/initramfs-framework/init index e3d8caa0e1..716a156f82 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/init +++ b/meta/recipes-core/initrdscripts/initramfs-framework/init | |||
@@ -120,7 +120,7 @@ if grep -q devtmpfs /proc/filesystems; then | |||
120 | mount -t devtmpfs devtmpfs /dev | 120 | mount -t devtmpfs devtmpfs /dev |
121 | else | 121 | else |
122 | if [ ! -d /dev ]; then | 122 | if [ ! -d /dev ]; then |
123 | fatal "ERROR: /dev doesn't exist and kernel doesn't has devtmpfs enabled." | 123 | fatal "ERROR: /dev doesn't exist and kernel doesn't have devtmpfs enabled." |
124 | fi | 124 | fi |
125 | fi | 125 | fi |
126 | 126 | ||
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs index e0efbe6ebe..38e138f618 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs +++ b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs | |||
@@ -59,7 +59,7 @@ rootfs_run() { | |||
59 | fi | 59 | fi |
60 | fi | 60 | fi |
61 | fi | 61 | fi |
62 | debug "Sleeping for $delay second(s) to wait root to settle..." | 62 | debug "Sleeping for $delay second(s) to wait for root to settle..." |
63 | sleep $delay | 63 | sleep $delay |
64 | C=$(( $C + 1 )) | 64 | C=$(( $C + 1 )) |
65 | done | 65 | done |
diff --git a/meta/recipes-core/libxcrypt/files/configure-c99.patch b/meta/recipes-core/libxcrypt/files/configure-c99.patch new file mode 100644 index 0000000000..b77ea7af07 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/configure-c99.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From cfe9f4d6b0a5d10a15e10e987d528c5c513a42f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Weimer <fweimer@redhat.com> | ||
3 | Date: Tue, 19 Dec 2023 11:00:11 +0100 | ||
4 | Subject: [PATCH] configure: Only text the makecontext signature we need | ||
5 | |||
6 | The test/explicit-bzero.c test uses a start routine without any | ||
7 | arguments. There is no need for the multi-argument version. | ||
8 | |||
9 | This avoids a build failure with glibc and future compilers. | ||
10 | The GNU C library declares the makecontext callback of | ||
11 | type void (*) (void), so no cast is needed. On other systems, | ||
12 | the type may be the (currently distinct) type void (*) (), | ||
13 | but given that this only affects the ability to execute a test, | ||
14 | no further machinery is added here to detect that different type. | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/178/] | ||
17 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
18 | --- | ||
19 | configure.ac | 2 -- | ||
20 | 1 file changed, 2 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 016997c..4b8afd8 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -303,13 +303,11 @@ AS_IF([test $ac_cv_header_ucontext_h = yes], | ||
27 | #include <ucontext.h> | ||
28 | static int x; | ||
29 | static void fn1(void) {} | ||
30 | -static void fn2(int a, int b) { x = a - b; } | ||
31 | ]], [[ | ||
32 | ucontext_t uc1, uc2; | ||
33 | if (getcontext(&uc1)) return 1; | ||
34 | if (setcontext(&uc1)) return 1; | ||
35 | makecontext(&uc1, fn1, 0); | ||
36 | - makecontext(&uc2, fn2, 2, 1, 1); | ||
37 | if (swapcontext(&uc1, &uc2)) return 1; | ||
38 | return x; | ||
39 | ]])], | ||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index ba93d91aef..ee6875aa05 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc | |||
@@ -13,7 +13,8 @@ SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol= | |||
13 | SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf" | 13 | SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf" |
14 | SRCBRANCH ?= "master" | 14 | SRCBRANCH ?= "master" |
15 | 15 | ||
16 | SRC_URI += "file://fix_cflags_handling.patch" | 16 | SRC_URI += "file://fix_cflags_handling.patch \ |
17 | file://configure-c99.patch" | ||
17 | 18 | ||
18 | PROVIDES = "virtual/crypt" | 19 | PROVIDES = "virtual/crypt" |
19 | 20 | ||
diff --git a/meta/recipes-core/libxml/libxml2_2.12.7.bb b/meta/recipes-core/libxml/libxml2_2.12.8.bb index 84601c282f..fb103f0273 100644 --- a/meta/recipes-core/libxml/libxml2_2.12.7.bb +++ b/meta/recipes-core/libxml/libxml2_2.12.8.bb | |||
@@ -20,7 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt | |||
20 | file://install-tests.patch \ | 20 | file://install-tests.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[archive.sha256sum] = "24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56" | 23 | SRC_URI[archive.sha256sum] = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93" |
24 | SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" | 24 | SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" |
25 | 25 | ||
26 | # Disputed as a security issue, but fixed in d39f780 | 26 | # Disputed as a security issue, but fixed in d39f780 |
diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index 8906906bc3..93af08c182 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb | |||
@@ -24,7 +24,7 @@ ID = "${DISTRO}" | |||
24 | NAME = "${DISTRO_NAME}" | 24 | NAME = "${DISTRO_NAME}" |
25 | VERSION = "${DISTRO_VERSION}${@' (%s)' % DISTRO_CODENAME if 'DISTRO_CODENAME' in d else ''}" | 25 | VERSION = "${DISTRO_VERSION}${@' (%s)' % DISTRO_CODENAME if 'DISTRO_CODENAME' in d else ''}" |
26 | VERSION_ID = "${DISTRO_VERSION}" | 26 | VERSION_ID = "${DISTRO_VERSION}" |
27 | VERSION_CODENAME = "${DISTRO_CODENAME}" | 27 | VERSION_CODENAME = "${@d.getVar('DISTRO_CODENAME') or ''}" |
28 | PRETTY_NAME = "${DISTRO_NAME} ${VERSION}" | 28 | PRETTY_NAME = "${DISTRO_NAME} ${VERSION}" |
29 | 29 | ||
30 | # The vendor field is hardcoded to "openembedded" deliberately. We'd | 30 | # The vendor field is hardcoded to "openembedded" deliberately. We'd |
diff --git a/meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch b/meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch new file mode 100644 index 0000000000..5be4a27b36 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 7463b382bcaf26aacc60b73f98f0262aa41db3ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Johannes Schneider <johannes.schneider@leica-geosystems.com> | ||
3 | Date: Thu, 20 Jun 2024 12:32:18 +0200 | ||
4 | Subject: [PATCH] meson: bpf: propagate 'sysroot' for cross compilation | ||
5 | |||
6 | During cross-compilation of systemd, the compiler used to build the bpf's needs | ||
7 | to be pointed at the correct include searchpath. Which can be done by passing | ||
8 | the corresponding directory in through the cflags; for example in yocto/bitbake | ||
9 | this would work: CFLAGS += "--sysroot=${STAGING_DIR_TARGET}" | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/33427] | ||
12 | Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com> | ||
13 | --- | ||
14 | meson.build | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index 187e7b216d..15df058ab6 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -1691,6 +1691,7 @@ if conf.get('BPF_FRAMEWORK') == 1 | ||
22 | '-ffile-prefix-map=', | ||
23 | '-fdebug-prefix-map=', | ||
24 | '-fmacro-prefix-map=', | ||
25 | + '--sysroot=', | ||
26 | ] | ||
27 | |||
28 | foreach opt : c_args | ||
29 | -- | ||
30 | 2.34.1 | ||
31 | |||
diff --git a/meta/recipes-core/systemd/systemd_255.6.bb b/meta/recipes-core/systemd/systemd_255.6.bb index 15b631fc07..0376412f61 100644 --- a/meta/recipes-core/systemd/systemd_255.6.bb +++ b/meta/recipes-core/systemd/systemd_255.6.bb | |||
@@ -28,6 +28,7 @@ SRC_URI += " \ | |||
28 | file://systemd-pager.sh \ | 28 | file://systemd-pager.sh \ |
29 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 29 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
30 | file://0008-implment-systemd-sysv-install-for-OE.patch \ | 30 | file://0008-implment-systemd-sysv-install-for-OE.patch \ |
31 | file://0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | # patches needed by musl | 34 | # patches needed by musl |
@@ -132,6 +133,7 @@ PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" | |||
132 | PACKAGECONFIG[audit] = "-Daudit=true,-Daudit=false,audit" | 133 | PACKAGECONFIG[audit] = "-Daudit=true,-Daudit=false,audit" |
133 | PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" | 134 | PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" |
134 | PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" | 135 | PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" |
136 | PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=true,-Dbpf-framework=false,clang-native bpftool-native libbpf,libbpf" | ||
135 | PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" | 137 | PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" |
136 | PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid" | 138 | PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid" |
137 | PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" | 139 | PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" |
@@ -232,6 +234,10 @@ PACKAGECONFIG[zstd] = "-Dzstd=true,-Dzstd=false,zstd" | |||
232 | 234 | ||
233 | RESOLV_CONF ??= "" | 235 | RESOLV_CONF ??= "" |
234 | 236 | ||
237 | # bpf-framework: pass the recipe-sysroot to the compiler used to build | ||
238 | # the eBPFs, so that it can find needed system includes in there. | ||
239 | CFLAGS:append = " --sysroot=${STAGING_DIR_TARGET}" | ||
240 | |||
235 | # Helper variables to clarify locations. This mirrors the logic in systemd's | 241 | # Helper variables to clarify locations. This mirrors the logic in systemd's |
236 | # build system. | 242 | # build system. |
237 | rootprefix ?= "${root_prefix}" | 243 | rootprefix ?= "${root_prefix}" |
diff --git a/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb b/meta/recipes-core/ttyrun/ttyrun_2.33.1.bb index 815f625a67..ccb7f9b268 100644 --- a/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb +++ b/meta/recipes-core/ttyrun/ttyrun_2.33.1.bb | |||
@@ -7,7 +7,7 @@ LICENSE = "MIT" | |||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af" |
8 | 8 | ||
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 = "686262fdcdaed7903ca1720d7dd0b1f9f5621d7b" |
11 | 11 | ||
12 | CVE_PRODUCT = "s390-tools" | 12 | CVE_PRODUCT = "s390-tools" |
13 | 13 | ||
diff --git a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch index 1f71722334..f92ec6b548 100644 --- a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +++ b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch | |||
@@ -5,7 +5,7 @@ Subject: [PATCH] Set relative to top_builddir path in Makefile to access | |||
5 | test-driver | 5 | test-driver |
6 | 6 | ||
7 | Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> | 7 | Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> |
8 | Upstream-Status: Pending | 8 | Upstream-Status: Inappropriate [specific to oe-core target ptest installation] |
9 | Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 | 9 | Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 |
10 | 10 | ||
11 | --- | 11 | --- |
diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc index d4e94d0162..c8f526b5c7 100644 --- a/meta/recipes-devtools/binutils/binutils-2.42.inc +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc | |||
@@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | |||
20 | 20 | ||
21 | CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" | 21 | CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" |
22 | 22 | ||
23 | SRCREV ?= "73b22b4481e85635eb978585f405c4433bcc0174" | 23 | SRCREV ?= "cbec9028dd3fa9b49e0204f1a989cea67cae32c6" |
24 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" | 24 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" |
25 | SRC_URI = "\ | 25 | SRC_URI = "\ |
26 | ${BINUTILS_GIT_URI} \ | 26 | ${BINUTILS_GIT_URI} \ |
@@ -36,6 +36,5 @@ SRC_URI = "\ | |||
36 | file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ | 36 | file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ |
37 | file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ | 37 | file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ |
38 | file://0015-gprofng-change-use-of-bignum-to-bigint.patch \ | 38 | file://0015-gprofng-change-use-of-bignum-to-bigint.patch \ |
39 | file://0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch \ | ||
40 | " | 39 | " |
41 | S = "${WORKDIR}/git" | 40 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb b/meta/recipes-devtools/binutils/binutils-testsuite_2.42.bb index 630815c7a3..f2facd52c3 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb +++ b/meta/recipes-devtools/binutils/binutils-testsuite_2.42.bb | |||
@@ -1,3 +1,6 @@ | |||
1 | # NOTE: This recipe cannot have -cross- in the file name because it triggers | ||
2 | # the cross build detection in sstate which causes it to use the wrong | ||
3 | # architecture | ||
1 | require binutils.inc | 4 | require binutils.inc |
2 | require binutils-${PV}.inc | 5 | require binutils-${PV}.inc |
3 | 6 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch b/meta/recipes-devtools/binutils/binutils/0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch deleted file mode 100644 index 7b52425a38..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch +++ /dev/null | |||
@@ -1,382 +0,0 @@ | |||
1 | From 5b1c70bfe0d8f84dc28237d6150b7b9d57c791a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Victor Do Nascimento <victor.donascimento@arm.com> | ||
3 | Date: Tue, 16 Apr 2024 11:49:15 +0100 | ||
4 | Subject: [PATCH] aarch64: Remove asserts from operand qualifier decoders | ||
5 | [PR31595] | ||
6 | |||
7 | Given that the disassembler should never abort when decoding | ||
8 | (potentially random) data, assertion statements in the | ||
9 | `get_*reg_qualifier_from_value' function family prove problematic. | ||
10 | |||
11 | Consider the random 32-bit word W, encoded in a data segment and | ||
12 | encountered on execution of `objdump -D <obj_name>'. | ||
13 | |||
14 | If: | ||
15 | |||
16 | (W & ~opcode_mask) == valid instruction | ||
17 | |||
18 | Then before `print_insn_aarch64_word' has a chance to report the | ||
19 | instruction as potentially undefined, an attempt will be made to have | ||
20 | the qualifiers for the instruction's register operands (if any) | ||
21 | decoded. If the relevant bits do not map onto a valid qualifier for | ||
22 | the matched instruction-like word, an abort will be triggered and the | ||
23 | execution of objdump aborted. | ||
24 | |||
25 | As this scenario is perfectly feasible and, in light of the fact that | ||
26 | objdump must successfully decode all sections of a given object file, | ||
27 | it is not appropriate to assert in this family of functions. | ||
28 | |||
29 | Therefore, we add a new pseudo-qualifier `AARCH64_OPND_QLF_ERR' for | ||
30 | handling invalid qualifier-associated values and re-purpose the | ||
31 | assertion conditions in qualifier-retrieving functions to be the | ||
32 | predicate guarding the returning of the calculated qualifier type. | ||
33 | If the predicate fails, we return this new qualifier and allow the | ||
34 | caller to handle the error as appropriate. | ||
35 | |||
36 | As these functions are called either from within | ||
37 | `aarch64_extract_operand' or `do_special_decoding', both of which are | ||
38 | expected to return non-zero values, it suffices that callers return | ||
39 | zero upon encountering `AARCH64_OPND_QLF_ERR'. | ||
40 | |||
41 | Ar present the error presented in the hypothetical scenario has been | ||
42 | encountered in `get_sreg_qualifier_from_value', but the change is made | ||
43 | to the whole family to keep the interface consistent. | ||
44 | |||
45 | Bug: https://sourceware.org/PR31595 | ||
46 | |||
47 | Upstream-Status: Backport [commit 2601b201e95ea0edab89342ee7137c74e88a8a79] | ||
48 | |||
49 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
50 | --- | ||
51 | .../testsuite/binutils-all/aarch64/illegal.d | 1 + | ||
52 | .../testsuite/binutils-all/aarch64/illegal.s | 3 + | ||
53 | include/opcode/aarch64.h | 3 + | ||
54 | opcodes/aarch64-dis.c | 98 +++++++++++++++---- | ||
55 | 4 files changed, 87 insertions(+), 18 deletions(-) | ||
56 | |||
57 | diff --git a/binutils/testsuite/binutils-all/aarch64/illegal.d b/binutils/testsuite/binutils-all/aarch64/illegal.d | ||
58 | index 4b90a1d9f39..b69318aec85 100644 | ||
59 | --- a/binutils/testsuite/binutils-all/aarch64/illegal.d | ||
60 | +++ b/binutils/testsuite/binutils-all/aarch64/illegal.d | ||
61 | @@ -8,5 +8,6 @@ Disassembly of section \.text: | ||
62 | |||
63 | 0+000 <.*>: | ||
64 | [ ]+0:[ ]+68ea18cc[ ]+.inst[ ]+0x68ea18cc ; undefined | ||
65 | +[ ]+4:[ ]+9dc39839[ ]+.inst[ ]+0x9dc39839 ; undefined | ||
66 | #pass | ||
67 | |||
68 | diff --git a/binutils/testsuite/binutils-all/aarch64/illegal.s b/binutils/testsuite/binutils-all/aarch64/illegal.s | ||
69 | index 216cbe6f265..43668c6db55 100644 | ||
70 | --- a/binutils/testsuite/binutils-all/aarch64/illegal.s | ||
71 | +++ b/binutils/testsuite/binutils-all/aarch64/illegal.s | ||
72 | @@ -4,4 +4,7 @@ | ||
73 | # ldpsw x12, x6, [x6],#-8 ; illegal because one of the dest regs is also the address reg | ||
74 | .inst 0x68ea18cc | ||
75 | |||
76 | + # illegal, resembles the opcode `ldapur' with invalid qualifier bits | ||
77 | + .inst 0x9dc39839 | ||
78 | + | ||
79 | # FIXME: Add more illegal instructions here. | ||
80 | diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h | ||
81 | index 2fca9528c20..e8fe93ef127 100644 | ||
82 | --- a/include/opcode/aarch64.h | ||
83 | +++ b/include/opcode/aarch64.h | ||
84 | @@ -894,6 +894,9 @@ enum aarch64_opnd_qualifier | ||
85 | /* Special qualifier helping retrieve qualifier information during the | ||
86 | decoding time (currently not in use). */ | ||
87 | AARCH64_OPND_QLF_RETRIEVE, | ||
88 | + | ||
89 | + /* Special qualifier used for indicating error in qualifier retrieval. */ | ||
90 | + AARCH64_OPND_QLF_ERR, | ||
91 | }; | ||
92 | |||
93 | /* Instruction class. */ | ||
94 | diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c | ||
95 | index 96f42ae862a..b70e6da9eb7 100644 | ||
96 | --- a/opcodes/aarch64-dis.c | ||
97 | +++ b/opcodes/aarch64-dis.c | ||
98 | @@ -219,9 +219,10 @@ static inline enum aarch64_opnd_qualifier | ||
99 | get_greg_qualifier_from_value (aarch64_insn value) | ||
100 | { | ||
101 | enum aarch64_opnd_qualifier qualifier = AARCH64_OPND_QLF_W + value; | ||
102 | - assert (value <= 0x1 | ||
103 | - && aarch64_get_qualifier_standard_value (qualifier) == value); | ||
104 | - return qualifier; | ||
105 | + if (value <= 0x1 | ||
106 | + && aarch64_get_qualifier_standard_value (qualifier) == value) | ||
107 | + return qualifier; | ||
108 | + return AARCH64_OPND_QLF_ERR; | ||
109 | } | ||
110 | |||
111 | /* Given VALUE, return qualifier for a vector register. This does not support | ||
112 | @@ -237,9 +238,10 @@ get_vreg_qualifier_from_value (aarch64_insn value) | ||
113 | if (qualifier >= AARCH64_OPND_QLF_V_2H) | ||
114 | qualifier += 1; | ||
115 | |||
116 | - assert (value <= 0x8 | ||
117 | - && aarch64_get_qualifier_standard_value (qualifier) == value); | ||
118 | - return qualifier; | ||
119 | + if (value <= 0x8 | ||
120 | + && aarch64_get_qualifier_standard_value (qualifier) == value) | ||
121 | + return qualifier; | ||
122 | + return AARCH64_OPND_QLF_ERR; | ||
123 | } | ||
124 | |||
125 | /* Given VALUE, return qualifier for an FP or AdvSIMD scalar register. */ | ||
126 | @@ -248,9 +250,10 @@ get_sreg_qualifier_from_value (aarch64_insn value) | ||
127 | { | ||
128 | enum aarch64_opnd_qualifier qualifier = AARCH64_OPND_QLF_S_B + value; | ||
129 | |||
130 | - assert (value <= 0x4 | ||
131 | - && aarch64_get_qualifier_standard_value (qualifier) == value); | ||
132 | - return qualifier; | ||
133 | + if (value <= 0x4 | ||
134 | + && aarch64_get_qualifier_standard_value (qualifier) == value) | ||
135 | + return qualifier; | ||
136 | + return AARCH64_OPND_QLF_ERR; | ||
137 | } | ||
138 | |||
139 | /* Given the instruction in *INST which is probably half way through the | ||
140 | @@ -263,13 +266,17 @@ get_expected_qualifier (const aarch64_inst *inst, int i) | ||
141 | { | ||
142 | aarch64_opnd_qualifier_seq_t qualifiers; | ||
143 | /* Should not be called if the qualifier is known. */ | ||
144 | - assert (inst->operands[i].qualifier == AARCH64_OPND_QLF_NIL); | ||
145 | - int invalid_count; | ||
146 | - if (aarch64_find_best_match (inst, inst->opcode->qualifiers_list, | ||
147 | - i, qualifiers, &invalid_count)) | ||
148 | - return qualifiers[i]; | ||
149 | + if (inst->operands[i].qualifier == AARCH64_OPND_QLF_NIL) | ||
150 | + { | ||
151 | + int invalid_count; | ||
152 | + if (aarch64_find_best_match (inst, inst->opcode->qualifiers_list, | ||
153 | + i, qualifiers, &invalid_count)) | ||
154 | + return qualifiers[i]; | ||
155 | + else | ||
156 | + return AARCH64_OPND_QLF_NIL; | ||
157 | + } | ||
158 | else | ||
159 | - return AARCH64_OPND_QLF_NIL; | ||
160 | + return AARCH64_OPND_QLF_ERR; | ||
161 | } | ||
162 | |||
163 | /* Operand extractors. */ | ||
164 | @@ -355,6 +362,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
165 | aarch64_insn value = extract_field (FLD_imm4_11, code, 0); | ||
166 | /* Depend on AARCH64_OPND_Ed to determine the qualifier. */ | ||
167 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
168 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
169 | + return 0; | ||
170 | shift = get_logsz (aarch64_get_qualifier_esize (info->qualifier)); | ||
171 | info->reglane.index = value >> shift; | ||
172 | } | ||
173 | @@ -374,6 +383,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
174 | if (pos > 3) | ||
175 | return false; | ||
176 | info->qualifier = get_sreg_qualifier_from_value (pos); | ||
177 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
178 | + return 0; | ||
179 | info->reglane.index = (unsigned) (value >> 1); | ||
180 | } | ||
181 | } | ||
182 | @@ -381,6 +392,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
183 | { | ||
184 | /* Need information in other operand(s) to help decoding. */ | ||
185 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
186 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
187 | + return 0; | ||
188 | switch (info->qualifier) | ||
189 | { | ||
190 | case AARCH64_OPND_QLF_S_4B: | ||
191 | @@ -405,6 +418,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
192 | |||
193 | /* Need information in other operand(s) to help decoding. */ | ||
194 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
195 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
196 | + return 0; | ||
197 | switch (info->qualifier) | ||
198 | { | ||
199 | case AARCH64_OPND_QLF_S_H: | ||
200 | @@ -644,9 +659,15 @@ aarch64_ext_advsimd_imm_shift (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
201 | 1xxx 1 2D */ | ||
202 | info->qualifier = | ||
203 | get_vreg_qualifier_from_value ((pos << 1) | (int) Q); | ||
204 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
205 | + return false; | ||
206 | } | ||
207 | else | ||
208 | - info->qualifier = get_sreg_qualifier_from_value (pos); | ||
209 | + { | ||
210 | + info->qualifier = get_sreg_qualifier_from_value (pos); | ||
211 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
212 | + return 0; | ||
213 | + } | ||
214 | |||
215 | if (info->type == AARCH64_OPND_IMM_VLSR) | ||
216 | /* immh <shift> | ||
217 | @@ -773,6 +794,8 @@ aarch64_ext_advsimd_imm_modified (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
218 | |||
219 | /* cmode */ | ||
220 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
221 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
222 | + return 0; | ||
223 | switch (info->qualifier) | ||
224 | { | ||
225 | case AARCH64_OPND_QLF_NIL: | ||
226 | @@ -1014,6 +1037,8 @@ aarch64_ext_ft (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
227 | if (value > 0x4) | ||
228 | return false; | ||
229 | info->qualifier = get_sreg_qualifier_from_value (value); | ||
230 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
231 | + return 0; | ||
232 | } | ||
233 | |||
234 | return true; | ||
235 | @@ -1086,6 +1111,8 @@ aarch64_ext_rcpc3_addr_offset (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
236 | aarch64_operand_error *errors ATTRIBUTE_UNUSED) | ||
237 | { | ||
238 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
239 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
240 | + return 0; | ||
241 | |||
242 | /* Rn */ | ||
243 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
244 | @@ -1105,6 +1132,8 @@ aarch64_ext_addr_offset (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
245 | aarch64_operand_error *errors ATTRIBUTE_UNUSED) | ||
246 | { | ||
247 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
248 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
249 | + return 0; | ||
250 | |||
251 | /* Rn */ | ||
252 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
253 | @@ -1154,6 +1183,8 @@ aarch64_ext_addr_regoff (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
254 | /* Need information in other operand(s) to help achieve the decoding | ||
255 | from 'S' field. */ | ||
256 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
257 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
258 | + return 0; | ||
259 | /* Get the size of the data element that is accessed, which may be | ||
260 | different from that of the source register size, e.g. in strb/ldrb. */ | ||
261 | size = aarch64_get_qualifier_esize (info->qualifier); | ||
262 | @@ -1172,6 +1203,8 @@ aarch64_ext_addr_simm (const aarch64_operand *self, aarch64_opnd_info *info, | ||
263 | { | ||
264 | aarch64_insn imm; | ||
265 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
266 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
267 | + return 0; | ||
268 | |||
269 | /* Rn */ | ||
270 | info->addr.base_regno = extract_field (FLD_Rn, code, 0); | ||
271 | @@ -1210,6 +1243,8 @@ aarch64_ext_addr_uimm12 (const aarch64_operand *self, aarch64_opnd_info *info, | ||
272 | { | ||
273 | int shift; | ||
274 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
275 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
276 | + return 0; | ||
277 | shift = get_logsz (aarch64_get_qualifier_esize (info->qualifier)); | ||
278 | /* Rn */ | ||
279 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
280 | @@ -1228,6 +1263,8 @@ aarch64_ext_addr_simm10 (const aarch64_operand *self, aarch64_opnd_info *info, | ||
281 | aarch64_insn imm; | ||
282 | |||
283 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
284 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
285 | + return 0; | ||
286 | /* Rn */ | ||
287 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
288 | /* simm10 */ | ||
289 | @@ -2467,6 +2504,8 @@ decode_sizeq (aarch64_inst *inst) | ||
290 | if (mask == 0x7) | ||
291 | { | ||
292 | inst->operands[idx].qualifier = get_vreg_qualifier_from_value (value); | ||
293 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
294 | + return 0; | ||
295 | return 1; | ||
296 | } | ||
297 | |||
298 | @@ -2649,6 +2688,8 @@ do_special_decoding (aarch64_inst *inst) | ||
299 | idx = select_operand_for_sf_field_coding (inst->opcode); | ||
300 | value = extract_field (FLD_sf, inst->value, 0); | ||
301 | inst->operands[idx].qualifier = get_greg_qualifier_from_value (value); | ||
302 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
303 | + return 0; | ||
304 | if ((inst->opcode->flags & F_N) | ||
305 | && extract_field (FLD_N, inst->value, 0) != value) | ||
306 | return 0; | ||
307 | @@ -2659,6 +2700,8 @@ do_special_decoding (aarch64_inst *inst) | ||
308 | idx = select_operand_for_sf_field_coding (inst->opcode); | ||
309 | value = extract_field (FLD_lse_sz, inst->value, 0); | ||
310 | inst->operands[idx].qualifier = get_greg_qualifier_from_value (value); | ||
311 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
312 | + return 0; | ||
313 | } | ||
314 | /* rcpc3 'size' field. */ | ||
315 | if (inst->opcode->flags & F_RCPC3_SIZE) | ||
316 | @@ -2670,12 +2713,18 @@ do_special_decoding (aarch64_inst *inst) | ||
317 | { | ||
318 | if (aarch64_operands[inst->operands[i].type].op_class | ||
319 | == AARCH64_OPND_CLASS_INT_REG) | ||
320 | - inst->operands[i].qualifier = get_greg_qualifier_from_value (value & 1); | ||
321 | + { | ||
322 | + inst->operands[i].qualifier = get_greg_qualifier_from_value (value & 1); | ||
323 | + if (inst->operands[i].qualifier == AARCH64_OPND_QLF_ERR) | ||
324 | + return 0; | ||
325 | + } | ||
326 | else if (aarch64_operands[inst->operands[i].type].op_class | ||
327 | == AARCH64_OPND_CLASS_FP_REG) | ||
328 | { | ||
329 | value += (extract_field (FLD_opc1, inst->value, 0) << 2); | ||
330 | inst->operands[i].qualifier = get_sreg_qualifier_from_value (value); | ||
331 | + if (inst->operands[i].qualifier == AARCH64_OPND_QLF_ERR) | ||
332 | + return 0; | ||
333 | } | ||
334 | } | ||
335 | } | ||
336 | @@ -2709,7 +2758,11 @@ do_special_decoding (aarch64_inst *inst) | ||
337 | /* For most related instruciton, the 'size' field is fully available for | ||
338 | operand encoding. */ | ||
339 | if (mask == 0x3) | ||
340 | - inst->operands[idx].qualifier = get_sreg_qualifier_from_value (value); | ||
341 | + { | ||
342 | + inst->operands[idx].qualifier = get_sreg_qualifier_from_value (value); | ||
343 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
344 | + return 0; | ||
345 | + } | ||
346 | else | ||
347 | { | ||
348 | get_operand_possible_qualifiers (idx, inst->opcode->qualifiers_list, | ||
349 | @@ -2744,6 +2797,9 @@ do_special_decoding (aarch64_inst *inst) | ||
350 | Q = (unsigned) extract_field (FLD_Q, inst->value, inst->opcode->mask); | ||
351 | inst->operands[0].qualifier = | ||
352 | get_vreg_qualifier_from_value ((num << 1) | Q); | ||
353 | + if (inst->operands[0].qualifier == AARCH64_OPND_QLF_ERR) | ||
354 | + return 0; | ||
355 | + | ||
356 | } | ||
357 | |||
358 | if ((inst->opcode->flags & F_OPD_SIZE) && inst->opcode->iclass == sve2_urqvs) | ||
359 | @@ -2753,7 +2809,11 @@ do_special_decoding (aarch64_inst *inst) | ||
360 | inst->opcode->mask); | ||
361 | inst->operands[0].qualifier | ||
362 | = get_vreg_qualifier_from_value (1 + (size << 1)); | ||
363 | + if (inst->operands[0].qualifier == AARCH64_OPND_QLF_ERR) | ||
364 | + return 0; | ||
365 | inst->operands[2].qualifier = get_sreg_qualifier_from_value (size); | ||
366 | + if (inst->operands[2].qualifier == AARCH64_OPND_QLF_ERR) | ||
367 | + return 0; | ||
368 | } | ||
369 | |||
370 | if (inst->opcode->flags & F_GPRSIZE_IN_Q) | ||
371 | @@ -2772,6 +2832,8 @@ do_special_decoding (aarch64_inst *inst) | ||
372 | assert (idx == 0 || idx == 1); | ||
373 | value = extract_field (FLD_Q, inst->value, 0); | ||
374 | inst->operands[idx].qualifier = get_greg_qualifier_from_value (value); | ||
375 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
376 | + return 0; | ||
377 | } | ||
378 | |||
379 | if (inst->opcode->flags & F_LDS_SIZE) | ||
380 | -- | ||
381 | 2.34.1 | ||
382 | |||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch new file mode 100644 index 0000000000..6fefbb2bca --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From f9ba9752ba5fd72441bc2018b2453967e75460d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Mon, 24 Jun 2024 02:00:11 +0000 | ||
4 | Subject: [PATCH] convert: handle rename of inode_includes() from e2fsprogs | ||
5 | 1.47.1 | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | [https://kernel.googlesource.com/pub/scm/linux/kernel/git/kdave/btrfs-progs/+/bcb887a4de2c56426a7a7de8d440b6ad75579f10%5E%21/#F0] | ||
9 | |||
10 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
11 | --- | ||
12 | configure.ac | 3 ++- | ||
13 | convert/source-ext2.c | 11 +++++++++-- | ||
14 | 2 files changed, 11 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 007d29b..816dd36 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -312,7 +312,8 @@ AS_IF([test "x$have_ext4_epoch_mask_define" = xno], [ | ||
21 | AC_DEFINE([EXT4_EPOCH_BITS], [2],[for encode and decode tv_nsec in ext2 inode]) | ||
22 | AC_DEFINE([EXT4_EPOCH_MASK], [((1U << EXT4_EPOCH_BITS) - 1)], [For encode and decode tv_nsec info in ext2 inode]) | ||
23 | AC_DEFINE([EXT4_NSEC_MASK], [(~0UL << EXT4_EPOCH_BITS)], [For encode and decode tv_nsec info in ext2 inode]) | ||
24 | - AC_DEFINE([inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]], | ||
25 | + # Use name from 1.47.1, backward compatibility is handled in convert/source-ext2.c | ||
26 | + AC_DEFINE([ext2fs_inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]], | ||
27 | [For encode and decode tv_nsec info in ext2 inode]) | ||
28 | ], | ||
29 | [AC_MSG_WARN([It seems that ext2_inode_large don't includes tv_nsec related info, probably old e2fsprogs, no 64bit time precision of converted images])], | ||
30 | diff --git a/convert/source-ext2.c b/convert/source-ext2.c | ||
31 | index 2186b25..bba81e4 100644 | ||
32 | --- a/convert/source-ext2.c | ||
33 | +++ b/convert/source-ext2.c | ||
34 | @@ -727,10 +727,17 @@ static inline void ext4_decode_extra_time(__le32 * tv_sec, __le32 * tv_nsec, | ||
35 | *tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS; | ||
36 | } | ||
37 | |||
38 | +/* | ||
39 | + * In e2fsprogs < 1.47.1 it's inode_includes, from >= on it's with ext2fs_ prefix. | ||
40 | + */ | ||
41 | +#ifndef ext2fs_inode_includes | ||
42 | +#define ext2fs_inode_includes(size, field) inode_includes(size, field) | ||
43 | +#endif | ||
44 | + | ||
45 | #define EXT4_COPY_XTIME(xtime, dst, tv_sec, tv_nsec) \ | ||
46 | do { \ | ||
47 | tv_sec = src->i_ ## xtime ; \ | ||
48 | - if (inode_includes(inode_size, i_ ## xtime ## _extra)) { \ | ||
49 | + if (ext2fs_inode_includes(inode_size, i_ ## xtime ## _extra)) { \ | ||
50 | tv_sec = src->i_ ## xtime ; \ | ||
51 | ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_ ## xtime ## _extra); \ | ||
52 | btrfs_set_stack_timespec_sec(&dst->xtime , tv_sec); \ | ||
53 | @@ -771,7 +778,7 @@ static int ext4_copy_inode_timespec_extra(struct btrfs_inode_item *dst, | ||
54 | EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec); | ||
55 | |||
56 | tv_sec = src->i_crtime; | ||
57 | - if (inode_includes(inode_size, i_crtime_extra)) { | ||
58 | + if (ext2fs_inode_includes(inode_size, i_crtime_extra)) { | ||
59 | tv_sec = src->i_crtime; | ||
60 | ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_crtime_extra); | ||
61 | btrfs_set_stack_timespec_sec(&dst->otime, tv_sec); | ||
62 | -- | ||
63 | 2.34.1 | ||
64 | |||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb index fac9f8f7ef..d61d956a70 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb | |||
@@ -17,6 +17,7 @@ DEPENDS = "util-linux zlib" | |||
17 | 17 | ||
18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ | 18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ |
19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ | 19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ |
20 | file://0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch \ | ||
20 | " | 21 | " |
21 | SRCREV = "5d97c32d6f94cf6f473a5f82964e3edaeb1b146e" | 22 | SRCREV = "5d97c32d6f94cf6f473a5f82964e3edaeb1b146e" |
22 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.2.bb index e6714629af..85b2901d50 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.1.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.2.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p | |||
9 | file://0001-include-rpm-rpmstring.h.patch \ | 9 | file://0001-include-rpm-rpmstring.h.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRCREV = "78b0c3ff48bd58eb9c0a72879cf1025e9f225684" | 12 | SRCREV = "0ce71adda8a33ede9e9d21b7c18cc58d5a495849" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch index b8a8697585..99044fbb1a 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch | |||
@@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> | |||
3 | Date: Wed, 29 Apr 2020 22:02:23 -0700 | 3 | Date: Wed, 29 Apr 2020 22:02:23 -0700 |
4 | Subject: [PATCH] Add support for riscv32 CPU | 4 | Subject: [PATCH] Add support for riscv32 CPU |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Inappropriate [not a debian architecture] |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | --- | 8 | --- |
9 | data/cputable | 1 + | 9 | data/cputable | 1 + |
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch index e8d8576f85..602a0b22c5 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch | |||
@@ -3,7 +3,7 @@ From: sweeaun <swee.aun.khor@intel.com> | |||
3 | Date: Sun, 10 Sep 2017 00:14:15 -0700 | 3 | Date: Sun, 10 Sep 2017 00:14:15 -0700 |
4 | Subject: [PATCH] dpkg: Support muslx32 build | 4 | Subject: [PATCH] dpkg: Support muslx32 build |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Inappropriate [not a debian architecture] |
7 | Changes made on ostable and tupletable to enable muslx32 build. | 7 | Changes made on ostable and tupletable to enable muslx32 build. |
8 | 8 | ||
9 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | 9 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> |
diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch index 8ac646b1a1..2573afb8e4 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch | |||
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit | |||
8 | 8 | ||
9 | helps compiling dpkg for musl/arm-softfloat | 9 | helps compiling dpkg for musl/arm-softfloat |
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Inappropriate [not a debian architecture] |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> | 13 | Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> |
14 | --- | 14 | --- |
diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch index cbdf01dbd9..b5eaa50172 100644 --- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch | |||
@@ -27,7 +27,7 @@ the required combination of "gnueabi-linux-armeb" was not found in | |||
27 | the triplettable file thereby returning dpkg_arch as | 27 | the triplettable file thereby returning dpkg_arch as |
28 | empty in configure script. | 28 | empty in configure script. |
29 | 29 | ||
30 | Upstream-Status: Pending | 30 | Upstream-Status: Inappropriate [not a debian architecture] |
31 | 31 | ||
32 | Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> | 32 | Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> |
33 | Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> | 33 | Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> |
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch index df2cd88ca4..ec5d503488 100644 --- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | |||
@@ -8,7 +8,7 @@ architecture for mips64, and possibly other arch's | |||
8 | because of faulty code added to Arch.pm in the latest | 8 | because of faulty code added to Arch.pm in the latest |
9 | release from upstream. We remove that code. | 9 | release from upstream. We remove that code. |
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Inappropriate [not a debian architecture] |
12 | 12 | ||
13 | Signed-off-by: Joe Slater <jslater@windriver.com> | 13 | Signed-off-by: Joe Slater <jslater@windriver.com> |
14 | --- | 14 | --- |
diff --git a/meta/recipes-devtools/expect/expect/expect-configure-c99.patch b/meta/recipes-devtools/expect/expect/expect-configure-c99.patch new file mode 100644 index 0000000000..09bf180df7 --- /dev/null +++ b/meta/recipes-devtools/expect/expect/expect-configure-c99.patch | |||
@@ -0,0 +1,201 @@ | |||
1 | Avoid calling exit without declaring the function. | ||
2 | |||
3 | Add missing <string.h> include for memcpy. | ||
4 | |||
5 | Use AC_TYPE_SIGNAL to fix REARM_SIG check. Add missing includes. | ||
6 | |||
7 | Fix various implicit int return types of main. | ||
8 | |||
9 | Upstream-Status: Submitted [https://sourceforge.net/p/expect/patches/24/] | ||
10 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
11 | |||
12 | diff --git a/configure.in b/configure.in | ||
13 | index 51558fa14d2bcf7e..055c88fbd8797eaa 100755 | ||
14 | --- a/configure.in | ||
15 | +++ b/configure.in | ||
16 | @@ -452,7 +452,11 @@ AC_CHECK_FUNC(siglongjmp, AC_DEFINE(HAVE_SIGLONGJMP)) | ||
17 | # because Unixware 2.0 handles it specially and refuses to compile | ||
18 | # autoconf's automatic test that is a call with no arguments | ||
19 | AC_MSG_CHECKING([for memcpy]) | ||
20 | -AC_TRY_LINK(,[ | ||
21 | +AC_TRY_LINK([ | ||
22 | +#ifdef HAVE_STRING_H | ||
23 | +#include <string.h> | ||
24 | +#endif | ||
25 | +],[ | ||
26 | char *s1, *s2; | ||
27 | memcpy(s1,s2,0); | ||
28 | ], | ||
29 | @@ -469,6 +473,7 @@ memcpy(s1,s2,0); | ||
30 | AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE]) | ||
31 | AC_TRY_RUN([ | ||
32 | #include <sys/wait.h> | ||
33 | +int | ||
34 | main() { | ||
35 | #ifndef WNOHANG | ||
36 | return 0; | ||
37 | @@ -489,6 +494,7 @@ rm -rf wnohang | ||
38 | AC_TRY_RUN([ | ||
39 | #include <stdio.h> | ||
40 | #include <sys/wait.h> | ||
41 | +int | ||
42 | main() { | ||
43 | #ifdef WNOHANG | ||
44 | FILE *fp = fopen("wnohang","w"); | ||
45 | @@ -527,16 +533,21 @@ else | ||
46 | AC_DEFINE(SELECT_MASK_TYPE, fd_set) | ||
47 | fi | ||
48 | |||
49 | -dnl # Check for the data type of the function used in signal(). This | ||
50 | -dnl # must be before the test for rearming. | ||
51 | -dnl # echo checking return type of signal handlers | ||
52 | -dnl AC_HEADER_EGREP([(void|sighandler_t).*signal], signal.h, retsigtype=void,AC_DEFINE(RETSIGTYPE, int) retsigtype=int) | ||
53 | +AC_TYPE_SIGNAL | ||
54 | |||
55 | # FIXME: check if alarm exists | ||
56 | AC_MSG_CHECKING([if signals need to be re-armed]) | ||
57 | AC_TRY_RUN([ | ||
58 | #include <signal.h> | ||
59 | -#define RETSIGTYPE $retsigtype | ||
60 | +#ifdef HAVE_STDLIB_H | ||
61 | +# include <stdlib.h> | ||
62 | +#endif | ||
63 | +#ifdef HAVE_UNISTD_H | ||
64 | +# include <unistd.h> | ||
65 | +#endif | ||
66 | +#ifndef NO_SYS_WAIT_H | ||
67 | +# include <sys/wait.h> | ||
68 | +#endif | ||
69 | |||
70 | int signal_rearms = 0; | ||
71 | |||
72 | @@ -553,6 +564,7 @@ int n; | ||
73 | signal_rearms++; | ||
74 | } | ||
75 | |||
76 | +int | ||
77 | main() | ||
78 | { | ||
79 | signal(SIGINT,parent_sigint_handler); | ||
80 | @@ -714,10 +726,11 @@ fi | ||
81 | AC_MSG_CHECKING([for struct sgttyb]) | ||
82 | AC_TRY_RUN([ | ||
83 | #include <sgtty.h> | ||
84 | +int | ||
85 | main() | ||
86 | { | ||
87 | struct sgttyb tmp; | ||
88 | - exit(0); | ||
89 | + return 0; | ||
90 | }], | ||
91 | AC_MSG_RESULT(yes) | ||
92 | AC_DEFINE(HAVE_SGTTYB) | ||
93 | @@ -738,10 +751,11 @@ if test $mach -eq 0 ; then | ||
94 | # pty_termios.c is set up to handle pty_termio. | ||
95 | AC_MSG_CHECKING([for struct termio]) | ||
96 | AC_TRY_RUN([#include <termio.h> | ||
97 | + int | ||
98 | main() | ||
99 | { | ||
100 | struct termio tmp; | ||
101 | - exit(0); | ||
102 | + return 0; | ||
103 | }], | ||
104 | AC_DEFINE(HAVE_TERMIO) | ||
105 | PTY_TYPE=termios | ||
106 | @@ -760,10 +774,11 @@ if test $mach -eq 0 ; then | ||
107 | # include <inttypes.h> | ||
108 | # endif | ||
109 | # include <termios.h> | ||
110 | + int | ||
111 | main() | ||
112 | { | ||
113 | struct termios tmp; | ||
114 | - exit(0); | ||
115 | + return 0; | ||
116 | }], | ||
117 | AC_DEFINE(HAVE_TERMIOS) | ||
118 | PTY_TYPE=termios | ||
119 | @@ -782,6 +797,7 @@ AC_TRY_RUN([ | ||
120 | #include <inttypes.h> | ||
121 | #endif | ||
122 | #include <termios.h> | ||
123 | +int | ||
124 | main() { | ||
125 | #if defined(TCGETS) || defined(TCGETA) | ||
126 | return 0; | ||
127 | @@ -804,6 +820,7 @@ AC_TRY_RUN([ | ||
128 | #include <inttypes.h> | ||
129 | #endif | ||
130 | #include <termios.h> | ||
131 | +int | ||
132 | main() { | ||
133 | #ifdef TIOCGWINSZ | ||
134 | return 0; | ||
135 | @@ -823,6 +840,7 @@ main() { | ||
136 | AC_MSG_CHECKING([for Cray-style ptys]) | ||
137 | SETUID=":" | ||
138 | AC_TRY_RUN([ | ||
139 | +int | ||
140 | main(){ | ||
141 | #ifdef CRAY | ||
142 | return 0; | ||
143 | @@ -878,12 +896,13 @@ AC_MSG_CHECKING([for SV-style timezone]) | ||
144 | AC_TRY_RUN([ | ||
145 | extern char *tzname[2]; | ||
146 | extern int daylight; | ||
147 | +int | ||
148 | main() | ||
149 | { | ||
150 | int *x = &daylight; | ||
151 | char **y = tzname; | ||
152 | |||
153 | - exit(0); | ||
154 | + return 0; | ||
155 | }], | ||
156 | AC_DEFINE(HAVE_SV_TIMEZONE) | ||
157 | AC_MSG_RESULT(yes), | ||
158 | diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 | ||
159 | index 0689cab3da994068..ebe839e5553ba520 100644 | ||
160 | --- a/tclconfig/tcl.m4 | ||
161 | +++ b/tclconfig/tcl.m4 | ||
162 | @@ -2400,7 +2400,7 @@ AC_DEFUN([TEA_TIME_HANDLER], [ | ||
163 | AC_TRY_COMPILE([#include <time.h>], | ||
164 | [extern long timezone; | ||
165 | timezone += 1; | ||
166 | - exit (0);], | ||
167 | + return 0;], | ||
168 | tcl_cv_timezone_long=yes, tcl_cv_timezone_long=no)]) | ||
169 | if test $tcl_cv_timezone_long = yes ; then | ||
170 | AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?]) | ||
171 | @@ -2412,7 +2412,7 @@ AC_DEFUN([TEA_TIME_HANDLER], [ | ||
172 | AC_TRY_COMPILE([#include <time.h>], | ||
173 | [extern time_t timezone; | ||
174 | timezone += 1; | ||
175 | - exit (0);], | ||
176 | + return 0;], | ||
177 | tcl_cv_timezone_time=yes, tcl_cv_timezone_time=no)]) | ||
178 | if test $tcl_cv_timezone_time = yes ; then | ||
179 | AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?]) | ||
180 | @@ -2452,17 +2452,17 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [ | ||
181 | double value; | ||
182 | value = strtod(infString, &term); | ||
183 | if ((term != infString) && (term[-1] == 0)) { | ||
184 | - exit(1); | ||
185 | + return 1; | ||
186 | } | ||
187 | value = strtod(nanString, &term); | ||
188 | if ((term != nanString) && (term[-1] == 0)) { | ||
189 | - exit(1); | ||
190 | + return 1; | ||
191 | } | ||
192 | value = strtod(spaceString, &term); | ||
193 | if (term == (spaceString+1)) { | ||
194 | - exit(1); | ||
195 | + return 1; | ||
196 | } | ||
197 | - exit(0); | ||
198 | + return 0; | ||
199 | }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy, | ||
200 | tcl_cv_strtod_buggy=buggy)]) | ||
201 | if test "$tcl_cv_strtod_buggy" = buggy; then | ||
diff --git a/meta/recipes-devtools/expect/expect/tcl840.patch b/meta/recipes-devtools/expect/expect/tcl840.patch new file mode 100644 index 0000000000..8c7b0e7a7f --- /dev/null +++ b/meta/recipes-devtools/expect/expect/tcl840.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Adjustments for compatibility with the currrent (Tcl 8.4.0+) channel | ||
2 | implementation. | ||
3 | |||
4 | Upstream-Status: Submitted [https://sourceforge.net/p/expect/patches/24/] | ||
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
6 | |||
7 | diff --git a/exp_chan.c b/exp_chan.c | ||
8 | index c92e26b6fbd02305..944200a63b102672 100644 | ||
9 | --- a/exp_chan.c | ||
10 | +++ b/exp_chan.c | ||
11 | @@ -60,7 +60,7 @@ void exp_background_channelhandler _ANSI_ARGS_((ClientData, | ||
12 | |||
13 | Tcl_ChannelType expChannelType = { | ||
14 | "exp", /* Type name. */ | ||
15 | - ExpBlockModeProc, /* Set blocking/nonblocking mode.*/ | ||
16 | + TCL_CHANNEL_VERSION_2, | ||
17 | ExpCloseProc, /* Close proc. */ | ||
18 | ExpInputProc, /* Input proc. */ | ||
19 | ExpOutputProc, /* Output proc. */ | ||
20 | @@ -70,6 +70,7 @@ Tcl_ChannelType expChannelType = { | ||
21 | ExpWatchProc, /* Initialize notifier. */ | ||
22 | ExpGetHandleProc, /* Get OS handles out of channel. */ | ||
23 | NULL, /* Close2 proc */ | ||
24 | + ExpBlockModeProc, /* Set blocking/nonblocking mode.*/ | ||
25 | }; | ||
26 | |||
27 | typedef struct ThreadSpecificData { | ||
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 18904ebc10..461a2c093a 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb | |||
@@ -27,6 +27,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ | |||
27 | file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \ | 27 | file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \ |
28 | file://0001-fixline1-fix-line-1.patch \ | 28 | file://0001-fixline1-fix-line-1.patch \ |
29 | file://0001-Add-prototype-to-function-definitions.patch \ | 29 | file://0001-Add-prototype-to-function-definitions.patch \ |
30 | file://expect-configure-c99.patch \ | ||
31 | file://tcl840.patch \ | ||
30 | file://run-ptest \ | 32 | file://run-ptest \ |
31 | " | 33 | " |
32 | SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" | 34 | SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" |
@@ -81,7 +83,3 @@ FILES:${PN} += "${libdir}/libexpect${PV}.so \ | |||
81 | " | 83 | " |
82 | 84 | ||
83 | BBCLASSEXTEND = "native nativesdk" | 85 | 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/gcc/gcc-14.1.inc b/meta/recipes-devtools/gcc/gcc-14.1.inc index b057e570f3..17a9c51d71 100644 --- a/meta/recipes-devtools/gcc/gcc-14.1.inc +++ b/meta/recipes-devtools/gcc/gcc-14.1.inc | |||
@@ -68,6 +68,7 @@ SRC_URI = "${BASEURI} \ | |||
68 | file://0023-Fix-install-path-of-linux64.h.patch \ | 68 | file://0023-Fix-install-path-of-linux64.h.patch \ |
69 | file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ | 69 | file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ |
70 | file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \ | 70 | file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \ |
71 | file://0026-libstdc-Fix-typo-in-_Grapheme_cluster_view-_Iterator.patch \ | ||
71 | " | 72 | " |
72 | 73 | ||
73 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" | 74 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" |
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index dba25eb754..d77b2ec3d1 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -6,7 +6,7 @@ require gcc-shared-source.inc | |||
6 | # These can be overridden by the version specific .inc file. | 6 | # These can be overridden by the version specific .inc file. |
7 | 7 | ||
8 | # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' | 8 | # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' |
9 | FORTRAN ?= ",f77" | 9 | FORTRAN ?= ",fortran" |
10 | LANGUAGES ?= "c,c++${FORTRAN}" | 10 | LANGUAGES ?= "c,c++${FORTRAN}" |
11 | 11 | ||
12 | EXTRA_OECONF_BASE ?= "" | 12 | EXTRA_OECONF_BASE ?= "" |
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 89b0bebcfb..ad9798530f 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc | |||
@@ -43,7 +43,7 @@ RUNTIMELIBSSP ?= "" | |||
43 | RUNTIMELIBSSP:mingw32 ?= "libssp" | 43 | RUNTIMELIBSSP:mingw32 ?= "libssp" |
44 | 44 | ||
45 | RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ | 45 | RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ |
46 | ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ | 46 | ${@bb.utils.contains('FORTRAN', ',fortran', 'libquadmath', '', d)} \ |
47 | " | 47 | " |
48 | # Only build libstdc++ for newlib | 48 | # Only build libstdc++ for newlib |
49 | RUNTIMETARGET:libc-newlib = "libstdc++-v3" | 49 | RUNTIMETARGET:libc-newlib = "libstdc++-v3" |
@@ -164,8 +164,6 @@ PACKAGES = "\ | |||
164 | libstdc++-precompile-dev \ | 164 | libstdc++-precompile-dev \ |
165 | libstdc++-dev \ | 165 | libstdc++-dev \ |
166 | libstdc++-staticdev \ | 166 | libstdc++-staticdev \ |
167 | libg2c \ | ||
168 | libg2c-dev \ | ||
169 | libssp \ | 167 | libssp \ |
170 | libssp-dev \ | 168 | libssp-dev \ |
171 | libssp-staticdev \ | 169 | libssp-staticdev \ |
@@ -196,15 +194,6 @@ FILES:${PN}-dbg += "\ | |||
196 | # So it needs to be added manually to images sadly. | 194 | # So it needs to be added manually to images sadly. |
197 | # RDEPENDS:${PN}-dbg += "python3-datetime" | 195 | # RDEPENDS:${PN}-dbg += "python3-datetime" |
198 | 196 | ||
199 | FILES:libg2c = "${target_libdir}/libg2c.so.*" | ||
200 | SUMMARY:libg2c = "Companion runtime library for g77" | ||
201 | FILES:libg2c-dev = "\ | ||
202 | ${libdir}/libg2c.so \ | ||
203 | ${libdir}/libg2c.a \ | ||
204 | ${libdir}/libfrtbegin.a \ | ||
205 | " | ||
206 | SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files" | ||
207 | |||
208 | FILES:libstdc++ = "${libdir}/libstdc++.so.*" | 197 | FILES:libstdc++ = "${libdir}/libstdc++.so.*" |
209 | SUMMARY:libstdc++ = "GNU standard C++ library" | 198 | SUMMARY:libstdc++ = "GNU standard C++ library" |
210 | FILES:libstdc++-dev = "\ | 199 | FILES:libstdc++-dev = "\ |
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 82da5ef82b..e9187fc444 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc | |||
@@ -33,8 +33,7 @@ PACKAGES = "\ | |||
33 | ${PN} ${PN}-plugins ${PN}-symlinks \ | 33 | ${PN} ${PN}-plugins ${PN}-symlinks \ |
34 | g++ g++-symlinks \ | 34 | g++ g++-symlinks \ |
35 | cpp cpp-symlinks \ | 35 | cpp cpp-symlinks \ |
36 | g77 g77-symlinks \ | 36 | ${@bb.utils.contains('FORTRAN', ',fortran', 'gfortran gfortran-symlinks', '', d)} \ |
37 | gfortran gfortran-symlinks \ | ||
38 | gcov gcov-symlinks \ | 37 | gcov gcov-symlinks \ |
39 | ${PN}-doc \ | 38 | ${PN}-doc \ |
40 | ${PN}-dev \ | 39 | ${PN}-dev \ |
@@ -61,7 +60,7 @@ RRECOMMENDS:${PN} += "\ | |||
61 | libssp \ | 60 | libssp \ |
62 | libssp-dev \ | 61 | libssp-dev \ |
63 | " | 62 | " |
64 | RDEPENDS:${PN} += "cpp" | 63 | RDEPENDS:${PN} += "binutils cpp" |
65 | 64 | ||
66 | FILES:${PN}-dev = "\ | 65 | FILES:${PN}-dev = "\ |
67 | ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ | 66 | ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ |
@@ -81,23 +80,15 @@ FILES:${PN}-plugins = "\ | |||
81 | " | 80 | " |
82 | ALLOW_EMPTY:${PN}-plugins = "1" | 81 | ALLOW_EMPTY:${PN}-plugins = "1" |
83 | 82 | ||
84 | FILES:g77 = "\ | 83 | INSANE_SKIP:${MLPREFIX}gfortran += "dev-deps" |
85 | ${bindir}/${TARGET_PREFIX}g77 \ | ||
86 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ | ||
87 | " | ||
88 | FILES:g77-symlinks = "\ | ||
89 | ${bindir}/g77 \ | ||
90 | ${bindir}/f77 \ | ||
91 | " | ||
92 | RRECOMMENDS:g77 = "\ | ||
93 | libg2c \ | ||
94 | libg2c-dev \ | ||
95 | " | ||
96 | |||
97 | FILES:gfortran = "\ | 84 | FILES:gfortran = "\ |
98 | ${bindir}/${TARGET_PREFIX}gfortran \ | 85 | ${bindir}/${TARGET_PREFIX}gfortran \ |
99 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ | 86 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ |
100 | " | 87 | " |
88 | RDEPENDS:gfortran = "\ | ||
89 | gcc \ | ||
90 | libgfortran-dev \ | ||
91 | " | ||
101 | RRECOMMENDS:gfortran = "\ | 92 | RRECOMMENDS:gfortran = "\ |
102 | libquadmath \ | 93 | libquadmath \ |
103 | libquadmath-dev \ | 94 | libquadmath-dev \ |
@@ -198,11 +189,6 @@ do_install () { | |||
198 | # Not sure why we end up with these but we don't want them... | 189 | # Not sure why we end up with these but we don't want them... |
199 | rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* | 190 | rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* |
200 | 191 | ||
201 | # Symlinks so we can use these trivially on the target | ||
202 | if [ -e ${TARGET_PREFIX}g77 ]; then | ||
203 | ln -sf ${TARGET_PREFIX}g77 g77 || true | ||
204 | ln -sf g77 f77 || true | ||
205 | fi | ||
206 | if [ -e ${TARGET_PREFIX}gfortran ]; then | 192 | if [ -e ${TARGET_PREFIX}gfortran ]; then |
207 | ln -sf ${TARGET_PREFIX}gfortran gfortran || true | 193 | ln -sf ${TARGET_PREFIX}gfortran gfortran || true |
208 | ln -sf gfortran f95 || true | 194 | ln -sf gfortran f95 || true |
diff --git a/meta/recipes-devtools/gcc/gcc/0026-libstdc-Fix-typo-in-_Grapheme_cluster_view-_Iterator.patch b/meta/recipes-devtools/gcc/gcc/0026-libstdc-Fix-typo-in-_Grapheme_cluster_view-_Iterator.patch new file mode 100644 index 0000000000..5a465b8c95 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0026-libstdc-Fix-typo-in-_Grapheme_cluster_view-_Iterator.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | From c9e05b03c18e898be604ab90401476e9c473cc52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Wakely <jwakely@redhat.com> | ||
3 | Date: Thu, 16 May 2024 17:15:55 +0100 | ||
4 | Subject: [PATCH] libstdc++: Fix typo in _Grapheme_cluster_view::_Iterator | ||
5 | [PR115119] | ||
6 | |||
7 | libstdc++-v3/ChangeLog: | ||
8 | |||
9 | PR libstdc++/115119 | ||
10 | * include/bits/unicode.h (_Iterator::operator++(int)): Fix typo | ||
11 | in increment expression. | ||
12 | * testsuite/ext/unicode/grapheme_view.cc: Check post-increment | ||
13 | on view's iterator. | ||
14 | |||
15 | Drop it when upgrading to 14.2 | ||
16 | |||
17 | Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/c9e05b03c18e898be604ab90401476e9c473cc52] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | libstdc++-v3/include/bits/unicode.h | 6 ++++-- | ||
21 | libstdc++-v3/testsuite/ext/unicode/grapheme_view.cc | 11 +++++++++++ | ||
22 | 2 files changed, 15 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/libstdc++-v3/include/bits/unicode.h b/libstdc++-v3/include/bits/unicode.h | ||
25 | index 46238143fb6..a14a17c5dfc 100644 | ||
26 | --- a/libstdc++-v3/include/bits/unicode.h | ||
27 | +++ b/libstdc++-v3/include/bits/unicode.h | ||
28 | @@ -34,10 +34,12 @@ | ||
29 | #include <array> | ||
30 | #include <bit> // bit_width | ||
31 | #include <charconv> // __detail::__from_chars_alnum_to_val_table | ||
32 | +#include <string_view> | ||
33 | #include <cstdint> | ||
34 | #include <bits/stl_algo.h> | ||
35 | #include <bits/stl_iterator.h> | ||
36 | -#include <bits/ranges_base.h> | ||
37 | +#include <bits/ranges_base.h> // iterator_t, sentinel_t, input_range, etc. | ||
38 | +#include <bits/ranges_util.h> // view_interface | ||
39 | |||
40 | namespace std _GLIBCXX_VISIBILITY(default) | ||
41 | { | ||
42 | @@ -802,7 +804,7 @@ inline namespace __v15_1_0 | ||
43 | operator++(int) | ||
44 | { | ||
45 | auto __tmp = *this; | ||
46 | - ++this; | ||
47 | + ++*this; | ||
48 | return __tmp; | ||
49 | } | ||
50 | |||
51 | diff --git a/libstdc++-v3/testsuite/ext/unicode/grapheme_view.cc b/libstdc++-v3/testsuite/ext/unicode/grapheme_view.cc | ||
52 | index ac1e8c50b05..a3bb36e14b8 100644 | ||
53 | --- a/libstdc++-v3/testsuite/ext/unicode/grapheme_view.cc | ||
54 | +++ b/libstdc++-v3/testsuite/ext/unicode/grapheme_view.cc | ||
55 | @@ -83,10 +83,21 @@ test_breaks() | ||
56 | VERIFY( iter == gv.end() ); | ||
57 | } | ||
58 | |||
59 | +constexpr void | ||
60 | +test_pr115119() | ||
61 | +{ | ||
62 | + // PR 115119 Typo in _Grapheme_cluster_view::_Iterator::operator++(int) | ||
63 | + uc::_Grapheme_cluster_view gv(" "sv); | ||
64 | + auto it = std::ranges::begin(gv); | ||
65 | + it++; | ||
66 | + VERIFY( it == std::ranges::end(gv) ); | ||
67 | +} | ||
68 | + | ||
69 | int main() | ||
70 | { | ||
71 | auto run_tests = []{ | ||
72 | test_breaks(); | ||
73 | + test_pr115119(); | ||
74 | return true; | ||
75 | }; | ||
76 | |||
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc index e810146d4d..c68645e392 100644 --- a/meta/recipes-devtools/gcc/libgfortran.inc +++ b/meta/recipes-devtools/gcc/libgfortran.inc | |||
@@ -47,8 +47,9 @@ do_install () { | |||
47 | chown -R root:root ${D} | 47 | chown -R root:root ${D} |
48 | } | 48 | } |
49 | 49 | ||
50 | # avoid virtual/libc | ||
50 | INHIBIT_DEFAULT_DEPS = "1" | 51 | INHIBIT_DEFAULT_DEPS = "1" |
51 | DEPENDS = "gcc-runtime gcc-cross-${TARGET_ARCH}" | 52 | DEPENDS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}compilerlibs" |
52 | 53 | ||
53 | BBCLASSEXTEND = "nativesdk" | 54 | BBCLASSEXTEND = "nativesdk" |
54 | 55 | ||
diff --git a/meta/recipes-devtools/git/git_2.45.1.bb b/meta/recipes-devtools/git/git_2.45.2.bb index d1b3e6ad40..6393c976e6 100644 --- a/meta/recipes-devtools/git/git_2.45.1.bb +++ b/meta/recipes-devtools/git/git_2.45.2.bb | |||
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ | |||
164 | " | 164 | " |
165 | EXTRA_OEMAKE += "NO_GETTEXT=1" | 165 | EXTRA_OEMAKE += "NO_GETTEXT=1" |
166 | 166 | ||
167 | SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24" | 167 | SRC_URI[tarball.sha256sum] = "98b26090ed667099a3691b93698d1e213e1ded73d36a2fde7e9125fce28ba234" |
diff --git a/meta/recipes-devtools/go/go-1.22.3.inc b/meta/recipes-devtools/go/go-1.22.4.inc index 34703bc1fa..44897daba4 100644 --- a/meta/recipes-devtools/go/go-1.22.3.inc +++ b/meta/recipes-devtools/go/go-1.22.4.inc | |||
@@ -15,4 +15,4 @@ SRC_URI += "\ | |||
15 | file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ | 15 | file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ |
16 | file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ | 16 | file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ |
17 | " | 17 | " |
18 | SRC_URI[main.sha256sum] = "80648ef34f903193d72a59c0dff019f5f98ae0c9aa13ade0b0ecbff991a76f68" | 18 | SRC_URI[main.sha256sum] = "fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784" |
diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.3.bb b/meta/recipes-devtools/go/go-binary-native_1.22.4.bb index b67d97608d..61da51be3a 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.3.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.4.bb | |||
@@ -9,9 +9,9 @@ PROVIDES = "go-native" | |||
9 | 9 | ||
10 | # Checksums available at https://go.dev/dl/ | 10 | # Checksums available at https://go.dev/dl/ |
11 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" | 11 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" |
12 | SRC_URI[go_linux_amd64.sha256sum] = "8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36" | 12 | SRC_URI[go_linux_amd64.sha256sum] = "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d" |
13 | SRC_URI[go_linux_arm64.sha256sum] = "6c33e52a5b26e7aa021b94475587fce80043a727a54ceb0eee2f9fc160646434" | 13 | SRC_URI[go_linux_arm64.sha256sum] = "a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771" |
14 | SRC_URI[go_linux_ppc64le.sha256sum] = "04b7b05283de30dd2da20bf3114b2e22cc727938aed3148babaf35cc951051ac" | 14 | SRC_URI[go_linux_ppc64le.sha256sum] = "a3e5834657ef92523f570f798fed42f1f87bc18222a16815ec76b84169649ec4" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" | 16 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" |
17 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" | 17 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" |
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.3.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.4.bb index 7ac9449e47..7ac9449e47 100644 --- a/meta/recipes-devtools/go/go-cross-canadian_1.22.3.bb +++ b/meta/recipes-devtools/go/go-cross-canadian_1.22.4.bb | |||
diff --git a/meta/recipes-devtools/go/go-cross_1.22.3.bb b/meta/recipes-devtools/go/go-cross_1.22.4.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/meta/recipes-devtools/go/go-cross_1.22.3.bb +++ b/meta/recipes-devtools/go/go-cross_1.22.4.bb | |||
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.3.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.4.bb index 1857c8a577..1857c8a577 100644 --- a/meta/recipes-devtools/go/go-crosssdk_1.22.3.bb +++ b/meta/recipes-devtools/go/go-crosssdk_1.22.4.bb | |||
diff --git a/meta/recipes-devtools/go/go-native_1.22.3.bb b/meta/recipes-devtools/go/go-native_1.22.3.bb deleted file mode 100644 index ddf25b2c9b..0000000000 --- a/meta/recipes-devtools/go/go-native_1.22.3.bb +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | # This recipe builds a native Go (written in Go) by first building an old Go 1.4 | ||
2 | # (written in C). However this old Go does not support all hosts platforms. | ||
3 | |||
4 | require go-${PV}.inc | ||
5 | |||
6 | inherit native | ||
7 | |||
8 | SRC_URI += "https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" | ||
9 | SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" | ||
10 | |||
11 | export GOOS = "${BUILD_GOOS}" | ||
12 | export GOARCH = "${BUILD_GOARCH}" | ||
13 | CC = "${@d.getVar('BUILD_CC').strip()}" | ||
14 | |||
15 | GOMAKEARGS ?= "--no-banner" | ||
16 | |||
17 | do_configure() { | ||
18 | cd ${WORKDIR}/go1.4/go/src | ||
19 | CGO_ENABLED=0 GOROOT=${WORKDIR}/go1.4/go ./make.bash | ||
20 | } | ||
21 | |||
22 | do_compile() { | ||
23 | export GOROOT_FINAL="${libdir_native}/go" | ||
24 | export GOROOT_BOOTSTRAP="${WORKDIR}/go1.4/go" | ||
25 | |||
26 | cd src | ||
27 | ./make.bash ${GOMAKEARGS} | ||
28 | cd ${B} | ||
29 | } | ||
30 | do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin" | ||
31 | |||
32 | make_wrapper() { | ||
33 | rm -f ${D}${bindir}/$2$3 | ||
34 | cat <<END >${D}${bindir}/$2$3 | ||
35 | #!/bin/bash | ||
36 | here=\`dirname \$0\` | ||
37 | export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" | ||
38 | \$here/../lib/go/bin/$1 "\$@" | ||
39 | END | ||
40 | chmod +x ${D}${bindir}/$2 | ||
41 | } | ||
42 | |||
43 | do_install() { | ||
44 | install -d ${D}${libdir}/go | ||
45 | cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/ | ||
46 | install -d ${D}${libdir}/go/src | ||
47 | (cd ${S}/src; for d in *; do \ | ||
48 | [ -d $d ] && cp -a ${S}/src/$d ${D}${libdir}/go/src/; \ | ||
49 | done) | ||
50 | find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \; | ||
51 | install -d ${D}${bindir} ${D}${libdir}/go/bin | ||
52 | for f in ${B}/bin/* | ||
53 | do | ||
54 | base=`basename $f` | ||
55 | install -m755 $f ${D}${libdir}/go/bin | ||
56 | make_wrapper $base $base | ||
57 | done | ||
58 | } | ||
diff --git a/meta/recipes-devtools/go/go-runtime_1.22.3.bb b/meta/recipes-devtools/go/go-runtime_1.22.4.bb index 63464a1501..63464a1501 100644 --- a/meta/recipes-devtools/go/go-runtime_1.22.3.bb +++ b/meta/recipes-devtools/go/go-runtime_1.22.4.bb | |||
diff --git a/meta/recipes-devtools/go/go_1.22.3.bb b/meta/recipes-devtools/go/go_1.22.4.bb index 46f5fbc6be..46f5fbc6be 100644 --- a/meta/recipes-devtools/go/go_1.22.3.bb +++ b/meta/recipes-devtools/go/go_1.22.4.bb | |||
diff --git a/meta/recipes-devtools/llvm/llvm_18.1.6.bb b/meta/recipes-devtools/llvm/llvm_18.1.8.bb index 189f5b1146..3c804eddd2 100644 --- a/meta/recipes-devtools/llvm/llvm_18.1.6.bb +++ b/meta/recipes-devtools/llvm/llvm_18.1.8.bb | |||
@@ -27,8 +27,7 @@ SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/ | |||
27 | 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 \ |
28 | file://llvm-config \ | 28 | file://llvm-config \ |
29 | " | 29 | " |
30 | SRC_URI[sha256sum] = "bd4b4cb6374bcd5fc5a3ba60cb80425d29da34f316b8821abc12c0db225cf6b4" | 30 | SRC_URI[sha256sum] = "0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a" |
31 | |||
32 | UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project" | 31 | UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project" |
33 | UPSTREAM_CHECK_REGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_REGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" |
34 | 33 | ||
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.103.0.bb b/meta/recipes-devtools/python/python3-hypothesis_6.103.2.bb index 18ef7992a1..b935bb02cf 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.103.0.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.103.2.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] = "7fe91917b99fc98ac150ec295775a687448c7c42c2276ab6e4a6969a4b285bb5" | 16 | SRC_URI[sha256sum] = "83504e31e90a0d7d6e8eb93e51525dc1a48d79c932a50ad6035e29f8295328cd" |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-attrs \ | 19 | python3-attrs \ |
diff --git a/meta/recipes-devtools/python/python3-mako/run-ptest b/meta/recipes-devtools/python/python3-mako/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta/recipes-devtools/python/python3-mako/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest --automake | ||
diff --git a/meta/recipes-devtools/python/python3-mako_1.3.5.bb b/meta/recipes-devtools/python/python3-mako_1.3.5.bb index d27fb121a6..d52f72f458 100644 --- a/meta/recipes-devtools/python/python3-mako_1.3.5.bb +++ b/meta/recipes-devtools/python/python3-mako_1.3.5.bb | |||
@@ -6,7 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d0995d6f7ba3f186a03118f244e88f57" | |||
6 | 6 | ||
7 | PYPI_PACKAGE = "Mako" | 7 | PYPI_PACKAGE = "Mako" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta ptest |
10 | |||
11 | SRC_URI:append = " \ | ||
12 | file://run-ptest \ | ||
13 | " | ||
10 | 14 | ||
11 | SRC_URI[sha256sum] = "48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" | 15 | SRC_URI[sha256sum] = "48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" |
12 | 16 | ||
@@ -17,4 +21,15 @@ RDEPENDS:${PN} = "python3-html \ | |||
17 | python3-threading \ | 21 | python3-threading \ |
18 | " | 22 | " |
19 | 23 | ||
24 | RDEPENDS:${PN}-ptest += "\ | ||
25 | python3-pytest \ | ||
26 | python3-unittest-automake-output \ | ||
27 | " | ||
28 | |||
29 | do_install_ptest() { | ||
30 | install -d ${D}${PTEST_PATH}/test | ||
31 | install -m 0644 ${S}/setup.cfg ${D}${PTEST_PATH}/ | ||
32 | cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ | ||
33 | } | ||
34 | |||
20 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-psutil_5.9.8.bb b/meta/recipes-devtools/python/python3-psutil_6.0.0.bb index 1a394eda33..9b77ec4005 100644 --- a/meta/recipes-devtools/python/python3-psutil_5.9.8.bb +++ b/meta/recipes-devtools/python/python3-psutil_6.0.0.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause" | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a9c72113a843d0d732a0ac1c200d81b1" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a9c72113a843d0d732a0ac1c200d81b1" |
4 | HOMEPAGE = "https://pypi.org/project/psutil/" | 4 | HOMEPAGE = "https://pypi.org/project/psutil/" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c" | 6 | SRC_URI[sha256sum] = "8faae4f310b6d969fa26ca0545338b21f73c6b15db7c4a8d934a5482faa818f2" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-testtools_2.7.1.bb b/meta/recipes-devtools/python/python3-testtools_2.7.2.bb index cc7e055632..8d7759b4a7 100644 --- a/meta/recipes-devtools/python/python3-testtools_2.7.1.bb +++ b/meta/recipes-devtools/python/python3-testtools_2.7.2.bb | |||
@@ -8,11 +8,13 @@ DEPENDS += "python3-hatch-vcs-native" | |||
8 | 8 | ||
9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "df6de96010e29ee21f637a147eabf30d50b25e3841dd1d68f93ee89ce77e366c" | 11 | SRC_URI[sha256sum] = "5be5bbc1f0fa0f8b60aca6ceec07845d41d0c475cf445bfadb4d2c45ec397ea3" |
12 | 12 | ||
13 | RDEPENDS:${PN} += "\ | 13 | RDEPENDS:${PN} += "\ |
14 | python3-compression \ | ||
14 | python3-doctest \ | 15 | python3-doctest \ |
15 | python3-extras \ | 16 | python3-extras \ |
17 | python3-json \ | ||
16 | python3-six \ | 18 | python3-six \ |
17 | " | 19 | " |
18 | 20 | ||
diff --git a/meta/recipes-devtools/python/python3-urllib3_2.2.1.bb b/meta/recipes-devtools/python/python3-urllib3_2.2.2.bb index fc1828b4ee..31a03a60b3 100644 --- a/meta/recipes-devtools/python/python3-urllib3_2.2.1.bb +++ b/meta/recipes-devtools/python/python3-urllib3_2.2.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19" | 6 | SRC_URI[sha256sum] = "dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" |
7 | 7 | ||
8 | inherit pypi python_hatchling | 8 | inherit pypi python_hatchling |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-websockets_12.0.bb b/meta/recipes-devtools/python/python3-websockets_12.0.bb index f89c3b629e..1bebcb4ce6 100644 --- a/meta/recipes-devtools/python/python3-websockets_12.0.bb +++ b/meta/recipes-devtools/python/python3-websockets_12.0.bb | |||
@@ -13,4 +13,5 @@ BBCLASSEXTEND = "native nativesdk" | |||
13 | RDEPENDS:${PN} = " \ | 13 | RDEPENDS:${PN} = " \ |
14 | python3-asyncio \ | 14 | python3-asyncio \ |
15 | python3-profile \ | 15 | python3-profile \ |
16 | python3-zipp \ | ||
16 | " | 17 | " |
diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch new file mode 100644 index 0000000000..6ebbaf10e0 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From bf3eb28bba24509a3e1cd40f1f0e26db833779a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Thu, 13 Jun 2024 10:54:31 -0400 | ||
4 | Subject: [PATCH] test_active_children: skip problematic test | ||
5 | |||
6 | This test is failing in some tests on the Autobuilder. Since it's of a | ||
7 | similar nature to other failing/hanging tests, disable it for now. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | |||
11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
12 | --- | ||
13 | Lib/test/_test_multiprocessing.py | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py | ||
17 | index 3955123455..a1861fa3a0 100644 | ||
18 | --- a/Lib/test/_test_multiprocessing.py | ||
19 | +++ b/Lib/test/_test_multiprocessing.py | ||
20 | @@ -579,6 +579,7 @@ def test_cpu_count(self): | ||
21 | self.assertTrue(type(cpus) is int) | ||
22 | self.assertTrue(cpus >= 1) | ||
23 | |||
24 | + @unittest.skip("skipping problematic test") | ||
25 | def test_active_children(self): | ||
26 | self.assertEqual(type(self.active_children()), list) | ||
27 | |||
28 | -- | ||
29 | 2.45.2 | ||
30 | |||
diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 104df94964..2de6ae2e98 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch | |||
@@ -11,7 +11,7 @@ has caused a long string of different issues for us. | |||
11 | 11 | ||
12 | As a result, patch this to a behaviour which works for us. | 12 | As a result, patch this to a behaviour which works for us. |
13 | 13 | ||
14 | Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] | 14 | Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] |
15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
16 | 16 | ||
17 | --- | 17 | --- |
diff --git a/meta/recipes-devtools/python/python3_3.12.4.bb b/meta/recipes-devtools/python/python3_3.12.4.bb index 64cd5d0bc0..8b5e7bd99c 100644 --- a/meta/recipes-devtools/python/python3_3.12.4.bb +++ b/meta/recipes-devtools/python/python3_3.12.4.bb | |||
@@ -32,6 +32,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
32 | file://0001-test_shutdown-skip-problematic-test.patch \ | 32 | file://0001-test_shutdown-skip-problematic-test.patch \ |
33 | file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ | 33 | file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ |
34 | file://0001-test_deadlock-skip-problematic-test.patch \ | 34 | file://0001-test_deadlock-skip-problematic-test.patch \ |
35 | file://0001-test_active_children-skip-problematic-test.patch \ | ||
35 | " | 36 | " |
36 | 37 | ||
37 | SRC_URI:append:class-native = " \ | 38 | SRC_URI:append:class-native = " \ |
diff --git a/meta/recipes-extended/bash/bash/0001-fix-c99.patch b/meta/recipes-extended/bash/bash/0001-fix-c99.patch new file mode 100644 index 0000000000..aa810f7d4e --- /dev/null +++ b/meta/recipes-extended/bash/bash/0001-fix-c99.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From e9ed388e760ec33dcf9e72c639946c0d0abeec26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Wed, 19 Jun 2024 12:57:39 +0000 | ||
4 | Subject: [PATCH] Fix C99 problems | ||
5 | |||
6 | Backport some fixes from upstream to fix configure checks that fail with GCC 14.1. | ||
7 | |||
8 | Upstream-Status: Backport [devel branch] | ||
9 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
10 | --- | ||
11 | aclocal.m4 | 3 +++ | ||
12 | configure.ac | 2 +- | ||
13 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
16 | index cc97bd4..7423b99 100644 | ||
17 | --- a/aclocal.m4 | ||
18 | +++ b/aclocal.m4 | ||
19 | @@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken, | ||
20 | #include <sys/types.h> | ||
21 | #include <fcntl.h> | ||
22 | #include <stdlib.h> | ||
23 | +#ifdef HAVE_UNISTD_H | ||
24 | +# include <unistd.h> | ||
25 | +#endif /* HAVE_UNISTD_H */ | ||
26 | int | ||
27 | main() | ||
28 | { | ||
29 | diff --git a/configure.ac b/configure.ac | ||
30 | index a3b5bd7..2a38c6b 100644 | ||
31 | --- a/configure.ac | ||
32 | +++ b/configure.ac | ||
33 | @@ -842,7 +842,7 @@ AC_CHECK_DECLS([strtold], [ | ||
34 | [AC_COMPILE_IFELSE( | ||
35 | [AC_LANG_PROGRAM( | ||
36 | [[#include <stdlib.h>]], | ||
37 | - [[long double r; char *foo, bar; r = strtold(foo, &bar);]] | ||
38 | + [[long double r; char *foo, *bar; r = strtold(foo, &bar);]] | ||
39 | )], | ||
40 | [bash_cv_strtold_broken=no],[bash_cv_strtold_broken=yes]) | ||
41 | ] | ||
diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.21.bb index 532adf4c1a..ccfe5c47a7 100644 --- a/meta/recipes-extended/bash/bash_5.2.21.bb +++ b/meta/recipes-extended/bash/bash_5.2.21.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ | |||
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 | file://fix-filesubst-errexit.patch \ |
17 | file://0001-fix-c99.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" | 20 | SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" |
diff --git a/meta/recipes-extended/cups/cups_2.4.8.bb b/meta/recipes-extended/cups/cups_2.4.9.bb index c0cddf7e99..e0a3522004 100644 --- a/meta/recipes-extended/cups/cups_2.4.8.bb +++ b/meta/recipes-extended/cups/cups_2.4.9.bb | |||
@@ -2,4 +2,4 @@ require cups.inc | |||
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0" | 5 | SRC_URI[sha256sum] = "38fbf4535a10554113e013d54fedda03ee88007ea6a9761d626a04e1e4489e8c" |
diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb b/meta/recipes-extended/gawk/gawk_5.3.0.bb index e94cf19db4..ac9d8500d6 100644 --- a/meta/recipes-extended/gawk/gawk_5.3.0.bb +++ b/meta/recipes-extended/gawk/gawk_5.3.0.bb | |||
@@ -52,6 +52,8 @@ do_install_ptest() { | |||
52 | cp ${S}/test/$i* ${D}${PTEST_PATH}/test | 52 | cp ${S}/test/$i* ${D}${PTEST_PATH}/test |
53 | done | 53 | done |
54 | sed -i \ | 54 | sed -i \ |
55 | -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \ | ||
56 | -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|g' \ | ||
55 | -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk | 57 | -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk |
56 | 58 | ||
57 | sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests | 59 | sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests |
diff --git a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb index 10a6149abc..ac14f30051 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ | |||
14 | file://run-ptest \ | 14 | file://run-ptest \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516" | 17 | SRC_URI[sha256sum] = "42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618" |
18 | 18 | ||
19 | CVE_STATUS_GROUPS = "CVE_STATUS_RECIPE" | 19 | CVE_STATUS_GROUPS = "CVE_STATUS_RECIPE" |
20 | CVE_STATUS_RECIPE = "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" | 20 | CVE_STATUS_RECIPE = "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" |
diff --git a/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch deleted file mode 100644 index 090ed5c1c9..0000000000 --- a/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Wed, 21 Sep 2016 21:14:40 +0200 | ||
4 | Subject: [PATCH] detect gold as GNU linker too | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | |||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 468c718..cd93f30 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) | ||
22 | AC_MSG_CHECKING([for GNU ld]) | ||
23 | LD=$($CC -print-prog-name=ld 2>&5) | ||
24 | |||
25 | -if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then | ||
26 | +if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then | ||
27 | # Not | ||
28 | GNU_LD="" | ||
29 | AC_MSG_RESULT([no]) | ||
diff --git a/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch b/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch deleted file mode 100644 index bc55582fd9..0000000000 --- a/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From fad40cfc18a42946a9a9e440c3434cd6b847ff9d Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Mon, 18 Jan 2016 17:05:19 +0000 | ||
4 | Subject: [PATCH] Makefile.in: Add tinfo library to the linking libraries | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | --- | ||
11 | Makefile.in | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/Makefile.in b/Makefile.in | ||
15 | index a85d00f..98b85f9 100644 | ||
16 | --- a/Makefile.in | ||
17 | +++ b/Makefile.in | ||
18 | @@ -1,4 +1,4 @@ | ||
19 | -LIBS = -lslang @LIBS@ | ||
20 | +LIBS = -lslang -ltinfo @LIBS@ | ||
21 | LIBTCL = @TCL_LIB_FLAG@ | ||
22 | |||
23 | CC = @CC@ | ||
24 | -- | ||
25 | 2.1.4 | ||
26 | |||
diff --git a/meta/recipes-extended/newt/files/cross_ar.patch b/meta/recipes-extended/newt/files/cross_ar.patch deleted file mode 100644 index 86cc0be1d3..0000000000 --- a/meta/recipes-extended/newt/files/cross_ar.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | Fix cross link using autoconf detected AR | ||
2 | |||
3 | If building on 32bit host and creating 64bit libraries, the target | ||
4 | package builds should not invoke the 32bit hosts's ar. Specifically | ||
5 | you will get an error message like: | ||
6 | |||
7 | x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -g -o test test.o libnewt.a -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lslang | ||
8 | libnewt.a: could not read symbols: Archive has no index; run ranlib to add one | ||
9 | collect2: error: ld returned 1 exit status | ||
10 | |||
11 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | Makefile.in | 3 ++- | ||
18 | configure.ac | 4 ++++ | ||
19 | 2 files changed, 6 insertions(+), 1 deletion(-) | ||
20 | |||
21 | Index: newt-0.52.20/Makefile.in | ||
22 | =================================================================== | ||
23 | --- newt-0.52.20.orig/Makefile.in | ||
24 | +++ newt-0.52.20/Makefile.in | ||
25 | @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ | ||
26 | LDFLAGS = @LDFLAGS@ | ||
27 | CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ | ||
28 | GNU_LD = @GNU_LD@ | ||
29 | +AR = @AR@ | ||
30 | |||
31 | VERSION = @VERSION@ | ||
32 | TAG = r$(subst .,-,$(VERSION)) | ||
33 | @@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE | ||
34 | $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) | ||
35 | |||
36 | $(LIBNEWT): $(LIBOBJS) | ||
37 | - ar rv $@ $^ | ||
38 | + $(AR) rv $@ $^ | ||
39 | |||
40 | newt.o $(SHAREDDIR)/newt.o: newt.c Makefile | ||
41 | |||
42 | Index: newt-0.52.20/configure.ac | ||
43 | =================================================================== | ||
44 | --- newt-0.52.20.orig/configure.ac | ||
45 | +++ newt-0.52.20/configure.ac | ||
46 | @@ -15,6 +15,10 @@ AC_PROG_INSTALL | ||
47 | AC_PROG_LN_S | ||
48 | AC_PROG_GREP | ||
49 | AC_SYS_LARGEFILE | ||
50 | +AN_MAKEVAR([AR], [AC_PROG_AR]) | ||
51 | +AN_PROGRAM([ar], [AC_PROG_AR]) | ||
52 | +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) | ||
53 | +AC_PROG_AR | ||
54 | |||
55 | AC_CHECK_SIZEOF([long]) | ||
56 | AC_CHECK_SIZEOF([long long]) | ||
diff --git a/meta/recipes-extended/newt/libnewt_0.52.24.bb b/meta/recipes-extended/newt/libnewt_0.52.24.bb deleted file mode 100644 index 1e39a1c5ca..0000000000 --- a/meta/recipes-extended/newt/libnewt_0.52.24.bb +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | SUMMARY = "A library for text mode user interfaces" | ||
2 | |||
3 | DESCRIPTION = "Newt is a programming library for color text mode, widget based user \ | ||
4 | interfaces. Newt can be used to add stacked windows, entry widgets, \ | ||
5 | checkboxes, radio buttons, labels, plain text fields, scrollbars, \ | ||
6 | etc., to text mode user interfaces. This package also contains the \ | ||
7 | shared library needed by programs built with newt, as well as a \ | ||
8 | /usr/bin/dialog replacement called whiptail. Newt is based on the \ | ||
9 | slang library." | ||
10 | |||
11 | HOMEPAGE = "https://releases.pagure.org/newt/" | ||
12 | SECTION = "libs" | ||
13 | |||
14 | LICENSE = "LGPL-2.0-only" | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
16 | |||
17 | # slang needs to be >= 2.2 | ||
18 | DEPENDS = "slang popt python3" | ||
19 | |||
20 | SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ | ||
21 | file://cross_ar.patch \ | ||
22 | file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ | ||
23 | file://0001-detect-gold-as-GNU-linker-too.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb" | ||
27 | |||
28 | S = "${WORKDIR}/newt-${PV}" | ||
29 | |||
30 | inherit autotools-brokensep python3native python3-dir python3targetconfig | ||
31 | |||
32 | EXTRA_OECONF = "--without-tcl --with-python" | ||
33 | |||
34 | EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" | ||
35 | |||
36 | CLEANBROKEN = "1" | ||
37 | |||
38 | export CPPFLAGS | ||
39 | |||
40 | PACKAGES:prepend = "whiptail ${PN}-python " | ||
41 | |||
42 | RDEPENDS:${PN}-python += "python3-core" | ||
43 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
44 | |||
45 | do_configure:prepend() { | ||
46 | sh autogen.sh | ||
47 | } | ||
48 | |||
49 | do_compile:prepend() { | ||
50 | # Make sure the recompile is OK | ||
51 | rm -f ${B}/.depend | ||
52 | } | ||
53 | |||
54 | FILES:whiptail = "${bindir}/whiptail" | ||
55 | |||
56 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc deleted file mode 100644 index 23e98d21be..0000000000 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | SUMMARY = "Utilities for managing processes on your system" | ||
2 | HOMEPAGE = "http://psmisc.sf.net/" | ||
3 | DESCRIPTION = "The psmisc package contains utilities for managing processes on your \ | ||
4 | system: pstree, killall and fuser. The pstree command displays a tree \ | ||
5 | structure of all of the running processes on your system. The killall \ | ||
6 | command sends a specified signal (SIGTERM if nothing is specified) to \ | ||
7 | processes identified by name. The fuser command identifies the PIDs \ | ||
8 | of processes that are using specified files or filesystems." | ||
9 | SECTION = "base" | ||
10 | DEPENDS = "ncurses virtual/libintl" | ||
11 | LICENSE = "GPL-2.0-only" | ||
12 | |||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" | ||
14 | |||
15 | S = "${WORKDIR}/psmisc-${PV}" | ||
16 | |||
17 | inherit autotools gettext | ||
18 | |||
19 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they | ||
20 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext | ||
21 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. | ||
22 | do_configure:prepend() { | ||
23 | ( cd ${S} && po/update-potfiles ) | ||
24 | } | ||
25 | |||
26 | |||
27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | ||
28 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
29 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | ||
30 | |||
31 | ALLOW_EMPTY:${PN} = "1" | ||
32 | |||
33 | PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" | ||
34 | PACKAGES += "psmisc-extras" | ||
35 | |||
36 | FILES:${PN} = "" | ||
37 | RDEPENDS:${PN} = "fuser killall pstree" | ||
38 | |||
39 | FILES:fuser = "${bindir}/fuser.${BPN}" | ||
40 | FILES:fuser-doc = "${mandir}/man1/fuser*" | ||
41 | |||
42 | FILES:killall = "${bindir}/killall.${BPN}" | ||
43 | FILES:killall-doc = "${mandir}/man1/killall*" | ||
44 | |||
45 | FILES:pstree = "${bindir}/pstree" | ||
46 | FILES:pstree-doc = "${mandir}/man1/pstree*" | ||
47 | |||
48 | FILES:psmisc-extras = "${bindir}" | ||
49 | FILES:psmisc-extras-doc = "${mandir}" | ||
50 | |||
51 | inherit update-alternatives | ||
52 | |||
53 | ALTERNATIVE_PRIORITY = "90" | ||
54 | |||
55 | ALTERNATIVE:killall = "killall" | ||
56 | |||
57 | ALTERNATIVE:fuser = "fuser" | ||
58 | |||
59 | ALTERNATIVE:pstree = "pstree" | ||
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch deleted file mode 100644 index 01335bdf40..0000000000 --- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 | ||
4 | Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE | ||
5 | |||
6 | Do not include sys/user.h since it conflicts with | ||
7 | pt_regs struct from kernel APIs in asm/ptrace.h | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Pending | ||
11 | --- | ||
12 | src/peekfd.c | 13 ++++++++----- | ||
13 | 1 file changed, 8 insertions(+), 5 deletions(-) | ||
14 | |||
15 | diff --git a/src/peekfd.c b/src/peekfd.c | ||
16 | index 36dff04..2b4b1dc 100644 | ||
17 | --- a/src/peekfd.c | ||
18 | +++ b/src/peekfd.c | ||
19 | @@ -30,8 +30,11 @@ | ||
20 | #include <asm/ptrace.h> | ||
21 | #include <byteswap.h> | ||
22 | #include <endian.h> | ||
23 | +#ifdef __GLIBC__ | ||
24 | #include <sys/user.h> | ||
25 | +#endif | ||
26 | #include <stdlib.h> | ||
27 | +#include <stdint.h> | ||
28 | #include <getopt.h> | ||
29 | #include <ctype.h> | ||
30 | #include <dirent.h> | ||
31 | @@ -341,11 +344,11 @@ int main(int argc, char **argv) | ||
32 | if (WIFSTOPPED(status)) { | ||
33 | #ifdef PPC | ||
34 | struct pt_regs regs; | ||
35 | - regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R0, 0); | ||
36 | - regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R3, 0); | ||
37 | - regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R4, 0); | ||
38 | - regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R5, 0); | ||
39 | - regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_ORIG_R3, 0); | ||
40 | + regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R0, 0); | ||
41 | + regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R3, 0); | ||
42 | + regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R4, 0); | ||
43 | + regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R5, 0); | ||
44 | + regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_ORIG_R3, 0); | ||
45 | #elif defined(ARM) | ||
46 | struct pt_regs regs; | ||
47 | ptrace(PTRACE_GETREGS, pid, 0, ®s); | ||
diff --git a/meta/recipes-extended/psmisc/psmisc_23.7.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb index ea272cd92d..4128ca0533 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.7.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb | |||
@@ -1,9 +1,62 @@ | |||
1 | require psmisc.inc | 1 | SUMMARY = "Utilities for managing processes on your system" |
2 | HOMEPAGE = "http://psmisc.sf.net/" | ||
3 | DESCRIPTION = "The psmisc package contains utilities for managing processes on your \ | ||
4 | system: pstree, killall and fuser. The pstree command displays a tree \ | ||
5 | structure of all of the running processes on your system. The killall \ | ||
6 | command sends a specified signal (SIGTERM if nothing is specified) to \ | ||
7 | processes identified by name. The fuser command identifies the PIDs \ | ||
8 | of processes that are using specified files or filesystems." | ||
9 | SECTION = "base" | ||
10 | DEPENDS = "ncurses virtual/libintl" | ||
11 | |||
2 | LICENSE = "GPL-2.0-only" | 12 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
4 | 14 | ||
5 | SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ | 15 | SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ |
6 | file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ | ||
7 | " | 16 | " |
8 | SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" | 17 | SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" |
9 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | |||
20 | inherit autotools gettext | ||
21 | |||
22 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they | ||
23 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext | ||
24 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. | ||
25 | do_configure:prepend() { | ||
26 | ( cd ${S} && po/update-potfiles ) | ||
27 | } | ||
28 | |||
29 | |||
30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | ||
31 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
32 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | ||
33 | |||
34 | ALLOW_EMPTY:${PN} = "1" | ||
35 | |||
36 | PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" | ||
37 | PACKAGES += "psmisc-extras" | ||
38 | |||
39 | FILES:${PN} = "" | ||
40 | RDEPENDS:${PN} = "fuser killall pstree" | ||
41 | |||
42 | FILES:fuser = "${bindir}/fuser.${BPN}" | ||
43 | FILES:fuser-doc = "${mandir}/man1/fuser*" | ||
44 | |||
45 | FILES:killall = "${bindir}/killall.${BPN}" | ||
46 | FILES:killall-doc = "${mandir}/man1/killall*" | ||
47 | |||
48 | FILES:pstree = "${bindir}/pstree" | ||
49 | FILES:pstree-doc = "${mandir}/man1/pstree*" | ||
50 | |||
51 | FILES:psmisc-extras = "${bindir}" | ||
52 | FILES:psmisc-extras-doc = "${mandir}" | ||
53 | |||
54 | inherit update-alternatives | ||
55 | |||
56 | ALTERNATIVE_PRIORITY = "90" | ||
57 | |||
58 | ALTERNATIVE:killall = "killall" | ||
59 | |||
60 | ALTERNATIVE:fuser = "fuser" | ||
61 | |||
62 | ALTERNATIVE:pstree = "pstree" | ||
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch index 9d1e05d7f4..9ca227d68d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch | |||
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix build with clang | |||
6 | Fix "error: non-void function 'fix_options' should return a value". | 6 | Fix "error: non-void function 'fix_options' should return a value". |
7 | Add function prototype to tcpd.c and miscd.c. | 7 | Add function prototype to tcpd.c and miscd.c. |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
10 | 10 | ||
11 | Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> | 11 | Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> |
12 | --- | 12 | --- |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch index 474703885d..8503177926 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch | |||
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix implicit-function-declaration warnings | |||
5 | 5 | ||
6 | These are seen with clang-15+ | 6 | These are seen with clang-15+ |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [upstream is dead] | 8 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | --- | 10 | --- |
11 | hosts_access.c | 3 +++ | 11 | hosts_access.c | 3 +++ |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch index 88c8d9cae7..f485fe3fb6 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch | |||
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove fgets() extern declaration | |||
6 | These sources already include <stdio.h> which should bring the correct | 6 | These sources already include <stdio.h> which should bring the correct |
7 | declaration | 7 | declaration |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | --- | 11 | --- |
12 | hosts_access.c | 1 - | 12 | hosts_access.c | 1 - |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff index 16d6719cbc..c5ba3af306 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 | 3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 |
4 | --- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 | 4 | --- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch index 9a735bff6d..fea8ab9d7a 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 | 3 | diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 |
4 | --- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100 | 4 | --- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch index 9e188027fc..525cd3531b 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847 | 3 | See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847 |
4 | 4 | ||
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch index 725f4b5957..1f3f9e24ac 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | * Mon Feb 5 2001 Preston Brown <pbrown@redhat.com> | 3 | * Mon Feb 5 2001 Preston Brown <pbrown@redhat.com> |
4 | - fix gethostbyname to work better with dot "." notation (#16949) | 4 | - fix gethostbyname to work better with dot "." notation (#16949) |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch index 96d47c39f4..ea45777734 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c | 3 | diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c |
4 | --- tcp_wrappers_7.6.orig/fix_options.c 1997-04-08 02:29:19.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/fix_options.c 1997-04-08 02:29:19.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch index 226106f4ff..77d5b42342 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | Path: news.porcupine.org!news.porcupine.org!not-for-mail | 3 | Path: news.porcupine.org!news.porcupine.org!not-for-mail |
4 | From: Wietse Venema <wietse@((no)(spam)(please))wzv.win.tue.nl> | 4 | From: Wietse Venema <wietse@((no)(spam)(please))wzv.win.tue.nl> |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch index 260e8d3138..09a1e0527e 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c | 3 | diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c |
4 | --- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002 | 4 | --- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch index d473fb6342..895a72e6b4 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | Index: tcp_wrappers_7.6/Makefile | 3 | Index: tcp_wrappers_7.6/Makefile |
4 | =================================================================== | 4 | =================================================================== |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch index bd1396bc79..9503fb3c88 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile | 3 | diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile |
4 | --- tcp_wrappers_7.6.orig/Makefile 2004-05-02 15:37:59.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/Makefile 2004-05-02 15:37:59.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch index eb5685c576..b6681df8ce 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 | 3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 |
4 | --- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch index 3ca6874119..0c8594cac3 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 | 3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 |
4 | --- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch index 3087377976..0c54ba6d35 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c | 3 | diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c |
4 | --- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100 | 4 | --- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch index 965544cc0b..0fd2ca7b2b 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Compile warning fixes from Debian | 1 | Compile warning fixes from Debian |
2 | 2 | ||
3 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | 3 | Signed-off-by: Adrian Bunk <bunk@stusta.de> |
4 | Upstream-Status: Inappropriate [upstream is dead] | 4 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
5 | 5 | ||
6 | --- a/options.c | 6 | --- a/options.c |
7 | +++ b/options.c | 7 | +++ b/options.c |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch index 27157a2e6d..d9a6909db7 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Compile warning fixes from Debian | 1 | Compile warning fixes from Debian |
2 | 2 | ||
3 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | 3 | Signed-off-by: Adrian Bunk <bunk@stusta.de> |
4 | Upstream-Status: Inappropriate [upstream is dead] | 4 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
5 | 5 | ||
6 | --- a/clean_exit.c | 6 | --- a/clean_exit.c |
7 | +++ b/clean_exit.c | 7 | +++ b/clean_exit.c |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch index 4cc554fc38..9b1a3c0fa1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c | 3 | diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c |
4 | --- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 | 4 | --- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch index 3ba214d241..79b677f456 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | Index: tcp_wrappers_7.6.orig/Makefile | 3 | Index: tcp_wrappers_7.6.orig/Makefile |
4 | =================================================================== | 4 | =================================================================== |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch index 797352579b..23762449ac 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch | |||
@@ -12,7 +12,7 @@ problem. | |||
12 | Also fixed: | 12 | Also fixed: |
13 | Fatal error: can't create shared/hosts_access.o: No such file or directory | 13 | Fatal error: can't create shared/hosts_access.o: No such file or directory |
14 | 14 | ||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
16 | 16 | ||
17 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 17 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
18 | --- | 18 | --- |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch index 19bd7d3c0f..30e74a1de1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 | 3 | diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 |
4 | --- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch index eee640e8a8..b998675aa0 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | __BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl | 1 | __BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl |
2 | glibc and uclibc had sys/cdefs.h doing it. | 2 | glibc and uclibc had sys/cdefs.h doing it. |
3 | 3 | ||
4 | Upstream-Status: Pending | 4 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
6 | 6 | ||
7 | Index: tcp_wrappers_7.6/tcpd.h | 7 | Index: tcp_wrappers_7.6/tcpd.h |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch index 7650600ab5..f42b9d2799 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) | 1 | STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) |
2 | 2 | ||
3 | Upstream-Status: Pending | 3 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
4 | 4 | ||
5 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 5 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
6 | 6 | ||
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch index 5875b81b2f..a864e38129 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c | 3 | diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c |
4 | --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff index 723f4f136a..2d0f548f89 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c | 3 | diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c |
4 | --- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100 | 4 | --- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch index fc2afeef15..b6543fc92e 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | --- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c | 3 | --- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c |
4 | +++ tcp-wrappers-7.6-ipv6.1/safe_finger.c | 4 | +++ tcp-wrappers-7.6-ipv6.1/safe_finger.c |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch index 9d7ea042b2..843063fd7c 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | * Mon Feb 10 2003 Harald Hoyer <harald@redhat.de> 7.6-29 | 3 | * Mon Feb 10 2003 Harald Hoyer <harald@redhat.de> 7.6-29 |
4 | - added security patch tcp_wrappers-7.6-sig.patch | 4 | - added security patch tcp_wrappers-7.6-sig.patch |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch index 76dd6340b2..d4a1146594 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c | 3 | diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c |
4 | --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200 |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch index cf4f993c1a..fb64f93f1d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch | |||
@@ -7,7 +7,7 @@ Date: Tue Feb 12 09:53:50 2013 -0500 | |||
7 | Added support for socklen_t type to len argument passed to socket related | 7 | Added support for socklen_t type to len argument passed to socket related |
8 | calls. This fixes a bug that causes tcp wrappers to fail when using sshd. | 8 | calls. This fixes a bug that causes tcp wrappers to fail when using sshd. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
11 | Signed-off-by: farrah rashid <farrah.rashid@windriver.com> | 11 | Signed-off-by: farrah rashid <farrah.rashid@windriver.com> |
12 | 12 | ||
13 | diff --git a/fix_options.c b/fix_options.c | 13 | diff --git a/fix_options.c b/fix_options.c |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch index be29bdcfaa..2e3b1719fd 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Backport | 1 | Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] |
2 | 2 | ||
3 | diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c | 3 | diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c |
4 | --- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 02:50:37.000000000 +0200 | 4 | --- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 02:50:37.000000000 +0200 |
diff --git a/meta/recipes-extended/wget/wget/CVE-2024-38428.patch b/meta/recipes-extended/wget/wget/CVE-2024-38428.patch new file mode 100644 index 0000000000..ed99a05464 --- /dev/null +++ b/meta/recipes-extended/wget/wget/CVE-2024-38428.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | From ed0c7c7e0e8f7298352646b2fd6e06a11e242ace Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> | ||
3 | Date: Sun, 2 Jun 2024 12:40:16 +0200 | ||
4 | Subject: Properly re-implement userinfo parsing (rfc2396) | ||
5 | |||
6 | * src/url.c (url_skip_credentials): Properly re-implement userinfo parsing (rfc2396) | ||
7 | |||
8 | The reason why the implementation is based on RFC 2396, an outdated standard, | ||
9 | is that the whole file is based on that RFC, and mixing standard here might be | ||
10 | dangerous. | ||
11 | |||
12 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/wget.git/commit/?id=ed0c7c7e0e8f7298352646b2fd6e06a11e242ace] | ||
13 | CVE: CVE-2024-38428 | ||
14 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
15 | --- | ||
16 | src/url.c | 40 ++++++++++++++++++++++++++++++++++------ | ||
17 | 1 file changed, 34 insertions(+), 6 deletions(-) | ||
18 | |||
19 | diff --git a/src/url.c b/src/url.c | ||
20 | index 69e948b..07c3bc8 100644 | ||
21 | --- a/src/url.c | ||
22 | +++ b/src/url.c | ||
23 | @@ -41,6 +41,7 @@ as that of the covered work. */ | ||
24 | #include "url.h" | ||
25 | #include "host.h" /* for is_valid_ipv6_address */ | ||
26 | #include "c-strcase.h" | ||
27 | +#include "c-ctype.h" | ||
28 | |||
29 | #ifdef HAVE_ICONV | ||
30 | # include <iconv.h> | ||
31 | @@ -526,12 +527,39 @@ scheme_leading_string (enum url_scheme scheme) | ||
32 | static const char * | ||
33 | url_skip_credentials (const char *url) | ||
34 | { | ||
35 | - /* Look for '@' that comes before terminators, such as '/', '?', | ||
36 | - '#', or ';'. */ | ||
37 | - const char *p = (const char *)strpbrk (url, "@/?#;"); | ||
38 | - if (!p || *p != '@') | ||
39 | - return url; | ||
40 | - return p + 1; | ||
41 | + /* | ||
42 | + * This whole file implements https://www.rfc-editor.org/rfc/rfc2396 . | ||
43 | + * RFC 2396 is outdated since 2005 and needs a rewrite or a thorough re-visit. | ||
44 | + * | ||
45 | + * The RFC says | ||
46 | + * server = [ [ userinfo "@" ] hostport ] | ||
47 | + * userinfo = *( unreserved | escaped | ";" | ":" | "&" | "=" | "+" | "$" | "," ) | ||
48 | + * unreserved = alphanum | mark | ||
49 | + * mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" | ||
50 | + */ | ||
51 | + static const char *allowed = "-_.!~*'();:&=+$,"; | ||
52 | + | ||
53 | + for (const char *p = url; *p; p++) | ||
54 | + { | ||
55 | + if (c_isalnum(*p)) | ||
56 | + continue; | ||
57 | + | ||
58 | + if (strchr(allowed, *p)) | ||
59 | + continue; | ||
60 | + | ||
61 | + if (*p == '%' && c_isxdigit(p[1]) && c_isxdigit(p[2])) | ||
62 | + { | ||
63 | + p += 2; | ||
64 | + continue; | ||
65 | + } | ||
66 | + | ||
67 | + if (*p == '@') | ||
68 | + return p + 1; | ||
69 | + | ||
70 | + break; | ||
71 | + } | ||
72 | + | ||
73 | + return url; | ||
74 | } | ||
75 | |||
76 | /* Parse credentials contained in [BEG, END). The region is expected | ||
77 | -- | ||
78 | cgit v1.1 | ||
79 | |||
diff --git a/meta/recipes-extended/wget/wget_1.24.5.bb b/meta/recipes-extended/wget/wget_1.24.5.bb index 64e6ee80af..602fc9e627 100644 --- a/meta/recipes-extended/wget/wget_1.24.5.bb +++ b/meta/recipes-extended/wget/wget_1.24.5.bb | |||
@@ -1,5 +1,6 @@ | |||
1 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ | 1 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ |
2 | file://0002-improve-reproducibility.patch \ | 2 | file://0002-improve-reproducibility.patch \ |
3 | file://CVE-2024-38428.patch \ | ||
3 | " | 4 | " |
4 | 5 | ||
5 | SRC_URI[sha256sum] = "fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" | 6 | SRC_URI[sha256sum] = "fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" |
diff --git a/meta/recipes-extended/xz/xz_5.4.6.bb b/meta/recipes-extended/xz/xz_5.4.6.bb index da3b75a10b..3f82e476bf 100644 --- a/meta/recipes-extended/xz/xz_5.4.6.bb +++ b/meta/recipes-extended/xz/xz_5.4.6.bb | |||
@@ -9,10 +9,10 @@ SECTION = "base" | |||
9 | # libgnu, which appears to be used for DOS builds. So we're left with | 9 | # libgnu, which appears to be used for DOS builds. So we're left with |
10 | # GPL-2.0-or-later and PD. | 10 | # GPL-2.0-or-later and PD. |
11 | LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" | 11 | LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" |
12 | LICENSE:${PN} = "GPL-2.0-or-later" | 12 | LICENSE:${PN} = "PD & GPL-2.0-or-later" |
13 | LICENSE:${PN}-dev = "GPL-2.0-or-later" | 13 | LICENSE:${PN}-dev = "PD & GPL-2.0-or-later" |
14 | LICENSE:${PN}-staticdev = "GPL-2.0-or-later" | 14 | LICENSE:${PN}-staticdev = "GPL-2.0-or-later" |
15 | LICENSE:${PN}-doc = "GPL-2.0-or-later" | 15 | LICENSE:${PN}-doc = "PD & GPL-2.0-or-later" |
16 | LICENSE:${PN}-dbg = "GPL-2.0-or-later" | 16 | LICENSE:${PN}-dbg = "GPL-2.0-or-later" |
17 | LICENSE:${PN}-locale = "GPL-2.0-or-later" | 17 | LICENSE:${PN}-locale = "GPL-2.0-or-later" |
18 | LICENSE:liblzma = "PD" | 18 | LICENSE:liblzma = "PD" |
diff --git a/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb b/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb index cda0552f7c..51c37e1a79 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.14.4.bb | |||
@@ -16,6 +16,7 @@ DEPENDS = " \ | |||
16 | graphene \ | 16 | graphene \ |
17 | harfbuzz \ | 17 | harfbuzz \ |
18 | jpeg \ | 18 | jpeg \ |
19 | libdrm \ | ||
19 | libepoxy \ | 20 | libepoxy \ |
20 | libpng \ | 21 | libpng \ |
21 | librsvg \ | 22 | librsvg \ |
diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch index e6bb6ec8e3..5001d63144 100644 --- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch | |||
@@ -5,7 +5,7 @@ Subject: [PATCH] generate glslang pkg-config | |||
5 | 5 | ||
6 | Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch | 6 | Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch |
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371] |
9 | 9 | ||
10 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 10 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
11 | --- | 11 | --- |
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 11fa917649..058f887b86 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -14,10 +14,7 @@ PACKAGECONFIG ??= "python tui libunwind libtraceevent" | |||
14 | PACKAGECONFIG[dwarf] = ",NO_DWARF=1" | 14 | PACKAGECONFIG[dwarf] = ",NO_DWARF=1" |
15 | PACKAGECONFIG[perl] = ",NO_LIBPERL=1,perl" | 15 | PACKAGECONFIG[perl] = ",NO_LIBPERL=1,perl" |
16 | PACKAGECONFIG[python] = ",NO_LIBPYTHON=1,python3 python3-setuptools-native" | 16 | PACKAGECONFIG[python] = ",NO_LIBPYTHON=1,python3 python3-setuptools-native" |
17 | # gui support was added with kernel 3.6.35 | 17 | PACKAGECONFIG[tui] = ",NO_SLANG=1,slang" |
18 | # since 3.10 libnewt was replaced by slang | ||
19 | # to cover a wide range of kernel we add both dependencies | ||
20 | PACKAGECONFIG[tui] = ",NO_NEWT=1,libnewt slang" | ||
21 | PACKAGECONFIG[libunwind] = ",NO_LIBUNWIND=1 NO_LIBDW_DWARF_UNWIND=1,libunwind" | 18 | PACKAGECONFIG[libunwind] = ",NO_LIBUNWIND=1 NO_LIBDW_DWARF_UNWIND=1,libunwind" |
22 | PACKAGECONFIG[libnuma] = ",NO_LIBNUMA=1" | 19 | PACKAGECONFIG[libnuma] = ",NO_LIBNUMA=1" |
23 | PACKAGECONFIG[bfd] = ",NO_LIBBFD=1" | 20 | PACKAGECONFIG[bfd] = ",NO_LIBBFD=1" |
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch deleted file mode 100644 index 30aeef5817..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Opdenacker <michael.opdenacker@bootlin.com> | ||
3 | Date: Tue, 30 Jan 2024 14:24:25 +0100 | ||
4 | Subject: [PATCH] topology: correct version script path | ||
5 | |||
6 | From: Jan Palus <jpalus@fastmail.com> | ||
7 | |||
8 | contrary to libasound, version script for libatopology is a regular | ||
9 | source file. while it's often the case that $(builddir) and $(srcdir) | ||
10 | point to the same directory, they don't always have to. therefore path | ||
11 | needs to point explicitly to $(srcdir) for Versions script in topology | ||
12 | |||
13 | Closes: https://github.com/alsa-project/alsa-lib/pull/383 | ||
14 | Fixes: GH-382 | ||
15 | Fixes: dc7da761f3a2 ("topology: separate Versions linker script") | ||
16 | Signed-off-by: Jan Palus <jpalus@fastmail.com> | ||
17 | Signed-off-by: Jaroslav Kysela <perex@perex.cz> | ||
18 | Upstream-Status: Backport [https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2a736a0d2543f206fd2653aaae8a08a4c42eb917] | ||
19 | --- | ||
20 | src/topology/Makefile.am | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am | ||
24 | index 04299588..e0b78373 100644 | ||
25 | --- a/src/topology/Makefile.am | ||
26 | +++ b/src/topology/Makefile.am | ||
27 | @@ -2,7 +2,7 @@ EXTRA_DIST = Versions | ||
28 | COMPATNUM=@LIBTOOL_VERSION_INFO@ | ||
29 | |||
30 | if VERSIONED_SYMBOLS | ||
31 | -VSYMS = -Wl,--version-script=Versions | ||
32 | +VSYMS = -Wl,--version-script=$(srcdir)/Versions | ||
33 | else | ||
34 | VSYMS = | ||
35 | endif | ||
36 | -- | ||
37 | 2.34.1 | ||
38 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.12.bb index c212b17aa3..d9136052b7 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.12.bb | |||
@@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ | |||
9 | file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ | 9 | file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ | 12 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" |
13 | file://0001-topology-correct-version-script-path.patch \ | 13 | SRC_URI[sha256sum] = "4868cd908627279da5a634f468701625be8cc251d84262c7e5b6a218391ad0d2" |
14 | " | ||
15 | SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d" | ||
16 | 14 | ||
17 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
18 | 16 | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch deleted file mode 100644 index ff7745d637..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From b01b176a665ba65979d74922955f51dc4888a713 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 23 Aug 2022 15:21:16 -0700 | ||
4 | Subject: [PATCH] arcam_av.c: Include missing string.h | ||
5 | |||
6 | bzero() function needs this header to be included | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/alsa-project/alsa-plugins/pull/47] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | arcam-av/arcam_av.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c | ||
15 | index 63f9b4e..29fc537 100644 | ||
16 | --- a/arcam-av/arcam_av.c | ||
17 | +++ b/arcam-av/arcam_av.c | ||
18 | @@ -27,6 +27,7 @@ | ||
19 | #include <signal.h> | ||
20 | #include <stddef.h> | ||
21 | #include <stdio.h> | ||
22 | +#include <string.h> | ||
23 | #include <termios.h> | ||
24 | #include <unistd.h> | ||
25 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.12.bb index 9500462d5c..819cdf8e7b 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.12.bb | |||
@@ -19,13 +19,11 @@ LICENSE = "LGPL-2.1-only & GPL-2.0-or-later" | |||
19 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ | 19 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ |
20 | file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 20 | file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
21 | file://m4/attributes.m4;endline=33;md5=bb8c6b2a67ac15156961e242fec33e50 \ | 21 | file://m4/attributes.m4;endline=33;md5=bb8c6b2a67ac15156961e242fec33e50 \ |
22 | file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ | 22 | file://rate/rate_samplerate.c;endline=35;md5=07fcfc9e83a7159ad14a7196ecdc7d48 \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2 \ | 25 | SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2" |
26 | file://0001-arcam_av.c-Include-missing-string.h.patch \ | 26 | SRC_URI[sha256sum] = "7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2" |
27 | " | ||
28 | SRC_URI[sha256sum] = "8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511" | ||
29 | 27 | ||
30 | DEPENDS += "alsa-lib" | 28 | DEPENDS += "alsa-lib" |
31 | 29 | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.12.bb index ce1a42c9b8..88b43c345b 100644 --- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.12.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" |
9 | 9 | ||
10 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" | 10 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" |
11 | SRC_URI[sha256sum] = "387c01cf30e2a1676d7b8f72b2681cf219abca70dd1ec2a9e33add5bf3feae81" | 11 | SRC_URI[sha256sum] = "168e7c0549b7bf8991092fa2bfb903631df779dc4c43ee8f4277fcb772d8c035" |
12 | # Something went wrong at upstream tarballing | 12 | # Something went wrong at upstream tarballing |
13 | 13 | ||
14 | inherit allarch | 14 | inherit allarch |
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch new file mode 100644 index 0000000000..960d34943e --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | From 2f24f10d9cf34ddce274496c4daa73f732d370c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sam James <sam@gentoo.org> | ||
3 | Date: Wed, 20 Dec 2023 12:32:43 +0000 | ||
4 | Subject: [PATCH] libavcodec: fix -Wint-conversion in vulkan | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | FIx warnings (soon to be errors in GCC 14, already so in Clang 15): | ||
10 | ``` | ||
11 | src/libavcodec/vulkan_av1.c: In function ‘vk_av1_create_params’: | ||
12 | src/libavcodec/vulkan_av1.c:183:43: error: initialization of ‘long long unsigned int’ from ‘void *’ makes integer from pointer without a cast [-Wint-conversion] | ||
13 | 183 | .videoSessionParametersTemplate = NULL, | ||
14 | | ^~~~ | ||
15 | src/libavcodec/vulkan_av1.c:183:43: note: (near initialization for ‘(anonymous).videoSessionParametersTemplate’) | ||
16 | ``` | ||
17 | |||
18 | Use Vulkan's VK_NULL_HANDLE instead of bare NULL. | ||
19 | |||
20 | Fix Trac ticket #10724. | ||
21 | |||
22 | Was reported downstream in Gentoo at https://bugs.gentoo.org/919067. | ||
23 | |||
24 | Signed-off-by: Sam James <sam@gentoo.org> | ||
25 | Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/2f24f10d9cf34ddce274496c4daa73f732d370c1] | ||
26 | --- | ||
27 | libavcodec/vulkan_av1.c | 2 +- | ||
28 | libavcodec/vulkan_decode.c | 6 +++--- | ||
29 | libavcodec/vulkan_h264.c | 2 +- | ||
30 | libavcodec/vulkan_hevc.c | 2 +- | ||
31 | libavcodec/vulkan_video.c | 2 +- | ||
32 | 5 files changed, 7 insertions(+), 7 deletions(-) | ||
33 | |||
34 | diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c | ||
35 | index 4998bf7ebc55f..9730e4b08dd40 100644 | ||
36 | --- a/libavcodec/vulkan_av1.c | ||
37 | +++ b/libavcodec/vulkan_av1.c | ||
38 | @@ -180,7 +180,7 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
39 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
40 | .pNext = &av1_params, | ||
41 | .videoSession = ctx->common.session, | ||
42 | - .videoSessionParametersTemplate = NULL, | ||
43 | + .videoSessionParametersTemplate = VK_NULL_HANDLE, | ||
44 | }; | ||
45 | |||
46 | err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create); | ||
47 | diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c | ||
48 | index a89d84fcaa972..fdbcbb450a1e0 100644 | ||
49 | --- a/libavcodec/vulkan_decode.c | ||
50 | +++ b/libavcodec/vulkan_decode.c | ||
51 | @@ -188,9 +188,9 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic, | ||
52 | return 0; | ||
53 | |||
54 | vkpic->dpb_frame = NULL; | ||
55 | - vkpic->img_view_ref = NULL; | ||
56 | - vkpic->img_view_out = NULL; | ||
57 | - vkpic->img_view_dest = NULL; | ||
58 | + vkpic->img_view_ref = VK_NULL_HANDLE; | ||
59 | + vkpic->img_view_out = VK_NULL_HANDLE; | ||
60 | + vkpic->img_view_dest = VK_NULL_HANDLE; | ||
61 | |||
62 | vkpic->destroy_image_view = vk->DestroyImageView; | ||
63 | vkpic->wait_semaphores = vk->WaitSemaphores; | ||
64 | diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c | ||
65 | index e727aafb162d3..39c123ddca57e 100644 | ||
66 | --- a/libavcodec/vulkan_h264.c | ||
67 | +++ b/libavcodec/vulkan_h264.c | ||
68 | @@ -315,7 +315,7 @@ static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
69 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
70 | .pNext = &h264_params, | ||
71 | .videoSession = ctx->common.session, | ||
72 | - .videoSessionParametersTemplate = NULL, | ||
73 | + .videoSessionParametersTemplate = VK_NULL_HANDLE, | ||
74 | }; | ||
75 | |||
76 | /* SPS list */ | ||
77 | diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c | ||
78 | index 99fdcf3b45839..033172cbd6958 100644 | ||
79 | --- a/libavcodec/vulkan_hevc.c | ||
80 | +++ b/libavcodec/vulkan_hevc.c | ||
81 | @@ -653,7 +653,7 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
82 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
83 | .pNext = &h265_params, | ||
84 | .videoSession = ctx->common.session, | ||
85 | - .videoSessionParametersTemplate = NULL, | ||
86 | + .videoSessionParametersTemplate = VK_NULL_HANDLE, | ||
87 | }; | ||
88 | |||
89 | HEVCHeaderSet *hdr; | ||
90 | diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c | ||
91 | index 5fa8292b28eaf..fb20315db4bbf 100644 | ||
92 | --- a/libavcodec/vulkan_video.c | ||
93 | +++ b/libavcodec/vulkan_video.c | ||
94 | @@ -287,7 +287,7 @@ av_cold void ff_vk_video_common_uninit(FFVulkanContext *s, | ||
95 | if (common->session) { | ||
96 | vk->DestroyVideoSessionKHR(s->hwctx->act_dev, common->session, | ||
97 | s->hwctx->alloc); | ||
98 | - common->session = NULL; | ||
99 | + common->session = VK_NULL_HANDLE; | ||
100 | } | ||
101 | |||
102 | if (common->nb_mem && common->mem) | ||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb index c0bce2db7a..dea1f54580 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | |||
@@ -26,6 +26,7 @@ SRC_URI = " \ | |||
26 | https://www.ffmpeg.org/releases/${BP}.tar.xz \ | 26 | https://www.ffmpeg.org/releases/${BP}.tar.xz \ |
27 | file://av1_ordering_info.patch \ | 27 | file://av1_ordering_info.patch \ |
28 | file://vulkan_av1_stable_API.patch \ | 28 | file://vulkan_av1_stable_API.patch \ |
29 | file://vulkan_fix_gcc14.patch \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" | 32 | SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" |
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.24.4.bb index 9df802afe9..eca0753cf2 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.24.4.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} | |||
12 | file://0001-connect-has-a-different-signature-on-musl.patch \ | 12 | file://0001-connect-has-a-different-signature-on-musl.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "b91114a2fd958f42acf441186e87e2bec93538ef35a9f8248111197360ffb237" | 15 | SRC_URI[sha256sum] = "8bff1b388522e03d761786e61fe9aff1f9867b8f7cc230043cbb2622dcf6f0fe" |
16 | 16 | ||
17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" | 17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" |
18 | RRECOMMENDS:${PN} = "git" | 18 | RRECOMMENDS:${PN} = "git" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.4.bb index d468f2983c..dfd26f7df7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.4.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ | |||
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" | 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" |
15 | SRC_URI[sha256sum] = "d9c5b152468a45c1fa8351410422090a7192707ad74d2e1a4367f5254e188d91" | 15 | SRC_URI[sha256sum] = "4d3803f36008e847fc4842c8dd366162baf8359526cc46c1851bf68bb638da73" |
16 | 16 | ||
17 | S = "${WORKDIR}/gst-libav-${PV}" | 17 | S = "${WORKDIR}/gst-libav-${PV}" |
18 | 18 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-uvcgadget-Use-g_path_get_basename-instead-of-libc-ba.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-uvcgadget-Use-g_path_get_basename-instead-of-libc-ba.patch new file mode 100644 index 0000000000..cc21435dde --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-uvcgadget-Use-g_path_get_basename-instead-of-libc-ba.patch | |||
@@ -0,0 +1,96 @@ | |||
1 | From 7c558e8ef9375aea953d1e7c854b25947c967f76 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jun 2024 23:09:54 -0700 | ||
4 | Subject: [PATCH] uvcgadget: Use g_path_get_basename instead of libc basename | ||
5 | |||
6 | Musl does not implement GNU basename and have fixed a bug where the | ||
7 | prototype was leaked into string.h [1], which resullts in compile errors | ||
8 | with GCC-14 and Clang-17+ | ||
9 | |||
10 | | sys/uvcgadget/configfs.c:262:21: error: call to undeclared function 'basename' | ||
11 | ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] | ||
12 | | 262 | const char *v = basename (globbuf.gl_pathv[i]); | ||
13 | | | ^ | ||
14 | |||
15 | Use glib function instead makes it portable across musl and glibc on | ||
16 | linux | ||
17 | |||
18 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7a | ||
19 | |||
20 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/7006] | ||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | .../gst-plugins-bad/sys/uvcgadget/configfs.c | 18 ++++++++++++------ | ||
24 | 1 file changed, 12 insertions(+), 6 deletions(-) | ||
25 | |||
26 | --- a/sys/uvcgadget/configfs.c | ||
27 | +++ b/sys/uvcgadget/configfs.c | ||
28 | @@ -7,7 +7,7 @@ | ||
29 | * Contact: Kieran Bingham <kieran.bingham@ideasonboard.com> | ||
30 | */ | ||
31 | |||
32 | -/* To provide basename and asprintf from the GNU library. */ | ||
33 | +/* To provide asprintf from the GNU library. */ | ||
34 | #define _GNU_SOURCE | ||
35 | |||
36 | #include <dirent.h> | ||
37 | @@ -259,9 +259,10 @@ udc_find_video_device (const char *udc, | ||
38 | } | ||
39 | |||
40 | if (i < globbuf.gl_pathc) { | ||
41 | - const char *v = basename (globbuf.gl_pathv[i]); | ||
42 | + gchar *v = g_path_get_basename (globbuf.gl_pathv[i]); | ||
43 | |||
44 | video = path_join ("/dev", v); | ||
45 | + g_free (v); | ||
46 | } | ||
47 | |||
48 | globfree (&globbuf); | ||
49 | @@ -894,6 +895,7 @@ configfs_parse_uvc_function (const char | ||
50 | { | ||
51 | struct uvc_function_config *fc; | ||
52 | char *fpath; | ||
53 | + gchar *bname; | ||
54 | int ret = 0; | ||
55 | |||
56 | fc = malloc (sizeof *fc); | ||
57 | @@ -923,11 +925,10 @@ configfs_parse_uvc_function (const char | ||
58 | * Parse the function configuration. Remove the gadget name qualifier | ||
59 | * from the function name, if any. | ||
60 | */ | ||
61 | - if (function) | ||
62 | - function = basename (function); | ||
63 | + bname = g_path_get_basename (function); | ||
64 | |||
65 | fc->udc = attribute_read_str (fpath, "../../UDC"); | ||
66 | - fc->video = udc_find_video_device (fc->udc, function); | ||
67 | + fc->video = udc_find_video_device (fc->udc, bname); | ||
68 | if (!fc->video) { | ||
69 | ret = -ENODEV; | ||
70 | goto done; | ||
71 | @@ -942,6 +943,7 @@ done: | ||
72 | } | ||
73 | |||
74 | free (fpath); | ||
75 | + g_free (bname); | ||
76 | |||
77 | return fc; | ||
78 | } | ||
79 | @@ -979,12 +981,16 @@ configfs_parse_uvc_videodev (int fd, con | ||
80 | char *function = NULL; | ||
81 | char rpath[PATH_MAX]; | ||
82 | char *res; | ||
83 | + gchar *bname; | ||
84 | |||
85 | res = realpath (video, rpath); | ||
86 | if (!res) | ||
87 | return NULL; | ||
88 | |||
89 | - function = video_find_config_name (basename (rpath)); | ||
90 | + bname = g_path_get_basename (rpath); | ||
91 | + function = video_find_config_name (bname); | ||
92 | + g_free (bname); | ||
93 | + | ||
94 | if (!function) | ||
95 | return NULL; | ||
96 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.4.bb index dbd504e87d..c7fb9dc91a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.4.bb | |||
@@ -9,8 +9,9 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad | |||
9 | file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ | 9 | file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ |
10 | file://0002-avoid-including-sys-poll.h-directly.patch \ | 10 | file://0002-avoid-including-sys-poll.h-directly.patch \ |
11 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ | 11 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ |
12 | file://0001-uvcgadget-Use-g_path_get_basename-instead-of-libc-ba.patch \ | ||
12 | " | 13 | " |
13 | SRC_URI[sha256sum] = "e90f26c7dc9c76f4aa599b758cfd6d8c10d6a0b9cb265ba2c3c9bdf3888558f8" | 14 | SRC_URI[sha256sum] = "260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3" |
14 | 15 | ||
15 | S = "${WORKDIR}/gst-plugins-bad-${PV}" | 16 | S = "${WORKDIR}/gst-plugins-bad-${PV}" |
16 | 17 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.4.bb index 8a967cf6eb..bda9f3e737 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.4.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba | |||
11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ | 12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "f1094397eaa7932f06e57ebbb075aa33aa2c76e4b75630a16b02c8d4af46832e" | 14 | SRC_URI[sha256sum] = "09f4ddf246eeb819da1494ce336316edbbcb28fdff3ee2f9804891e84df39b2a" |
15 | 15 | ||
16 | S = "${WORKDIR}/gst-plugins-base-${PV}" | 16 | S = "${WORKDIR}/gst-plugins-base-${PV}" |
17 | 17 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.4.bb index 41a93e85a4..48d5f9ce86 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.4.bb | |||
@@ -6,7 +6,7 @@ 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 | 8 | ||
9 | SRC_URI[sha256sum] = "150f914e61dc05600b68b88ca103c7cc227130158e389ea9ea159f4050a2ebb0" | 9 | SRC_URI[sha256sum] = "023096d661cf58cde3e0dcdbf56897bf588830232358c305f3e15fd63e116626" |
10 | 10 | ||
11 | S = "${WORKDIR}/gst-plugins-good-${PV}" | 11 | S = "${WORKDIR}/gst-plugins-good-${PV}" |
12 | 12 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.4.bb index 533de0234f..37f870be59 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.4.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = " \ | |||
15 | https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ | 15 | https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "4c951341c4c648630b6fe1234ec113d81dd2d248529bf2b5478e0ad077c80ed3" | 18 | SRC_URI[sha256sum] = "4604f8709c0bc4d6960ef6ae6fd91e0b20af011bfe22e103f5b85377cf3f1ef4" |
19 | 19 | ||
20 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" | 20 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" |
21 | 21 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.4.bb index 5fbf860741..6f05863486 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.4.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" |
9 | 9 | ||
10 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" | 10 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" |
11 | SRC_URI[sha256sum] = "ecdb3e2ba94ea2c82b93a8c715d5a7e04f9726a8838c0a6b17694928fd1e8595" | 11 | SRC_URI[sha256sum] = "5510358316eb5c965829a393714b4d88306033cd64db3eae8cc62b41ae80a392" |
12 | 12 | ||
13 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" | 13 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" |
14 | RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" | 14 | RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.4.bb index f63d61b2c9..13431ed788 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.4.bb | |||
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" | |||
10 | 10 | ||
11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" | 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "62628ecca78b8f5b51c59a4d602c65e9205ffc50c3c83cd61fab1f6348b63565" | 13 | SRC_URI[sha256sum] = "eeca811cef6312fa21433294ae216b3c6fa0a389d8980727102516bdcf973eae" |
14 | 14 | ||
15 | S = "${WORKDIR}/${PNREAL}-${PV}" | 15 | S = "${WORKDIR}/${PNREAL}-${PV}" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.4.bb index 8ddfe15de9..b4ace68129 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.4.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | |||
11 | 11 | ||
12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" | 12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "845f2efe0dca8dab234dde8fb091da2cd06a9d2a683422b56dcb688954f9070e" | 14 | SRC_URI[sha256sum] = "2dfb322e37370b6671b62ff60dc1da81f87dac5a17c1c7ef15a783d2355900b8" |
15 | 15 | ||
16 | S = "${WORKDIR}/${REALPN}-${PV}" | 16 | S = "${WORKDIR}/${REALPN}-${PV}" |
17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest index ab2df80dcc..7fee5a3d09 100755 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest | |||
@@ -16,6 +16,11 @@ GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" | |||
16 | 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" |
17 | 17 | ||
18 | # Known unreliable tests as per subprojects/gst-devtools/validate/launcher/testsuites/check.py: | 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" | 19 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_pull_short_read" |
20 | |||
21 | # These tests are fragile | ||
22 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14884 | ||
23 | # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3524 | ||
24 | GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_convert_duration,parser_pull_frame_growth,parser_reverse_playback" | ||
20 | 25 | ||
21 | gnome-desktop-testing-runner gstreamer | 26 | gnome-desktop-testing-runner gstreamer |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.4.bb index cd04ade602..0625accb7b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.4.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x | |||
22 | file://0003-tests-use-a-dictionaries-for-environment.patch \ | 22 | file://0003-tests-use-a-dictionaries-for-environment.patch \ |
23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ | 23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ |
24 | " | 24 | " |
25 | SRC_URI[sha256sum] = "1225ef4a329fae1cadc5ec727dab249ad567e8072879493561ceb91ed34aa414" | 25 | SRC_URI[sha256sum] = "52c93bc48e03533aa676fd8c15eb6b5fc326c68db311c50bcc0a865f31a6c653" |
26 | 26 | ||
27 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | 27 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ |
28 | check \ | 28 | check \ |
diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index a1fc9e26a0..d5bd7fe523 100644 --- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | |||
@@ -18,8 +18,8 @@ diff --git a/Makefile b/Makefile | |||
18 | index 223a839..a735584 100644 | 18 | index 223a839..a735584 100644 |
19 | --- a/Makefile | 19 | --- a/Makefile |
20 | +++ b/Makefile | 20 | +++ b/Makefile |
21 | @@ -1,6 +1,6 @@ | 21 | @@ -2,6 +2,6 @@ |
22 | VERSION = 2.6 | 22 | VERSION = 2.7 |
23 | -CC = $(CROSS_COMPILE)gcc | 23 | -CC = $(CROSS_COMPILE)gcc |
24 | -AR = $(CROSS_COMPILE)ar | 24 | -AR = $(CROSS_COMPILE)ar |
25 | +CC ?= $(CROSS_COMPILE)gcc | 25 | +CC ?= $(CROSS_COMPILE)gcc |
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 70315c4694..3fbdfa2038 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | SRCREV = "217cd8518c5f7777d490892aa9c765a6b2782cb5" | 1 | SRCREV = "5bd94923ffda2ab326d081926dbfc6775fb5050b" |
2 | PV = "2.6" | 2 | PV = "2.7" |
3 | PE = "1" | 3 | PE = "1" |
4 | 4 | ||
5 | SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" | 5 | SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" |
diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch deleted file mode 100644 index baf06d6b84..0000000000 --- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: settings-daemon/settings-daemon.c | ||
4 | =================================================================== | ||
5 | --- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 | ||
6 | +++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 | ||
7 | @@ -187,6 +187,10 @@ | ||
8 | GCONF_VALUE_STRING, translate_string_string }, | ||
9 | { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", | ||
10 | GCONF_VALUE_STRING, translate_string_string }, | ||
11 | + { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", | ||
12 | + GCONF_VALUE_STRING, translate_string_string }, | ||
13 | + { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , | ||
14 | + GCONF_VALUE_BOOL, translate_bool_int }, | ||
15 | }; | ||
16 | |||
17 | static const TranslationEntry* | ||
18 | Index: settings-daemon/settings-daemon.schemas | ||
19 | =================================================================== | ||
20 | --- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 | ||
21 | +++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 | ||
22 | @@ -196,6 +196,27 @@ | ||
23 | </locale> | ||
24 | </schema> | ||
25 | |||
26 | + <schema> | ||
27 | + <key>/schemas/desktop/gnome/sound/theme_name</key> | ||
28 | + <applyto>/desktop/gnome/sound/theme_name</applyto> | ||
29 | + <owner>gnome</owner> | ||
30 | + <type>string</type> | ||
31 | + <default>freedesktop</default> | ||
32 | + <locale name="C"> | ||
33 | + <short>Sound Theme Name</short> | ||
34 | + </locale> | ||
35 | + </schema> | ||
36 | + | ||
37 | + <schema> | ||
38 | + <key>/schemas/desktop/gnome/sound/event_sounds</key> | ||
39 | + <applyto>/desktop/gnome/sound/event_sounds</applyto> | ||
40 | + <owner>gnome</owner> | ||
41 | + <type>bool</type> | ||
42 | + <default>true</default> | ||
43 | + <locale name="C"> | ||
44 | + <short>Enable Sound Events</short> | ||
45 | + </locale> | ||
46 | + </schema> | ||
47 | |||
48 | </schemalist> | ||
49 | </gconfschemafile> | ||
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 fb00de9bc9..aee89b2f57 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 | |||
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc | |||
7 | DEPENDS = "gconf glib-2.0 gtk+3" | 7 | DEPENDS = "gconf glib-2.0 gtk+3" |
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | 9 | ||
10 | # SRCREV tagged 0.0.2 | 10 | PV .= "+git" |
11 | SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" | 11 | # SRCREV tagged 0.0.2 + one patch |
12 | SRCREV = "df669c6579a6ac7e1ef56be66617f35ae7d33d68" | ||
12 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \ | 13 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \ |
13 | file://addsoundkeys.patch \ | ||
14 | file://70settings-daemon.sh \ | 14 | file://70settings-daemon.sh \ |
15 | " | 15 | " |
16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git" | |||
19 | 19 | ||
20 | inherit autotools pkgconfig gconf features_check | 20 | inherit autotools pkgconfig gconf features_check |
21 | 21 | ||
22 | FILES:${PN} = "${bindir}/* ${sysconfdir}" | 22 | FILES:${PN} = "${bindir}/* ${sysconfdir}" |
23 | 23 | ||
24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES | 24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES |
25 | REQUIRED_DISTRO_FEATURES = "x11" | 25 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta/recipes-support/debianutils/debianutils_5.17.bb b/meta/recipes-support/debianutils/debianutils_5.19.bb index c5f25bae40..0fe9b1ec14 100644 --- a/meta/recipes-support/debianutils/debianutils_5.17.bb +++ b/meta/recipes-support/debianutils/debianutils_5.19.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=4b667f30411d21bc8fd7db85d502a8e9 | |||
11 | SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "baf12e98a02883d1b76081e32f2185ee3497570b" | 14 | SRCREV = "295d7674cdd526f3c9ec9de76db50efa280a5df0" |
15 | 15 | ||
16 | inherit autotools update-alternatives | 16 | inherit autotools update-alternatives |
17 | 17 | ||
diff --git a/meta/recipes-support/diffoscope/diffoscope_267.bb b/meta/recipes-support/diffoscope/diffoscope_271.bb index 69bad508cd..a8443183ec 100644 --- a/meta/recipes-support/diffoscope/diffoscope_267.bb +++ b/meta/recipes-support/diffoscope/diffoscope_271.bb | |||
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" | |||
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "c0a807aa66e18eae88c1adca28988675c9749d3ad1a8db3d2eb7e2afb8763568" | 15 | SRC_URI[sha256sum] = "7690f284a84a866c6f89fa5bb33a867574417ee1c5f2c6d49655cd3761d0fe2c" |
16 | 16 | ||
17 | RDEPENDS:${PN} += "\ | 17 | RDEPENDS:${PN} += "\ |
18 | binutils \ | 18 | binutils \ |
diff --git a/meta/recipes-support/enchant/enchant2_2.7.3.bb b/meta/recipes-support/enchant/enchant2_2.8.1.bb index d5073b6f31..825cf2e388 100644 --- a/meta/recipes-support/enchant/enchant2_2.7.3.bb +++ b/meta/recipes-support/enchant/enchant2_2.8.1.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] = "fe6ad4cbe8c71b9384ffdef962be52d4d2bd5ebfb6351435bb390543d4f78b1e" | 15 | SRC_URI[sha256sum] = "ff79de470b8eb16f53849dc49f2bce8ca4eb7decabfc1349716fe12616e52f4e" |
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/fribidi/fribidi_1.0.14.bb b/meta/recipes-support/fribidi/fribidi_1.0.15.bb index 51752096de..14d901a530 100644 --- a/meta/recipes-support/fribidi/fribidi_1.0.14.bb +++ b/meta/recipes-support/fribidi/fribidi_1.0.15.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | |||
11 | 11 | ||
12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.xz \ | 12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.xz \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a" | 14 | SRC_URI[sha256sum] = "0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587" |
15 | 15 | ||
16 | inherit meson lib_package pkgconfig github-releases | 16 | inherit meson lib_package pkgconfig github-releases |
17 | 17 | ||
diff --git a/meta/recipes-support/libevdev/libevdev_1.13.1.bb b/meta/recipes-support/libevdev/libevdev_1.13.2.bb index 85cfd78507..fd2bfdad9b 100644 --- a/meta/recipes-support/libevdev/libevdev_1.13.1.bb +++ b/meta/recipes-support/libevdev/libevdev_1.13.2.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \ | |||
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" | 12 | SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" |
13 | SRC_URI[sha256sum] = "06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36" | 13 | SRC_URI[sha256sum] = "3eca86a6ce55b81d5bce910637fc451c8bbe373b1f9698f375c7f1ad0de3ac48" |
14 | 14 | ||
15 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
16 | 16 | ||
diff --git a/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch b/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch deleted file mode 100644 index 69a51d5662..0000000000 --- a/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From c320799c941d42a9b7e351805359694ea3b36d2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 5 Apr 2015 09:08:38 -0700 | ||
4 | Subject: [PATCH] nls.m4: Take it from gettext-0.15 | ||
5 | |||
6 | It otherwise expects gettext to provide it. Lets go independent | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | --- | ||
12 | m4/nls.m4 | 30 ++++++++++++++++++++++++++++++ | ||
13 | 1 file changed, 30 insertions(+) | ||
14 | create mode 100644 m4/nls.m4 | ||
15 | |||
16 | diff --git a/m4/nls.m4 b/m4/nls.m4 | ||
17 | new file mode 100644 | ||
18 | index 0000000..2c8fe69 | ||
19 | --- /dev/null | ||
20 | +++ b/m4/nls.m4 | ||
21 | @@ -0,0 +1,30 @@ | ||
22 | +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. | ||
23 | +dnl This file is free software; the Free Software Foundation | ||
24 | +dnl gives unlimited permission to copy and/or distribute it, | ||
25 | +dnl with or without modifications, as long as this notice is preserved. | ||
26 | +dnl | ||
27 | +dnl This file can can be used in projects which are not available under | ||
28 | +dnl the GNU General Public License or the GNU Library General Public | ||
29 | +dnl License but which still want to provide support for the GNU gettext | ||
30 | +dnl functionality. | ||
31 | +dnl Please note that the actual code of the GNU gettext library is covered | ||
32 | +dnl by the GNU Library General Public License, and the rest of the GNU | ||
33 | +dnl gettext package package is covered by the GNU General Public License. | ||
34 | +dnl They are not in the public domain. | ||
35 | + | ||
36 | +dnl Authors: | ||
37 | +dnl Ulrich Drepper drepper@cygnus.com, 1995-2000. | ||
38 | +dnl Bruno Haible haible@clisp.cons.org, 2000-2003. | ||
39 | + | ||
40 | +AC_PREREQ(2.50) | ||
41 | + | ||
42 | +AC_DEFUN([AM_NLS], | ||
43 | +[ | ||
44 | +AC_MSG_CHECKING([whether NLS is requested]) | ||
45 | +dnl Default is enabled NLS | ||
46 | +AC_ARG_ENABLE(nls, | ||
47 | +[ --disable-nls do not use Native Language Support], | ||
48 | +USE_NLS=$enableval, USE_NLS=yes) | ||
49 | +AC_MSG_RESULT($USE_NLS) | ||
50 | +AC_SUBST(USE_NLS) | ||
51 | +]) | ||
52 | -- | ||
53 | 2.1.4 | ||
54 | |||
diff --git a/meta/recipes-support/libfm/libfm-extra_1.3.2.bb b/meta/recipes-support/libfm/libfm-extra_1.3.2.bb index 79dd1d92dc..eff1b54f73 100644 --- a/meta/recipes-support/libfm/libfm-extra_1.3.2.bb +++ b/meta/recipes-support/libfm/libfm-extra_1.3.2.bb | |||
@@ -9,7 +9,6 @@ SECTION = "x11/libs" | |||
9 | DEPENDS = "glib-2.0-native glib-2.0 intltool-native" | 9 | DEPENDS = "glib-2.0-native glib-2.0 intltool-native" |
10 | 10 | ||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ |
12 | file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ | ||
13 | " | 12 | " |
14 | 13 | ||
15 | SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" | 14 | SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" |
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.5.0.bb index 6cef8c068c..f23a122a9c 100644 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.5.0.bb | |||
@@ -5,12 +5,12 @@ stamp. It is a small-scale, yet fast entropy source that is viable in almost \ | |||
5 | all environments and on a lot of CPU architectures." | 5 | all environments and on a lot of CPU architectures." |
6 | HOMEPAGE = "http://www.chronox.de/jent.html" | 6 | HOMEPAGE = "http://www.chronox.de/jent.html" |
7 | LICENSE = "GPL-2.0-or-later | BSD-3-Clause" | 7 | LICENSE = "GPL-2.0-or-later | BSD-3-Clause" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=64a87180908540620ce364b5e69b3b03 \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=18a5cada7ee95e61db4180f0cb4a69cf \ |
9 | file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \ | 9 | file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \ |
10 | file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ | 10 | file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ |
11 | " | 11 | " |
12 | SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https" |
13 | SRCREV = "4544e11320138ac02797af81766f4476a71bb09f" | 13 | SRCREV = "48b2ffc128af776ff3658a70e5d7bb4a82180189" |
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
16 | do_configure[noexec] = "1" | 16 | do_configure[noexec] = "1" |
diff --git a/meta/recipes-support/libpcre/libpcre2_10.43.bb b/meta/recipes-support/libpcre/libpcre2_10.44.bb index fd0bd79212..ceb2b85458 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.43.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.44.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" | |||
15 | GITHUB_BASE_URI = "https://github.com/PhilipHazel/pcre2/releases" | 15 | GITHUB_BASE_URI = "https://github.com/PhilipHazel/pcre2/releases" |
16 | UPSTREAM_CHECK_REGEX = "releases/tag/pcre2-(?P<pver>\d+(\.\d+)+)$" | 16 | UPSTREAM_CHECK_REGEX = "releases/tag/pcre2-(?P<pver>\d+(\.\d+)+)$" |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb" | 18 | SRC_URI[sha256sum] = "d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96" |
19 | 19 | ||
20 | CVE_PRODUCT = "pcre2" | 20 | CVE_PRODUCT = "pcre2" |
21 | 21 | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.16.bb b/meta/recipes-support/rng-tools/rng-tools_6.17.bb index ed755ae705..fc141a984c 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.16.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.17.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \ | |||
11 | file://default \ | 11 | file://default \ |
12 | file://rng-tools.service \ | 12 | file://rng-tools.service \ |
13 | " | 13 | " |
14 | SRCREV = "e061c313b95890eb5fa0ada0cd6eec619dafdfe2" | 14 | SRCREV = "bd00c08b0c3c6a880b0988befe97fd35b315468c" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 795707ec5d..bf2c34d594 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py | |||
@@ -284,19 +284,8 @@ class Partition(): | |||
284 | 284 | ||
285 | extraopts = self.mkfs_extraopts or "-F -i 8192" | 285 | extraopts = self.mkfs_extraopts or "-F -i 8192" |
286 | 286 | ||
287 | if os.getenv('SOURCE_DATE_EPOCH'): | 287 | # use hash_seed to generate reproducible ext4 images |
288 | sde_time = int(os.getenv('SOURCE_DATE_EPOCH')) | 288 | (extraopts, pseudo) = self.get_hash_seed_ext4(extraopts, pseudo) |
289 | if pseudo: | ||
290 | pseudo = "export E2FSPROGS_FAKE_TIME=%s;%s " % (sde_time, pseudo) | ||
291 | else: | ||
292 | pseudo = "export E2FSPROGS_FAKE_TIME=%s; " % sde_time | ||
293 | |||
294 | # Set hash_seed to generate deterministic directory indexes | ||
295 | namespace = uuid.UUID("e7429877-e7b3-4a68-a5c9-2f2fdf33d460") | ||
296 | if self.fsuuid: | ||
297 | namespace = uuid.UUID(self.fsuuid) | ||
298 | hash_seed = str(uuid.uuid5(namespace, str(sde_time))) | ||
299 | extraopts += " -E hash_seed=%s" % hash_seed | ||
300 | 289 | ||
301 | label_str = "" | 290 | label_str = "" |
302 | if self.label: | 291 | if self.label: |
@@ -344,6 +333,23 @@ class Partition(): | |||
344 | 333 | ||
345 | self.check_for_Y2038_problem(rootfs, native_sysroot) | 334 | self.check_for_Y2038_problem(rootfs, native_sysroot) |
346 | 335 | ||
336 | def get_hash_seed_ext4(self, extraopts, pseudo): | ||
337 | if os.getenv('SOURCE_DATE_EPOCH'): | ||
338 | sde_time = int(os.getenv('SOURCE_DATE_EPOCH')) | ||
339 | if pseudo: | ||
340 | pseudo = "export E2FSPROGS_FAKE_TIME=%s;%s " % (sde_time, pseudo) | ||
341 | else: | ||
342 | pseudo = "export E2FSPROGS_FAKE_TIME=%s; " % sde_time | ||
343 | |||
344 | # Set hash_seed to generate deterministic directory indexes | ||
345 | namespace = uuid.UUID("e7429877-e7b3-4a68-a5c9-2f2fdf33d460") | ||
346 | if self.fsuuid: | ||
347 | namespace = uuid.UUID(self.fsuuid) | ||
348 | hash_seed = str(uuid.uuid5(namespace, str(sde_time))) | ||
349 | extraopts += " -E hash_seed=%s" % hash_seed | ||
350 | |||
351 | return (extraopts, pseudo) | ||
352 | |||
347 | def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, | 353 | def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, |
348 | native_sysroot, pseudo): | 354 | native_sysroot, pseudo): |
349 | """ | 355 | """ |
@@ -437,13 +443,16 @@ class Partition(): | |||
437 | 443 | ||
438 | extraopts = self.mkfs_extraopts or "-i 8192" | 444 | extraopts = self.mkfs_extraopts or "-i 8192" |
439 | 445 | ||
446 | # use hash_seed to generate reproducible ext4 images | ||
447 | (extraopts, pseudo) = self.get_hash_seed_ext4(extraopts, None) | ||
448 | |||
440 | label_str = "" | 449 | label_str = "" |
441 | if self.label: | 450 | if self.label: |
442 | label_str = "-L %s" % self.label | 451 | label_str = "-L %s" % self.label |
443 | 452 | ||
444 | mkfs_cmd = "mkfs.%s -F %s %s -U %s %s" % \ | 453 | mkfs_cmd = "mkfs.%s -F %s %s -U %s %s" % \ |
445 | (self.fstype, extraopts, label_str, self.fsuuid, rootfs) | 454 | (self.fstype, extraopts, label_str, self.fsuuid, rootfs) |
446 | exec_native_cmd(mkfs_cmd, native_sysroot) | 455 | exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) |
447 | 456 | ||
448 | self.check_for_Y2038_problem(rootfs, native_sysroot) | 457 | self.check_for_Y2038_problem(rootfs, native_sysroot) |
449 | 458 | ||